xrpn 1.9.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a506c2229e1ac07680bb7885f8ee929e6fe24208070b1f6be31b13974796cb17
-  data.tar.gz: cc2e596c179dc3b2fe86c434d9545d71b21f505059920359e8ebf7d0f548d213
+  metadata.gz: b9008be323da1eee11b22525fc7a1ca512a7682a12cbe03f8a7cb0964a5a80d5
+  data.tar.gz: 2e70c297fd2e010fdb85c7b078ffa79da3bff4b06aab3154de79c083a12430be
 SHA512:
-  metadata.gz: 8231b1b1bd0d11121da97380a52c944c932532ce67348a3587f699add4d094465cd778bfb903cccc7080c0c4e63982893c9a0e50b5ddb415f78502338975754f
-  data.tar.gz: 8815fa3fca80c8cf7e7210952162167d6e4ca8ed2ecbac09e6a7ca47b76d3fb57fc045d6358fb64071a80d6549bd2f0fd2fbf1e284e7325fdc49936bcb625024
+  metadata.gz: '093cf06d45e2db7c771acde846fe23119aa040bc0a13b4f509bed71371750e0cfbcfee0563cc3e01d72d7f36acb0bbd7dd80521a419ba1749e5cf447ec7a59b3'
+  data.tar.gz: 8041978530c6fb78fb50a8f63efb662513a588e1b4b047ac620432789b1a364c92426cb7135575e217cac198eb1d0276572ddaec0fefab3d0850a7b3aa9abfe8

data/bin/xrpn

@@ -23,12 +23,8 @@ require 'bigdecimal'
 require 'open-uri'
 require 'json'
 require 'tty-prompt'
+require 'timeout'
 
-$gem = nil
-begin
-  $gem = Gem.latest_spec_for("xrpn").gem_dir
-rescue
-end
 
 # ENSURE DIRs
 Dir.mkdir(Dir.home + "/.xrpn") unless File.exist?(Dir.home + "/.xrpn")
@@ -37,8 +33,11 @@ Dir.mkdir(Dir.home + "/.xrpn") unless File.exist?(Dir.home + "/.xrpn")
 end
 
 # READ LIBRARY AND COMMANDS
+$gem = `VISUAL=echo gem open xrpn`.chomp
+$gem = nil if $gem =~ /^Unable/
+$cmd = []
 Dir[$gem+"/xlib/*"].each { |file| load file } if $gem   # Read xlib directory from the Gem
-Dir[Dir.home+"/.xrpn/xlib/*"].each { |file| load file } # Read xlib directory from home dir
+Dir[Dir.home+"/.xrpn/xlib/*"].each { |file| load file unless $cmd.include?(file) } # Read xlib directory from home dir
 read_xcmd # Read XRPN commands (both from Gem and home dir)
 
 # INITIALIZE VARIABLES
@@ -134,6 +133,8 @@ until @p.pc == @p.prg[@p.pg].length do
       puts "No such command: #{l1}"
       exit if $exe
       @p.stop
+    elsif l1.downcase == "reload"
+      read_xcmd
     elsif XRPN.method_defined?(l1.downcase) # Or execute the command with either 1 or 2 parts
       begin
         l2 ? ret = @p.send(l1.downcase, l2) : ret = @p.send(l1.downcase)

data/xcmd/cmds

@@ -0,0 +1,8 @@
+class XRPN
+# Print all available commands
+  def cmds
+    p $cmd
+  end
+end
+ 
+# vim:ft=ruby:

data/xlib/_xrpn_version

@@ -1,5 +1,6 @@
 def xrpn_version
-  puts "XRPN version: 1.9"
+  puts "XRPN version:    2.0"
+  puts "RubyGem version: " + Gem.latest_spec_for("xrpn").version.to_s
 end
  
 # vim:ft=ruby:

data/xlib/hp_41

@@ -1,6 +1,7 @@
 def hp_41 (a)
   a.map!{|x| x.sub( /^\s+/,      ""           )} # Remove spaces at start of line
   a.map!{|x| x.sub( /^\d\d+[^0-9.]/, ""       )} # Remove line numbers from program
+  a.map!{|x| x.sub( /\t+; .*/,    ""          )} # Remove comments
   a.map!{|x| x.sub( /\s+$/,      ""           )} # Remove trailing spaces
   a.map!{|x| x.sub( /\s\s+/,      ""          )} # Remove multiple spaces
   a.map!{|x| x.sub( /([a-zA-Z ]*)/, &:downcase)} # Downcase everything (use the /i below here)
@@ -8,15 +9,17 @@ def hp_41 (a)
   a.map!{|x| x.sub( /R\^/i,      "rup"        )}
   a.map!{|x| x.sub( /X\^2/i,     "sqr"        )}
   a.map!{|x| x.sub( /X\*\*2/i,   "sqr"        )}
-  a.map!{|x| x.sub( /^E(\d+)/i,  '1e\1'       )}
+  a.map!{|x| x.sub( /^1*E(\d+)/i,'1e\1'       )}
   a.map!{|x| x.sub( /1\/X/i,     "recip"      )}
   a.map!{|x| x.sub( /HMS\+/i,    "hmsplus"    )}
   a.map!{|x| x.sub( /HMS-/i,     "hmsminus"   )}
   a.map!{|x| x.sub( /DATE\+/i,   "dateplus"   )}
   a.map!{|x| x.sub( /Σ\+/i,      "splus"      )}
   a.map!{|x| x.sub( /Σ-/i,       "sminus"     )}
+  a.map!{|x| x.sub( /ΣREG/i,     "sreg"       )}
   a.map!{|x| x.sub( /S\+/i,      "splus"      )}
   a.map!{|x| x.sub( /S-/i,       "sminus"     )}
+  a.map!{|x| x.sub( /SREG/i,     "sreg"       )}
   a.map!{|x| x.sub( /SIGMA\+/i,  "splus"      )}
   a.map!{|x| x.sub( /SIGMA-/i,   "sminus"     )}
   a.map!{|x| x.sub( /SIGMAREG/,  "sreg"       )}

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.9.1'
+  s.version     = '2.0'
   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.9: Added functions 'lastpage' and 'load' and also added 'pprgtofile' in version 1.9.1 (see GitHub wiki)"
+  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'."
 
   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.9.1
+  version: '2.0'
 platform: ruby
 authors:
 - Geir Isene
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -28,9 +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 1.9: Added functions
-  ''lastpage'' and ''load'' and also added ''pprgtofile'' in version 1.9.1 (see GitHub
-  wiki)'
+  programs and opens the possibilities to many, many more. New in 2.0: Startup speed
+  4X. Added command ''cmds''.'
 email: g@isene.com
 executables:
 - xrpn
@@ -96,6 +95,7 @@ files:
 - xcmd/cmdadd
 - xcmd/cmddel
 - xcmd/cmdhelp
+- xcmd/cmds
 - xcmd/copy
 - xcmd/correct
 - xcmd/cos
@@ -341,7 +341,7 @@ homepage: https://github.com/isene/XRPN
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,8 +356,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: XRPN - The eXtended RPN (Reverse Polish Notation) programming language
 test_files: []