xrpn 1.3.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd6c24bf0ae1e16e943aaf138b71c12d3fb91f96a76db8c4177ab4ff4a0a5f5
-  data.tar.gz: 38e57e229c8d739f5967de726866f87b309b1e74be3e42ca65d4807ea4768ea2
+  metadata.gz: 257af776c59f5959ad0f647a818754cb9662a72b66bd9f57fbfd5de5ccd55bb0
+  data.tar.gz: 4b2e366317250288ef9adc01a82c45a18547193bc4c07c224166f03a5291e07f
 SHA512:
-  metadata.gz: 8fda5beedc920d94a7711ad6d78908b785cd08ece3909a3e79583045300faf784c1b762640fd79fb1c9a178404b0da8199c4af9f50531a356f455fcb07b38107
-  data.tar.gz: 678af3b283e0970dca83f62c8ad85a26a3a4902b59aa0832edbf37308fd1a7dbd25dcd4fd9e250c6ff0f6eb48b4c8ec34cf9bde22f10ad7f2b1d1f855b3e0f10
+  metadata.gz: 35a01b19ccfd4fdf469345356966205c656b72fff3a82c26c2809fb6938dd9cab7908e2c04976ffd3eb7b608451587d46128707c130b05875beba0caab468444
+  data.tar.gz: f1dd342b8f13f72e5540766ed43b7fc2cf48b0b099d3bec56fccff8e9aa745f884bad06dfe3765401d671c472968c4e0c003da4c1bf3b22fec65164270de2bc9

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,9 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!
 
+input = (STDIN.tty?) ? '' : $stdin.read
+$exe  = input unless input == ''
+
 # INITIALIZE CLASS
 @p = XRPN.new($rfile)
 
@@ -58,7 +76,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|

data/xcmd/getfile

@@ -3,11 +3,11 @@ class XRPN
   def getfile
     lift
     begin
-      @x = File.read(@a)
+      @x = File.read(@a).chomp
     rescue
-      return "Cannot read the file '#{a}'"
+      return "Cannot read the file \"#{a}\""
     end
   end
 end
  
-# vim:ft=ruby:
+# vim:ft=ruby:

data/xcmd/getfilea

@@ -2,11 +2,11 @@ class XRPN
 # Read any file named in Alpha into Alpha
   def getfilea
     begin
-      @a = File.read(@a)
+      @a = File.read(@a).chomp
     rescue
-      return "Cannot read the file '#{a}'"
+      return "Cannot read the file \"#{a}\""
     end
   end
 end
  
-# vim:ft=ruby:
+# vim:ft=ruby:

data/xlib/_xrpn_version

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

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.3.4'
+  s.version     = '1.5'
   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.4: Added file system commands READ, OPEN, COPY, MOVE."
+  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.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.4
+  version: '1.5'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,8 +28,10 @@ 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.4: Added file
-  system commands READ, OPEN, COPY, MOVE.'
+  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'''
 email: g@isene.com
 executables:
 - xrpn
@@ -223,7 +225,6 @@ files:
 - xcmd/rclpta
 - xcmd/rclsw
 - xcmd/rdn
-- xcmd/read
 - xcmd/recip
 - xcmd/regmove
 - xcmd/regswap

data/xcmd/read

@@ -1,12 +0,0 @@
-class XRPN
-# Reads content of file named in Alpha into X
-  def read
-    begin
-      @x = File.read(@a).chomp
-    rescue
-      puts "Cannot read file \"#{@a}\""
-    end
-  end
-end
- 
-# vim:ft=ruby: