rpl 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6394da05e2547dd85c3ab87e8ad841d72edc90b99e16bb1abbd43850e4c824d
-  data.tar.gz: 87e6d2304b45909e04ccdae776cea33fb26048c98f6488ceb44539c348ad7063
+  metadata.gz: e546030597f71600c2156d2e4b92e8e6385fce7b551fe24e30cb386db734bf32
+  data.tar.gz: 1e441262cd8c01d1fcb56905ca97f8efa56b9f607f2786a76ea71c30c4948cc2
 SHA512:
-  metadata.gz: 0fbe309e4c373ab91b0f50022c3571d28e387b9476d7deb96fb35fb2db25970a946f254a4819b088a0741b3271fa07d6710165f186365478726ad01e6d3ce788
-  data.tar.gz: 5d928b2865843d21275a26e14dce2fc4be75ddb371a7d0dd0cf185037c2766af85186da83fd8acdd56f6500647d4610bd245ae7fe243ef53790871a396d5f4c3
+  metadata.gz: 14e5ab387f0d91e57b7b89a1383343beda02c4dafbffedb07721b722fdb760f646867fbc64bff0b1a9335d3329c63d1358ef21307a6b55afc1caa57a52d08a58
+  data.tar.gz: 90f8b97a3f57ba05576970c623fc1c709c58f02d0cefd239df9ea275e44409ceea97f83bff14e159cfc2df900467d5b309f46f5d6a72c5548c1b11684133462b

data/bin/rpl

@@ -84,5 +84,5 @@ end
 # third launch REPL if (explicitely or implicitely) asked
 RplRepl.new( interpreter ).run if options[:run_REPL]
 
-# last print resulting stack on exit (formatted so that it can be fed back later to interpreter)
-pp interpreter.export_stack
+# last print defined vars and resulting stack on exit (formatted so that it can be fed back later to interpreter)
+pp "#{interpreter.export_vars} #{interpreter.export_stack}"

data/lib/rpl/interpreter.rb

@@ -7,11 +7,30 @@ require 'bigdecimal/util'
 require 'rpl/dictionary'
 require 'rpl/types'
 
+class BitArray
+  def initialize
+    @mask = 0
+  end
+
+  def []=(position, value)
+    if value.zero?
+      @mask ^= (1 << position)
+    else
+      @mask |= (1 << position)
+    end
+  end
+
+  def [](position)
+    @mask[position]
+  end
+end
+
 class Interpreter
   include BigMath
   include Types
 
   attr_reader :stack,
+              :frame_buffer,
               :dictionary,
               :version
 
@@ -22,6 +41,12 @@ class Interpreter
 
     @dictionary = dictionary
     @stack = stack
+
+    initialize_frame_buffer
+  end
+
+  def initialize_frame_buffer
+    @frame_buffer = BitArray.new
   end
 
   def run( input )
@@ -35,19 +60,15 @@ class Interpreter
           @stack << elt
         else
           command = @dictionary.lookup( elt.value )
-          if command.nil?
-            # if there isn't a command by that name then it's a name
-            # elt[:type] = :name
 
+          if command.nil?
             @stack << elt
           elsif command.is_a?( Proc )
             command.call
+          elsif command.instance_of?( RplProgram )
+            run( command.value )
           else
-            if command.instance_of?( RplProgram )
-              run( command.value )
-            else
-              @stack << command
-            end
+            @stack << command
           end
         end
       else
@@ -78,6 +99,12 @@ class Interpreter
     args
   end
 
+  def export_vars
+    @dictionary.vars
+               .map { |name, value| "#{value} '#{name}' sto" }
+               .join(' ')
+  end
+
   def export_stack
     @stack.map(&:to_s).join(' ')
   end

data/lib/rpl/parser.rb

@@ -1,5 +1,14 @@
 # frozen_string_literal: true
 
+class RplTypeError < StandardError
+  attr_reader :reason
+
+  def initialize( reason = '-undefined-' )
+    super
+    @reason = reason
+  end
+end
+
 class Parser
   include Types
 
@@ -24,13 +33,20 @@ class Parser
     splitted_input = input.split(' ')
 
     # 2-passes:
-    # 1. regroup strings and programs
+    # 1. regroup strings, lists, complexes, names and programs
     opened_programs = 0
     closed_programs = 0
+
     opened_lists = 0
     closed_lists = 0
+
+    opened_complexes = 0
+    closed_complexes = 0
+
     string_delimiters = 0
+
     name_delimiters = 0
+
     regrouping = false
 
     regrouped_input = []
@@ -41,13 +57,16 @@ class Parser
       elsif elt[0] == '{'
         opened_lists += 1
         elt.gsub!( '{', '{ ') if elt.length > 1 && elt[1] != ' '
+      elsif elt[0] == '('
+        opened_complexes += 1
+        elt.gsub!( '( ', '(') if elt.length > 1 && elt[1] == ' '
       elsif elt[0] == '"' && elt.length > 1
         string_delimiters += 1
       elsif elt[0] == "'" && elt.length > 1
         name_delimiters += 1
       end
 
-      elt = "#{regrouped_input.pop} #{elt}".strip if regrouping
+      elt = "#{regrouped_input.pop}#{opened_complexes > closed_complexes ? '' : ' '}#{elt}".strip if regrouping
 
       regrouped_input << elt
 
@@ -58,21 +77,26 @@ class Parser
       when '}'
         closed_lists += 1
         elt.gsub!( '}', ' }') if elt.length > 1 && elt[-2] != ' '
+      when ')'
+        closed_complexes += 1
+        elt.gsub!( ' )', ')') if elt.length > 1 && elt[-2] == ' '
       when '"'
         string_delimiters += 1
       when "'"
         name_delimiters += 1
       end
 
-      regrouping = string_delimiters.odd? || name_delimiters.odd? || (opened_programs > closed_programs ) || (opened_lists > closed_lists )
+      regrouping = string_delimiters.odd? || name_delimiters.odd? || (opened_programs > closed_programs) || (opened_lists > closed_lists) || (opened_complexes > closed_complexes)
     end
 
     # 2. parse
-    regrouped_input.map do |element|
+    parsed_input = regrouped_input.map do |element|
       if RplBoolean.can_parse?( element )
         Types.new_object( RplBoolean, element )
       elsif RplNumeric.can_parse?( element )
         Types.new_object( RplNumeric, element )
+      elsif RplComplex.can_parse?( element )
+        Types.new_object( RplComplex, element )
       elsif RplList.can_parse?( element )
         Types.new_object( RplList, element )
       elsif RplString.can_parse?( element )
@@ -83,5 +107,7 @@ class Parser
         Types.new_object( RplName, element )
       end
     end
+
+    parsed_input
   end
 end

data/lib/rpl/types/complex.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rpl/parser'
+
+module Types
+  class RplComplex
+    attr_accessor :value
+
+    def initialize( value )
+      raise RplTypeError unless self.class.can_parse?( value )
+
+      # we systematicalyl trim enclosing ()
+      value = value[1..-2] if value.is_a?( String ) && value[0] == '(' && value[-1] == ')'
+
+      @value = Complex( value )
+    end
+
+    def to_s
+      "(#{@value})"
+    end
+
+    def self.can_parse?( value )
+      # we systematicalyl trim enclosing ()
+      value = value[1..-2] if value.is_a?( String ) && value[0] == '(' && value[-1] == ')'
+
+      begin
+        Complex( value )
+      rescue ArgumentError
+        return false
+      end
+
+      true
+    end
+
+    def ==( other )
+      other.class == RplComplex and
+        other.value == value
+    end
+  end
+end

data/lib/rpl/types/list.rb

@@ -23,7 +23,7 @@ module Types
 
     def self.can_parse?( value )
       value.instance_of?( Array ) or
-        value[0..1] == '{ ' && value[-2..-1] == ' }'
+        value[0..1] == '{ ' && value[-2..] == ' }'
     end
 
     def ==( other )

data/lib/rpl/types/string.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rpl/parser'
+
 module Types
   class RplString
     attr_accessor :value

data/lib/rpl/types.rb

@@ -6,9 +6,11 @@ require 'rpl/types/list'
 require 'rpl/types/string'
 require 'rpl/types/program'
 require 'rpl/types/numeric'
+require 'rpl/types/complex'
 
 module Types
   module_function
+
   def new_object( type_class, value )
     if type_class.can_parse?( value )
       type_class.new( value )

data/lib/rpl/words/branch.rb

@@ -8,13 +8,15 @@ module RplLang
       def populate_dictionary
         super
 
+        category = 'Branch'
+
         @dictionary.add_word( ['ift'],
-                              'Branch',
+                              category,
                               '( t pt -- … ) eval pt or not based on the value of boolean t',
                               Types.new_object( RplProgram, '« « nop » ifte »' ) )
 
         @dictionary.add_word( ['ifte'],
-                              'Branch',
+                              category,
                               '( t pt pf -- … ) eval pt or pf based on the value of boolean t',
                               proc do
                                 args = stack_extract( [:any, :any, [RplBoolean]] )
@@ -23,7 +25,7 @@ module RplLang
                               end )
 
         @dictionary.add_word( ['times'],
-                              'Branch',
+                              category,
                               '( p n -- … ) eval p n times while pushing counter on stack before',
                               proc do
                                 args = stack_extract( [[RplNumeric], :any] )
@@ -36,7 +38,7 @@ module RplLang
                               end )
 
         @dictionary.add_word( ['loop'],
-                              'Branch',
+                              category,
                               '( p n1 n2 -- … ) eval p looping from n1 to n2 while pushing counter on stack before',
                               proc do
                                 args = stack_extract( [[RplNumeric], [RplNumeric], :any] )

data/lib/rpl/words/display.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RplLang
+  module Words
+    module Display
+      include Types
+
+      def populate_dictionary
+        super
+
+        category = 'Display'
+
+        @dictionary.add_word( ['erase'],
+                              category,
+                              '( -- ) erase display',
+                              proc do
+                                initialize_frame_buffer
+                              end )
+
+        @dictionary.add_word( ['display→', 'display->'],
+                              category,
+                              '( -- pict ) put current display state on stack',
+                              proc do
+                                @stack << @frame_buffer # FIXME: RplPict type
+                              end )
+      end
+    end
+  end
+end

data/lib/rpl/words/filesystem.rb

@@ -8,8 +8,10 @@ module RplLang
       def populate_dictionary
         super
 
+        category = 'Filesystem'
+
         @dictionary.add_word( ['fread'],
-                              'Filesystem',
+                              category,
                               '( filename -- content ) read file and put content on stack as string',
                               proc do
                                 args = stack_extract( [[RplString]] )
@@ -20,12 +22,12 @@ module RplLang
                               end )
 
         @dictionary.add_word( ['feval'],
-                              'Filesystem',
+                              category,
                               '( filename -- … ) read and run file',
                               Types.new_object( RplProgram, '« fread eval »' ) )
 
         @dictionary.add_word( ['fwrite'],
-                              'Filesystem',
+                              category,
                               '( content filename -- ) write content into filename',
                               proc do
                                 args = stack_extract( [[RplString], :any] )

data/lib/rpl/words/general.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'tempfile'
-
 module RplLang
   module Words
     module General
@@ -10,13 +8,15 @@ module RplLang
       def populate_dictionary
         super
 
+        category = 'General'
+
         @dictionary.add_word( ['nop'],
-                              'General',
+                              category,
                               '( -- ) no operation',
                               proc {} )
 
         @dictionary.add_word( ['help'],
-                              'General',
+                              category,
                               '( w -- s ) pop help string of the given word',
                               proc do
                                 args = stack_extract( [[RplName]] )
@@ -26,86 +26,24 @@ module RplLang
                                 @stack << Types.new_object( RplString, "\"#{args[0].value}: #{word.nil? ? 'not a core word' : word[:help]}\"" )
                               end )
 
-        @dictionary.add_word( ['words'],
-                              'REPL',
-                              'DEBUG',
-                              proc do
-                                @dictionary.words
-                                           .to_a
-                                           .group_by { |word| word.last[:category] }
-                                           .each do |cat, words|
-                                  puts cat
-                                  puts "    #{words.map(&:first).join(', ')}"
-                                end
-                              end )
-
         @dictionary.add_word( ['quit'],
-                              'General',
+                              category,
                               '( -- ) Stop and quit interpreter',
                               proc {} )
 
         @dictionary.add_word( ['version'],
-                              'General',
+                              category,
                               '( -- n ) Pop the interpreter\'s version number',
                               proc do
                                 @stack << Types.new_object( RplString, "\"#{@version}\"" )
                               end )
 
         @dictionary.add_word( ['uname'],
-                              'General',
+                              category,
                               '( -- s ) Pop the interpreter\'s complete indentification string',
                               proc do
                                 @stack << Types.new_object( RplString, "\"Rpl Interpreter version #{@version}\"" )
                               end )
-
-        @dictionary.add_word( ['history'],
-                              'REPL',
-                              '',
-                              proc {} )
-
-        @dictionary.add_word( ['edit'],
-                              'General',
-                              '( -- s ) Pop the interpreter\'s complete indentification string',
-                              proc do
-                                args = stack_extract( [:any] )
-
-                                value = args[0].to_s
-                                tempfile = Tempfile.new('rpl')
-
-                                begin
-                                  tempfile.write( value )
-                                  tempfile.rewind
-
-                                  `$EDITOR #{tempfile.path}`
-
-                                  edited_value = tempfile.read
-                                ensure
-                                  tempfile.close
-                                  tempfile.unlink
-                                end
-
-                                @stack << Types.new_object( args[0].class, edited_value )
-                              end )
-
-        @dictionary.add_word( ['.s'],
-                              'REPL',
-                              'DEBUG',
-                              proc { pp @stack } )
-
-        @dictionary.add_word( ['.d'],
-                              'REPL',
-                              'DEBUG',
-                              proc { pp @dictionary } )
-
-        @dictionary.add_word( ['.v'],
-                              'REPL',
-                              'DEBUG',
-                              proc { pp @dictionary.vars } )
-
-        @dictionary.add_word( ['.lv'],
-                              'REPL',
-                              'DEBUG',
-                              proc { pp @dictionary.local_vars_layers } )
       end
     end
   end

data/lib/rpl/words/list.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RplLang
+  module Words
+    module List
+      include Types
+
+      def populate_dictionary
+        super
+
+        category = 'Lists'
+
+        @dictionary.add_word( ['→list', '->list'],
+                              category,
+                              '( … x -- […] ) pack x stacks levels into a list',
+                              proc do
+                                args = stack_extract( [[RplNumeric]] )
+                                args = stack_extract( %i[any] * args[0].value )
+
+                                @stack << Types.new_object( RplList, args.reverse )
+                              end )
+
+        @dictionary.add_word( ['list→', 'list->'],
+                              category,
+                              '( […] -- … ) unpack list on stack',
+                              proc do
+                                args = stack_extract( [[RplList]] )
+
+                                args[0].value.each do |elt|
+                                  @stack << elt
+                                end
+                              end )
+
+        @dictionary.add_word( ['dolist'],
+                              category,
+                              '( […] prg -- … ) run prg on each element of a list',
+                              proc do
+                                args = stack_extract( [[RplProgram], [RplList]] )
+
+                                args[1].value.each do |elt|
+                                  @stack << elt
+                                  run( args[0].value )
+                                end
+
+                                run( "#{args[1].value.length} →list" )
+                              end )
+      end
+    end
+  end
+end

data/lib/rpl/words/logarithm.rb

@@ -8,106 +8,108 @@ module RplLang
       def populate_dictionary
         super
 
+        category = 'Logs on reals and complexes'
+
         @dictionary.add_word( ['ℇ', 'e'],
-                              'Logs on reals and complexes',
+                              category,
                               '( … -- ℇ ) push ℇ',
                               proc do
                                 @stack << Types.new_object( RplNumeric, BigMath.E( RplNumeric.precision ) )
                               end )
 
         # @dictionary.add_word( ['ln'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'logarithm base e',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['lnp1'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'ln(1+x) which is useful when x is close to 0',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['exp'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'exponential',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['expm'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'exp(x)-1 which is useful when x is close to 0',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['log10'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'logarithm base 10',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['alog10'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'exponential base 10',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['log2'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'logarithm base 2',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['alog2'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'exponential base 2',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['sinh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'hyperbolic sine',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['asinh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'inverse hyperbolic sine',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['cosh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'hyperbolic cosine',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['acosh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'inverse hyperbolic cosine',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['tanh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'hyperbolic tangent',
         #                       proc do
 
         #                       end )
 
         # @dictionary.add_word( ['atanh'],
-        #                       'Logs on reals and complexes',
+        #                       category,
         #                       'inverse hyperbolic tangent',
         #                       proc do