rpl 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 351033e886b47bece3ef9d5c143932c512c484bf92fce4128eb72edbdbdb7da3
-  data.tar.gz: 92812d157842f269ea72158f3db150ee62489aed54bba6d754ee2b4d6f386989
+  metadata.gz: 745f492092d7e5dd03c90ca25ee5de900832730342075295a8f9d190734ed4d4
+  data.tar.gz: b7a56161fcf77d5b90b015e4bc67ba3a770605aba261c46f40adfbac1232daa6
 SHA512:
-  metadata.gz: a5be657562ddfe9aa9329e3e5dcbf4cd9253428b11d8b2822ae09cd2d6a4a05e11d6864d474135b9275b4b0f338e87ee606fad898c118a274cb72633153a532b
-  data.tar.gz: ed16880b36a64da41863d07d281f46f0c9db1a3f2b8a2b75ba99ed3ebafb8439fd6c008ef84c39bf1382cd203c8885735d5655077b01da237d4c770d0d1c5514
+  metadata.gz: 4df6860f009ab1ae4c957000e98fd7f39be60c2d9370ab0626a60e71a84625b14e9d5bb9142c53d178d602b2654ec95ade37d4bf03825245a318d7da9f5a6296
+  data.tar.gz: 19f365a0e10430051ba6ca75cbe55d4504fb3ef2e6d778e4114d335f20c558f7921b9921b949caf11eb3fccb1538f014f3c2a396421648fee0035fa8eac08f67

data/bin/rpl

@@ -3,34 +3,42 @@
 
 require 'English'
 require 'optparse'
-require 'readline'
+require 'reline'
 
 require 'rpl'
 
 class RplRepl
   def initialize( interpreter: Rpl.new )
+    begin
+      @stty_save = `stty -g`.chomp
+    rescue Error => e
+      puts "Couldn't get terminal characteristics"
+      pp e
+    end
+
     @interpreter = interpreter
   end
 
   def run
     print_stack unless @interpreter.stack.empty?
 
-    Readline.completion_proc = proc do |s|
+    Reline.completion_proc = proc do |s|
       ( @interpreter.dictionary.words.keys + @interpreter.dictionary.vars.keys ).grep(/^#{Regexp.escape(s)}/)
     end
-    Readline.completion_append_character = ' '
+    Reline.completion_append_character = ' '
 
     prefill = ''
     loop do
-      Readline.pre_input_hook = lambda do
-        return if prefill.empty?
+      unless prefill.empty?
+        Reline.pre_input_hook = lambda do
+          Reline.insert_text( prefill.to_s )
+          Reline.redisplay
 
-        Readline.refresh_line
-        Readline.insert_text( prefill.to_s )
-        Readline.redisplay
+          Reline.pre_input_hook = nil
+        end
       end
 
-      input = Readline.readline( ' ', true )
+      input = Reline.readline( ' ', true )
 
       break if input.nil? || input.strip == 'quit'
 
@@ -39,12 +47,11 @@ class RplRepl
       if input.strip == 'edit'
         prefill = @interpreter.stack.pop.to_s
       elsif input.strip == 'history'
-        Readline::HISTORY.each do |line|
-          pp line
-        end
+        history = Reline::HISTORY.map { |line| "\"#{line}\"" }.join(' ')
+        @interpreter.run( "{ #{history} }" )
       elsif input.empty?
         # Remove blank lines from history
-        Readline::HISTORY.pop
+        Reline::HISTORY.pop
       else
         begin
           @interpreter.run( input )
@@ -54,6 +61,10 @@ class RplRepl
       end
 
       print_stack
+    rescue Interrupt
+      puts '^C'
+      `stty #{@stty_save}` if @stty_save
+      exit 0
     end
   end
 

data/lib/rpl.rb

@@ -5,7 +5,7 @@ require 'rpl/types'
 require 'rpl/words'
 
 class Rpl < Interpreter
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 
   include Types
 

metadata

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