gloo-lang 0.9.7 → 0.9.10

data/lib/gloo_lang/core/gloo_system.rb

@@ -18,7 +18,8 @@ module GlooLang
       attr_reader :pn
 
       # Set up the object.
-      def initialize( pn )
+      def initialize( engine, pn )
+        @engine = engine
         @pn = pn
       end
 
@@ -137,7 +138,7 @@ module GlooLang
         o = "msg_#{msg}"
         return self.public_send( o ) if self.respond_to? o
 
-        $log.error "Message #{msg} not implemented"
+        @engine.log.error "Message #{msg} not implemented"
         return false
       end
 
@@ -163,22 +164,22 @@ module GlooLang
 
       # Get the Gloo home directory
       def msg_gloo_home
-        return $settings.user_root
+        return @engine.settings.user_root
       end
 
       # Get the Gloo configuration directory
       def msg_gloo_config
-        return $settings.config_path
+        return @engine.settings.config_path
       end
 
       # Get the Gloo projects directory
       def msg_gloo_projects
-        return $settings.project_path
+        return @engine.settings.project_path
       end
 
       # Get the Gloo log directory
       def msg_gloo_log
-        return $settings.log_path
+        return @engine.settings.log_path
       end
 
       # ---------------------------------------------------------------------
@@ -196,12 +197,12 @@ module GlooLang
 
       # Get the number of lines on screen.
       def msg_screen_lines
-        return GlooLang::App::Settings.lines
+        return GlooLang::App::Settings.lines( @engine )
       end
 
       # Get the number of columns on screen.
       def msg_screen_cols
-        return GlooLang::App::Settings.cols
+        return GlooLang::App::Settings.cols( @engine )
       end
 
       # ---------------------------------------------------------------------

data/lib/gloo_lang/core/heap.rb

@@ -19,13 +19,14 @@ module GlooLang
       #
       # Set up the object heap.
       #
-      def initialize
-        $log.debug 'object heap intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'object heap intialized...'
 
-        @root = GlooLang::Objs::Container.new
+        @root = GlooLang::Objs::Container.new( @engine)
         @root.name = 'root'
 
-        @context = Pn.root
+        @context = Pn.root engine
         @it = It.new
         @error = Error.new
       end

data/lib/gloo_lang/core/here.rb

@@ -21,8 +21,8 @@ module GlooLang
       #
       # Expand here reference if present.
       #
-      def self.expand_here( pn )
-        target = $engine.exec_env.here_obj
+      def self.expand_here( engine, pn )
+        target = engine.exec_env.here_obj
 
         here = pn.elements.first
         remainder = pn.elements[ 1..-1 ].join( '.' )

data/lib/gloo_lang/core/obj.rb

@@ -15,7 +15,8 @@ module GlooLang
       #
       # Set up the object.
       #
-      def initialize
+      def initialize( engine )
+        @engine = engine
         @value = ''
         @children = []
         @parent = nil
@@ -152,7 +153,7 @@ module GlooLang
                    :type => type,
                    :value => nil,
                    :parent => self }
-        return $engine.factory.create params
+        return @engine.factory.create params
       end
 
       #
@@ -193,7 +194,7 @@ module GlooLang
         end
 
         if self.type_display == GlooLang::Objs::Alias.typename
-          ln = GlooLang::Core::Pn.new( self.value )
+          ln = GlooLang::Core::Pn.new( @engine, self.value )
           redirect = ln.resolve
           return redirect.find_child( name )
         end
@@ -256,7 +257,7 @@ module GlooLang
         @params = params
         return self.dispatch msg if self.can_receive_message? msg
 
-        $log.error "Object #{self.name} cannot receive message #{msg}"
+        @engine.log.error "Object #{self.name} cannot receive message #{msg}"
         return false
       end
 
@@ -269,7 +270,7 @@ module GlooLang
           self.public_send( o )
           return true
         else
-          $log.error "Message #{msg} not implemented"
+          @engine.log.error "Message #{msg} not implemented"
           return false
         end
       end
@@ -279,12 +280,12 @@ module GlooLang
       #
       def msg_unload
         if self.root?
-          $log.error 'Cannot unload the root object.'
+          @engine.log.error 'Cannot unload the root object.'
           return
         end
 
-        $engine.event_manager.on_unload self
-        $engine.heap.unload self
+        @engine.event_manager.on_unload self
+        @engine.heap.unload self
       end
 
       # ---------------------------------------------------------------------

data/lib/gloo_lang/core/obj_finder.rb

@@ -13,13 +13,13 @@ module GlooLang
       # the given name.
       # If the container isn't provided, root will be used.
       #
-      def self.by_name( name, container = nil )
-        container = $engine.heap.root if container.nil?
+      def self.by_name( engine, name, container = nil )
+        container = engine.heap.root if container.nil?
         arr = []
 
         container.children.each do |o|
           arr << o if o.name == name
-          arr += by_name( name, o ) if o.child_count.positive?
+          arr += by_name( engine, name, o ) if o.child_count.positive?
         end
 
         return arr

data/lib/gloo_lang/core/parser.rb

@@ -12,8 +12,9 @@ module GlooLang
       #
       # Set up the parser.
       #
-      def initialize
-        $log.debug 'parser intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'parser intialized...'
       end
 
       #
@@ -25,9 +26,9 @@ module GlooLang
         tokens = GlooLang::Core::Tokens.new( cmd )
         dic = GlooLang::Core::Dictionary.instance
         verb = dic.find_verb( tokens.verb )
-        return verb.new( tokens, params ) if verb
+        return verb.new( @engine, tokens, params ) if verb
 
-        $log.error "Verb '#{tokens.verb}' was not found."
+        @engine.log.error "Verb '#{tokens.verb}' was not found."
         return nil
       end
 
@@ -51,7 +52,7 @@ module GlooLang
       #
       def run( cmd )
         v = parse_immediate( cmd )
-        GlooLang::Exec::Runner.go( v ) if v
+        GlooLang::Exec::Runner.go( @engine, v ) if v
       end
 
     end

data/lib/gloo_lang/core/pn.rb

@@ -19,29 +19,30 @@ module GlooLang
       # Set up the object given a source string,
       # ie: the full path and name.
       #
-      def initialize( src )
+      def initialize( engine, src )
+        @engine = engine
         set_to src
       end
 
       #
       # Reference to the root object path.
       #
-      def self.root
-        return Pn.new( ROOT )
+      def self.root( engine )
+        return Pn.new( engine, ROOT )
       end
 
       #
       # Reference to it.
       #
-      def self.it
-        return Pn.new( IT )
+      def self.it( engine )
+        return Pn.new( engine, IT )
       end
 
       #
       # Reference to the error message.
       #
-      def self.error
-        return Pn.new( ERROR )
+      def self.error( engine )
+        return Pn.new( engine, ERROR )
       end
 
       #
@@ -127,13 +128,13 @@ module GlooLang
       # Get the parent that contains the object referenced.
       #
       def get_parent
-        o = $engine.heap.root
+        o = @engine.heap.root
 
         if self.includes_path?
           @elements[ 0..-2 ].each do |e|
             o = o.find_child( e )
             if o.nil?
-              $log.error "Object '#{e}' was not found."
+              @engine.log.error "Object '#{e}' was not found."
               return nil
             end
           end
@@ -169,18 +170,21 @@ module GlooLang
       # Find the object referenced or return nil if it is not found.
       #
       def resolve
-        return $engine.heap.root if self.root?
-        return $engine.heap.it if self.it?
-        return $engine.heap.error if self.error?
-        return GlooLang::Core::GlooSystem.new( self ) if self.gloo_sys?
-
-        Here.expand_here( self ) if Here.includes_here_ref?( @elements )
+        return @engine.heap.root if self.root?
+        return @engine.heap.it if self.it?
+        return @engine.heap.error if self.error?
+        return GlooLang::Core::GlooSystem.new(
+          @engine, self ) if self.gloo_sys?
+
+        if Here.includes_here_ref?( @elements )
+          Here.expand_here( @engine, self )
+        end
 
         parent = self.get_parent
         return nil unless parent
 
         obj = parent.find_child( self.name )
-        return GlooLang::Objs::Alias.resolve_alias( obj, self.src )
+        return GlooLang::Objs::Alias.resolve_alias( @engine, obj, self.src )
       end
 
     end

data/lib/gloo_lang/core/verb.rb

@@ -16,7 +16,8 @@ module GlooLang
       #
       # Set up the verb.
       #
-      def initialize( tokens, params = [] )
+      def initialize( engine, tokens, params = [] )
+        @engine = engine
         @tokens = tokens
         @params = params
       end

data/lib/gloo_lang/exec/dispatch.rb

@@ -15,24 +15,24 @@ module GlooLang
       #
       # Dispatch the given message to the given object.
       #
-      def self.message( msg, to_obj, params = nil )
-        $log.debug "Dispatch message #{msg} to #{to_obj.name}"
+      def self.message( engine, msg, to_obj, params = nil )
+        engine.log.debug "Dispatch message #{msg} to #{to_obj.name}"
         a = GlooLang::Exec::Action.new msg, to_obj, params
-        GlooLang::Exec::Dispatch.action a
+        GlooLang::Exec::Dispatch.action( engine, a )
       end
 
       #
       # Dispatch an action.
       #
-      def self.action( action )
+      def self.action( engine, action )
         unless action.valid?
-          $log.warn "Object #{action.to.name} does not respond to #{action.msg}"
+          engine.log.warn "Object #{action.to.name} does not respond to #{action.msg}"
         end
 
-        $engine.exec_env.push_action action
-        $log.debug "Sending message #{action.msg} to #{action.to.name}"
+        engine.exec_env.push_action action
+        engine.log.debug "Sending message #{action.msg} to #{action.to.name}"
         action.dispatch
-        $engine.exec_env.pop_action
+        engine.exec_env.pop_action
       end
 
     end

data/lib/gloo_lang/exec/exec_env.rb

@@ -19,13 +19,14 @@ module GlooLang
       #
       # Set up the execution environment.
       #
-      def initialize
-        $log.debug 'exec env intialized...'
+      def initialize( engine )
+        @engine = engine
+        @engine.log.debug 'exec env intialized...'
 
-        @verbs = GlooLang::Exec::Stack.new VERB_STACK
-        @actions = GlooLang::Exec::Stack.new ACTION_STACK
-        @scripts = GlooLang::Exec::Stack.new SCRIPT_STACK
-        @here = GlooLang::Exec::Stack.new HERE_STACK
+        @verbs = GlooLang::Exec::Stack.new( @engine, VERB_STACK )
+        @actions = GlooLang::Exec::Stack.new( @engine, ACTION_STACK )
+        @scripts = GlooLang::Exec::Stack.new( @engine, SCRIPT_STACK )
+        @here = GlooLang::Exec::Stack.new( @engine, HERE_STACK )
       end
 
       #

data/lib/gloo_lang/exec/runner.rb

@@ -15,28 +15,28 @@ module GlooLang
       # that need to be done before or after a verb
       # is done running.
       #
-      def self.go( verb )
-        $log.debug "running verb #{verb.type_display}"
-        $engine.heap.error.start_tracking
-        $engine.exec_env.verbs.push verb
+      def self.go( engine, verb )
+        engine.log.debug "running verb #{verb.type_display}"
+        engine.heap.error.start_tracking
+        engine.exec_env.verbs.push verb
         verb&.run
-        $engine.exec_env.verbs.pop
-        $engine.heap.error.clear_if_no_errors
+        engine.exec_env.verbs.pop
+        engine.heap.error.clear_if_no_errors
       end
 
       #
       # Send 'run' message to the object.
       # Resolve the path_name and then send the run message.
       #
-      def self.run( path_name )
-        $log.debug "running script at #{path_name}"
-        pn = GlooLang::Core::Pn.new path_name
+      def self.run( engine, path_name )
+        engine.log.debug "running script at #{path_name}"
+        pn = GlooLang::Core::Pn.new( engine, path_name )
         o = pn.resolve
 
         if o
           o.send_message 'run'
         else
-          $log.error "Could not send message to object.  Bad path: #{path_name}"
+          engine.log.error "Could not send message to object.  Bad path: #{path_name}"
         end
       end
 

data/lib/gloo_lang/exec/script.rb

@@ -13,7 +13,8 @@ module GlooLang
       #
       # Set up the script.
       #
-      def initialize( obj )
+      def initialize( engine, obj )
+        @engine = engine
         @obj = obj
       end
 
@@ -23,17 +24,17 @@ module GlooLang
       # of lines.
       #
       def run
-        $engine.exec_env.push_script self
+        @engine.exec_env.push_script self
 
         if @obj.value.is_a? String
-          $engine.parser.run @obj.value
+          @engine.parser.run @obj.value
         elsif @obj.value.is_a? Array
           @obj.value.each do |line|
-            $engine.parser.run line
+            @engine.parser.run line
           end
         end
 
-        $engine.exec_env.pop_script
+        @engine.exec_env.pop_script
       end
 
       #

data/lib/gloo_lang/exec/stack.rb

@@ -13,19 +13,20 @@ module GlooLang
       #
       # Set up the stack.
       #
-      def initialize( name )
+      def initialize( engine, name )
+        @engine = engine
         @name = name
         clear_stack
-        $log.debug "#{name} stack intialized..."
+        @engine.log.debug "#{name} stack intialized..."
       end
 
       #
       # Push an item onto the stack.
       #
       def push( obj )
-        $log.debug "#{@name}:push #{obj.display_value}"
+        @engine.log.debug "#{@name}:push #{obj.display_value}"
         @stack.push obj
-        self.update_out_file if $settings.debug
+        self.update_out_file if @engine.settings.debug
       end
 
       #
@@ -33,8 +34,8 @@ module GlooLang
       #
       def pop
         o = @stack.pop
-        $log.debug "#{@name}:pop #{o.display_value}"
-        self.update_out_file if $settings.debug
+        @engine.log.debug "#{@name}:pop #{o.display_value}"
+        self.update_out_file if @engine.settings.debug
       end
 
       #
@@ -55,7 +56,7 @@ module GlooLang
       # Get the file we'll write debug information for the stack.
       #
       def out_file
-        return File.join( $settings.debug_path, @name )
+        return File.join( @engine.settings.debug_path, @name )
       end
 
       #

data/lib/gloo_lang/expr/expression.rb

@@ -15,7 +15,8 @@ module GlooLang
       #
       # Create the expression from a list of tokens.
       #
-      def initialize( tokens )
+      def initialize( engine, tokens )
+        @engine = engine
         @tokens = tokens
         @symbols = []
         @left = nil
@@ -110,7 +111,7 @@ module GlooLang
         return LDecimal.new( token ) if LDecimal.decimal?( token )
 
         # last chance: an Object reference
-        return GlooLang::Core::Pn.new( token )
+        return GlooLang::Core::Pn.new( @engine, token )
       end
 
     end

data/lib/gloo_lang/objs/basic/alias.rb

@@ -48,9 +48,9 @@ module GlooLang
       # Check to see if the referenced object exists.
       #
       def msg_resolve
-        pn = GlooLang::Core::Pn.new( self.value )
+        pn = GlooLang::Core::Pn.new( @engine, self.value )
         s = pn.exists?
-        $engine.heap.it.set_to s
+        @engine.heap.it.set_to s
         return s
       end
 
@@ -64,12 +64,12 @@ module GlooLang
       # If it ends with the * then we won't resolve the alias since
       # we are trying to refer to the alias itself.
       #
-      def self.resolve_alias( obj, ref_name = nil )
+      def self.resolve_alias( engine, obj, ref_name = nil )
         return nil unless obj
         return obj unless obj.type_display == GlooLang::Objs::Alias.typename
         return obj if ref_name&.end_with?( ALIAS_REFERENCE )
 
-        ln = GlooLang::Core::Pn.new( obj.value )
+        ln = GlooLang::Core::Pn.new( engine, obj.value )
         return ln.resolve
       end
 

data/lib/gloo_lang/objs/basic/boolean.rb

@@ -93,7 +93,7 @@ module GlooLang
       def msg_not
         v = !value
         set_value v
-        $engine.heap.it.set_to v
+        @engine.heap.it.set_to v
         return v
       end
 
@@ -102,7 +102,7 @@ module GlooLang
       #
       def msg_true
         set_value true
-        $engine.heap.it.set_to true
+        @engine.heap.it.set_to true
         return true
       end
 
@@ -111,7 +111,7 @@ module GlooLang
       #
       def msg_false
         set_value false
-        $engine.heap.it.set_to false
+        @engine.heap.it.set_to false
         return false
       end
 

data/lib/gloo_lang/objs/basic/container.rb

@@ -41,7 +41,7 @@ module GlooLang
       #
       def msg_count
         i = child_count
-        $engine.heap.it.set_to i
+        @engine.heap.it.set_to i
         return i
       end
 
@@ -57,7 +57,7 @@ module GlooLang
       #
       def msg_show_key_value_table
         data = self.children.map { |o| [ o.name, o.value ] }
-        $engine.platform.show_table nil, data, title
+        @engine.platform.show_table nil, data, title
       end
 
     end

data/lib/gloo_lang/objs/basic/decimal.rb

@@ -35,7 +35,7 @@ module GlooLang
         end
 
         unless new_value.is_a? Numeric
-          self.value = $engine.converter.convert( new_value, 'Decimal', 0.0 )
+          self.value = @engine.converter.convert( new_value, 'Decimal', 0.0 )
           return
         end
 
@@ -61,13 +61,13 @@ module GlooLang
       def msg_round
         data = 0
         if @params&.token_count&.positive?
-          expr = GlooLang::Expr::Expression.new( @params.tokens )
+          expr = GlooLang::Expr::Expression.new( @engine, @params.tokens )
           data = expr.evaluate.to_i
         end
 
         i = self.value.round( data )
         set_value i
-        $engine.heap.it.set_to i
+        @engine.heap.it.set_to i
         return i
       end
 

data/lib/gloo_lang/objs/basic/integer.rb

@@ -30,7 +30,7 @@ module GlooLang
       #
       def set_value( new_value )
         unless new_value.is_a? Numeric
-          self.value = $engine.converter.convert( new_value, 'Integer', 0 )
+          self.value = @engine.converter.convert( new_value, 'Integer', 0 )
           return
         end
 
@@ -54,7 +54,7 @@ module GlooLang
       def msg_inc
         i = value + 1
         set_value i
-        $engine.heap.it.set_to i
+        @engine.heap.it.set_to i
         return i
       end
 
@@ -64,7 +64,7 @@ module GlooLang
       def msg_dec
         i = value - 1
         set_value i
-        $engine.heap.it.set_to i
+        @engine.heap.it.set_to i
         return i
       end
 

data/lib/gloo_lang/objs/basic/script.rb

@@ -90,7 +90,7 @@ module GlooLang
       # Send the object the unload message.
       #
       def msg_run
-        s = GlooLang::Exec::Script.new self
+        s = GlooLang::Exec::Script.new( @engine, self )
         s.run
       end
 

data/lib/gloo_lang/objs/basic/string.rb

@@ -48,7 +48,7 @@ module GlooLang
       #
       def msg_size
         s = value.size
-        $engine.heap.it.set_to s
+        @engine.heap.it.set_to s
         return s
       end
 
@@ -58,7 +58,7 @@ module GlooLang
       def msg_up
         s = value.upcase
         set_value s
-        $engine.heap.it.set_to s
+        @engine.heap.it.set_to s
         return s
       end
 
@@ -68,7 +68,7 @@ module GlooLang
       def msg_down
         s = value.downcase
         set_value s
-        $engine.heap.it.set_to s
+        @engine.heap.it.set_to s
         return s
       end
 

data/lib/gloo_lang/objs/basic/text.rb

@@ -64,14 +64,14 @@ module GlooLang
       def msg_page
         return unless value
 
-        $engine.platform.show( value, false, true )
+        @engine.platform.show( value, false, true )
       end
 
       #
       # Edit the text in the default editor.
       #
       def msg_edit
-        self.value = $engine.platform.edit( self.value )
+        self.value = @engine.platform.edit( self.value )
       end
 
     end