xrpn 1.9.5 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751d07df684dda975c02987fa4b1988a898e90ca38cee59c43599afa70839461
-  data.tar.gz: 0b35a364703da952c89c3a4a4dd544437e838ec5806f4a60ad93702bce2a43c8
+  metadata.gz: 9b24dce24109f4a7222e21c8512f6d94abc5249627b5c5fcb3c445ad3f6fd6d4
+  data.tar.gz: c1f0dcc7aeb1b15e9f2301305069c8845b02da91fae7a955f39bf29c533835b0
 SHA512:
-  metadata.gz: 4ac219252e205fb60271a60b5e5f9a8e6bb7f19c3dfe7e0ce8f2dce60ca1d1a8ffb83645ee664601a7a1a09ddd150c0c5275950ca1fd6bf5599443530023deae
-  data.tar.gz: 9506c918f3173955a7112c45e5d19c194a58c0579f797f6cfef605fdf65a71321da052b828c77b3246da4efd9b9868d8d35af4b02b9d3bba17c29af03b9bcca8
+  metadata.gz: 6f900855140a10644b1a83bfa50de31e74c2ac1468e7fc2284f698187e69538515a19744893b0f4c1d7cb3fe88a9b749628386803be304d72a99538685ecb0ed
+  data.tar.gz: 25471831a90d05f1138baad38554922c3ef43efe7d7195313d521ed1e29665b459b67dbc94b99fa2d94360665204117684ca532836fbaed76a426d015826ac14

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.1"
+  puts "RubyGem version: " + Gem.latest_spec_for("xrpn").version.to_s
 end
  
 # vim:ft=ruby:

data/xlib/debug_mode

@@ -9,8 +9,8 @@ def debug_mode
       @p.prstk
       @line = @debugprompt.ask(">")
       unless @line == nil or @line.length == 1
-        @line = [@line]
-        @line = hp_41(@line)[0]
+        @line = hp_41([@line])[0]
+        #@line = rxcmd(@line)
       end
     end
     case @line
@@ -87,6 +87,13 @@ def debug_mode
       @p.prg[@p.pg].insert(@p.pc + 1, @line.sub(/^\+\+ /, ''))
     when "--"
       @p.prg[@p.pg].delete_at(@p.pc)
+    when /^:/
+      begin
+        eval @line[1..-1]
+      rescue StandardError => err
+        puts err
+      end
+      break
     when nil # A simple ENTER
       @line = "lift"
       break

data/xlib/numeric

@@ -36,12 +36,16 @@ class Numeric
     s  = x.to_i.to_s
     self < 0 ? m = "-" : m  = ""
     s.sub!(/-/, '')
-    f  = x.frc.to_s[0..(i + 1)].to_f
-    f  = f.to_s.sub(/../, '')
+    f  = (x.frc * 10 ** i).round.to_i.to_s
+    if f.length > i # Fix rounding overflow
+      s = (x + 1).to_i.to_s
+      f = f[1..-1]
+    end
+    f  = f.to_s
     i > 0 ? s.sub!(/(\d*\.)(\d{,#{i}}).*/, '\1\2') : s.sub!(/(\d*).*/, '\1') 
     if e.abs >= n # If exponent kicks in
       s += "." + f.ljust(i, "0")
-      s += "e"
+      s += " e"
       if ge < 0
         s += "-"
         s.sub!(/0\.(\d)/, '\1.')

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.9.5'
+  s.version     = '2.1'
   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). 1.9.5: Comments are now removed when loading programs (comments start with a tab and a semicolon and a space and whatever)"
+  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."
 
   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.5
+  version: '2.1'
 platform: ruby
 authors:
 - Geir Isene
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-10-26 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.9: Added functions
-  ''lastpage'' and ''load'' and also added ''pprgtofile'' in version 1.9.1 (see GitHub
-  wiki). 1.9.5: Comments are now removed when loading programs (comments start with
-  a tab and a semicolon and a space and whatever)'
+  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.'
 email: g@isene.com
 executables:
 - xrpn
@@ -97,6 +96,7 @@ files:
 - xcmd/cmdadd
 - xcmd/cmddel
 - xcmd/cmdhelp
+- xcmd/cmds
 - xcmd/copy
 - xcmd/correct
 - xcmd/cos
@@ -342,7 +342,7 @@ homepage: https://github.com/isene/XRPN
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -357,8 +357,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: []