xrpn 2.0 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9008be323da1eee11b22525fc7a1ca512a7682a12cbe03f8a7cb0964a5a80d5
-  data.tar.gz: 2e70c297fd2e010fdb85c7b078ffa79da3bff4b06aab3154de79c083a12430be
+  metadata.gz: 5ffb9be2c7f2d0322a75cc674de598d9606afa71b467ac55e65dbef3aae512d7
+  data.tar.gz: 7cda743855ab4708bff10c7e12cadadbcd8484605fb2f9526805988f0a06adad
 SHA512:
-  metadata.gz: '093cf06d45e2db7c771acde846fe23119aa040bc0a13b4f509bed71371750e0cfbcfee0563cc3e01d72d7f36acb0bbd7dd80521a419ba1749e5cf447ec7a59b3'
-  data.tar.gz: 8041978530c6fb78fb50a8f63efb662513a588e1b4b047ac620432789b1a364c92426cb7135575e217cac198eb1d0276572ddaec0fefab3d0850a7b3aa9abfe8
+  metadata.gz: 5bfe087a054e763f342bbe111a2e2ba9924a37719be5784e494deb6be75d3412d7f2442bdc84156dcc3a9389af69ed7a5cf42e3ba824d875ecb3f0fb04f3a3ec
+  data.tar.gz: f9400c2544b32edc95db3c243a6490ce4f1860a6dc9c9379042b51710845c542474053127bfd5c8cefbb2d579eaf58e01f8ed04958240b2c802a3162f0866b3e

data/bin/xrpn

@@ -137,7 +137,12 @@ until @p.pc == @p.prg[@p.pg].length do
       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)
+        if @p.flg["25"] == true
+          @p.flg["25"] = false
+          unerror { l2 ? ret = @p.send(l1.downcase, l2) : ret = @p.send(l1.downcase) }
+        else
+          l2 ? ret = @p.send(l1.downcase, l2) : ret = @p.send(l1.downcase)
+        end
       rescue ArgumentError
         puts "Command needs an argument (#{@line})"
         exit if $exe

data/xcmd/error

@@ -0,0 +1,8 @@
+class XRPN
+# Clears Flag 25 (error flag)
+  def error
+    @p.flg["25"] = false
+  end
+end
+ 
+# vim:ft=ruby:

data/xcmd/unerror

@@ -0,0 +1,8 @@
+class XRPN
+# Sets Flag 25 (error flag)
+  def error
+    @p.flg["25"] = true
+  end
+end
+ 
+# vim:ft=ruby:

data/xlib/_xrpn_version

@@ -1,5 +1,5 @@
 def xrpn_version
-  puts "XRPN version:    2.0"
+  puts "XRPN version:    2.2"
   puts "RubyGem version: " + Gem.latest_spec_for("xrpn").version.to_s
 end
  

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/xlib/unerror

@@ -0,0 +1,6 @@
+def unerror
+   begin
+     yield  
+   rescue Exception
+   end
+end

data/xrpn.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '2.0'
+  s.version     = '2.2'
   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'."
+  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"
 
   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.0'
+  version: '2.2'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -29,7 +29,9 @@ description: 'A full programming language and environment extending the features
   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''.'
+  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'
 email: g@isene.com
 executables:
 - xrpn
@@ -128,6 +130,7 @@ files:
 - xcmd/end
 - xcmd/eng
 - xcmd/enter
+- xcmd/error
 - xcmd/exp
 - xcmd/expx1
 - xcmd/fact
@@ -282,6 +285,7 @@ files:
 - xcmd/tone
 - xcmd/tonexy
 - xcmd/tx
+- xcmd/unerror
 - xcmd/version
 - xcmd/view
 - xcmd/writefile
@@ -335,6 +339,7 @@ files:
 - xlib/setpt
 - xlib/string
 - xlib/theme
+- xlib/unerror
 - xlib/xrpn_class
 - xrpn.gemspec
 homepage: https://github.com/isene/XRPN