fOOrth 0.6.6 → 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/stdio_lib_tests.rb

@@ -49,4 +49,66 @@ class StdioLibraryTester < Minitest::Test
     foorth_raises('1+1i .emit')
   end
 
+  #Looks like some unit testing has crept into integration testing. OK.
+  def test_some_formatting
+    assert_equal("1 4\n2 5\n3  ",       [1,2,3,4,5].format_foorth_columns(false, 5))
+    assert_equal(["1 4", "2 5", "3  "], [1,2,3,4,5].format_description(5))
+
+    assert_equal(["1 2", "3 4", "5"],   "1 2 3 4 5".format_description(5))
+
+    assert_equal([], [].format_description(5))
+    assert_equal([], nil.format_description(5))
+
+    result =
+       "1 5 9  13 17 21 25 29 33 37 41 45 49 53 57 61 65 69 73 77 81 85 89 93 97 \n" +
+       "2 6 10 14 18 22 26 30 34 38 42 46 50 54 58 62 66 70 74 78 82 86 90 94 98 \n" +
+       "3 7 11 15 19 23 27 31 35 39 43 47 51 55 59 63 67 71 75 79 83 87 91 95 99 \n" +
+       "4 8 12 16 20 24 28 32 36 40 44 48 52 56 60 64 68 72 76 80 84 88 92 96 100"
+
+    assert_equal(result, (1..100).to_a.format_foorth_columns(false, 80) )
+
+    data =
+      [["key_largo", "/long_folder_name_one/long_folder_name_two/long_folder_name_three/fine_descriptive_name"],
+       ["key_west",  "Semper ubi sub ubi. Semper ubi sub ubi. Semper ubi sub ubi. Semper ubi sub ubi. "],
+       ["counting",  Array.new(100) {|i| i} ],
+       ["pie", Math::PI]
+      ]
+
+    result =
+       "key_largo /long_folder_name_one/long_folder_name_two/long_folder_name_three/fin\n" +
+       "          e_descriptive_name\n" +
+       "key_west  Semper ubi sub ubi. Semper ubi sub ubi. Semper ubi sub ubi. Semper\n" +
+       "          ubi sub ubi.\n" +
+       "counting  0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95\n" +
+       "          1 6 11 16 21 26 31 36 41 46 51 56 61 66 71 76 81 86 91 96\n" +
+       "          2 7 12 17 22 27 32 37 42 47 52 57 62 67 72 77 82 87 92 97\n" +
+       "          3 8 13 18 23 28 33 38 43 48 53 58 63 68 73 78 83 88 93 98\n" +
+       "          4 9 14 19 24 29 34 39 44 49 54 59 64 69 74 79 84 89 94 99\n" +
+       "pie       3.141592653589793"
+
+    assert_equal(result, data.foorth_format_bullets(80))
+
+    assert_equal("", [].foorth_format_bullets(80))
+
+
+    data =
+      {"key_largo" => "/long_folder_name_one/long_folder_name_two/long_folder_name_three/fine_descriptive_name",
+       "key_west"  => "Semper ubi sub ubi. Semper ubi sub ubi. Semper ubi sub ubi. Semper ubi sub ubi. ",
+       "counting"  => Array.new(100) {|i| i},
+       "pie"       => Math::PI
+      }
+
+    assert_equal(result, data.foorth_format_bullets(80))
+
+  end
+
+  def test_formatting_some_more
+    foorth_run('5 $chars_per_line !')
+    foorth_equal('[ 1 2 3 4 5 ] .format_columns', ["1 4\n2 5\n3  "])
+
+    foorth_run('80 $chars_per_line !')
+    foorth_equal('[ [ 1 "apple" ] [ 2 "cherry" ] [ 3 "prune" ] ] .format_bullets',
+                 ["1 apple\n2 cherry\n3 prune"])
+  end
+
 end

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

@@ -72,12 +72,26 @@ class ThreadLibraryTester < Minitest::Test
     foorth_equal('$tmtx .do{{ 3 4 + }}', [7])
 
     foorth_run('""* val$: $tmtx_str')
-    foorth_equal('{{ $tmtx .do{{ 0 10 do $tmtx_str "@" << loop }} }} ' +
-                 '.start drop $tmtx .do{{ $tmtx_str }} ', ["@"*10])
 
-    foorth_run('""* val$: $tmtx_str')
-    foorth_equal('{{ Mutex .do{{ 0 10 do $tmtx_str "@" << loop }} }} ' +
-                 '.start drop Mutex .do{{ $tmtx_str }} ', ["@"*10])
+    code = ': test_mutex_one $tmtx_str .clear! ' +
+           '{{ $tmtx .do{{ 0 10 do $tmtx_str "@" << loop }} }} .start drop ' +
+           'begin $tmtx .do{{ $tmtx_str }} .present? until $tmtx_str ;'
+
+    foorth_run(code)
+
+    10.times do
+      foorth_equal('test_mutex_one', ["@"*10])
+    end
+
+    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_equal('test_mutex_two', ["@"*10])
+    end
   end
 
 end

data/lib/fOOrth.rb

@@ -10,8 +10,6 @@ require 'ruby_sscanf'
 require 'English'
 
 require 'pp'
-
-$no_alias_read_line_module = true
 require 'mini_readline'
 
 require_relative 'fOOrth/version'

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,74 +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(name, allow_defaults=:allow)
-      if (@symbol = SymbolMap.map(@name = name))
-        do_map_name(allow_defaults)
-      end
-    end
-
-    #Private methods follow.
-    private
-
-    #Do a search of dictionaries based on the syntax of the name.
-    def do_map_name(allow_defaults)
-      self[@symbol]        ||
-      do_target_class_map  ||
-      do_target_object_map ||
-      do_target_vm_map     ||
-      do_object_class_map  ||
-      do_global_map        ||
-      (allow_defaults && case @name[0]
-      when '.'
-        TosSpec.new(@name, @symbol, [:temp])
-
-      when '~'
-        SelfSpec.new(@name, @symbol, [:temp])
-
-      else
-        spec_error
-      end)
-    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