gloo-lang 0.9.8 → 0.9.9

data/lib/gloo_lang/verbs/move.rb

@@ -56,15 +56,15 @@ module GlooLang
       def lookup_obj
         arr = @tokens.before_token( TO )
         if arr.count == 1
-          $engine.err MISSING_SRC_ERR
+          @engine.err MISSING_SRC_ERR
           return
         end
 
         name = arr[ 1 ]
-        pn = GlooLang::Core::Pn.new name
+        pn = GlooLang::Core::Pn.new( @engine, name )
         o = pn.resolve
 
-        $engine.err( "#{MISSING_SRC_OBJ_ERR} #{name}" ) unless o
+        @engine.err( "#{MISSING_SRC_OBJ_ERR} #{name}" ) unless o
         return o
       end
 
@@ -74,13 +74,13 @@ module GlooLang
       def lookup_dst
         dst = @tokens.after_token( TO )
         unless dst
-          $engine.err MISSING_DST_ERR
+          @engine.err MISSING_DST_ERR
           return nil
         end
 
-        pn = GlooLang::Core::Pn.new dst
+        pn = GlooLang::Core::Pn.new( @engine, dst )
         o = pn.resolve
-        $engine.err( "#{MISSING_DST_OBJ_ERR} '#{dst}'" ) unless o
+        @engine.err( "#{MISSING_DST_OBJ_ERR} '#{dst}'" ) unless o
         return o
       end
 

data/lib/gloo_lang/verbs/put.rb

@@ -54,7 +54,7 @@ module GlooLang
       def fetch_value_tokens
         value = @tokens.before_token( INTO )
         if value.nil? || ( value.count <= 1 )
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return nil
         end
 
@@ -69,7 +69,7 @@ module GlooLang
         target = @tokens.after_token( INTO )
         return target if target
 
-        $engine.err INTO_MISSING_ERR
+        @engine.err INTO_MISSING_ERR
         return nil
       end
 
@@ -77,15 +77,15 @@ module GlooLang
       # Update the target with the new value.
       #
       def update_target( target, value )
-        pn = GlooLang::Core::Pn.new target
+        pn = GlooLang::Core::Pn.new( @engine, target )
         o = pn.resolve
         if o.nil?
-          $engine.err "#{TARGET_ERR} #{target}"
+          @engine.err "#{TARGET_ERR} #{target}"
         elsif value.count.positive?
-          expr = GlooLang::Expr::Expression.new( value )
+          expr = GlooLang::Expr::Expression.new( @engine, value )
           result = expr.evaluate
           o.set_value result
-          $engine.heap.it.set_to result
+          @engine.heap.it.set_to result
         end
       end
 

data/lib/gloo_lang/verbs/quit.rb

@@ -18,7 +18,7 @@ module GlooLang
       # engine stop gracefully next time through the loop.
       #
       def run
-        $engine.stop_running
+        @engine.stop_running
       end
 
       #

data/lib/gloo_lang/verbs/run.rb

@@ -19,7 +19,7 @@ module GlooLang
       #
       def run
         if @tokens.token_count < 2
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
@@ -54,7 +54,7 @@ module GlooLang
       # Run a script specified by pathname
       #
       def run_script
-        GlooLang::Exec::Runner.run @tokens.second
+        GlooLang::Exec::Runner.run( @engine, @tokens.second )
       end
 
       #
@@ -62,12 +62,12 @@ module GlooLang
       #
       def run_expression
         unless @tokens.token_count > 2
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
           return
         end
 
-        expr = GlooLang::Expr::Expression.new( @tokens.params[ 1..-1 ] )
-        $engine.parser.run expr.evaluate
+        expr = GlooLang::Expr::Expression.new( @engine, @tokens.params[ 1..-1 ] )
+        @engine.parser.run expr.evaluate
       end
 
     end

data/lib/gloo_lang/verbs/save.rb

@@ -17,7 +17,7 @@ module GlooLang
       def run
         # TODO:  Not currently using folders or keeping
         # track of where the object was loaded from.
-        $engine.persist_man.save @tokens.second
+        @engine.persist_man.save @tokens.second
       end
 
       #

data/lib/gloo_lang/verbs/show.rb

@@ -17,12 +17,12 @@ module GlooLang
       #
       def run
         if @tokens.token_count > 1
-          expr = GlooLang::Expr::Expression.new( @tokens.params )
+          expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
           result = expr.evaluate
-          $log.show get_formatted_string( result )
-          $engine.heap.it.set_to result
+          @engine.log.show get_formatted_string( result )
+          @engine.heap.it.set_to result
         else
-          $log.show ''
+          @engine.log.show ''
         end
       end
 
@@ -51,7 +51,7 @@ module GlooLang
       #
       def get_formatted_string( str )
         if @params&.token_count&.positive?
-          expr = GlooLang::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           val = expr.evaluate
           color = val.to_sym
           # return ColorizedString[ str.to_s ].colorize( color )

data/lib/gloo_lang/verbs/tell.rb

@@ -51,7 +51,7 @@ module GlooLang
       def setup_msg
         @msg = @tokens.after_token( TO )
 
-        $engine.err( UNKNOWN_MSG_ERR ) unless @msg
+        @engine.err( UNKNOWN_MSG_ERR ) unless @msg
       end
 
       #
@@ -59,7 +59,7 @@ module GlooLang
       #
       def setup_target
         @obj_name = @tokens.second
-        pn = GlooLang::Core::Pn.new @obj_name
+        pn = GlooLang::Core::Pn.new( @engine, @obj_name )
         @target_obj = pn.resolve
       end
 
@@ -68,9 +68,10 @@ module GlooLang
       #
       def dispatch_msg
         if @target_obj
-          GlooLang::Exec::Dispatch.message @msg, @target_obj, @params
+          GlooLang::Exec::Dispatch.message(
+            @engine, @msg, @target_obj, @params )
         else
-          $engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
+          @engine.err "#{OBJ_NOT_FOUND_ERR} #{@obj_name}"
         end
       end
 

data/lib/gloo_lang/verbs/unless.rb

@@ -55,7 +55,7 @@ module GlooLang
           # The first token is the verb, so we drop it.
           value = value[ 1..-1 ]
         else
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
         end
 
         return value
@@ -67,7 +67,7 @@ module GlooLang
       def evals_false( value )
         eval_result = false
         if value.count.positive?
-          expr = GlooLang::Expr::Expression.new( value )
+          expr = GlooLang::Expr::Expression.new( @engine, value )
           result = expr.evaluate
           eval_result = true if result == false
           eval_result = true if result.is_a?( Numeric ) && result.zero?
@@ -81,7 +81,7 @@ module GlooLang
       #
       def run_do
         cmd = @tokens.expr_after( DO )
-        i = $engine.parser.parse_immediate cmd
+        i = @engine.parser.parse_immediate cmd
         return unless i
 
         i.run

data/lib/gloo_lang/verbs/version.rb

@@ -15,7 +15,7 @@ module GlooLang
       # Run the verb.
       #
       def run
-        $log.show GlooLang::App::Info.full_version
+        @engine.log.show GlooLang::App::Info.full_version
       end
 
       #

data/lib/gloo_lang/verbs/wait.rb

@@ -17,7 +17,7 @@ module GlooLang
       def run
         x = 1
         if @tokens.token_count > 1
-          expr = GlooLang::Expr::Expression.new( @tokens.params )
+          expr = GlooLang::Expr::Expression.new( @engine, @tokens.params )
           x = expr.evaluate.to_i
         end
         sleep x

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler