xrpn 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257af776c59f5959ad0f647a818754cb9662a72b66bd9f57fbfd5de5ccd55bb0
-  data.tar.gz: 4b2e366317250288ef9adc01a82c45a18547193bc4c07c224166f03a5291e07f
+  metadata.gz: 6eaeb18f29172b8e96f6f06ef04d3be02c30296f13b3f7f67a30fae7791ba464
+  data.tar.gz: d5807637849f72490dd5ec06357d3b7f8de1024850dd87954fdf2d69e1cdb6b8
 SHA512:
-  metadata.gz: 35a01b19ccfd4fdf469345356966205c656b72fff3a82c26c2809fb6938dd9cab7908e2c04976ffd3eb7b608451587d46128707c130b05875beba0caab468444
-  data.tar.gz: f1dd342b8f13f72e5540766ed43b7fc2cf48b0b099d3bec56fccff8e9aa745f884bad06dfe3765401d671c472968c4e0c003da4c1bf3b22fec65164270de2bc9
+  metadata.gz: d150e537776c8ffb9a0e1324a132b9fece173abbea78b23b329b082774d07da3e80d028a0098edf59655a10b983cc65df063ff5c57e8795c28e75a86756bb530
+  data.tar.gz: ac92b3b15c37ddb86b921a4fbfa30ff3ac38237325747a1cd4b5ebcfce85bbd23634b284af332c76ebc7366457baa02ad86e9868fb5a879d726a1cc8d786a248

data/bin/xrpn

@@ -63,6 +63,7 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
+# HANDLE INPUT FROM STDIN (PIPE) OR STRING VIA -e
 input = (STDIN.tty?) ? '' : $stdin.read
 $exe  = input unless input == ''
 
@@ -85,6 +86,8 @@ if $lfile                                               # Read file to load but
     @p.prg[i] = hp_41(@p.prg[i])
   end
 end
+@p.prg[@p.pg].push("END") unless @p.prg[@p.pg].last.upcase == "END"
+
 read_state($sfile) if $sfile                            # Read state file in ~.xrpn/ if -s switch is used
 $debug = true      if $lfile or $sfile                  # Do not run loaded program or program in state file
 
@@ -107,13 +110,13 @@ until @p.pc == @p.prg[@p.pg].length do
     @p.x = @line.to_f
     @p.flg["22"] = true  # Number has been entered
     @p.flg["23"] = false
-  elsif @line.match(/^>?".*"/) # If an Alpha string is supplied 
-    if @line.match(/^"\|/)
+  elsif @line.match(/^>?["'].*["']/) # If an Alpha string is supplied 
+    if @line.match(/^["']\|/)
       @p.a += @line.sub(/\|-?/, '').gsub(/\"/, '') # Append to Alpha if "|abc", "|-abc"
-    elsif @line.match(/^>"/)
+    elsif @line.match(/^>["']/)
       @p.a += @line.sub(/>/, '').gsub(/\"/, '')    # Append to Alpha if >"abc"
     else
-      @p.a = @line.gsub(/\"/, '') # ...or set Alpha to the supplied string
+      @p.a = @line.gsub(/["']/, '') # ...or set Alpha to the supplied string
     end
     @p.flg["22"] = false
     @p.flg["23"] = true  # String has been entered
@@ -125,6 +128,7 @@ until @p.pc == @p.prg[@p.pg].length do
     l1 = "" if l1 == nil
     if not $cmd.include?(l1.downcase) # Catch unknown command
       puts "No such command: #{l1}"
+      exit if $exe
       @p.stop
     elsif XRPN.method_defined?(l1.downcase) # Or execute the command with either 1 or 2 parts
       begin

data/xlib/_xrpn_version

@@ -1,5 +1,5 @@
 def xrpn_version
-  puts "XRPN version: 1.5"
+  puts "XRPN version: 1.6"
 end
  
 # vim:ft=ruby:

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.5'
+  s.version     = '1.6'
   s.licenses    = ['Unlicense']
   s.summary     = "XRPN - The eXtended RPN (Reverse Polish Notation) programming language"
-  s.description = "A full programming language and environment extending the features of the venerable HP calculator programmable calculators. With XRPN you can accomplish a wide range of modern programming tasks as well as running existing HP-41 FOCAL programs directly. XRPN gives modern life to tens of thousands of old HP calculator programs and opens the possibilities to many, many more. New in 1.5: You can now pipe commands into xrpn or run xrpn with the -e option to supply a program from the command line. Such string must have commands separated by a comma like this: '1, 2, +, sin, 1/x, prx'"
+  s.description = "A full programming language and environment extending the features of the venerable HP calculator programmable calculators. With XRPN you can accomplish a wide range of modern programming tasks as well as running existing HP-41 FOCAL programs directly. XRPN gives modern life to tens of thousands of old HP calculator programs and opens the possibilities to many, many more. New in 1.6: Added the option to use single-quotes for Alpha entry. Added the safety-catch of adding an END to programs that does not have and END as the last line."
 
   s.authors     = ["Geir Isene"]
   s.email       = 'g@isene.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xrpn
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,10 +28,9 @@ description: 'A full programming language and environment extending the features
   the venerable HP calculator programmable calculators. With XRPN you can accomplish
   a wide range of modern programming tasks as well as running existing HP-41 FOCAL
   programs directly. XRPN gives modern life to tens of thousands of old HP calculator
-  programs and opens the possibilities to many, many more. New in 1.5: You can now
-  pipe commands into xrpn or run xrpn with the -e option to supply a program from
-  the command line. Such string must have commands separated by a comma like this:
-  ''1, 2, +, sin, 1/x, prx'''
+  programs and opens the possibilities to many, many more. New in 1.6: Added the option
+  to use single-quotes for Alpha entry. Added the safety-catch of adding an END to
+  programs that does not have and END as the last line.'
 email: g@isene.com
 executables:
 - xrpn