fOOrth 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde7de9c337c4b22e08296e3b2a6fb2b57e5a112
-  data.tar.gz: 6a3280aae89e3ac08f58de51411d9a73a2b321b8
+  metadata.gz: c3e8b4a5ccbb3c56347525737ec50f95a1016e19
+  data.tar.gz: 9bdb8b038c70895ddb82722ff0deeed11c3bdf47
 SHA512:
-  metadata.gz: eedf9eb80534ec2e6057857b81c641c0059252604b28466d423e281125a0722877e70cd9a143396fdcf0b1fc512189327cc0906eaa382b8ff82313b4015c548d
-  data.tar.gz: e21563be0a8a01a0949beed1b97da9250ce0dce5a60e87d8bef76a542b4552c8ef65ec92cd691e88f516c4a532667083d8a91d0febc1ecaa041b6369c4de1548
+  metadata.gz: 8fe86ae93e915c05e9702fd3996d96a258cd0c5e164292eb2c9a1776a576a2c2878fd59c640bdae12e0543689cf3854b2a24076e2c2b8534b6cc4e6180d56241
+  data.tar.gz: 04f4a12816c42a8b698a2f7c43055d7ba3ce3151dee06103f1d17826cc9182355f66240a3d8390b6939376dcd193abad00a4271507d7bcf2b5cac7b2f1fa0d18

data/integration/compile_lib_tests.rb

@@ -195,4 +195,45 @@ class CompileLibraryTester < Minitest::Test
     foorth_equal('42 // foo bar etc 33', [42])
   end
 
+  def test_method_casting
+    foorth_equal('    asm"vm.push(vm.get_cast)" ', [nil] )
+    foorth_equal('\'. asm"vm.push(vm.get_cast); vm.clear_cast" ', [XfOOrth::TosSpec] )
+    foorth_equal('\'* asm"vm.push(vm.get_cast); vm.clear_cast" ', [XfOOrth::NosSpec] )
+    foorth_equal('\'~ asm"vm.push(vm.get_cast); vm.clear_cast" ', [XfOOrth::SelfSpec] )
+
+    foorth_raises('\'. ')
+    foorth_raises('\'* ')
+    foorth_raises('\'~ ')
+
+    foorth_raises('\'. \'. ')
+    foorth_raises('\'. \'* ')
+    foorth_raises('\'. \'~ ')
+
+    foorth_raises('\'* \'. ')
+    foorth_raises('\'* \'* ')
+    foorth_raises('\'* \'~ ')
+
+    foorth_raises('\'~ \'. ')
+    foorth_raises('\'~ \'* ')
+    foorth_raises('\'~ \'~ ')
+
+    foorth_equal('Object \'. .: .test ; asm"vm.push(vm.get_cast)" ', [nil] )
+
+    foorth_raises("'. :  foo ; ")
+    foorth_raises("'. !: foo ; ")
+
+    foorth_raises("'* :  foo ; ")
+    foorth_raises("'* !: foo ; ")
+
+    foorth_raises("'~ :  foo ; ")
+    foorth_raises("'~ !: foo ; ")
+
+    foorth_equal("Integer    .: .riff self swap -  ; 10 5 .riff", [-5])
+    foorth_equal("Integer '* .: .diff self swap -  ; 10 5 .diff", [5])
+
+    foorth_equal("Integer    .: minus self swap -  ; 10 5 minus", [5])
+    foorth_equal("Integer '. .: rinus self swap -  ; 10 5 rinus", [-5])
+
+  end
+
 end

data/irbt.rb

@@ -2,8 +2,6 @@
 # An IRB + fOOrth Test bed
 
 require 'irb'
-$force_alias_read_line_module = true
-require 'mini_readline'
 
 puts "Starting an IRB console with fOOrth loaded."
 

data/lib/fOOrth/compiler.rb

@@ -5,6 +5,7 @@ require_relative 'compiler/parser'
 require_relative 'compiler/token'
 require_relative 'compiler/modes'
 require_relative 'compiler/word_specs'
+require_relative 'compiler/cast'
 require_relative 'compiler/context'
 require_relative 'compiler/process'
 
@@ -34,16 +35,11 @@ module XfOOrth
     #The level of comment nesting.
     attr_accessor :parens
 
-    #Is a force compile in effect?
-    attr_accessor :force
-
     #Return the compiler to a known state.
     def compiler_reset
-      @buffer = nil
-      @parser = nil
-      @quotes = 0
-      @parens = 0
-      @force  = false
+      @buffer = @parser = nil
+      @quotes = @parens = 0
+      clear_cast
       @context = Context.new(nil, vm: self, mode: :execute)
       self
     end

data/lib/fOOrth/compiler/cast.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+#* compiler/cast.rb - Support for casting methods to alternate routings.
+module XfOOrth
+
+  #* compiler/cast.rb - Support for casting methods to alternate routings.
+  class VirtualMachine
+
+    #Set the method cast.
+    def set_cast(spec)
+      error "F12: Multiple methods casts detected." if @cast
+      @cast = spec
+    end
+
+    #Clear the method cast
+    def clear_cast
+      @cast = nil
+    end
+
+    #Verify the method cast
+    def verify_cast(allowed)
+      if @cast && !allowed.include?(@cast)
+        error "F13: Cast of #{@cast.foorth_class_name} not allowed."
+      end
+    end
+
+    #Make sure there are no dangling casts.
+    def verify_casts_cleared
+      error "F12: Dangling method cast detected." if @cast
+    end
+
+    #Get the method cast and clear it.
+    def get_cast
+      @cast
+    end
+
+  end
+
+end

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

@@ -11,9 +11,9 @@ module XfOOrth
     #* name - The string to be mapped.
     #<br>Returns:
     #* The specification that corresponds to the name or nil if none found.
-    def map(name)
+    def map(name, allow_defaults=:allow)
       if (@symbol = SymbolMap.map(@name = name))
-        do_map_name
+        do_map_name(allow_defaults)
       end
     end
 
@@ -21,42 +21,23 @@ module XfOOrth
     private
 
     #Do a search of dictionaries based on the syntax of the name.
-    def do_map_name
-      self[@symbol]              ||
-      case @name[0]
+    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 '.'
-        do_object_class_map      ||
-        do_target_vm_map         ||
         TosSpec.new(@name, @symbol, [:temp])
 
       when '~'
-        do_target_class_map      ||
-        do_target_object_map     ||
-        do_target_vm_map         ||
         SelfSpec.new(@name, @symbol, [:temp])
 
-      when '@'
-        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_target_vm_map         ||
-        spec_error
-
       else
-        do_object_class_map      ||
-        do_target_vm_map         ||
-        do_global_target_map     ||
         spec_error
-      end
-
+      end)
     end
 
     #Do a search of the Object class for the item.
@@ -80,7 +61,7 @@ module XfOOrth
     end
 
     #Do a search of the globals.
-    def do_global_target_map
+    def do_global_map
       $FOORTH_GLOBALS[@symbol]
     end
 

data/lib/fOOrth/compiler/process.rb

@@ -18,8 +18,11 @@ module XfOOrth
     #* source - A source object. Typically a Console, StringSource or FileSource.
     def process(source)
       save, @parser, start_depth = @parser, Parser.new(source), @context.depth
+
       due_process
       @context.check_depth(start_depth)
+      verify_casts_cleared
+
       @parser = save
     end
 
@@ -35,11 +38,10 @@ module XfOOrth
       dbg_puts token.to_s
       code = token.code
 
-      if execute_mode? || ((token.has_tag?(:immediate)) && (!@force))
+      if execute_mode? || token.has_tag?(:immediate)
         @context.target.instance_exec(self, &eval("lambda {|vm| #{code} }"))
       else
-        @buffer << code
-        @force = false
+        self << code
       end
     end
 

data/lib/fOOrth/core/class.rb

@@ -7,7 +7,7 @@ class Class
   #<br>Decree!
   #* These are to be the only references to @_private_foorth_name!
   def foorth_name
-    @_private_foorth_name ||= name.freeze
+    @_private_foorth_name ||= name.gsub(/.*::/, '').freeze
   end
 
   #Get the name of the class or a safe default.

data/lib/fOOrth/debug.rb

@@ -2,8 +2,6 @@
 
 require_relative 'debug/display_abort'
 require_relative 'debug/dbg_puts'
-require_relative 'debug/context_dump'
-require_relative 'debug/vm_dump'
 
 #Set up the default debug conduit.
 $foorth_dbg = $stdout

data/lib/fOOrth/debug/display_abort.rb

@@ -18,12 +18,6 @@ module XfOOrth
       if debug
         puts "Data Stack Contents: #{data_stack.inspect}"
 
-        if @context
-          @context.debug_dump(self)
-        else
-          puts "Error: No context is available!"
-        end
-
         puts "\nInternal Backtrace Dump:"
         puts
         puts exception.backtrace

data/lib/fOOrth/library.rb

@@ -25,6 +25,7 @@ require_relative 'library/bundle_library'
 require_relative 'library/sync_bundle_library'
 require_relative 'library/other_value_types_library'
 require_relative 'library/command_library'
+require_relative 'library/introspection_library'
 require_relative 'library/in_stream_library'
 require_relative 'library/out_stream_library'
 require_relative 'library/queue_library'

data/lib/fOOrth/library/array_library.rb

@@ -470,7 +470,7 @@ module XfOOrth
     result = "[ "
 
     self.each do |value|
-      if value.is_a?(String)
+      if value.is_a?(String) || value.nil?
         result << value.inspect + " "
       else
         value.to_foorth_s(vm)
@@ -532,50 +532,4 @@ module XfOOrth
   Array.create_shared_method('.keys', TosSpec, [],
     &lambda {|vm| vm.push((0...self.length).to_a) })
 
-
-  $fcpl = 80 #fOOrth Character Per Line
-  $flpp = 25 #fOOrth Lines Per Page
-
-  # [ l 2 3 ... n ] .pp []; pretty print the array!
-  Array.create_shared_method('.pp', TosSpec, [], &lambda {|vm|
-    self.foorth_strmax(vm)
-    width = vm.pop + 1
-    cols  = (width <= $fcpl) ? ($fcpl / width) : 1
-    full_rows = ((cols * width) % $fcpl) == 0
-    rows_left = (self.length + cols - 1) / cols
-    pages = (rows_left + $flpp - 1) / $flpp
-    page_capacity = $flpp * cols
-
-    (0...pages).each do |page|
-      offset = page * page_capacity
-      rows_this_page = (rows_left >= $flpp) ? $flpp : rows_left
-
-      (0...rows_this_page).each do |row|
-        (0...cols).each do |col|
-          self[offset + col*rows_this_page + row].to_foorth_s(vm)
-
-          if cols > 1
-            print vm.pop.ljust(width)
-          else
-            print vm.pop
-          end
-        end
-
-        puts unless full_rows
-      end
-
-      rows_left -= $flpp
-      puts "\n"
-    end
-  })
-
-  #Show the page length.
-  VirtualMachine.create_shared_method(')pl', MacroSpec,
-    [:macro, 'puts "Page Length = #{$flpp}"; '])
-
-
-  #Set/show the page length.
-  VirtualMachine.create_shared_method(')set_pl', MacroSpec,
-    [:macro, 'puts "New Page Length = #{$flpp = vm.pop.to_i}"; '])
-
 end

data/lib/fOOrth/library/command_library.rb

@@ -27,34 +27,6 @@ module XfOOrth
   VirtualMachine.create_shared_method(')noshow', MacroSpec,
     [:macro, "vm.show_stack = false; "])
 
-  #Dump the context.
-  VirtualMachine.create_shared_method(')context', VmSpec, [],
-    &lambda {|vm| vm.context.debug_dump(vm) })
-
-  #Dump the context right NOW!.
-  VirtualMachine.create_shared_method(')context!', VmSpec, [:immediate],
-    &lambda {|vm| vm.context.debug_dump(vm) })
-
-  #Dump the virtual machine.
-  VirtualMachine.create_shared_method(')vm', VmSpec, [],
-    &lambda {|vm| vm.debug_dump })
-
-  #Dump the virtual machine right NOW!
-  VirtualMachine.create_shared_method(')vm!', VmSpec, [:immediate],
-    &lambda {|vm| vm.debug_dump })
-
-  #Map a symbol entry
-  VirtualMachine.create_shared_method(')map"', VmSpec, [], &lambda {|vm|
-    str = vm.pop.to_s
-    puts "#{str} => #{(SymbolMap.map(str).to_s)}"
-  })
-
-  #Unmap a symbol entry
-  VirtualMachine.create_shared_method(')unmap"', VmSpec, [], &lambda {|vm|
-    str = vm.pop.to_s
-    puts "#{str} <= #{(SymbolMap.unmap(str.to_sym).to_s)}"
-  })
-
   #Start an Interactive RuBy session (IRB)
   VirtualMachine.create_shared_method(')irb', VmSpec, [], &lambda {|vm|
     require 'irb'
@@ -130,76 +102,79 @@ module XfOOrth
   VirtualMachine.create_shared_method(')entries', VmSpec, [], &lambda {|vm|
     entries = SymbolMap.forward_map.keys.sort
     puts 'Symbol Map Entries = '
-    entries.foorth_pretty(vm)
+    entries.foorth_columns(vm)
     puts
   })
 
   #List the methods defined for this object.
   Object.create_shared_method(')methods', TosSpec, [], &lambda {|vm|
-    if self.foorth_has_exclusive?
-      puts 'Exclusive Methods = '
-      self.foorth_exclusive.extract_method_names.sort.foorth_pretty(vm)
+    if foorth_has_exclusive?
+      puts '#{foorth_name} Exclusive Methods = '
+      foorth_exclusive.extract_method_names.sort.foorth_columns(vm)
     end
 
-    puts "#{self.class.foorth_name} Shared Methods = "
-    self.class.foorth_shared.extract_method_names.sort.foorth_pretty(vm)
+    my_class = self.class
+
+    puts "#{my_class.foorth_name} Shared Methods = "
+    my_class.foorth_shared.extract_method_names.sort.foorth_columns(vm)
   })
 
   #List the methods defined for this class.
   Class.create_shared_method(')methods', TosSpec, [], &lambda {|vm|
-    if self.foorth_has_exclusive?
-      puts "#{self.foorth_name} Class Methods = "
-      self.foorth_exclusive.extract_method_names.sort.foorth_pretty(vm)
+    if foorth_has_exclusive?
+      puts "#{foorth_name} Class Methods = "
+      foorth_exclusive.extract_method_names.sort.foorth_columns(vm)
     end
 
-    puts "#{self.foorth_name} Shared Methods = "
-    self.foorth_shared.extract_method_names.sort.foorth_pretty(vm)
+    puts "#{foorth_name} Shared Methods = "
+    foorth_shared.extract_method_names.sort.foorth_columns(vm)
   })
 
   #List the stubs defined for this class.
   Class.create_shared_method(')stubs', TosSpec, [], &lambda {|vm|
-    if self.foorth_has_exclusive?
-      puts "#{self.foorth_name} Class Stubs = "
-      self.foorth_exclusive.extract_method_names(:stubs).sort.foorth_pretty(vm)
+    if foorth_has_exclusive?
+      puts "#{foorth_name} Class Stubs = "
+      foorth_exclusive.extract_method_names(:stubs).sort.foorth_columns(vm)
     end
 
-    puts "#{self.foorth_name} Shared Stubs = "
-    self.foorth_shared.extract_method_names(:stubs).sort.foorth_pretty(vm)
+    puts "#{foorth_name} Shared Stubs = "
+    foorth_shared.extract_method_names(:stubs).sort.foorth_columns(vm)
   })
 
 
   #List the classes defined in fOOrth.
   VirtualMachine.create_shared_method(')classes', VmSpec, [], &lambda {|vm|
-    $FOORTH_GLOBALS.values.
-      select {|entry| entry.has_tag?(:class)}.
-      collect {|spec| spec.new_class.foorth_name}.
-      sort.
-      foorth_pretty(vm)
+    $FOORTH_GLOBALS.values
+      .select {|entry| entry.has_tag?(:class)}
+      .collect {|spec| spec.new_class.foorth_name}
+      .sort
+      .foorth_columns(vm)
   })
 
   #List the globals defined in fOOrth.
   VirtualMachine.create_shared_method(')globals', VmSpec, [], &lambda {|vm|
-    $FOORTH_GLOBALS.keys.
-      select  {|key| !($FOORTH_GLOBALS[key].has_tag?(:class))}.
-      collect {|key| "#{XfOOrth::SymbolMap.unmap(key)} (#{key.to_s})"}.
-      foorth_pretty(vm)
+    $FOORTH_GLOBALS.keys
+      .select  {|key| !($FOORTH_GLOBALS[key].has_tag?(:class))}
+      .collect {|key| "#{XfOOrth::SymbolMap.unmap(key)}"}
+      .sort
+      .foorth_columns(vm)
   })
 
   #List the virtual machine methods
   #List the methods defined for this object.
   VirtualMachine.create_shared_method(')words', VmSpec, [], &lambda {|vm|
     if vm.foorth_has_exclusive?
-      puts 'Exclusive Methods = '
-      vm.foorth_exclusive.extract_method_names.sort.foorth_pretty(vm)
+      puts "#{foorth_name} Exclusive Methods = "
+      vm.foorth_exclusive.extract_method_names.sort.foorth_columns(vm)
     end
 
-    puts "#{vm.class.foorth_name} Shared Methods = "
-    vm.class.foorth_shared.extract_method_names.sort.foorth_pretty(vm)
+    my_class = vm.class
+
+    puts "#{my_class.foorth_name} Shared Methods = "
+    my_class.foorth_shared.extract_method_names.sort.foorth_columns(vm)
   })
 
   VirtualMachine.create_shared_method(')threads', VmSpec, [], &lambda {|vm|
-    Thread.list.
-      collect {|thrd| "#{thrd} vm = <#{thrd[:vm].name}>" }.
-      foorth_pretty(vm)
+    puts Thread.list.map {|thread| "#{thread} vm = <#{thread[:vm].name}>"}
   })
 end