rpl 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d134c204019846af46914a72d7cd820e58dbe5f5aba2e8cd3f7ec278a7b0cfa4
-  data.tar.gz: 61d0ae3b6bd7e9971af16dc7800d0ec53240c6e05e040e43842e26e19c2dfb4e
+  metadata.gz: 4c0b6dde921b1be42f37aada134849b5a96f458243f261e14b4bc4d7b17175d3
+  data.tar.gz: 0bac9ebecadaab0cc5ac023284dbad7a12d6e543e4b266b52cdcdd5815933e24
 SHA512:
-  metadata.gz: 2e60874443dd57923ba5674ad18ed3c858f8dbe95868d6e102e740daa7fcb6e550e7e1359a56d08ec7e611da43a26aeb0afba61e4fd7527c45dba2152d07ce0b
-  data.tar.gz: 635163aadcc99ccbce2ab5c047090db712c40eff0b3a973b38d7d7a9545611d6abe03e86dce319189ee92696f6e4c5cea7aef795102ddefacd2b2ba3675e9200
+  metadata.gz: 1c26e7c6146a97efd4dc45d7f2f93979156d459a47a7e3c6aa93b2ad4afac4f1fd40e5fcb67f5052e9a026dbb20109fae9dcd93cf5501e9e7d9f60ef469d41f7
+  data.tar.gz: a282895d927482056affe83b864b985f8251e97e6b6e80eb742959cfa7adaf0901739e3f45fb0ba3cf8ce0cd3f4851b51671c8b6e454d377a5963f963a86304d

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/interpreter.rb

@@ -197,7 +197,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.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-02-16 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