rpl 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8843f4b55d77c8d3ec6c92cbe565ecb883361ba8cb47628097425b4b6f73da2
-  data.tar.gz: 430db66a68a4eeead6b16091e75aa9022a6a734004006067a38fb5283c3ec261
+  metadata.gz: fabbce316a5c08423208383985c44621b20e0032499072ada99fe46aa24b7f9a
+  data.tar.gz: d1861c145f2647640cf5192fd376177a2565915e979a15cb46a34a7e340d6171
 SHA512:
-  metadata.gz: 7eff83ebc75b43ba473b913513590b82286932dd8b9628f9ae8970bb8d352ddd60a057e648d31fad7a5fefab974d2ddbcd9a03b18094c8c977e709bf1d910f56
-  data.tar.gz: 5fcd3aa9b3c9d918876fc5f69e3025a2f0339a4e0da8c2bc66432db11821ded06a149b3dcfe88d2d3d955c90ca42c86d0f2a4dc1257612bc5804380cf0638a4a
+  metadata.gz: 2150ec4f68a633e83e1e17ce6508ad706e8e3a5cfe9e3683322f9e257d59ac6d37303d2ea87072f4479fe2b42189231748e3d294028a2fdfa6952ad8ae528aa3
+  data.tar.gz: 9e4b5766997db3b9825bd9d713e90a0494d3a007f3f4882bfe7f5eb5aed2e5b47281ee9d077e96915697f884e4a362aed3f652ce647e71b92cee1c4689e4212e

data/bin/rpl

@@ -1,16 +1,21 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require 'English'
+require 'optparse'
 require 'readline'
 
 require 'rpl'
 
 class RplRepl
-  def initialize
-    @interpreter = Rpl.new
+  def initialize( interpreter )
+    interpreter ||= Rpl.new
+    @interpreter = interpreter
   end
 
   def run
+    print_stack unless @interpreter.stack.empty?
+
     Readline.completion_proc = proc do |s|
       ( @interpreter.dictionary.words.keys + @interpreter.dictionary.vars.keys ).grep(/^#{Regexp.escape(s)}/)
     end
@@ -48,4 +53,34 @@ class RplRepl
   end
 end
 
-RplRepl.new.run
+interpreter = Rpl.new
+
+options = { run_REPL: ARGV.empty?,
+            files: [],
+            programs: [] }
+
+OptionParser.new do |opts|
+  opts.on('-c', '--code "program"', ' ') do |program|
+    options[:programs] << program
+  end
+
+  opts.on('-f', '--file program.rpl', 'load program.rpl') do |filename|
+    options[:files] << filename
+  end
+
+  opts.on('-i', '--interactive', 'launch interactive REPL') do
+    options[:run_REPL] = true
+  end
+end.parse!
+
+options[:files].each do |filename|
+  interpreter.run "\"#{filename}\" feval"
+end
+
+options[:programs].each do |program|
+  interpreter.run program
+end
+
+RplRepl.new( interpreter ).run if options[:run_REPL]
+
+pp interpreter.stack.map { |elt| interpreter.stringify( elt ) }.join(' ')

data/lib/rpl/core/operations.rb

@@ -300,12 +300,16 @@ module RplLang
 
         #                       end )
 
-        # @dictionary.add_word( ['xpon'],
-        #                       'Operations on reals',
-        #                       'exponant of a real number',
-        #                       proc do
+        @dictionary.add_word( ['xpon'],
+                              'Operations on reals',
+                              'exponant of a real number',
+                              proc do
+                                args = stack_extract( [%i[numeric]] )
 
-        #                       end )
+                                @stack << { type: :numeric,
+                                            base: infer_resulting_base( args ),
+                                            value: args[0][:value].exponent }
+                              end )
 
         @dictionary.add_word( ['ip'],
                               'Operations on reals',

data/lib/rpl/core/program.rb

@@ -12,7 +12,11 @@ module RplLang
                               proc do
                                 args = stack_extract( [:any] )
 
-                                run( args[0][:value].to_s )
+                                if %i[list numeric boolean].include?( args[0][:type] )
+                                  @stack << args[0] # these types evaluate to themselves
+                                else
+                                  run( args[0][:value].to_s )
+                                end
                               end )
       end
     end

data/lib/rpl/interpreter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'bigdecimal'
 require 'bigdecimal/math'
+require 'bigdecimal/util'
 
 require 'rpl/dictionary'
 
@@ -41,12 +43,31 @@ class Interpreter
       end
     end
 
+    unless input.index("\n").nil?
+      input = input
+                .split("\n")
+                .map do |line|
+        comment_begin_index = line.index('#')
+
+        if comment_begin_index.nil?
+          line
+        elsif comment_begin_index == 0
+          ''
+        else
+          line[0..(comment_begin_index - 1)]
+        end
+      end
+                .join(' ')
+    end
+
     splitted_input = input.split(' ')
 
     # 2-passes:
     # 1. regroup strings and programs
     opened_programs = 0
     closed_programs = 0
+    opened_lists = 0
+    closed_lists = 0
     string_delimiters = 0
     name_delimiters = 0
     regrouping = false
@@ -56,22 +77,33 @@ class Interpreter
       if elt[0] == '«'
         opened_programs += 1
         elt.gsub!( '«', '« ') if elt.length > 1 && elt[1] != ' '
+      elsif elt[0] == '{'
+        opened_lists += 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
-      string_delimiters += 1 if elt[0] == '"' && elt.length > 1
-      name_delimiters += 1 if elt[0] == "'" && elt.length > 1
 
       elt = "#{regrouped_input.pop} #{elt}".strip if regrouping
 
       regrouped_input << elt
 
-      if elt[-1] == '»'
+      case elt[-1]
+      when '»'
         closed_programs += 1
         elt.gsub!( '»', ' »') if elt.length > 1 && elt[-2] != ' '
+      when '}'
+        closed_lists += 1
+        elt.gsub!( '}', ' }') if elt.length > 1 && elt[-2] != ' '
+      when '"'
+        string_delimiters += 1
+      when "'"
+        name_delimiters += 1
       end
-      string_delimiters += 1 if elt[-1] == '"'
-      name_delimiters += 1 if elt[-1] == "'"
 
-      regrouping = string_delimiters.odd? || name_delimiters.odd? || (opened_programs > closed_programs )
+      regrouping = string_delimiters.odd? || name_delimiters.odd? || (opened_programs > closed_programs ) || (opened_lists > closed_lists )
     end
 
     # 2. parse
@@ -83,6 +115,8 @@ class Interpreter
       parsed_entry[:type] = case elt[0]
                             when '«'
                               :program
+                            when '{'
+                              :list
                             when '"'
                               :string
                             when "'"
@@ -97,18 +131,30 @@ class Interpreter
 
       if %I[string name].include?( parsed_entry[:type] )
         parsed_entry[:value] = parsed_entry[:value][1..-2]
-      elsif parsed_entry[:type] == :program
+      elsif %I[program].include?( parsed_entry[:type] )
         parsed_entry[:value] = parsed_entry[:value][2..-3]
-      elsif parsed_entry[:type] == :numeric
-        parsed_entry[:base] = 10 # TODO: parse others possible bases 0x...
-
-        begin
-          parsed_entry[:value] = Float( parsed_entry[:value] )
-          parsed_entry[:value] = parsed_entry[:value].to_i if (parsed_entry[:value] % 1).zero? && elt.index('.').nil?
-        rescue ArgumentError
-          parsed_entry[:value] = Integer( parsed_entry[:value] )
+      elsif %I[list].include?( parsed_entry[:type] )
+        parsed_entry[:value] = parse( parsed_entry[:value][2..-3] )
+      elsif %I[numeric].include?( parsed_entry[:type] )
+        underscore_position = parsed_entry[:value].index('_')
+
+        if parsed_entry[:value][0] == '0' && ( ['b', 'o', 'x'].include?( parsed_entry[:value][1] ) || !underscore_position.nil? )
+          if parsed_entry[:value][1] == 'x'
+            parsed_entry[:base] = 16
+          elsif parsed_entry[:value][1] == 'b'
+            parsed_entry[:base] = 2
+          elsif parsed_entry[:value][1] == 'o'
+            parsed_entry[:base] = 8
+            parsed_entry[:value] = parsed_entry[:value][2..]
+          elsif !underscore_position.nil?
+            parsed_entry[:base] = parsed_entry[:value][1..(underscore_position - 1)].to_i
+            parsed_entry[:value] = parsed_entry[:value][(underscore_position + 1)..]
+          end
+        else
+          parsed_entry[:base] = 10
         end
 
+        parsed_entry[:value] = parsed_entry[:value].to_i( parsed_entry[:base] ) unless parsed_entry[:base] == 10
         parsed_entry[:value] = BigDecimal( parsed_entry[:value], @precision )
       end
 
@@ -197,7 +243,7 @@ class Interpreter
 
       "#{prefix}#{suffix}"
     when :list
-      "[#{elt[:value].map { |e| stringify( e ) }.join(', ')}]"
+      "{ #{elt[:value].map { |e| stringify( e ) }.join(' ')} }"
     when :program
       "« #{elt[:value]} »"
     when :string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies: []
 description: A language inspired by HP's RPL and https://github.com/louisrubet/rpn/
 email: gwenhael@le-moine.org
@@ -45,7 +45,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">"
     - !ruby/object:Gem::Version
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Functional Stack Language