gloo-lang 0.9.7 → 0.9.10

data/lib/gloo_lang/verbs/help.rb

@@ -36,7 +36,7 @@ module GlooLang
         if opts
           dispatch opts
         else
-          $engine.help.page_topic DEFAULT_HELP
+          @engine.help.page_topic DEFAULT_HELP
         end
       end
 
@@ -46,7 +46,7 @@ module GlooLang
       def get_verb_list
         out = "Verbs:\n"
         str = ''
-        verbs = $engine.dictionary.get_verbs.sort_by( &:keyword )
+        verbs = @engine.dictionary.get_verbs.sort_by( &:keyword )
         verbs.each_with_index do |v, i|
           cut = v.keyword_shortcut.ljust( 5, ' ' )
           str << " #{cut} #{v.keyword.ljust( 20, ' ' )}"
@@ -72,7 +72,7 @@ module GlooLang
       def get_obj_list
         out = "Object Types:\n"
         str = ''
-        objs = $engine.dictionary.get_obj_types.sort_by( &:typename )
+        objs = @engine.dictionary.get_obj_types.sort_by( &:typename )
         objs.each_with_index do |o, i|
           name = o.typename
           if o.short_typename != o.typename
@@ -94,7 +94,7 @@ module GlooLang
       def get_topics
         out = "Help Topics:\n"
         str = ''
-        objs = $engine.help.topics.keys.sort
+        objs = @engine.help.topics.keys.sort
         objs.each_with_index do |o, i|
           str << " #{o.ljust( 30, ' ' )}"
           if ( ( i + 1 ) % 4 ).zero?
@@ -130,7 +130,7 @@ module GlooLang
       # Report an error with the inline help.
       #
       def report_help_error( opts )
-        $engine.err "#{HELP_NOT_FOUND_ERR} '#{opts}'"
+        @engine.err "#{HELP_NOT_FOUND_ERR} '#{opts}'"
       end
 
       #
@@ -139,13 +139,13 @@ module GlooLang
       def dispatch( opts )
         return if dispatch_help_page( opts )
 
-        $log.debug 'looking for built in help topic'
+        @engine.log.debug 'looking for built in help topic'
         cmd = DISPATCH[ opts.to_sym ]
         if cmd
-          $log.debug 'found help index'
+          @engine.log.debug 'found help index'
           send cmd
         else
-          $log.debug 'looking for entity help'
+          @engine.log.debug 'looking for entity help'
           entity_help opts
         end
       rescue
@@ -156,16 +156,16 @@ module GlooLang
       # Dispatch to a help page if we can find one.
       #
       def dispatch_help_page( opts )
-        if $engine.help.topic? opts
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic opts
+        if @engine.help.topic? opts
+          @engine.log.debug 'found expanded help topic'
+          @engine.help.page_topic opts
           return true
         end
 
-        key = $engine.dictionary.lookup_keyword opts
-        if $engine.help.topic? key
-          $log.debug 'found expanded help topic'
-          $engine.help.page_topic key
+        key = @engine.dictionary.lookup_keyword opts
+        if @engine.help.topic? key
+          @engine.log.debug 'found expanded help topic'
+          @engine.help.page_topic key
           return true
         end
 
@@ -177,8 +177,8 @@ module GlooLang
       # silent mode.
       #
       def show_output( out )
-        $engine.heap.it.set_to out
-        puts out unless $engine.args.quiet?
+        @engine.heap.it.set_to out
+        puts out unless @engine.args.quiet?
       end
 
       #
@@ -205,8 +205,8 @@ module GlooLang
       # information about.
       #
       def try_verb_help( opts )
-        if $engine.dictionary.verb?( opts )
-          t = $engine.dictionary.find_verb( opts )
+        if @engine.dictionary.verb?( opts )
+          t = @engine.dictionary.find_verb( opts )
           out = t.send 'help'
           show_output out
           return true
@@ -220,8 +220,8 @@ module GlooLang
       # information about.
       #
       def try_object_help( opts )
-        if $engine.dictionary.obj?( opts )
-          t = $engine.dictionary.find_obj( opts )
+        if @engine.dictionary.obj?( opts )
+          t = @engine.dictionary.find_obj( opts )
           out = t.send 'help'
           show_output out
           return true
@@ -234,14 +234,14 @@ module GlooLang
       # Show application settings.
       #
       def show_settings
-        $settings.show
+        @engine.settings.show
       end
 
       #
       # Show all keywords: verbs and objects.
       #
       def show_keywords
-        $engine.dictionary.show_keywords
+        @engine.dictionary.show_keywords
       end
 
       #

data/lib/gloo_lang/verbs/if.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_true( 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 == true
           eval_result = true if result.is_a?( Numeric ) && result != 0
@@ -81,7 +81,7 @@ module GlooLang
       #
       def run_then
         cmd = @tokens.expr_after( THEN )
-        i = $engine.parser.parse_immediate cmd
+        i = @engine.parser.parse_immediate cmd
         return unless i
 
         i.run

data/lib/gloo_lang/verbs/list.rb

@@ -22,7 +22,7 @@ module GlooLang
         if obj
           show_target( obj, levels )
         else
-          $engine.err "#{TARGET_MISSING_ERR} #{target}"
+          @engine.err "#{TARGET_MISSING_ERR} #{target}"
         end
       end
 
@@ -30,9 +30,9 @@ module GlooLang
       # Determine the target object for the show command.
       #
       def determine_target
-        return $engine.heap.context if @tokens.token_count == 1
+        return @engine.heap.context if @tokens.token_count == 1
 
-        return GlooLang::Core::Pn.new( @tokens.second )
+        return GlooLang::Core::Pn.new( @engine, @tokens.second )
       end
 
       #
@@ -72,12 +72,12 @@ module GlooLang
       #
       def show_obj( obj, indent = '  ' )
         if obj.multiline_value? && obj.value_is_array?
-          $log.show "#{indent}#{obj.name} [#{obj.type_display}] :"
+          @engine.log.show "#{indent}#{obj.name} [#{obj.type_display}] :"
           obj.value.each do |line|
-            $log.show "#{indent}  #{line}"
+            @engine.log.show "#{indent}  #{line}"
           end
         else
-          $log.show "#{indent}#{obj.name} [#{obj.type_display}] : #{obj.value}"
+          @engine.log.show "#{indent}#{obj.name} [#{obj.type_display}] : #{obj.value}"
         end
       end
 
@@ -86,7 +86,7 @@ module GlooLang
       #
       def determine_levels
         # Check settings for the default value.
-        levels = $settings.list_indent
+        levels = @engine.settings.list_indent
         return levels if levels
 
         # Last chance: use the default

data/lib/gloo_lang/verbs/load.rb

@@ -19,10 +19,10 @@ module GlooLang
         fn = @tokens.second
 
         if fn
-          $log.debug "Getting ready to load file: #{fn}"
-          $engine.persist_man.load fn
+          @engine.log.debug "Getting ready to load file: #{fn}"
+          @engine.persist_man.load fn
         else
-          $engine.err MISSING_EXPR_ERR
+          @engine.err MISSING_EXPR_ERR
         end
       end
 

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.7
+  version: 0.9.10
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.4.6
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +200,7 @@ files:
 - lib/gloo-lang.rb
 - lib/gloo_lang/app/args.rb
 - lib/gloo_lang/app/engine.rb
+- lib/gloo_lang/app/engine_context.rb
 - lib/gloo_lang/app/help.rb
 - lib/gloo_lang/app/info.rb
 - lib/gloo_lang/app/log.rb