rpl 0.15.2 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936af4447e39381fe59aac32c442db5f16dfeac4aa656fa2f3d60a31f5814b3d
-  data.tar.gz: 4adf532c8185dc0083139af76243e63706a62d885fd6619c39667046bb45a53b
+  metadata.gz: dd44b5eda44e13d48f14e40dc350d6dbb32876da8a2362fd84aa6e1937d1c21c
+  data.tar.gz: b7f718fb990c70d7ae85528bb5532aacab627be27a845468126d3bf16d1d75ab
 SHA512:
-  metadata.gz: 44ace87f98a80156f3f7567fe30b48935c550b5481f64930717fb849673d171e4b6612d17ddde8c62564964cd9ba8cc13fc3b5e4e8418b10c2da8bdec4278d9f
-  data.tar.gz: 6493f90e472f0ed0b3afc6966b61adfe98f11116c3ecdae0e3a7606e7f27b8075a6f9e1060b9e65278aad368b3f5a6f2eff847129571f2164b45eab0daabc63b
+  metadata.gz: 88865d32234816b8a79fa1749eea4470666549fb454085f1c4bcc3457328936513ae86b48aaff4a74725923f5bd402ac030512e0400d96cf0ad41e1e4b1fe374
+  data.tar.gz: da6fa03c6200a4d5a9e29e19ff3791b5ad93de42575c95f551596acc2a6154ff4e57a499f24531e3748c6399b727c9df58502405315aa67eeff32c8a81bb69f0

data/bin/rpl

@@ -78,7 +78,7 @@ class RplRepl
 end
 
 def persistence_filename
-  persistence_dir = ENV['XDG_DATA_HOME']
+  persistence_dir = ENV.fetch('XDG_DATA_HOME', nil)
   persistence_dir ||= '~/.local/share'
   persistence_dir += '/rpl.rb'
 
@@ -88,7 +88,7 @@ end
 options = { run_REPL: false,
             persistence: true,
             live_persistence: true,
-            persistence_filename: persistence_filename,
+            persistence_filename:,
             files: [],
             programs: [],
             verbosity: :critical }
@@ -155,7 +155,7 @@ options[:programs].each do |program|
 end
 
 # third launch REPL if (explicitely or implicitely) asked
-RplRepl.new( interpreter: interpreter ).run! if options[:run_REPL]
+RplRepl.new( interpreter: ).run! if options[:run_REPL]
 
 interpreter.persist_state if options[:persistence]
 

data/lib/rpl/dictionary.rb

@@ -13,9 +13,9 @@ class Dictionary
 
   def add_word!( names, category, help, implementation )
     names.each do |name|
-      @words[ name ] = { category: category,
-                         help: help,
-                         implementation: implementation }
+      @words[ name ] = { category:,
+                         help:,
+                         implementation: }
     end
   end
 

data/lib/rpl/parser.rb

@@ -30,7 +30,7 @@ class Parser
                    .join(' ')
     end
 
-    splitted_input = input.split(' ')
+    splitted_input = input.split
 
     # 2-passes:
     # 1. regroup strings, lists, complexes, names and programs
@@ -90,7 +90,7 @@ class Parser
     end
 
     # 2. parse
-    parsed_input = regrouped_input.map do |element|
+    regrouped_input.map do |element|
       if RplBoolean.can_parse?( element )
         Types.new_object( RplBoolean, element )
       elsif RplNumeric.can_parse?( element )
@@ -107,7 +107,5 @@ class Parser
         Types.new_object( RplName, element )
       end
     end
-
-    parsed_input
   end
 end

data/lib/rpl/types/boolean.rb

@@ -25,7 +25,7 @@ module Types
     end
 
     def ==( other )
-      other.class == RplBoolean and
+      other.class == RplBoolean &&
         other.value == value
     end
   end

data/lib/rpl/types/complex.rb

@@ -20,20 +20,14 @@ module Types
     end
 
     def self.can_parse?( value )
-      # we systematicalyl trim enclosing ()
+      # we systematically trim enclosing ()
       value = value[1..-2] if value.is_a?( String ) && value[0] == '(' && value[-1] == ')'
 
-      begin
-        Complex( value )
-      rescue ArgumentError
-        return false
-      end
-
-      true
+      !Complex( value, exception: false ).nil?
     end
 
     def ==( other )
-      other.class == RplComplex and
+      other.class == RplComplex &&
         other.value == value
     end
   end

data/lib/rpl/types/list.rb

@@ -12,7 +12,7 @@ module Types
       @value = if value.instance_of?( Array )
                  value
                else
-                 # we systematicalyl trim enclosing { }
+                 # we systematically trim enclosing { }
                  Parser.parse( value[2..-3] )
                end
     end
@@ -22,12 +22,13 @@ module Types
     end
 
     def self.can_parse?( value )
-      value.instance_of?( Array ) or
-        value[0..1] == '{ ' && value[-2..] == ' }'
+      value.instance_of?( Array ) ||
+        ( value[0..1] == '{ ' &&
+          value[-2..] == ' }' )
     end
 
     def ==( other )
-      other.class == RplList and
+      other.class == RplList &&
         other.value == value
     end
   end

data/lib/rpl/types/name.rb

@@ -22,14 +22,14 @@ module Types
     end
 
     def self.can_parse?( value )
-      ( value.length > 2 and value[0] == "'" and value[-1] == "'" ) or
-        ( value != "''" and !value.match?(/^[0-9']+$/) and
+      ( value.length > 2 && value[0] == "'" && value[-1] == "'" ) ||
+        ( value != "''" && !value.match?(/^[0-9']+$/) &&
           # it's not any other type
           [RplBoolean, RplList, RplProgram, RplString, RplNumeric].reduce( true ) { |memo, type_class| memo && !type_class.can_parse?( value ) } )
     end
 
     def ==( other )
-      other.class == RplName and
+      other.class == RplName &&
         other.value == value
     end
   end

data/lib/rpl/types/numeric.rb

@@ -32,9 +32,7 @@ module Types
         @base = value.base
       when BigDecimal
         @value = value
-      when Integer
-        @value = BigDecimal( value, @@precision )
-      when Float
+      when Integer, Float
         @value = BigDecimal( value, @@precision )
       when String
         begin
@@ -94,19 +92,19 @@ module Types
     end
 
     def self.can_parse?( value )
-      [RplNumeric, BigDecimal, Integer, Float].include?( value.class ) or
-        ( value.is_a?( String ) and ( value.match?(/^-?[0-9]*\.?[0-9]+$/) or
-                                      value.match?(/^-?∞$/) or
-                                      value.match?(/^0b[0-1]+$/) or
-                                      value.match?(/^0o[0-7]+$/) or
-                                      value.match?(/^0x[0-9a-f]+$/) or
-                                      ( value.match?(/^[0-9]+b[0-9a-z]+$/) and
+      [RplNumeric, BigDecimal, Integer, Float].include?( value.class ) ||
+        ( value.is_a?( String ) && ( value.match?(/^-?[0-9]*\.?[0-9]+$/) ||
+                                      value.match?(/^-?∞$/) ||
+                                      value.match?(/^0b[0-1]+$/) ||
+                                      value.match?(/^0o[0-7]+$/) ||
+                                      value.match?(/^0x[0-9a-f]+$/) ||
+                                      ( value.match?(/^[0-9]+b[0-9a-z]+$/) &&
                                         value.split('_').first.to_i <= 36 ) ) )
     end
 
     def ==( other )
-      other.class == RplNumeric and
-        other.base == base and
+      other.class == RplNumeric &&
+        other.base == base &&
         other.value == value
     end
   end

data/lib/rpl/types/program.rb

@@ -7,7 +7,7 @@ module Types
     def initialize( value )
       raise RplTypeError unless self.class.can_parse?( value )
 
-      # we systematicalyl trim enclosing « »
+      # we systematically trim enclosing « »
       @value = value[2..-3] # TODO: parse each element ?
     end
 
@@ -16,11 +16,14 @@ module Types
     end
 
     def self.can_parse?( value )
-      value.length > 4 && value[0..1] == '« ' && value[-2..-1] == ' »' && !value[2..-3].strip.empty?
+      value.length > 4 &&
+        value[0..1] == '« ' &&
+        value[-2..] == ' »' &&
+        !value[2..-3].strip.empty?
     end
 
     def ==( other )
-      other.class == RplProgram and
+      other.class == RplProgram &&
         other.value == value
     end
   end

data/lib/rpl/types/string.rb

@@ -22,7 +22,7 @@ module Types
     end
 
     def ==( other )
-      other.class == RplString and
+      other.class == RplString &&
         other.value == value
     end
   end

data/lib/rpl/words/logarithm.rb

@@ -10,7 +10,7 @@ module RplLang
 
         category = 'Logs on reals and complexes'
 
-        @dictionary.add_word!( ['ℇ', 'e'],
+        @dictionary.add_word!( %w[ℇ e],
                                category,
                                '( … -- ℇ ) push ℇ',
                                proc do

data/lib/rpl/words/operations-reals-complexes.rb

@@ -30,7 +30,7 @@ module RplLang
                                             new_list = if args[1].instance_of?( RplList )
                                                          RplList.new( args[0].to_s ).value.concat( args[1].value )
                                                        else
-                                                         RplList.new( args[0].to_s ).value.concat( [args[1]] )
+                                                         RplList.new( args[0].to_s ).value.push(args[1])
                                                        end
 
                                             RplList.new( "{ #{new_list.join(' ')} }" )
@@ -47,9 +47,9 @@ module RplLang
                                           elsif args[0].instance_of?( RplString )
                                             RplString.new( if args[1].instance_of?( RplString ) ||
                                                               args[1].instance_of?( RplName )
-                                                           "\"#{args[0].value}#{args[1].value}\""
-                                                         else
-                                                           "\"#{args[0].value}#{args[1]}\""
+                                                             "\"#{args[0].value}#{args[1].value}\""
+                                                           else
+                                                             "\"#{args[0].value}#{args[1]}\""
                                                            end )
 
                                           elsif args[0].instance_of?( RplName )
@@ -189,11 +189,11 @@ module RplLang
                                  args = stack_extract( [[RplNumeric]] )
 
                                  @stack << RplNumeric.new( if args[0].value.positive?
-                                                           1
-                                                         elsif args[0].value.negative?
-                                                           -1
-                                                         else
-                                                           0
+                                                             1
+                                                           elsif args[0].value.negative?
+                                                             -1
+                                                           else
+                                                             0
                                                            end )
                                end )
       end

data/lib/rpl/words/operations-reals.rb

@@ -25,7 +25,7 @@ module RplLang
                                proc do
                                  args = stack_extract( [[RplNumeric], [RplNumeric]] )
 
-                                 @stack << RplNumeric.new( 100.0 * ( args[0].value / args[1].value ), args[1].base )
+                                 @stack << RplNumeric.new( ( args[0].value / args[1].value ) * 100.0, args[1].base )
                                end )
 
         @dictionary.add_word!( ['mod'],

data/lib/rpl/words/program.rb

@@ -23,6 +23,15 @@ module RplLang
                                  end
                                end )
 
+        @dictionary.add_word!( ['sheval'],
+                               category,
+                               '( string -- output ) run string in OS shell and put output on stack',
+                               proc do
+                                 args = stack_extract( [[RplString]] )
+
+                                 @stack << Types.new_object( RplString, "\"#{`#{args[0].value}`}\"" )
+                               end )
+
         @dictionary.add_word!( ['↴', 'lsto'],
                                category,
                                '( content name -- ) store to local variable',

data/lib/rpl/words/string-list.rb

@@ -17,10 +17,10 @@ module RplLang
                                  args = stack_extract( [[RplString, RplList]] )
 
                                  @stack << if args[0].is_a?( RplString )
-                                 Types.new_object( RplString, "\"#{args[0].value.reverse}\"" )
-                               else
-                                 Types.new_object( args[0].class, "{ #{args[0].value.reverse.join(' ')} }" )
-                               end
+                                             Types.new_object( RplString, "\"#{args[0].value.reverse}\"" )
+                                           else
+                                             Types.new_object( args[0].class, "{ #{args[0].value.reverse.join(' ')} }" )
+                                           end
                                end )
       end
     end

data/lib/rpl/words/time-date.rb

@@ -30,7 +30,7 @@ module RplLang
                                proc do
                                  ticks_since_epoch = Time.utc( 1, 1, 1 ).to_i * 10_000_000
                                  now = Time.now
-                                 @stack << Types.new_object( RplNumeric, now.to_i * 10_000_000 + now.nsec / 100 - ticks_since_epoch )
+                                 @stack << Types.new_object( RplNumeric, (now.to_i * 10_000_000) + (now.nsec / 100) - ticks_since_epoch )
                                end )
       end
     end

data/lib/rpl/words/trig.rb

@@ -12,7 +12,7 @@ module RplLang
 
         category = 'Trig on reals and complexes'
 
-        @dictionary.add_word!( ['𝛑', 'pi'],
+        @dictionary.add_word!( %w[𝛑 pi],
                                category,
                                '( … -- 𝛑 ) push 𝛑',
                                proc do

data/lib/rpl.rb

@@ -5,7 +5,7 @@ require 'rpl/types'
 require 'rpl/words'
 
 class Rpl < Interpreter
-  VERSION = '0.15.2'
+  VERSION = '0.16.1'
 
   include Types
 
@@ -15,7 +15,7 @@ class Rpl < Interpreter
                   dictionary: Dictionary.new,
                   persistence_filename: nil,
                   live_persistence: true )
-    super( stack: stack, dictionary: dictionary )
+    super( stack:, dictionary: )
 
     @persistence_filename = persistence_filename
     @live_persistence = live_persistence
@@ -37,13 +37,11 @@ class Rpl < Interpreter
   def persist_state
     return if @persistence_filename.nil?
 
-    File.open( @persistence_filename, 'w' ) do |persistence_file|
-      persistence_file.write "#{export_vars}\n#{export_stack}"
-    end
+    File.write(@persistence_filename, "#{export_vars}\n#{export_stack}")
   end
 
   def run!( input )
-    stack = super
+    stack = super( input )
 
     persist_state if @live_persistence
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.1
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Reverse-Polish-Lisp inspired language in ruby
 email: gwenhael@le-moine.org
@@ -55,7 +55,8 @@ files:
 homepage: https://github.com/gwenhael-le-moine/rpl.rb
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Functional Stack Language