rpl 0.9.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e9bc8ba67723150f213575e38739395c1e6e3d0a9e4698f674e3639ab1b832
-  data.tar.gz: 3f2fbc820f3bdddca938a03b5ef84ea1ff87c6808ab1d7be54ad0e4acc3bf159
+  metadata.gz: 10af1c6c132173d66be7c554831cd2d86d289c401b5aa36ba16deaca62634ab6
+  data.tar.gz: b0a72cece6e644b76c1dfe4a4a8533936d1025b464a64cbcfa82640549209b66
 SHA512:
-  metadata.gz: cb8417f6fabef1f7b852965b1c6b3bd0c88a97ee916f142e5fe88f8f088a70899130c2bb508427ca0c6659216d03a2b07e7f4b1c64ec2c36916b2e77d3375dfa
-  data.tar.gz: 3231ef3590627ac0ab7897a58282dd3a432339d5adbebb900c25ad4871ca91259d3ec38459f26dd865849d679a7561cffbe70ec20b4a58676aaaab57332e9ebc
+  metadata.gz: ae2fc038218acbaced883355476dd1fcb77d325cda5db7dc7fc49eedc70d90a58b071f6efece38929d8ac292dd325ec6b663bc70cab31f73ee9f039d5e4847c5
+  data.tar.gz: daabf61d638a593ca324eade777e0d26e959f29a0883b8af67c34647efd6efe7da5e5af777fac6a6ea7e4197495fa08bfe76cf9aca593c7849564d8e6fa00431

data/bin/rpl

@@ -8,9 +8,7 @@ require 'readline'
 require 'rpl'
 
 class RplRepl
-  def initialize( interpreter )
-    interpreter ||= Rpl.new
-
+  def initialize( interpreter: Rpl.new )
     @interpreter = interpreter
   end
 
@@ -51,11 +49,27 @@ class RplRepl
 end
 
 options = { run_REPL: ARGV.empty?,
+            persistence_filename: File.expand_path( '~/.local/state/rpl.rb/machine' ),
+            live_persistence: true,
             files: [],
             programs: [] }
 
+Version = Rpl::VERSION
+
 OptionParser.new do |opts|
-  opts.on('-c', '--code "program"', ' ') do |program|
+  opts.on('-s', "--state filename", "persist state in filename (default: #{options[:persistence_filename]}) (will be created if needed)") do |filename|
+    options[:persistence_filename] = File.expand_path( filename )
+  end
+
+  opts.on('-q', '--no-state', 'Do not load persisted state') do
+    options[:persistence_filename] = nil
+  end
+
+  opts.on('-d', '--no-persist', 'Do not persist state') do
+    options[:live_persistence] = false
+  end
+
+  opts.on('-c', '--code "program"', 'run provided "program"') do |program|
     options[:programs] << program
   end
 
@@ -69,11 +83,12 @@ OptionParser.new do |opts|
 end.parse!
 
 # Instantiate interpreter
-interpreter = Rpl.new
+interpreter = Rpl.new( persistence_filename: options[:persistence_filename],
+                       live_persistence: options[:live_persistence] )
 
 # first run provided files if any
 options[:files].each do |filename|
-  interpreter.run "\"#{filename}\" feval"
+  interpreter.run "\"#{File.expand_path( filename )}\" feval"
 end
 
 # second run provided code if any
@@ -82,7 +97,8 @@ options[:programs].each do |program|
 end
 
 # third launch REPL if (explicitely or implicitely) asked
-RplRepl.new( interpreter ).run if options[:run_REPL]
-
-# 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}"
+if options[:run_REPL]
+  RplRepl.new( interpreter: interpreter ).run
+else
+  interpreter.persist_state
+end

data/lib/rpl/interpreter.rb

@@ -36,9 +36,7 @@ class Interpreter
 
   attr_accessor :precision
 
-  def initialize( stack = [], dictionary = Rpl::Lang::Dictionary.new )
-    @version = 0.91
-
+  def initialize( stack: [], dictionary: Dictionary.new )
     @dictionary = dictionary
     @stack = stack
 
@@ -100,12 +98,19 @@ class Interpreter
   end
 
   def export_vars
-    @dictionary.vars
-               .map { |name, value| "#{value} '#{name}' sto" }
-               .join(' ')
+    vars_as_string = "@ variables:\n"
+    vars_as_string += @dictionary.vars
+                                 .map { |name, value| "#{value}\n'#{name}' sto\n" }
+                                 .join("\n")
+
+    vars_as_string
   end
 
   def export_stack
-    @stack.map(&:to_s).join(' ')
+    stack_as_string = "@ stack:\n"
+    stack_as_string += @stack.map(&:to_s)
+                             .join("\n")
+
+    stack_as_string
   end
 end

data/lib/rpl/words/filesystem.rb

@@ -16,7 +16,7 @@ module RplLang
                               proc do
                                 args = stack_extract( [[RplString]] )
 
-                                path = File.absolute_path( args[0].value )
+                                path = File.expand_path( args[0].value )
 
                                 @stack << Types.new_object( RplString, "\"#{File.read( path )}\"" )
                               end )
@@ -32,7 +32,7 @@ module RplLang
                               proc do
                                 args = stack_extract( [[RplString], :any] )
 
-                                File.write( File.absolute_path( args[0].value ),
+                                File.write( File.expand_path( args[0].value ),
                                             args[1].value )
                               end )
       end

data/lib/rpl/words/general.rb

@@ -35,15 +35,13 @@ module RplLang
                               category,
                               '( -- n ) Pop the interpreter\'s version number',
                               proc do
-                                @stack << Types.new_object( RplString, "\"#{@version}\"" )
+                                @stack << Types.new_object( RplString, "\"#{Rpl::VERSION}\"" )
                               end )
 
         @dictionary.add_word( ['uname'],
                               category,
                               '( -- s ) Pop the interpreter\'s complete indentification string',
-                              proc do
-                                @stack << Types.new_object( RplString, "\"Rpl Interpreter version #{@version}\"" )
-                              end )
+                              Types.new_object( RplProgram, '« "Rpl Interpreter version " version + »' ) )
       end
     end
   end

data/lib/rpl.rb

@@ -5,12 +5,49 @@ require 'rpl/types'
 require 'rpl/words'
 
 class Rpl < Interpreter
+  VERSION = '0.10.2'
+
   include Types
 
-  def initialize( stack = [], dictionary = Dictionary.new )
-    super
+  attr_accessor :live_persistence
+
+  def initialize( stack: [],
+                  dictionary: Dictionary.new,
+                  persistence_filename: nil,
+                  live_persistence: true )
+    super( stack: stack, dictionary: dictionary )
+
+    @persistence_filename = persistence_filename
+    @live_persistence = live_persistence
 
     populate_dictionary if @dictionary.words.empty?
+
+    load_persisted_state
+  end
+
+  def load_persisted_state
+    return if @persistence_filename.nil?
+
+    FileUtils.mkdir_p( File.dirname( @persistence_filename ) )
+    FileUtils.touch( @persistence_filename )
+
+    run "\"#{@persistence_filename}\" feval"
+  end
+
+  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
+  end
+
+  def run( input )
+    stack = super
+
+    persist_state if @live_persistence
+
+    stack
   end
 
   prepend RplLang::Words::Branch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-05 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