lib/gloo_lang/persist/file_loader.rb in gloo-lang-0.9.8 vs lib/gloo_lang/persist/file_loader.rb in gloo-lang-0.9.9

@@ -15,11 +15,12 @@
       attr_reader :obj
 
       #
       # Set up a file storage for an object.
       #
-      def initialize( pn )
+      def initialize( engine, pn )
+        @engine = engine
         @pn = pn
         @tabs = 0
         @obj = nil
         @in_multiline = false
         @exiting_multiline = false
@@ -31,18 +32,18 @@
       #
       # Load the objects from the file.
       #
       def load
         unless File.exist?( @pn )
-          $log.error "File '#{@pn}' does not exist."
+          @engine.log.error "File '#{@pn}' does not exist."
           return
         end
 
-        $log.debug "Loading file '#{@pn}'"
+        @engine.log.debug "Loading file '#{@pn}'"
         @tabs = 0
         @parent_stack = []
-        @parent = $engine.heap.root
+        @parent = @engine.heap.root
         @parent_stack.push @parent
         f = File.open( @pn, 'r' )
         f.each_line do |line|
           next if skip_line? line
 
@@ -148,10 +149,10 @@
         unless @block_value == ''
           value = @block_value
           @block_value = ''
         end
         params = { name: name, type: type, value: value, parent: @parent }
-        @last = $engine.factory.create( params )
+        @last = @engine.factory.create( params )
 
         if value.empty? && @last&.multiline_value?
           @multi_indent = 0
           @in_multiline = true
           puts "*** Start multiline. multi_indent: #{@multi_indent}" if @debug