fOOrth 0.6.10 → 0.6.11

data/integration/procedure_lib_tests.rb

@@ -43,4 +43,20 @@ class ProcedureLibraryTester < Minitest::Test
     foorth_equal('{{ 42 var: a a @ }} .call', [42])
   end
 
+  def test_instance_data
+    foorth_run('42 Object .new .with{{ val@: @test self val$: $t_i_d_1 }}')
+    foorth_run('$t_i_d_1  .:: .mulby @test * ; ')
+    foorth_equal('2 $t_i_d_1 .mulby', [84])
+
+    foorth_run('99 $t_i_d_1 .with{{ var@: @boot }} ')
+    foorth_run('$t_i_d_1  .:: .addby @boot @ + ; ')
+    foorth_equal('2 $t_i_d_1 .addby', [101])
+
+    foorth_run('$t_i_d_1 .:: .set_boot @boot ! ;')
+    foorth_run('56 $t_i_d_1 .set_boot')
+    foorth_equal('2 $t_i_d_1 .addby', [58])
+
+    foorth_run('128 $t_i_d_1 .set_boot')
+    foorth_equal('64 $t_i_d_1 .addby', [192])
+  end
 end

data/integration/queue_lib_tests.rb

@@ -42,8 +42,9 @@ class QueueLibraryTester < Minitest::Test
 
     foorth_equal('5 $q .push', [])
     foorth_equal('$q .empty?', [false])
+    foorth_equal('$q .present?', [true])
     foorth_equal('$q .length', [1])
-    foorth_equal('$q .clear',  [])
+    foorth_equal('$q .clear!',  [])
     foorth_equal('$q .empty?', [true])
     foorth_equal('$q .length', [0])
 

data/integration/stack_lib_tests.rb

@@ -60,8 +60,9 @@ class StackLibraryTester < Minitest::Test
     foorth_run('42 $s .push')
     foorth_equal('$s .empty?', [false])
     foorth_equal('$s .peek', [42])
+    foorth_equal('$s .present?', [true])
 
-    foorth_run('$s .clear')
+    foorth_run('$s .clear!')
 
     foorth_equal('$s .empty?', [true])
     foorth_raises('$s .peek')

data/integration/string_lib_tests.rb

@@ -523,4 +523,15 @@ class StringLibraryTester < Minitest::Test
     foorth_equal('"Hello World" p"%s %s" .map{{ v .mutable? }}', [[false, false]])
   end
 
+  def test_string_emptiness
+    foorth_equal('""  .empty?',     [true])
+    foorth_equal('"1" .empty?',     [false])
+
+    foorth_equal('""  .present?',   [false])
+    foorth_equal('"1" .present?',   [true])
+
+    foorth_equal('"1"* dup .clear!', [""])
+  end
+
+
 end

data/integration/thread_lib_tests.rb

@@ -71,23 +71,26 @@ class ThreadLibraryTester < Minitest::Test
     foorth_run('$tmtx .lock $tmtx .unlock ')
     foorth_equal('$tmtx .do{{ 3 4 + }}', [7])
 
-    code = ': test_mutex_one ' +
+    foorth_run('""* val$: $tmtx_str')
+
+    code = ': test_mutex_one $tmtx_str .clear! ' +
            '{{ $tmtx .do{{ 0 10 do $tmtx_str "@" << loop }} }} .start drop ' +
-           'begin $tmtx .do{{ $tmtx_str }} "" = while again $tmtx_str ;'
+           'begin $tmtx .do{{ $tmtx_str }} .present? until $tmtx_str ;'
 
-    foorth_run('""* val$: $tmtx_str')
     foorth_run(code)
 
     10.times do
-      foorth_equal('""* val$: $tmtx_str test_mutex_one', ["@"*10])
+      foorth_equal('test_mutex_one', ["@"*10])
     end
 
-    code = '{{ Mutex .do{{ 0 10 do $tmtx_str "@" << loop }} }} .start drop ' +
-           'begin Mutex .do{{ $tmtx_str }} "" = while again $tmtx_str'
+    code = ': test_mutex_two $tmtx_str .clear! ' +
+           '{{ Mutex .do{{ 0 10 do $tmtx_str "@" << loop }} }} .start drop ' +
+           'begin Mutex .do{{ $tmtx_str }} .present? until $tmtx_str ;'
+
+    foorth_run(code)
 
     10.times do
-      foorth_run('""* val$: $tmtx_str')
-      foorth_equal(code, ["@"*10])
+      foorth_equal('test_mutex_two', ["@"*10])
     end
   end
 

data/lib/fOOrth/compiler/context.rb

@@ -1,64 +1,64 @@
-# coding: utf-8
-
-require_relative 'context/map_name'
-require_relative 'context/tags'
-require_relative 'context/locals'
-
-#* compiler/context.rb - The compile progress context manager of the fOOrth
-#  language system.
-module XfOOrth
-
-  #A class for the management of global, hierarchical, and nested compile time contexts.
-  #* compiler/context.rb - \Context constructor, tag support, and local defs.
-  class Context
-
-    #The previous context object that this one builds on. Set to nil if there
-    #is none.
-    attr_reader :previous
-
-    #Setup an instance of compiler context.
-    #<br>Parameters:
-    #* previous - The previous context object or nil if there is none.
-    #* data - A hash of context data.
-    def initialize(previous, data={})
-      @previous, @data = previous, data
-    end
-
-    #How many levels of nested context are there?
-    def depth
-      1 + (previous ? previous.depth : 0)
-    end
-
-    #Is the current nesting level what is expected?
-    #<br>Parameters
-    #* expected_depth - the expected nesting depth.
-    #<br>Notes
-    #* Raises an error (F12) on incorrect nesting.
-    def check_depth(expected_depth)
-      if expected_depth - self.depth != 0
-        error "F12: Error, Invalid control/structure nesting."
-      end
-    end
-
-    #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
+# coding: utf-8
+
+require_relative 'context/map_name'
+require_relative 'context/tags'
+require_relative 'context/locals'
+
+#* compiler/context.rb - The compile progress context manager of the fOOrth
+#  language system.
+module XfOOrth
+
+  #A class for the management of global, hierarchical, and nested compile time contexts.
+  #* compiler/context.rb - \Context constructor, tag support, and local defs.
+  class Context
+
+    #The previous context object that this one builds on. Set to nil if there
+    #is none.
+    attr_reader :previous
+
+    #Setup an instance of compiler context.
+    #<br>Parameters:
+    #* previous - The previous context object or nil if there is none.
+    #* data - A hash of context data.
+    def initialize(previous, data={})
+      @previous, @data = previous, data
+    end
+
+    #How many levels of nested context are there?
+    def depth
+      1 + (previous ? previous.depth : 0)
+    end
+
+    #Is the current nesting level what is expected?
+    #<br>Parameters
+    #* expected_depth - the expected nesting depth.
+    #<br>Notes
+    #* Raises an error (F12) on incorrect nesting.
+    def check_depth(expected_depth)
+      if expected_depth - self.depth != 0
+        error "F12: Error, Invalid control/structure nesting."
+      end
+    end
+
+    #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/locals.rb

@@ -1,34 +1,34 @@
-# coding: utf-8
-
-#* compiler/context/locals.rb - Support local methods in context.
-module XfOOrth
-
-  #* compiler/context/locals.rb - Support local methods in context.
-  class Context
-
-    #Create a local method on this context.
-    #<br>Parameters:
-    #* name - The name of the method to create.
-    #* spec_class - The specification class to use.
-    #* options - An array of options.
-    #* block - A block to associate with the name.
-    #<br>Returns
-    #* The spec created for the shared method.
-    def create_local_method(name, spec_class, options, &block)
-      sym = SymbolMap.add_entry(name)
-      self[sym] = spec_class.new(name, sym, options, &block)
-    end
-
-    #Remove a local method on this context.
-    #<br>Parameters:
-    #* The name of the method to remove.
-    def remove_local_method(name)
-      if (sym = SymbolMap.map(name))
-        @data.delete(sym)
-      else
-        error "F90: Unable to remove local method #{name}"
-      end
-    end
-
-  end
-end
+# coding: utf-8
+
+#* compiler/context/locals.rb - Support local methods in context.
+module XfOOrth
+
+  #* compiler/context/locals.rb - Support local methods in context.
+  class Context
+
+    #Create a local method on this context.
+    #<br>Parameters:
+    #* name - The name of the method to create.
+    #* spec_class - The specification class to use.
+    #* options - An array of options.
+    #* block - A block to associate with the name.
+    #<br>Returns
+    #* The spec created for the shared method.
+    def create_local_method(name, spec_class, options, &block)
+      sym = SymbolMap.add_entry(name)
+      self[sym] = spec_class.new(name, sym, options, &block)
+    end
+
+    #Remove a local method on this context.
+    #<br>Parameters:
+    #* The name of the method to remove.
+    def remove_local_method(name)
+      if (sym = SymbolMap.map(name))
+        @data.delete(sym)
+      else
+        error "F90: Unable to remove local method #{name}"
+      end
+    end
+
+  end
+end

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

@@ -1,85 +1,85 @@
-# coding: utf-8
-
-#* compiler/context/map_name.rb - The fOOrth language mapping of names in a context.
-module XfOOrth
-
-  #* compiler/context/map_name.rb - The fOOrth language mapping of names in a context.
-  class Context
-
-    #Map a name to a specification.
-    #<br>Parameters:
-    #* name - The string to be mapped.
-    #<br>Returns:
-    #* The specification that corresponds to the name or nil if none found.
-    def map_with_defaults(name)
-      if (@symbol = SymbolMap.map(@name = name))
-        do_map_name ||
-          case @name[0]
-          when '.'
-            TosSpec.new(@name, @symbol, [:temp])
-
-          when '~'
-            SelfSpec.new(@name, @symbol, [:temp])
-
-          else
-            spec_error
-          end
-      end
-    end
-
-    #Map a name to a specification.
-    #<br>Parameters:
-    #* name - The string to be mapped.
-    #<br>Returns:
-    #* The specification that corresponds to the name or nil if none found.
-    def map_without_defaults(name)
-      if (@symbol = SymbolMap.map(@name = name))
-        do_map_name
-      end
-    end
-
-    #Private methods follow.
-    private
-
-    #Do a search of dictionaries based on the syntax of the name.
-    def do_map_name
-      self[@symbol]        ||
-      do_target_class_map  ||
-      do_target_object_map ||
-      do_target_vm_map     ||
-      do_object_class_map  ||
-      do_global_map
-    end
-
-    #Do a search of the Object class for the item.
-    def do_object_class_map
-      Object.map_foorth_shared(@symbol)
-    end
-
-    #Do a search of the :cls tag if it is specified.
-    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_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_target_vm_map
-      (vm = self[:vm])  && vm.map_foorth_exclusive(@symbol)
-    end
-
-    #Do a search of the globals.
-    def do_global_map
-      $FOORTH_GLOBALS[@symbol]
-    end
-
-    #Error: Unable to find a specification.
-    def spec_error
-      error "F11: ?#{@name}?"
-    end
-
-  end
-end
+# coding: utf-8
+
+#* compiler/context/map_name.rb - The fOOrth language mapping of names in a context.
+module XfOOrth
+
+  #* compiler/context/map_name.rb - The fOOrth language mapping of names in a context.
+  class Context
+
+    #Map a name to a specification.
+    #<br>Parameters:
+    #* name - The string to be mapped.
+    #<br>Returns:
+    #* The specification that corresponds to the name or nil if none found.
+    def map_with_defaults(name)
+      if (@symbol = SymbolMap.map(@name = name))
+        do_map_name ||
+          case @name[0]
+          when '.'
+            TosSpec.new(@name, @symbol, [:temp])
+
+          when '~'
+            SelfSpec.new(@name, @symbol, [:temp])
+
+          else
+            spec_error
+          end
+      end
+    end
+
+    #Map a name to a specification.
+    #<br>Parameters:
+    #* name - The string to be mapped.
+    #<br>Returns:
+    #* The specification that corresponds to the name or nil if none found.
+    def map_without_defaults(name)
+      if (@symbol = SymbolMap.map(@name = name))
+        do_map_name
+      end
+    end
+
+    #Private methods follow.
+    private
+
+    #Do a search of dictionaries based on the syntax of the name.
+    def do_map_name
+      self[@symbol]        ||
+      do_target_class_map  ||
+      do_target_object_map ||
+      do_target_vm_map     ||
+      do_object_class_map  ||
+      do_global_map
+    end
+
+    #Do a search of the Object class for the item.
+    def do_object_class_map
+      Object.map_foorth_shared(@symbol)
+    end
+
+    #Do a search of the :cls tag if it is specified.
+    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_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_target_vm_map
+      (vm = self[:vm])  && vm.map_foorth_exclusive(@symbol)
+    end
+
+    #Do a search of the globals.
+    def do_global_map
+      $FOORTH_GLOBALS[@symbol]
+    end
+
+    #Error: Unable to find a specification.
+    def spec_error
+      error "F11: ?#{@name}?"
+    end
+
+  end
+end