xrpn 1.3.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a270f73ff7966f8a5f28def1881aca7cbccd491fbd17e6f8be18a0a8ad423319
-  data.tar.gz: e1aa37a38e2ce9b9ebc7561053374fe0ed78b45c2a4e069047a5e96953f0700f
+  metadata.gz: 6eaeb18f29172b8e96f6f06ef04d3be02c30296f13b3f7f67a30fae7791ba464
+  data.tar.gz: d5807637849f72490dd5ec06357d3b7f8de1024850dd87954fdf2d69e1cdb6b8
 SHA512:
-  metadata.gz: 17429308f52f6dc00b1b2ff7ce2ef8cb4fda18326e8eec0ba902c39b222d6b75792da79f6a5769dc1cd45925982204850ced2e1ccd91afcb6da771ed14a20ef0
-  data.tar.gz: a65735d8ff489cc55567850697e4d7a9c7748a6de7e9a130886c6d4c858234496370fe5f18accd306df2306972c66bb948889100df9369b74f9f0e4795e04a30
+  metadata.gz: d150e537776c8ffb9a0e1324a132b9fece173abbea78b23b329b082774d07da3e80d028a0098edf59655a10b983cc65df063ff5c57e8795c28e75a86756bb530
+  data.tar.gz: ac92b3b15c37ddb86b921a4fbfa30ff3ac38237325747a1cd4b5ebcfce85bbd23634b284af332c76ebc7366457baa02ad86e9868fb5a879d726a1cc8d786a248

data/README.md

@@ -1,4 +1,5 @@
 # XRPN
+![Ruby](https://img.shields.io/badge/language-Ruby-red) ![Unlicense](https://img.shields.io/badge/license-Unlicense-green) ![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-important)
 
 ## Introduction
 
@@ -25,10 +26,11 @@ To run XRPN, make sure the program file ("bin/xrpn") is copied or linked to a di
 The full synopsis goes like this:
 ```
 Usage: xrpn [options]
-    -f, --file XRPN-file             Specify the file to process
-    -l, --load XRPN-file             Specify a file to load, but not run
+    -e, --execute string             Interpret string as program and run
+    -f, --file program               Specify the file to process
+    -l, --load program(s)            File(s) to load, but not run
     -s, --state STATE                Load a State file
-	-c, --check program              Program file to check for errors
+    -c, --check program              Program file to check for errors
     -x, --X X-value                  Set initial value in the X register
     -y, --Y Y-value                  Set initial value in the Y register
     -z, --Z Z-value                  Set initial value in the Z register
@@ -38,6 +40,11 @@ Usage: xrpn [options]
         --help                       Display LONG help text
     -v, --version                    Display the XRPN version number
 ```
+A program can be run by supplying a program file (option -f), by supplying a string with commands separated by commas (option -e) or by starting xrpn without any options and keying in the program manually.
+
+Using the -eoption, you could do e.g. `xrpn -e "43, sin, 1/x, prx"`.
+
+You can also pipe a string into xrpn like this: `echo "1,2,+,4,/,prx" | xrpn`.
 
 ## FOCAL and the HP-41 system
 

data/bin/xrpn

@@ -1,5 +1,19 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+#
+# SCRIPT INFO 
+# Name:       XRPN - eXtended Reverse Polish Notation programming language
+# Language:   Pure Ruby, best viewed in VIM
+# Author:     Geir Isene <g@isene.com>
+# Web_site:   http://isene.com/
+# Github:     https://github.com/isene/xrpn
+# License:    I release all copyright claims. This code is in the public domain.
+#             Permission is granted to use, copy modify, distribute, and sell
+#             this software for any purpose. I make no guarantee about the
+#             suitability of this software for any purpose and I am not liable
+#             for any damages resulting from its use. Further, I am under no
+#             obligation to maintain or extend this software. It is provided 
+#             on an 'as is' basis without any expressed or implied warranty.
 
 # GET EXTENSIONS
 require 'optparse'
@@ -33,6 +47,7 @@ optparse = OptionParser.new do |opts|
   opts.banner = "Usage: xrpn [options]"
 
   # Define the options, and what they do
+  opts.on('-e', '--execute string', 'Interpret string as program and run')   { |e| $exe   = e  }
   opts.on('-f', '--file program', 'Specify the file to process')             { |f| $rfile = f  }
   opts.on('-l', '--load program(s)', Array, 'File(s) to load, but not run')  { |l| $lfile = l  }
   opts.on('-s', '--state STATE', 'Load a State file')                        { |s| $sfile = s  }
@@ -48,6 +63,10 @@ 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 == ''
+
 # INITIALIZE CLASS
 @p = XRPN.new($rfile)
 
@@ -58,7 +77,8 @@ load(Dir.home+'/.xrpn/conf') if File.exist?(Dir.home+'/.xrpn/conf')
 @p.x, @p.y, @p.z, @p.t, @p.a = @x, @y, @z, @t, @a
 
 # INITIALIZE XRPN PROGRAM
-@p.prg[@p.pg] = ["LBL \"XRPN\"", "END"] unless $rfile   # Put dummy program in page 0 if no file to run
+@p.prg[@p.pg] = ["LBL \"XRPN\"", "END"]                 # Put dummy program in page 0 if no file/string to run
+@p.prg[@p.pg] = hp_41($exe.split(",")) if $exe          # Read in string as program is supplied by -e/--execute
 @p.prg[@p.pg] = hp_41(@p.prg[@p.pg]) if $rfile          # Substitute HP-41 commands with XRPN commands
 if $lfile                                               # Read file to load but not run if -l switch is used
   $lfile.each_with_index do |f, i|
@@ -66,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
 
@@ -88,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
@@ -106,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.3"
+  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.3.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.3.5: Removed READ (already had that with GETFILE."
+  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.3.5
+  version: '1.6'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,8 +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.3.5: Removed READ
-  (already had that with GETFILE.'
+  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