xrpn 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03241e60303fa493ab7d0e6f895ad47fbb9a51feea4b9bf034da8c38c48e8a6a
-  data.tar.gz: 63525da3f160509e5f08e56f4602ce9685bf6174de16dc70e5cc97f73d0e815d
+  metadata.gz: 6c5391ee8849b22f558676040acf0db029c86f29561273158993f0d27f582020
+  data.tar.gz: 9112bbb8560e9703cc2a4524d1a1556ba24b31022b767c4bc3a566ddfd057275
 SHA512:
-  metadata.gz: 3c6a5493fef70b4ec8f441b9f4856fed4568668a3f81954613482b9261412fc406dc53f05b2a7f5976f07ca45ee742a6d27db94c10399855635529208e694d9f
-  data.tar.gz: 0abf7767dd0e1a5ba63fabf11e83b30aae1b20dc81f4b2e419438f486a8fe287a682314cfb47127c5b4c1b99524c94cbf5a4b5f22bf2373cfa0733fd2bede5ae
+  metadata.gz: '0326418721cc8e91b93b05003f146f94f22dcaf7e503d0e768c30890f089ee10c486f25d228538d78bec5a7d0a0a0c7fc93f40145757c429ae37b8ce52d27333'
+  data.tar.gz: 2caeba8dded77c1e56812a9b3dd9de074fc90a2aab737561bc2dfefa1f534f453dad46c0aecb00000d2ef8bd5e94f35fe545cbc547b3772ee2cb29a7dd3ff91f

data/bin/xrpn

@@ -17,13 +17,13 @@ require 'tty-prompt'
 
 # ENSURE DIRs
 Dir.mkdir(Dir.home + "/.xrpn") unless File.exist?(Dir.home + "/.xrpn")
-["cmd", "data", "extra", "lib", "print"].each do |d|
+["data", "extra", "print", "xcmd", "xlib"].each do |d|
   Dir.mkdir(Dir.home + "/.xrpn/" + d) unless File.exist?(Dir.home + "/.xrpn/" + d)
 end
 
 # INITIALIZE
 @x, @y, @z, @t, @a = 0, 0, 0, 0, ""
-Dir[Dir.home+"/.xrpn/lib/*"].each { |file| load file }  # Read libraries
+Dir[Dir.home+"/.xrpn/xlib/*"].each { |file| load file } # Read libraries
 read_cmd                                                # Read XRPN commands
 @p = XRPN.new($rfile)
 @p.x, @p.y, @p.z, @p.t, @p.a = @x, @y, @z, @t, @a
@@ -37,9 +37,9 @@ if $lfile                                               # Read file to load but
 end
 read_state($sfile) if $sfile                            # Read state file in ~.xrpn/ if -s switch is used
 $debug = true      if $lfile or $sfile                  # Do not run loaded program or program in state file
-load(Dir.home+'/.xrpn/lib/theme_dark')  if File.exist?(Dir.home+'/.xrpn/lib/theme_dark') # Read theme file
-load(Dir.home+'/.xrpn/conf')            if File.exist?(Dir.home+'/.xrpn/conf')           # Read config file
-load(Dir.home+'/.xrpn/lib/theme_light') if $theme == "light" and File.exist?(Dir.home+'/.xrpn/lib/theme_light') # Read theme file
+load(Dir.home+'/.xrpn/xlib/theme_dark')  if File.exist?(Dir.home+'/.xrpn/lib/theme_dark') # Read theme file
+load(Dir.home+'/.xrpn/conf')             if File.exist?(Dir.home+'/.xrpn/conf')           # Read config file
+load(Dir.home+'/.xrpn/xlib/theme_light') if $theme == "light" and File.exist?(Dir.home+'/.xrpn/xlib/theme_light') # Read theme file
 load(Dir.home+'/.xrpn/theme') if File.exist?(Dir.home+'/.xrpn/theme') # Override theme if user theme file exists
 
 

data/lib/xrpn_load.rb

@@ -0,0 +1,2 @@
+Dir[__dir__ + "/../xlib/*"].each { |file| load file }
+Dir[__dir__ + "/../xcmd/*"].each { |file| load file }

data/xrpn.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'xrpn'
-  s.version     = '1.1.3'
+  s.version     = '1.1.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."
@@ -9,9 +9,8 @@ Gem::Specification.new do |s|
   s.email       = 'g@isene.com'
   s.homepage    = 'https://github.com/isene/XRPN'
 
-  s.add_runtime_dependency 'optparse', '~> 0.3'
   s.add_runtime_dependency 'tty-prompt', '~> 0.23'
   
-  s.files       = Dir.glob("cmd/*") + Dir.glob("lib/*") + ["bin/xrpn", "xrpn.gemspec"]
+  s.files       = ["bin/xrpn", "lib/xrpn_load.rb", "xrpn.gemspec"]
   s.executables << 'xrpn'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: xrpn
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: optparse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -50,292 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/xrpn
-- cmd/abs
-- cmd/acos
-- cmd/adate
-- cmd/adateiso
-- cmd/add
-- cmd/adv
-- cmd/agsub
-- cmd/aleng
-- cmd/almcat
-- cmd/almnow
-- cmd/anum
-- cmd/aoff
-- cmd/aon
-- cmd/appchr
-- cmd/apprec
-- cmd/arcl
-- cmd/arcli
-- cmd/arclrec
-- cmd/arot
-- cmd/ashf
-- cmd/asin
-- cmd/asroom
-- cmd/asto
-- cmd/asub
-- cmd/atan
-- cmd/atime
-- cmd/atime24
-- cmd/atox
-- cmd/aview
-- cmd/aviewc
-- cmd/beep
-- cmd/bindec
-- cmd/cat
-- cmd/cf
-- cmd/chs
-- cmd/cla
-- cmd/clalma
-- cmd/clalmx
-- cmd/cld
-- cmd/clear
-- cmd/clfl
-- cmd/clk12
-- cmd/clk24
-- cmd/clkeys
-- cmd/clock
-- cmd/clp
-- cmd/clralms
-- cmd/clrg
-- cmd/clrgx
-- cmd/cls
-- cmd/clst
-- cmd/clx
-- cmd/cmdadd
-- cmd/cmddel
-- cmd/correct
-- cmd/cos
-- cmd/crflas
-- cmd/crfld
-- cmd/cube
-- cmd/d_r
-- cmd/date
-- cmd/dateplus
-- cmd/ddate
-- cmd/dec
-- cmd/decbin
-- cmd/dechex
-- cmd/decoct
-- cmd/deg
-- cmd/degq
-- cmd/delchr
-- cmd/delrec
-- cmd/divide
-- cmd/dmy
-- cmd/dot
-- cmd/dow
-- cmd/drop
-- cmd/dropy
-- cmd/dse
-- cmd/ed
-- cmd/emdir
-- cmd/emdirx
-- cmd/emroom
-- cmd/end
-- cmd/eng
-- cmd/enter
-- cmd/exp
-- cmd/expx1
-- cmd/fact
-- cmd/fc
-- cmd/fcc
-- cmd/fcs
-- cmd/fix
-- cmd/fixq
-- cmd/flsize
-- cmd/frc
-- cmd/fs
-- cmd/fsc
-- cmd/fss
-- cmd/geir
-- cmd/getas
-- cmd/getfile
-- cmd/getfilea
-- cmd/getkey
-- cmd/getkeyx
-- cmd/getp
-- cmd/getr
-- cmd/getrec
-- cmd/getrx
-- cmd/getsub
-- cmd/getweb
-- cmd/getx
-- cmd/grad
-- cmd/gsb
-- cmd/gto
-- cmd/help
-- cmd/hexdec
-- cmd/hms
-- cmd/hmsminus
-- cmd/hmsplus
-- cmd/hr
-- cmd/inschr
-- cmd/insrec
-- cmd/int
-- cmd/invf
-- cmd/isg
-- cmd/lastx
-- cmd/lbl
-- cmd/lift
-- cmd/ln
-- cmd/ln1x
-- cmd/log
-- cmd/mdy
-- cmd/mean
-- cmd/mod
-- cmd/multiply
-- cmd/oct
-- cmd/octdec
-- cmd/off
-- cmd/on
-- cmd/p_r
-- cmd/pack
-- cmd/page
-- cmd/pagedel
-- cmd/pageq
-- cmd/pageswap
-- cmd/pasn
-- cmd/pcat
-- cmd/pclps
-- cmd/percent
-- cmd/percentch
-- cmd/pi
-- cmd/posa
-- cmd/posfl
-- cmd/pow
-- cmd/pprg
-- cmd/pprgx
-- cmd/pra
-- cmd/prflags
-- cmd/prompt
-- cmd/prp
-- cmd/prregs
-- cmd/prstk
-- cmd/prx
-- cmd/prxm
-- cmd/pse
-- cmd/psize
-- cmd/purfl
-- cmd/r_d
-- cmd/r_p
-- cmd/rad
-- cmd/rand
-- cmd/rcl
-- cmd/rclaf
-- cmd/rclflag
-- cmd/rclpt
-- cmd/rclpta
-- cmd/rclsw
-- cmd/rdn
-- cmd/recip
-- cmd/regmove
-- cmd/regswap
-- cmd/reload
-- cmd/reszfl
-- cmd/rnd
-- cmd/root
-- cmd/rtn
-- cmd/rubycmd
-- cmd/runsw
-- cmd/rup
-- cmd/saveas
-- cmd/savep
-- cmd/saver
-- cmd/saverx
-- cmd/savex
-- cmd/savexm
-- cmd/sci
-- cmd/sdev
-- cmd/seekpt
-- cmd/seekpta
-- cmd/sep
-- cmd/setaf
-- cmd/setsw
-- cmd/sf
-- cmd/shellcmd
-- cmd/sign
-- cmd/sin
-- cmd/size
-- cmd/sizeq
-- cmd/sminus
-- cmd/splus
-- cmd/sqr
-- cmd/sqrt
-- cmd/sreg
-- cmd/sregq
-- cmd/stdivide
-- cmd/stmultiply
-- cmd/sto
-- cmd/stoflag
-- cmd/stop
-- cmd/stopsw
-- cmd/stplus
-- cmd/stsubtract
-- cmd/subtract
-- cmd/sw
-- cmd/swap
-- cmd/swpt
-- cmd/tan
-- cmd/tenx
-- cmd/time
-- cmd/tx
-- cmd/version
-- cmd/view
-- cmd/writefile
-- cmd/xeq
-- cmd/xeq0
-- cmd/xeqnn
-- cmd/xeqy
-- cmd/xf
-- cmd/xgt0
-- cmd/xgteq0
-- cmd/xgteqnn
-- cmd/xgteqy
-- cmd/xgtnn
-- cmd/xgty
-- cmd/xlt0
-- cmd/xlteq0
-- cmd/xlteqnn
-- cmd/xlteqy
-- cmd/xltnn
-- cmd/xlty
-- cmd/xmexistq
-- cmd/xmfileq
-- cmd/xneq0
-- cmd/xneqnn
-- cmd/xneqy
-- cmd/xnn
-- cmd/xtoa
-- cmd/xy
-- cmd/xyzalm
-- lib/_xrpn_version.rb
-- lib/bei.rb
-- lib/check.rb
-- lib/conditional.rb
-- lib/convert_base.rb
-- lib/debug_mode.rb
-- lib/dtparse.rb
-- lib/error.rb
-- lib/fact.rb
-- lib/getpt.rb
-- lib/help.rb
-- lib/hp_41.rb
-- lib/ind.rb
-- lib/load_xm.rb
-- lib/locate_prg.rb
-- lib/numeric.rb
-- lib/numformat.rb
-- lib/optparse.rb
-- lib/read_cmd.rb
-- lib/read_state.rb
-- lib/save_state.rb
-- lib/save_xm.rb
-- lib/setpt.rb
-- lib/string.rb
-- lib/theme_dark.rb
-- lib/theme_light.rb
-- lib/xrpn_class.rb
+- lib/xrpn_load.rb
 - xrpn.gemspec
 homepage: https://github.com/isene/XRPN
 licenses:

data/cmd/abs

@@ -1,7 +0,0 @@
-class XRPN
-  def abs
-    @x = @x.abs
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/acos

@@ -1,10 +0,0 @@
-class XRPN
-  def acos
-    @l = @x
-    @x = Math::acos(@x)
-    @x = @x.to_deg  if @deg == "deg"
-    @x = @x.to_grad if @deg == "grad"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/adate

@@ -1,12 +0,0 @@
-class XRPN
-  def adate
-    d = @x.to_s
-    if @flg["31"] # DMY
-      @a += d.sub(/(\d*)\.(\d\d)\d\d(\d\d)\d*/, '\1.\2.\3')
-    else # MDY
-      @a += d.sub(/(\d*)\.(\d\d)\d\d(\d\d)\d*/, '\1/\2/\3')
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/adateiso

@@ -1,13 +0,0 @@
-class XRPN
-  def adateiso
-    d = @x.to_s
-    d = "0" + d if d.match(/^\d\./)
-    if @flg["31"] # DMY
-      @a += d.sub(/(\d*)\.(\d\d)(\d\d\d\d)\d*/, '\3-\2-\1')
-    else # MDY
-      @a += d.sub(/(\d*)\.(\d\d)(\d\d\d\d)\d*/, '\3-\1-\2')
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/add

@@ -1,9 +0,0 @@
-class XRPN
-  def +
-    @l = @x
-    @x = @y + @x
-    dropy
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/adv

@@ -1,7 +0,0 @@
-class XRPN
-  def adv
-    puts "\n"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/agsub

@@ -1,8 +0,0 @@
-class XRPN
-  def agsub
-    return unless (@x.is_a? String and @y.is_a? String)
-    @a.gsub!(Regexp.new(@x), @y)
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/aleng

@@ -1,8 +0,0 @@
-class XRPN
-  def aleng
-	lift
-    @x = @a.length
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/almcat

@@ -1,7 +0,0 @@
-class XRPN
-  def almcat
-    return "ALMCAT: No clock, alarm or stopwatch functions are implemented"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/almnow

@@ -1,7 +0,0 @@
-class XRPN
-  def almnow
-    return "ALMNOW: No clock, alarm or stopwatch functions are implemented"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/anum

@@ -1,10 +0,0 @@
-class XRPN
-  def anum
-    lift
-    n = @a.scan(/[\d.,e]+/).first
-    n.sub!(/,/, '.') unless @dot
-    @x = n.to_f
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/aoff

@@ -1,7 +0,0 @@
-class XRPN
-  def aoff
-    return "AOFF: As with AON, no real need for that function"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/aon

@@ -1,7 +0,0 @@
-class XRPN
-  def aon
-    return "AON: No real need for that function"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/appchr

@@ -1,13 +0,0 @@
-class XRPN
-  def appchr
-    if @xmcont[0][0] == ""
-      return 
-    else
-      r = @xmcont[0][3].to_i + 1
-      @xmcont[r] += @a
-      savexm
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/apprec

@@ -1,13 +0,0 @@
-class XRPN
-  def apprec
-    if @xmcont[0][0] == ""
-      return 
-    else
-      @xmcont[0][3] = @xmcont[0][3].to_i + 1.0
-      @xmcont.insert(@xmcont[0][3].to_i + 1, @a)
-      savexm
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/arcl

@@ -1,22 +0,0 @@
-class XRPN
-  def arcl (r)
-    a = false
-    case r.downcase
-    when "x"
-      a = @x
-    when "y"
-      a = @y
-    when "z"
-      a = @z
-    when "t"
-      a = @t
-    end
-    a ? @a += numformat(a) : @a += numformat(@reg[r])
-	  if @a == nil
-      @reg[r] = ""
-      @a = ""
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/arcli

@@ -1,7 +0,0 @@
-class XRPN
-  def arcli
-    @a += @x.to_i.to_s
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/arclrec

@@ -1,30 +0,0 @@
-class XRPN
-  def arclrec
-    if @xmcont[0][0] == ""
-      return 
-    else
-      if @xmcont[0][3] > @xmcont.length - 2
-        @xmcont[0][3] = 0.0 
-		return "END OF FILE"
-      end
-      r, c = getpt
-      n = 24 - @a.length
-      n = 0 if n < 0
-      e = c + n
-      n > 0 ? s = @xmcont[r][c..e - 1] : s = "" 
-      @a += s
-      if e > @xmcont[r].length - 2
-        setpt(r + 1, 0)
-        @flg["17"]    = true
-      elsif n > 0
-        p c, n, @xmcont[0][3]
-        setpt(r, e + 1)
-        p "After", @xmcont[0][3]
-        @flg["17"]    = false
-      end
-      savexm
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/arot

@@ -1,13 +0,0 @@
-class XRPN
-  def arot
-    if @x > 0
-      r  = (@x - 1).to_i
-      @a = @a[(r + 1)..] + @a[0..r]
-    elsif @x < 0
-      r  = (@x - 1).abs.to_i
-      @a = @a[(r - 1)..] + @a[0..(r - 2)]
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/ashf

@@ -1,7 +0,0 @@
-class XRPN
-  def ashf
-    @a = @a[6..]
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/asin

@@ -1,10 +0,0 @@
-class XRPN
-  def asin
-    @l = @x
-    @x = Math::asin(@x)
-    @x = @x.to_deg  if @deg == "deg"
-    @x = @x.to_grad if @deg == "grad"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/asroom

@@ -1,7 +0,0 @@
-class XRPN
-  def asroom
-    return "ASROOM: There's always plenty of room"
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/asto

@@ -1,21 +0,0 @@
-class XRPN
-  def asto (r)
-    case r.downcase
-    when "x"
-      @l = @x
-      @x = @a
-    when "y"
-      @y = @a
-    when "z"
-      @z = @a
-    when "t"
-      @t = @a
-    when "l"
-      @l = @a
-    else
-      @reg[r] = @a
-    end
-  end
-end
- 
-# vim:ft=ruby:

data/cmd/asub

@@ -1,8 +0,0 @@
-class XRPN
-  def asub
-    return unless (@x.is_a? String and @y.is_a? String)
-    @a.sub!(Regexp.new(@x), @y)
-  end
-end
- 
-# vim:ft=ruby: