rpl 0.9.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e9bc8ba67723150f213575e38739395c1e6e3d0a9e4698f674e3639ab1b832
-  data.tar.gz: 3f2fbc820f3bdddca938a03b5ef84ea1ff87c6808ab1d7be54ad0e4acc3bf159
+  metadata.gz: f003b868db4dbda2168ccfa57e5ac82d01621af12b56d8c65f541a91e9f305ff
+  data.tar.gz: c3792a7db5c8f3e3a9ff3950c859db242bd2ddffa0dcc783b85e87143e68a88b
 SHA512:
-  metadata.gz: cb8417f6fabef1f7b852965b1c6b3bd0c88a97ee916f142e5fe88f8f088a70899130c2bb508427ca0c6659216d03a2b07e7f4b1c64ec2c36916b2e77d3375dfa
-  data.tar.gz: 3231ef3590627ac0ab7897a58282dd3a432339d5adbebb900c25ad4871ca91259d3ec38459f26dd865849d679a7561cffbe70ec20b4a58676aaaab57332e9ebc
+  metadata.gz: 004405ac78a320d83a9a7e24448c8e10ee916d999afc29201df8d66601d455286764f598fd6a8703560dcb3fda1da8976569e237d256faf3d42240ae4416b6ac
+  data.tar.gz: 7ed6ddfd403d45e120e3b5adb0c3c1657b8e1de9c4fe7e511af56f212c492f271e8ef5152aabc0bf9bbc344af1ce56f66e97b7e60d947840be479b5de62eb9ec

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,25 @@ class RplRepl
 end
 
 options = { run_REPL: ARGV.empty?,
+            persistence_filename: File.expand_path( '~/.local/state/rpl.rb/machine' ),
+            live_persistence: true,
             files: [],
             programs: [] }
 
 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 +81,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 +95,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,8 +36,8 @@ class Interpreter
 
   attr_accessor :precision
 
-  def initialize( stack = [], dictionary = Rpl::Lang::Dictionary.new )
-    @version = 0.91
+  def initialize( stack: [], dictionary: Dictionary.new )
+    @version = 0.101
 
     @dictionary = dictionary
     @stack = stack
@@ -100,12 +100,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.rb

@@ -7,10 +7,45 @@ require 'rpl/words'
 class Rpl < Interpreter
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Gwenhael Le Moine