rpl 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f26f2f32e0e42c05a0ed59c2f21bb31433a5c2be29454cc17e7c5e1ee9bc2b1
-  data.tar.gz: ddb9ad1384954af38402126f5425654e1534b684f57271736bd64eace4cc987a
+  metadata.gz: fabbce316a5c08423208383985c44621b20e0032499072ada99fe46aa24b7f9a
+  data.tar.gz: d1861c145f2647640cf5192fd376177a2565915e979a15cb46a34a7e340d6171
 SHA512:
-  metadata.gz: 1d3ebfc6baa238fc2ad342f71c871399cbb37d4e8a87bbbbaf0173573947592ebeb62a2686a4a99ba07bf8860e97abb0615abce86450ffa328915cace9523658
-  data.tar.gz: ee1d985c2f136ef8eedd496b3c5a1c051f19f46aef118c2e308f2b5dbbe2cc5191555e714fc398c0c518c13e388e48d30db4d81751160bf0e8f6e1374dc17eae
+  metadata.gz: 2150ec4f68a633e83e1e17ce6508ad706e8e3a5cfe9e3683322f9e257d59ac6d37303d2ea87072f4479fe2b42189231748e3d294028a2fdfa6952ad8ae528aa3
+  data.tar.gz: 9e4b5766997db3b9825bd9d713e90a0494d3a007f3f4882bfe7f5eb5aed2e5b47281ee9d077e96915697f884e4a362aed3f652ce647e71b92cee1c4689e4212e

data/lib/rpl/core/program.rb

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

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,6 +43,23 @@ 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:
@@ -112,20 +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] == :list
+      elsif %I[list].include?( parsed_entry[:type] )
         parsed_entry[:value] = parse( 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[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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 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