fOOrth 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8d03277abd6024718037df06ade52cfcce35bd
-  data.tar.gz: d0c444270cd30f0935df44d5e019bc8e227a90b3
+  metadata.gz: cde7de9c337c4b22e08296e3b2a6fb2b57e5a112
+  data.tar.gz: 6a3280aae89e3ac08f58de51411d9a73a2b321b8
 SHA512:
-  metadata.gz: 01de4937a043a3b7c6f1baace960a67e0f3034644b789af6226f44000ea679af4420f38a47d76ee992282a525279baac76be88b1b1f6ca24781823e23ba4593a
-  data.tar.gz: f407b7398c820ee7126d2a58051f35b1a42839267df76ac12a23c12341b3a0e5d3485c09b21a00e8d99420b45da5da7b1e04515ff2db3631b4e798750a73716c
+  metadata.gz: eedf9eb80534ec2e6057857b81c641c0059252604b28466d423e281125a0722877e70cd9a143396fdcf0b1fc512189327cc0906eaa382b8ff82313b4015c548d
+  data.tar.gz: e21563be0a8a01a0949beed1b97da9250ce0dce5a60e87d8bef76a542b4552c8ef65ec92cd691e88f516c4a532667083d8a91d0febc1ecaa041b6369c4de1548

data/fOOrth.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
                                       entry.start_with?("images")  }
 
   spec.files         = raw_list
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(tests|integration)/})
   spec.require_paths = ["lib"]
   spec.executables   = ["fOOrth"]

data/integration/data_ref_lib_tests.rb

@@ -40,4 +40,51 @@ class DataRefLibraryTester < Minitest::Test
     foorth_equal('10 val$: $test2',   [])
     foorth_equal('$test2',            [10])
   end
+
+  def test_shared_instance_variables
+    foorth_run('class: TIV01')
+    foorth_run('TIV01 .: .init val@: @dder  0 var@: @counter ;')
+    foorth_run('TIV01 .: .add  @dder + ;')
+    foorth_run('TIV01 .: .count  @counter @ 1+ dup @counter ! ;')
+
+    foorth_run('11 TIV01 .new  val$: $tiv01_01')
+    foorth_equal('$tiv01_01 .class .name', ['TIV01'])
+    foorth_equal('20 $tiv01_01 .add', [31])
+    foorth_equal('$tiv01_01 .count', [1])
+    foorth_equal('$tiv01_01 .count', [2])
+    foorth_equal('$tiv01_01 .count', [3])
+
+    foorth_run('42 TIV01 .new  val$: $tiv01_02')
+    foorth_equal('$tiv01_02 .class .name', ['TIV01'])
+    foorth_equal('20 $tiv01_02 .add', [62])
+    foorth_equal('$tiv01_02 .count', [1])
+    foorth_equal('$tiv01_02 .count', [2])
+    foorth_equal('$tiv01_02 .count', [3])
+
+    foorth_equal('$tiv01_01 .count', [4])
+  end
+
+  def test_exclusive_instance_variables
+    foorth_run('Object .new val$: $tiv02_01')
+    foorth_run('$tiv02_01 .:: .init val@: @dder 0 var@: @counter ;')
+    foorth_run('$tiv02_01 .:: .add @dder + ;')
+    foorth_run('$tiv02_01 .:: .count  @counter @ 1+ dup @counter ! ;')
+
+    foorth_run('11 $tiv02_01 .init ')
+    foorth_equal('20 $tiv02_01 .add', [31])
+    foorth_equal('$tiv02_01 .count', [1])
+    foorth_equal('$tiv02_01 .count', [2])
+    foorth_equal('$tiv02_01 .count', [3])
+
+    foorth_run('$tiv02_01 .clone val$: $tiv02_02')
+    foorth_run('42 $tiv02_02 .init ')
+    foorth_equal('20 $tiv02_02 .add', [62])
+    foorth_equal('$tiv02_02 .count', [1])
+    foorth_equal('$tiv02_02 .count', [2])
+    foorth_equal('$tiv02_02 .count', [3])
+
+    foorth_equal('20 $tiv02_01 .add', [31])
+    foorth_equal('$tiv02_01 .count', [4])
+  end
+
 end

data/lib/fOOrth/compiler/context.rb

@@ -40,10 +40,25 @@ module XfOOrth
       end
     end
 
-    #Get the currently define method receiver
-    def recvr
-      self[:obj] || self[:cls] || self[:vm] || error("F90: No message receiver.")
+    #Get the current target.
+    def target
+      self[:obj] || self[:cls] || self[:vm] || no_target_error
     end
 
+    #Get the current target object.
+    def target_object
+      self[:obj] || no_target_error
+    end
+
+    #Get the current target class.
+    def target_class
+      self[:cls] || no_target_error
+    end
+
+    #Signal that no receiver was found in this context.
+    #This is an internal error indication.
+    def no_target_error
+      error("F90: No target found in context.")
+    end
   end
 end

data/lib/fOOrth/compiler/context/map_name.rb

@@ -26,32 +26,33 @@ module XfOOrth
       case @name[0]
       when '.'
         do_object_class_map      ||
-        do_vm_target_map         ||
+        do_target_vm_map         ||
         TosSpec.new(@name, @symbol, [:temp])
 
       when '~'
-        do_class_target_map      ||
-        do_object_target_map     ||
-        do_vm_target_map         ||
+        do_target_class_map      ||
+        do_target_object_map     ||
+        do_target_vm_map         ||
         SelfSpec.new(@name, @symbol, [:temp])
 
       when '@'
-        do_class_target_map      ||
-        do_object_target_map     ||
-        do_vm_target_map         ||
+        do_target_class_map      ||
+        do_target_object_map     ||
+        do_target_vm_map         ||
         spec_error
 
       when '$'
         do_global_target_map     ||
+        do_target_vm_map         ||
         spec_error
 
       when '#'
-        do_vm_target_map         ||
+        do_target_vm_map         ||
         spec_error
 
       else
         do_object_class_map      ||
-        do_vm_target_map         ||
+        do_target_vm_map         ||
         do_global_target_map     ||
         spec_error
       end
@@ -64,17 +65,17 @@ module XfOOrth
     end
 
     #Do a search of the :cls tag if it is specified.
-    def do_class_target_map
+    def do_target_class_map
       (tc = self[:cls]) && tc.map_foorth_shared(@symbol)
     end
 
     #Do a search of the :obj tag if it is specified.
-    def do_object_target_map
+    def do_target_object_map
       (to = self[:obj]) && to.map_foorth_exclusive(@symbol)
     end
 
     #Do a search of the :vm tag if it is specified.
-    def do_vm_target_map
+    def do_target_vm_map
       (vm = self[:vm])  && vm.map_foorth_exclusive(@symbol)
     end
 

data/lib/fOOrth/compiler/modes.rb

@@ -17,7 +17,7 @@ module XfOOrth
     def process_text(text)
       if execute_mode?
         dbg_puts "  Code=#{text.inspect}"
-        @context.recvr.instance_exec(self, &eval("lambda {|vm| #{text} }"))
+        @context.target.instance_exec(self, &eval("lambda {|vm| #{text} }"))
       else
         self << text
       end

data/lib/fOOrth/compiler/parser/skip.rb

@@ -30,6 +30,8 @@ module XfOOrth
     #* true
     #<br>Note:
     #* Raises an XfOOrthError exception on an unterminated comment.
+    #<br>Endemic Code Smells
+    #* :reek:DuplicateMethodCall -- false positive
     def skip_over_comment
       vm = Thread.current[:vm]
       vm.parens += 1

data/lib/fOOrth/compiler/process.rb

@@ -36,7 +36,7 @@ module XfOOrth
       code = token.code
 
       if execute_mode? || ((token.has_tag?(:immediate)) && (!@force))
-        @context.recvr.instance_exec(self, &eval("lambda {|vm| #{code} }"))
+        @context.target.instance_exec(self, &eval("lambda {|vm| #{code} }"))
       else
         @buffer << code
         @force = false

data/lib/fOOrth/compiler/process/string.rb

@@ -11,14 +11,16 @@ module XfOOrth
     #* token - The token to receive the generated code.
     #* word  - The text of the word.
     def string_parms(token, word)
+      source = parser.source
+
       if word.end_with?('"')
         string_value = parser.get_string.foorth_embed
 
-        if parser.source.peek == '*'
-          parser.source.get
-          token.add("vm.push(StringBuffer.new(#{string_value})); ")
+        if source.peek == '*'
+          source.get
+          token.add("vm.push(StringBuffer.new(#{string_value})); ", [:string])
         else
-          token.add("vm.push(#{string_value}.freeze); ")
+          token.add("vm.push(#{string_value}.freeze); ", [:string])
         end
       end
     end

data/lib/fOOrth/compiler/source.rb

@@ -45,7 +45,7 @@ module XfOOrth
     #<br>Returns:
     #* A peek at next character or nil if none are available.
     def peek
-      @peek_buffer ||= get
+      @peek_buffer ||= get unless eoln?
     end
 
     #Has the source reached the end of the available data?

data/lib/fOOrth/compiler/source/console.rb

@@ -47,7 +47,7 @@ module XfOOrth
     #<br>Returns:
     #* A peek at next character or nil if none are available.
     def peek
-      @peek_buffer ||= get
+      @peek_buffer ||= get unless eoln?
     end
 
     #Has the scanning of the text reached the end of input?

data/lib/fOOrth/compiler/token.rb

@@ -16,13 +16,26 @@ module XfOOrth
     end
 
     #Append some text/tags to the code_fragment.
+    #<br>Parameters
+    #* text - A string of code to be appended to this token.
+    #* tags - An optional array of tags to be added to this token.
+    #<br>Possible tag values:
+    #* :class - This token contains a class constant..
+    #* :immediate - The token is executed, even in compile modes.
+    #* :macro - This token contains an in-line macro.
+    #* :numeric - This token contains a numeric literal.
+    #* :procedure - This token contains a procedure literal.
+    #* :string - This token contains a string literal.
+    #* :stub - This token contains a stub spec.
+    #* :temp - This token contains code from a temporary spec.
+    #* none - Nothing special here. Move along, move along.
     def add(text, tags=nil)
       @code << text
       @tags.concat(tags).uniq! if tags
       self
     end
 
-    #Does this token have the specified tag?
+    #Does this token have the specified tag value?
     def has_tag?(value)
       @tags.include?(value)
     end

data/lib/fOOrth/compiler/word_specs.rb

@@ -21,13 +21,16 @@ module XfOOrth
     #* name - The string that maps to the symbol.
     #* symbol - The symbol that the name maps to.
     #* tags - A an array of tags.
-    #<br>These may include:
+    #<br>These include:
+    #* :class - This spec defines a class.
     #* :immediate - The word is executed, even in compile modes.
-    #* :macro - Identifies the spec as a macro spec to assist debugging.
+    #* :macro - This spec defines an in-line macro.
     #* :stub - The word is a place holder in the hierarchy.
+    #* :temp - A temporary spec used during compilation.
+    #* none - Nothing special here. Move along, move along.
     #<br>Endemic Code Smells
     #* :reek:ControlParameter -- false positive
-    def initialize(name, symbol, tags=[], &block)
+    def initialize(name, symbol, tags, &block)
       @tags = tags
       @does = block || get_stub_action(name, symbol)
       build_builds_string(name, symbol)
@@ -40,7 +43,7 @@ module XfOOrth
       end
     end
 
-    #Look up an tag of interest.
+    #Look up a tag of interest.
     def has_tag?(tag)
       @tags.include?(tag)
     end
@@ -93,8 +96,8 @@ module XfOOrth
     #Get the default action if none is specified.
     def get_stub_action(name, symbol)
       lambda do |vm|
-        #NOS methods can leave an extra bit of mess on the stack which must
-        #be cleaned up at this time or it will cause further problems.
+        #NOS methods leave an extra item on the stack which must
+        #be removed at this time.
         vm.data_stack.pop
 
         error "F20: A #{self.foorth_name} does not understand #{name} (#{symbol.inspect})."
@@ -107,7 +110,7 @@ module XfOOrth
   class ClassSpec < AbstractWordSpec
     #Generate the Ruby code for this fOOrth class.
     #<br>Parameters:
-    #* \new_class - The string that maps to the symbol.
+    #* \new_class - The class object being specified.
     #* _symbol - The symbol that the name maps to. Unused
     def build_builds_string(new_class, _symbol)
       @new_class = new_class
@@ -158,7 +161,7 @@ module XfOOrth
     #* _name  - The string that maps to the symbol. Unused
     #* symbol - The symbol that the name maps to.
     def build_builds_string(_name, symbol)
-      @builds = "vm.context[#{symbol.inspect}].does.call(vm); "
+      @builds = "instance_exec(vm, &vm.context[#{symbol.inspect}].does); "
     end
   end
 

data/lib/fOOrth/core/class.rb

@@ -10,6 +10,11 @@ class Class
     @_private_foorth_name ||= name.freeze
   end
 
+  #Get the name of the class or a safe default.
+  def foorth_class_name
+    self.foorth_name || "AnonymousClass<#{self.object_id}>".freeze
+  end
+
   #Set the foorth name of this class.
   #<br>Decree!
   #* These are to be the only references to @_private_foorth_name!

data/lib/fOOrth/core/object.rb

@@ -5,19 +5,21 @@ class Object
 
   #Get the foorth name of this object.
   def foorth_name
-    "#{self.class.foorth_name} instance"
+    "#{self.class.foorth_name} instance".freeze
   end
 
   #Access/create the object's exclusive fOOrth dictionary.
   #<br>Decree!
-  #* These are to be the only reference to @_private_foorth_exclusive!
+  #* This method and the next are to be the only references
+  #  to the @_private_foorth_exclusive variable.
   def foorth_exclusive
     @_private_foorth_exclusive ||= Hash.new
   end
 
   #Does this object have exclusive methods defined on it?
   #<br>Decree!
-  #* These are to be the only reference to @_private_foorth_exclusive!
+  #* This method and the previous are to be the only references
+  #  to the @_private_foorth_exclusive variable.
   def foorth_has_exclusive?
     instance_variable_defined?(:@_private_foorth_exclusive)
   end
@@ -58,7 +60,9 @@ class Object
   #* block - Any block that might have passed to the method.
   #<br>Note:
   #* Since stubs for Object class do not create methods, an attempt is made
-  #  to execute the stub if the symbol maps and is in the Object class.
+  #  to execute the stub if the symbol maps and is in the Object class. This
+  #  ensures that the case specific stub code is used rather than the generic
+  #  code in this method.
   def method_missing(symbol, *args, &block)
     if (name = XfOOrth::SymbolMap.unmap(symbol))
       if (stub_spec = Object.foorth_shared[symbol])

data/lib/fOOrth/core/virtual_machine.rb

@@ -19,7 +19,7 @@ module XfOOrth
       #Create a new fOOrth subclass of this class. This is not allowed for the
       #VirtualMachine class so this stub merely raises an exception.
       def create_foorth_subclass(_name)
-        error "F13: Forbidden operation: (VirtualMachine.create_foorth_subclass)."
+        error "F13: Forbidden operation: VirtualMachine .class: "
       end
 
     end

data/lib/fOOrth/library/class_library.rb

@@ -11,7 +11,7 @@ module XfOOrth
   #Get the class as a string.
   # [cls] .to_s ["cls as a string"]
   Class.create_shared_method('.to_s', TosSpec, [], &lambda {|vm|
-    vm.push(self.foorth_name || "AnonymousClass<#{self.object_id}>".freeze)
+    vm.push(self.foorth_class_name)
   })
 
   #The .parent_class method. Retrieves the parent class of a class.

data/lib/fOOrth/library/compile_library.rb

@@ -68,11 +68,46 @@ module XfOOrth
       })
 
       XfOOrth.add_common_compiler_locals(vm, '.:')
+      XfOOrth.add_dot_colon_locals(vm.context)
     else
       delayed_compile_mode('.:')
     end
   })
 
+  #The procedure used for dot colon instance vars
+  DC_VAR = lambda {|vm|
+    var_name = vm.parser.get_word()
+
+    unless /^@[a-z][a-z0-9_]*$/ =~ var_name
+      error "F10: Invalid var name #{var_name}"
+    end
+
+    var_symbol = XfOOrth::SymbolMap.add_entry(var_name)
+    vm << "#{'@'+(var_symbol.to_s)} = [vm.pop]; "
+
+    vm.context.target_class.create_shared_method(var_name, InstanceVarSpec, [])
+  }
+
+  #The procedure used for dot colon instance vals
+  DC_VAL = lambda {|vm|
+    val_name = vm.parser.get_word()
+
+    unless /^@[a-z][a-z0-9_]*$/ =~ val_name
+      error "F10: Invalid val name #{val_name}"
+    end
+
+    val_symbol = XfOOrth::SymbolMap.add_entry(val_name)
+    vm << "#{'@'+(val_symbol.to_s)} = vm.pop; "
+
+    vm.context.target_class.create_shared_method(val_name, InstanceVarSpec, [])
+  }
+
+  # Add locals specific to a dot colon methods.
+  def self.add_dot_colon_locals(context)
+    context.create_local_method('var@:', LocalSpec, [:immediate], &DC_VAR)
+    context.create_local_method('val@:', LocalSpec, [:immediate], &DC_VAL)
+  end
+
 
   # DOT COLON COLON =============================
 
@@ -91,11 +126,45 @@ module XfOOrth
       })
 
       XfOOrth.add_common_compiler_locals(vm, '.::')
+      XfOOrth.add_dot_colon_colon_locals(vm.context)
     else
       delayed_compile_mode('.::')
     end
   })
 
+  #The procedure used for dot colon colon instance vars
+  DCC_VAR = lambda { |vm|
+    var_name = vm.parser.get_word()
+
+    unless /^@[a-z][a-z0-9_]*$/ =~ var_name
+      error "F10: Invalid var name #{var_name}"
+    end
+
+    var_symbol = XfOOrth::SymbolMap.add_entry(var_name)
+    vm << "#{'@'+(var_symbol.to_s)} = [vm.pop]; "
+
+    vm.context.target_object.create_exclusive_method(var_name, InstanceVarSpec, [])
+  }
+
+  #The procedure used for dot colon colon instance vals
+  DCC_VAL = lambda {|vm|
+    val_name = vm.parser.get_word()
+
+    unless /^@[a-z][a-z0-9_]*$/ =~ val_name
+      error "F10: Invalid val name #{val_name}"
+    end
+
+    val_symbol = XfOOrth::SymbolMap.add_entry(val_name)
+    vm << "#{'@'+(val_symbol.to_s)} = vm.pop; "
+
+    vm.context.target_object.create_exclusive_method(val_name, InstanceVarSpec, [])
+  }
+
+  # Add locals specific to a dot colon colon methods.
+  def self.add_dot_colon_colon_locals(context)
+    context.create_local_method('var@:', LocalSpec, [:immediate], &DCC_VAR)
+    context.create_local_method('val@:', LocalSpec, [:immediate], &DCC_VAL)
+  end
 
   # COMMON LOCAL DEFNS ==========================
 
@@ -103,8 +172,6 @@ module XfOOrth
   #<br>Parameters:
   #* vm - The current virtual machine instance.
   #* ctrl - A list of valid start controls.
-  #<br>Endemic Code Smells
-  #* :reek:TooManyStatements
   def self.add_common_compiler_locals(vm, ctrl)
     context = vm.context
 
@@ -112,10 +179,6 @@ module XfOOrth
     context.create_local_method('var:', LocalSpec, [:immediate], &Local_Var_Action)
     context.create_local_method('val:', LocalSpec, [:immediate], &Local_Val_Action)
 
-    #Support for instance data.
-    context.create_local_method('var@:', LocalSpec, [:immediate], &Inst_Var_Action)
-    context.create_local_method('val@:', LocalSpec, [:immediate], &Inst_Val_Action)
-
     #Support for super methods.
     context.create_local_method('super', LocalSpec, [:immediate],
       &lambda {|vm| vm << 'super(vm); ' })

data/lib/fOOrth/library/ctrl_struct_library.rb

@@ -8,12 +8,12 @@ module XfOOrth
     suspend_execute_mode('if vm.pop? then ', :if)
 
     context.create_local_method('else', LocalSpec, [:immediate], &lambda {|vm|
-      check_deferred_mode('else ', [:if])
+      vm.check_deferred_mode('else ', [:if])
       vm.context.remove_local_method('else')
     })
 
     context.create_local_method('then', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('end; ', [:if]) })
+      &lambda {|vm| vm.resume_execute_mode('end; ', [:if]) })
   })
 
   # [unspecified] switch ... end [unspecified]
@@ -27,7 +27,7 @@ module XfOOrth
       &lambda {|vm| vm << 'break if vm.pop?; ' })
 
     context.create_local_method('end', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('break; end; ', [:switch]) })
+      &lambda {|vm| vm.resume_execute_mode('break; end; ', [:switch]) })
   })
 
   # Looping constructs for fOOrth.
@@ -35,16 +35,16 @@ module XfOOrth
     suspend_execute_mode('begin ', :begin)
 
     context.create_local_method('while', LocalSpec, [:immediate],
-      &lambda {|vm| check_deferred_mode('break unless vm.pop?; ', [:begin]) })
+      &lambda {|vm| vm.check_deferred_mode('break unless vm.pop?; ', [:begin]) })
 
     context.create_local_method('until', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('end until vm.pop?; ', [:begin]) })
+      &lambda {|vm| vm.resume_execute_mode('end until vm.pop?; ', [:begin]) })
 
     context.create_local_method('again', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('end until false; ', [:begin]) })
+      &lambda {|vm| vm.resume_execute_mode('end until false; ', [:begin]) })
 
     context.create_local_method('repeat', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('end until false; ', [:begin]) })
+      &lambda {|vm| vm.resume_execute_mode('end until false; ', [:begin]) })
   })
 
   # Support for the sanitized do loop constructs!
@@ -66,10 +66,10 @@ module XfOOrth
       [:macro, 'vm.push(jloop[2] - jloop[0]); '])
 
     context.create_local_method('loop', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('iloop[0] += 1}; ', [:do]) })
+      &lambda {|vm| vm.resume_execute_mode('iloop[0] += 1}; ', [:do]) })
 
     context.create_local_method('+loop', LocalSpec, [:immediate],
-      &lambda {|vm| resume_execute_mode('iloop[0] += vm.vm_do_increment}; ', [:do]) })
+      &lambda {|vm| vm.resume_execute_mode('iloop[0] += vm.vm_do_increment}; ', [:do]) })
   })
 
   #Support for the try ... catch ... finally ... end construct.
@@ -99,7 +99,7 @@ module XfOOrth
     })
 
     context.create_local_method('finally', LocalSpec, [:immediate], &lambda {|vm|
-      check_deferred_mode('ensure; ', [:try_block])
+      vm.check_deferred_mode('ensure; ', [:try_block])
 
       vm.context.remove_local_method('catch')
       vm.context.remove_local_method('finally')
@@ -118,7 +118,7 @@ module XfOOrth
     suspend_buffered_mode('[[')
 
     vm.context.create_local_method(']]', LocalSpec, [:immediate], &lambda {|vm|
-      resume_buffered_mode('[[')
+      vm.resume_buffered_mode('[[')
     })
   })
 

data/lib/fOOrth/library/data_ref_library.rb

@@ -29,30 +29,6 @@ module XfOOrth
       &lambda {|vm| vm << "vm.push(#{symbol}); "} )
   }
 
-  #The lambda used to define instance variables. fOOrth language definition is:
-  # [n] var@: @iv [], @iv = [n]
-  Inst_Var_Action = lambda { |vm|
-    name   = vm.parser.get_word()
-    error "F10: Invalid var name #{name}" unless /^@[a-z][a-z0-9_]*$/ =~ name
-    symbol = XfOOrth::SymbolMap.add_entry(name)
-    vm << "#{'@'+(symbol.to_s)} = [vm.pop]; "
-
-    #Add a defn for the instance variable.
-    vm.context.recvr.create_shared_method(name, InstanceVarSpec, [])
-  }
-
-  #The lambda used to define instance values. fOOrth language definition is:
-  # [n] val@: @iv [], @iv = n
-  Inst_Val_Action = lambda { |vm|
-    name   = vm.parser.get_word()
-    error "F10: Invalid val name #{name}" unless /^@[a-z][a-z0-9_]*$/ =~ name
-    symbol = XfOOrth::SymbolMap.add_entry(name)
-    vm << "#{'@'+(symbol.to_s)} = vm.pop; "
-
-    #Add a defn for the instance variable.
-    vm.context.recvr.create_shared_method(name, InstanceVarSpec, [])
-  }
-
   # Thread Variables
   # [n] var#: #tv [], Thread.current[#tv] = [n]
   VirtualMachine.create_shared_method('var#:', VmSpec, [], &lambda {|vm|

data/lib/fOOrth/library/stubs.rb

@@ -4,11 +4,11 @@
 module XfOOrth
 
   # Some comparison words.  See numeric_library.rb and string_library.rb
-  Object.create_shared_method('>',    NosSpec, [:stub])
-  Object.create_shared_method('<',    NosSpec, [:stub])
-  Object.create_shared_method('>=',   NosSpec, [:stub])
-  Object.create_shared_method('<=',   NosSpec, [:stub])
-  Object.create_shared_method('<=>',  NosSpec, [:stub])
+  Object.create_shared_method('>',      NosSpec, [:stub])
+  Object.create_shared_method('<',      NosSpec, [:stub])
+  Object.create_shared_method('>=',     NosSpec, [:stub])
+  Object.create_shared_method('<=',     NosSpec, [:stub])
+  Object.create_shared_method('<=>',    NosSpec, [:stub])
 
   # Some comparison with zero words.  See numeric_library.rb
   Object.create_shared_method('0=',     TosSpec, [:stub])
@@ -48,10 +48,10 @@ module XfOOrth
   Object.create_shared_method('@',      TosSpec, [:stub])
   Object.create_shared_method('!',      TosSpec, [:stub])
 
-  Object.create_shared_method('parse',     NosSpec, [:stub])
-  Object.create_shared_method('parse!',    NosSpec, [:stub])
-  Object.create_shared_method('p"',        NosSpec, [:stub])
-  Object.create_shared_method('p!"',       NosSpec, [:stub])
+  Object.create_shared_method('parse',  NosSpec, [:stub])
+  Object.create_shared_method('parse!', NosSpec, [:stub])
+  Object.create_shared_method('p"',     NosSpec, [:stub])
+  Object.create_shared_method('p!"',    NosSpec, [:stub])
 
   #Procedure literal stubs.
   Object.create_shared_method('.each{{',        NosSpec, [:stub])
@@ -66,11 +66,11 @@ module XfOOrth
   Object.create_shared_method('.new_default{{', NosSpec, [:stub])
 
   #Embedding stubs.
-  Object.create_shared_method(',asm',           TosSpec, [:stub])
-  Object.create_shared_method(',asm"',          TosSpec, [:stub])
+  Object.create_shared_method(',asm',   TosSpec, [:stub])
+  Object.create_shared_method(',asm"',  TosSpec, [:stub])
 
   #Define some "crossover" symbols.
-  SymbolMap.add_entry('.is_class?',     "foorth_is_class?".to_sym)
+  SymbolMap.add_entry('.is_class?',     :foorth_is_class?)
   SymbolMap.add_entry('.to_s',          :to_foorth_s)
   SymbolMap.add_entry('.strlen',        :foorth_strlen)
   SymbolMap.add_entry('.strmax',        :foorth_strmax)

data/lib/fOOrth/monkey_patch/exceptions.rb

@@ -109,11 +109,11 @@ end
 class RuntimeError
 
   #Massage the messages a bit
+  #<br>Endemic Code Smells
+  #* :reek:FeatureEnvy
   def message
     msg = super
-
     msg["frozen"] && msg["frozen"] = "protected"
-
     msg
   end
 

data/lib/fOOrth/monkey_patch/object.rb

@@ -5,7 +5,7 @@ class Object
 
   #Raise a fOOrth language internal exception as this operation is not allowed.
   def foorth_embed
-    error "F40: Can't embed class #{self.class.to_s}"
+    error "F40: Can't embed class #{self.class.foorth_class_name}"
   end
 
   #Convert this object to a fOOrth boolean.

data/lib/fOOrth/version.rb

@@ -3,5 +3,5 @@
 #* version.rb - The version string for fOOrth.
 module XfOOrth
   #The version string for fOOrth.
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/tests/compiler/context_tests.rb

@@ -107,7 +107,7 @@ class ContextTester < Minitest::Test
 
     name = 'b'
     sym = XfOOrth::SymbolMap.add_entry(name)
-    context[sym] = XfOOrth::VmSpec.new(name, sym)
+    context[sym] = XfOOrth::VmSpec.new(name, sym, [])
     spec = context.map(name)
     assert(spec.is_a?(XfOOrth::VmSpec))
   end
@@ -118,7 +118,7 @@ class ContextTester < Minitest::Test
 
     name = '.c'
     sym = XfOOrth::SymbolMap.add_entry(name)
-    mk[sym] = XfOOrth::TosSpec.new(name, sym)
+    mk[sym] = XfOOrth::TosSpec.new(name, sym, [])
     spec = context.map(name)
     assert(spec.is_a?(XfOOrth::TosSpec))
   end
@@ -129,7 +129,7 @@ class ContextTester < Minitest::Test
 
     name = '.d'
     sym = XfOOrth::SymbolMap.add_entry(name)
-    mk[sym] = XfOOrth::TosSpec.new(name, sym)
+    mk[sym] = XfOOrth::TosSpec.new(name, sym, [])
     spec = context.map(name)
     assert(spec.is_a?(XfOOrth::TosSpec))
   end
@@ -148,19 +148,16 @@ class ContextTester < Minitest::Test
 
   def test_the_locating_of_the_receiver
     context = XfOOrth::Context.new(nil, vm: 'vm_sample')
-    assert_equal('vm_sample', context.recvr)
+    assert_equal('vm_sample', context.target)
 
     context = XfOOrth::Context.new(context, cls: 'cls_sample')
-    assert_equal('cls_sample', context.recvr)
+    assert_equal('cls_sample', context.target)
 
     context = XfOOrth::Context.new(context, obj: 'obj_sample')
-    assert_equal('obj_sample', context.recvr)
+    assert_equal('obj_sample', context.target)
 
     context = XfOOrth::Context.new(nil)
-
-    assert_raises(XfOOrth::XfOOrthError) do
-      context.recvr
-    end
+    assert_raises(XfOOrth::XfOOrthError) { context.target }
   end
 
   def test_adding_and_removing_local_methods

data/tests/compiler/spec_tests.rb

@@ -95,7 +95,7 @@ class SpecTester < Minitest::Test
   def test_local_spec
     spec = XfOOrth::LocalSpec.new("fred", :freddy, [:foo])
 
-    assert_equal("vm.context[:freddy].does.call(vm); ", spec.builds)
+    assert_equal("instance_exec(vm, &vm.context[:freddy].does); ", spec.builds)
     assert_instance_of(Proc, spec.does)
     assert(spec.has_tag?(:foo))
     refute(spec.has_tag?(:bar))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fOOrth
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler