xrpn 2.3 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6ace1f064aca783f21398cdb1f2f4f559ed9c81c5f0ec320bbfb1bcb141dba9
-  data.tar.gz: 49ba0dbb56fb0d008b137f869aa384d405a178f65a3ae4cef0da13ce1ee417bd
+  metadata.gz: 84914aee77f72d7498f7550ebd2baab36750512ef40df1821a5eecd3e990bc42
+  data.tar.gz: 05f5f0827b724fc60f627ecf7a830396ae037c6e2cfaf5f0fe3240fb519a4e58
 SHA512:
-  metadata.gz: 391751c7be85bb1c289813dbc181386ea5e547be63e22ae59991f7713d44bfe034cbed36cd8aedfb131dd19f433cb71fc75449cd6ba4300c4d642d65f4bbbed9
-  data.tar.gz: 712a0cf5d4452142836fa7ef503ea56236bbe8bb76f500acceff98778072212d97751d604eb0d8c63d910bab166ef80c5c97a58f872e606067e5e577d51dd8d4
+  metadata.gz: 644a84de681db279ebc4d710559c05b7d5411733474ea40b8f7ee54644176d3c371c8dbc86cffac9d89a05ea5549a77cae382289731f2ef441f16415d305d3c2
+  data.tar.gz: 7a573988b18edbed9c245eeb82c2b3fc3038375f72ba2832ebe1d2f5114c182723ef122d5ca99cb8193477a5f9b9b6fc46388a60cb51454214f812f94f74323d

data/README.md

@@ -1,5 +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)
+![Ruby](https://img.shields.io/badge/language-Ruby-red) [![Gem Version](https://badge.fury.io/rb/xrpn.svg)](https://badge.fury.io/rb/xrpn) ![Unlicense](https://img.shields.io/badge/license-Unlicense-green) ![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-important)
 
 ## Introduction
 

data/bin/xrpn

@@ -80,7 +80,7 @@ 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"]                 # Put dummy program in page 0 if no file/string to run
+@p.prg[@p.pg] = ["LBL \"XRPN\"", "END"] unless $rfile   # 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

data/xcmd/getweb

@@ -5,9 +5,9 @@ class XRPN
     begin
       @x = open(@a) {|f| f.read }
     rescue
-      return "Cannot get the content of '#{a}'"
+      return "Cannot get the content of \"#{a}\""
     end
   end
 end
  
-# vim:ft=ruby:
+# vim:ft=ruby:

data/xcmd/pprg

@@ -7,7 +7,7 @@ class XRPN
       pr = "\"#{@a}\""
       page, pos, prgm = locate_prg (pr)
       if pos == nil
-        puts "No such program to print."
+        puts "No such program to print #{pr}"
         return
       end
     end
@@ -25,4 +25,4 @@ class XRPN
   end
 end
  
-# vim:ft=ruby:
+# vim:ft=ruby:

data/xlib/check

@@ -1,5 +1,5 @@
 def check(file)
-  load Dir.home+"/.xrpn/lib/read_cmd"
+  load Dir.home+"/.xrpn/xlib/read_xcmd"
   read_cmd
   errors = 0
   if File.exist?(file) 

data/xlib/read_xcmd

@@ -1,12 +1,14 @@
 def read_xcmd
-  $cmd = []
   if $gem
-    Dir[$gem+"/xcmd/*"].each do |file|
-      load file
-      l = File.read(file)
-      c = l.sub(/.*\s*def /m, '')
-      c = c.sub(/\s.*/m, '')
-      $cmd.push(c)
+    begin
+      Dir[$gem+"/xcmd/*"].each do |file|
+        load file
+        l = File.read(file)
+        c = l.sub(/.*\s*def /m, '')
+        c = c.sub(/\s.*/m, '')
+        $cmd.push(c)
+      end
+    rescue
     end
   end
   Dir[Dir.home+"/.xrpn/xcmd/*"].each do |file|
@@ -17,6 +19,7 @@ def read_xcmd
     $cmd.push(c)
   end
   $cmd.sort!
+  $cmd.uniq!
 end
  
 # vim:ft=ruby:

data/xlib/rxcmd

@@ -0,0 +1,20 @@
+def rxcmd(xcmd)
+  return xcmd if $cmd.include?(xcmd)
+  $gem ? gfile = $gem+"/xcmd/#{xcmd}" : gfile = ""
+  xfile = Dir.home+"/.xrpn/xcmd/#{xcmd}"
+  [gfile, xfile].each do |file|
+    if File.exist?(file)
+      load file
+      l    = File.read(file)
+      c    = l.sub(/.*\s*def /m, '')
+      c    = c.sub(/\s.*/m, '')
+      $cmd.push(c)
+      $cmd.sort!
+      $cmd.uniq!
+      return xcmd
+    end
+  end
+  return nil
+end
+ 
+# vim:ft=ruby:

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '2.3'
+  s.version     = '2.4'
   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 2.0: Startup speed 4X. Added command 'cmds'. 2.1: Fixed rounding overflow bug. Added : commands to access underlying Ruby. 2.2: Added error exception (flag 25) with commands 'error'=CF 25 and 'unerror'=SF 25. 2.3: Better Flag 25 handling."
+  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 2.4: Fixed loading of files via the -f switch."
 
   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: '2.3'
+  version: '2.4'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,10 +28,8 @@ 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 2.0: Startup speed
-  4X. Added command ''cmds''. 2.1: Fixed rounding overflow bug. Added : commands to
-  access underlying Ruby. 2.2: Added error exception (flag 25) with commands ''error''=CF
-  25 and ''unerror''=SF 25. 2.3: Better Flag 25 handling.'
+  programs and opens the possibilities to many, many more. New in 2.4: Fixed loading
+  of files via the -f switch.'
 email: g@isene.com
 executables:
 - xrpn
@@ -205,7 +203,6 @@ files:
 - xcmd/posfl
 - xcmd/pow
 - xcmd/pprg
-- xcmd/pprg1
 - xcmd/pprgtofile
 - xcmd/pprgx
 - xcmd/pra
@@ -233,7 +230,6 @@ files:
 - xcmd/recip
 - xcmd/regmove
 - xcmd/regswap
-- xcmd/reload
 - xcmd/reszfl
 - xcmd/rnd
 - xcmd/root
@@ -334,6 +330,7 @@ files:
 - xlib/numformat
 - xlib/read_state
 - xlib/read_xcmd
+- xlib/rxcmd
 - xlib/save_state
 - xlib/save_xm
 - xlib/setpt

data/xcmd/pprg1

@@ -1,28 +0,0 @@
-class XRPN
-# Print program
-  def pprg
-    page = @pg
-    pos  = 0
-    if @a != ""
-      pr = "\"#{@a}\""
-      page, pos, prgm = locate_prg (pr)
-      if pos == nil
-        puts "No such program to print #{pr}"
-        return
-      end
-    end
-    @prg[page].each_index do |i|
-      next if i < pos
-      print "#{format('%02d', i + 1)}"
-      if @prg[page][i].downcase.match(/lbl/)
-        print "◆"
-      else
-        print " "
-      end
-      puts  "#{@prg[page][i]}"
-      break if @prg[page][i] == "END"
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/xcmd/reload

@@ -1,8 +0,0 @@
-class XRPN
-# Reload all commands in the ./xrpn/cmd directory (makes it possble to modify or add commands while a program is running)
-  def reload
-    read_cmd
-  end
-end
- 
-# vim:ft=ruby: