added dup to doc

Makefile

@@ -57,8 +57,8 @@ test:
 	go test -v ./...
 
 singletest:
-	@echo "Call like this: make singletest TEST=TestPrepareColumns ARGS=-v"
+	@echo "Call like this: ''make singletest TEST=TestPrepareColumns"
-	go test -run $(TEST) $(ARGS)
+	go test -run $(TEST)
 
 cover-report:
 	go test ./... -cover -coverprofile=coverage.out

calc.go

@@ -62,8 +62,6 @@ const Help string = `
 Operators:
 basic operators: + - x * / ^  (* is an alias of x)
 
-Bitwise operators: and or xor < (left shift) > (right shift)
-
 Percent functions:
 %                    percent
 %-                   substract percent
@@ -121,28 +119,20 @@ func (c *Calc) GetCompleteCustomFuncalls() func(string) []string {
 		}
 
 		for command := range c.SettingsCommands {
-			if len(command) > 1 {
 			completions = append(completions, command)
 		}
-		}
 
 		for command := range c.ShowCommands {
-			if len(command) > 1 {
 			completions = append(completions, command)
 		}
-		}
 
 		for command := range c.StackCommands {
-			if len(command) > 1 {
 			completions = append(completions, command)
 		}
-		}
 
 		for command := range c.Commands {
-			if len(command) > 1 {
 			completions = append(completions, command)
 		}
-		}
 
 		return completions
 	}
@@ -245,15 +235,6 @@ func (c *Calc) Eval(line string) {
 			c.stack.Backup()
 			c.stack.Push(num)
 		} else {
-			// try hex
-			var i int
-			_, err := fmt.Sscanf(item, "0x%x", &i)
-			if err == nil {
-				c.stack.Backup()
-				c.stack.Push(float64(i))
-				continue
-			}
-
 			if contains(c.Constants, item) {
 				// put the constant onto the stack
 				c.stack.Backup()
@@ -261,7 +242,7 @@ func (c *Calc) Eval(line string) {
 				continue
 			}
 
-			if exists(c.Funcalls, item) {
+			if _, ok := c.Funcalls[item]; ok {
 				if err := c.DoFuncall(item); err != nil {
 					fmt.Println(err)
 				} else {
@@ -270,18 +251,20 @@ func (c *Calc) Eval(line string) {
 				continue
 			}
 
-			if exists(c.BatchFuncalls, item) {
+			if c.batch {
-				if !c.batch {
+				if _, ok := c.BatchFuncalls[item]; ok {
+					if err := c.DoFuncall(item); err != nil {
+						fmt.Println(err)
+					} else {
+						c.Result()
+					}
+					continue
+				}
+			} else {
+				if _, ok := c.BatchFuncalls[item]; ok {
 					fmt.Println("only supported in batch mode")
 					continue
 				}
-
-				if err := c.DoFuncall(item); err != nil {
-					fmt.Println(err)
-				} else {
-					c.Result()
-				}
-				continue
 			}
 
 			if contains(c.LuaFunctions, item) {
@@ -302,22 +285,22 @@ func (c *Calc) Eval(line string) {
 			}
 
 			// internal commands
-			if exists(c.Commands, item) {
+			if _, ok := c.Commands[item]; ok {
 				c.Commands[item].Func(c)
 				continue
 			}
 
-			if exists(c.ShowCommands, item) {
+			if _, ok := c.ShowCommands[item]; ok {
 				c.ShowCommands[item].Func(c)
 				continue
 			}
 
-			if exists(c.StackCommands, item) {
+			if _, ok := c.StackCommands[item]; ok {
 				c.StackCommands[item].Func(c)
 				continue
 			}
 
-			if exists(c.SettingsCommands, item) {
+			if _, ok := c.SettingsCommands[item]; ok {
 				c.SettingsCommands[item].Func(c)
 				continue
 			}
@@ -505,7 +488,7 @@ func (c *Calc) PutVar(name string) {
 }
 
 func (c *Calc) GetVar(name string) {
-	if exists(c.Vars, name) {
+	if _, ok := c.Vars[name]; ok {
 		c.Debug(fmt.Sprintf("retrieve %.2f from %s", c.Vars[name], name))
 		c.stack.Backup()
 		c.stack.Push(c.Vars[name])
@@ -518,10 +501,8 @@ func sortcommands(hash Commands) []string {
 	keys := make([]string, 0, len(hash))
 
 	for key := range hash {
-		if len(key) > 1 {
 		keys = append(keys, key)
 	}
-	}
 
 	sort.Strings(keys)
 

calc_test.go

@@ -241,45 +241,6 @@ func TestCalc(t *testing.T) {
 			cmd:  `4 4 + undo *`,
 			exp:  16,
 		},
-
-		// bit tests
-		{
-			name: "bit and",
-			cmd:  `1 3 and`,
-			exp:  1,
-		},
-		{
-			name: "bit or",
-			cmd:  `1 3 or`,
-			exp:  3,
-		},
-		{
-			name: "bit xor",
-			cmd:  `1 3 xor`,
-			exp:  2,
-		},
-
-		// converters
-		{
-			name: "inch-to-cm",
-			cmd:  `111 inch-to-cm`,
-			exp:  281.94,
-		},
-		{
-			name: "gallons-to-liters",
-			cmd:  `111 gallons-to-liters`,
-			exp:  420.135,
-		},
-		{
-			name: "meters-to-yards",
-			cmd:  `111 meters-to-yards`,
-			exp:  1.2139107611548556,
-		},
-		{
-			name: "miles-to-kilometers",
-			cmd:  `111 miles-to-kilometers`,
-			exp:  178.599,
-		},
 	}
 
 	for _, tt := range tests {

command.go

@@ -18,12 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"bufio"
 	"fmt"
 	"os"
-	"os/exec"
-	"strconv"
-	"strings"
 )
 
 type CommandFunction func(*Calc)
@@ -121,15 +117,6 @@ func (c *Calc) SetCommands() {
 				}
 			},
 		),
-
-		"hex": NewCommand(
-			"show last stack item in hex form (converted to int)",
-			func(c *Calc) {
-				if c.stack.Len() > 0 {
-					fmt.Printf("0x%x\n", int(c.stack.Last()[0]))
-				}
-			},
-		),
 	}
 
 	c.StackCommands = Commands{
@@ -188,102 +175,6 @@ func (c *Calc) SetCommands() {
 				}
 			},
 		),
-
-		"edit": NewCommand(
-			"edit the stack interactively",
-			func(c *Calc) {
-				if c.stack.Len() == 0 {
-					fmt.Println("empty stack")
-					return
-				}
-
-				c.stack.Backup()
-
-				// put the stack contents into a tmp file
-				tmp, err := os.CreateTemp("", "stack")
-				if err != nil {
-					fmt.Println(err)
-					return
-				}
-				defer os.Remove(tmp.Name())
-
-				comment := `# add or remove numbers as you wish.
-# each number must be on its own line.
-# numbers must be floating point formatted.
-`
-				_, err = tmp.WriteString(comment)
-				if err != nil {
-					fmt.Println(err)
-					return
-				}
-
-				for _, item := range c.stack.All() {
-					_, err = fmt.Fprintf(tmp, "%f\n", item)
-					if err != nil {
-						fmt.Println(err)
-						return
-					}
-				}
-
-				tmp.Close()
-
-				// determine which editor to use
-				editor := "vi"
-				enveditor, present := os.LookupEnv("EDITOR")
-				if present {
-					if editor != "" {
-						if _, err := os.Stat(editor); err == nil {
-							editor = enveditor
-						}
-					}
-				}
-
-				// execute editor with our tmp file containing current stack
-				cmd := exec.Command(editor, tmp.Name())
-
-				cmd.Stdin = os.Stdin
-				cmd.Stdout = os.Stdout
-				cmd.Stderr = os.Stderr
-
-				err = cmd.Run()
-				if err != nil {
-					fmt.Println("could not run editor command: ", err)
-					return
-				}
-
-				// read the file back in
-				modified, err := os.Open(tmp.Name())
-				if err != nil {
-					fmt.Println("Error opening file:", err)
-					return
-				}
-				defer modified.Close()
-
-				// reset the stack
-				c.stack.Clear()
-
-				// and put the new contents (if legit) back onto the stack
-				scanner := bufio.NewScanner(modified)
-				for scanner.Scan() {
-					line := strings.TrimSpace(c.Comment.ReplaceAllString(scanner.Text(), ""))
-					if line == "" {
-						continue
-					}
-
-					num, err := strconv.ParseFloat(line, 64)
-					if err != nil {
-						fmt.Printf("%s is not a floating point number!\n", line)
-						continue
-					}
-
-					c.stack.Push(num)
-				}
-
-				if err := scanner.Err(); err != nil {
-					fmt.Println("Error reading from file:", err)
-				}
-			},
-		),
 	}
 
 	// general commands
@@ -305,15 +196,6 @@ func (c *Calc) SetCommands() {
 
 	// aliases
 	c.Commands["quit"] = c.Commands["exit"]
-
+	c.SettingsCommands["undebug"] = c.SettingsCommands["nodebug"]
-	c.SettingsCommands["d"] = c.SettingsCommands["debug"]
+	c.SettingsCommands["show"] = c.SettingsCommands["showstack"]
-	c.SettingsCommands["b"] = c.SettingsCommands["batch"]
-	c.SettingsCommands["s"] = c.SettingsCommands["showstack"]
-
-	c.ShowCommands["h"] = c.ShowCommands["history"]
-	c.ShowCommands["p"] = c.ShowCommands["dump"]
-	c.ShowCommands["v"] = c.ShowCommands["vars"]
-
-	c.StackCommands["c"] = c.StackCommands["clear"]
-	c.StackCommands["u"] = c.StackCommands["undo"]
 }

funcs.go

@@ -387,85 +387,6 @@ func DefineFunctions() Funcalls {
 				return NewR(math.Hypot(arg[0], arg[1]), nil)
 			},
 			2),
-
-		// converters of all kinds
-		"cm-to-inch": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]/2.54, nil)
-			},
-			1),
-
-		"inch-to-cm": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]*2.54, nil)
-			},
-			1),
-
-		"gallons-to-liters": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]*3.785, nil)
-			},
-			1),
-
-		"liters-to-gallons": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]/3.785, nil)
-			},
-			1),
-
-		"yards-to-meters": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]*91.44, nil)
-			},
-			1),
-
-		"meters-to-yards": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]/91.44, nil)
-			},
-			1),
-
-		"miles-to-kilometers": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]*1.609, nil)
-			},
-			1),
-
-		"kilometers-to-miles": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(arg[0]/1.609, nil)
-			},
-			1),
-
-		"or": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(float64(int(arg[0])|int(arg[1])), nil)
-			},
-			2),
-
-		"and": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(float64(int(arg[0])&int(arg[1])), nil)
-			},
-			2),
-
-		"xor": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(float64(int(arg[0])^int(arg[1])), nil)
-			},
-			2),
-
-		"<": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(float64(int(arg[0])<<int(arg[1])), nil)
-			},
-			2),
-
-		">": NewFuncall(
-			func(arg Numbers) R {
-				return NewR(float64(int(arg[0])>>int(arg[1])), nil)
-			},
-			2),
 	}
 
 	// aliases

go.mod

@@ -4,9 +4,7 @@ go 1.20
 
 require (
 	github.com/chzyer/readline v1.5.1 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/yuin/gopher-lua v1.1.0 // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
-	golang.org/x/tools v0.1.12 // indirect
 )

go.sum

@@ -2,15 +2,9 @@ github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwys
 github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

main.go

@@ -30,7 +30,7 @@ import (
 	lua "github.com/yuin/gopher-lua"
 )
 
-const VERSION string = "2.0.12"
+const VERSION string = "2.0.9"
 
 const Usage string = `This is rpn, a reverse polish notation calculator cli.
 
@@ -42,7 +42,6 @@ Options:
   -s, --stack         show last 5 items of the stack (off by default)
   -i  --intermediate  print intermediate results
   -m, --manual        show manual
-  -c, --config <file> load <file> containing LUA code
   -v, --version       show version
   -h, --help          show help
 
@@ -52,10 +51,6 @@ this only when working with stdin. E.g.: echo "2 3 4 5" | rpn +
 Copyright (c) 2023 T.v.Dein`
 
 func main() {
-	os.Exit(Main())
-}
-
-func Main() int {
 	calc := NewCalc()
 
 	showversion := false
@@ -79,12 +74,12 @@ func Main() int {
 
 	if showversion {
 		fmt.Printf("This is rpn version %s\n", VERSION)
-		return 0
+		return
 	}
 
 	if showhelp {
 		fmt.Println(Usage)
-		return 0
+		return
 	}
 
 	if enabledebug {
@@ -93,7 +88,7 @@ func Main() int {
 
 	if showmanual {
 		man()
-		return 0
+		os.Exit(0)
 	}
 
 	// the lua state object is global, instanciate it early
@@ -106,13 +101,6 @@ func Main() int {
 		luarunner := NewInterpreter(configfile, enabledebug)
 		luarunner.InitLua()
 		calc.SetInt(luarunner)
-		if calc.debug {
-			fmt.Println("loaded config")
-		}
-	} else {
-		if calc.debug {
-			fmt.Println(err)
-		}
 	}
 
 	if len(flag.Args()) > 1 {
@@ -120,7 +108,7 @@ func Main() int {
 		// called like rpn 2 2 +
 		calc.stdin = true
 		calc.Eval(strings.Join(flag.Args(), " "))
-		return 0
+		return
 	}
 
 	// interactive mode, need readline
@@ -164,8 +152,6 @@ func Main() int {
 		calc.batch = true
 		calc.Eval(flag.Args()[0])
 	}
-
-	return 0
 }
 
 func inputIsStdin() bool {

main_test.go

@@ -1,20 +0,0 @@
-package main
-
-import (
-	"os"
-	"testing"
-
-	"github.com/rogpeppe/go-internal/testscript"
-)
-
-func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
-		"testrpn": Main,
-	}))
-}
-
-func TestRpn(t *testing.T) {
-	testscript.Run(t, testscript.Params{
-		Dir: "t",
-	})
-}

rpn.go

@@ -105,9 +105,6 @@ DESCRIPTION
     If the first parameter to rpn is a math operator or function, batch mode
     is enabled automatically, see last example.
 
-    You can enter integers, floating point numbers (positive or negative) or
-    hex numbers (prefixed with 0x).
-
   STACK MANIPULATION
     There are lots of stack manipulation commands provided. The most
     important one is undo which goes back to the stack before the last math
@@ -132,14 +129,6 @@ DESCRIPTION
         x                    multiply (alias: *)
         ^                    power
 
-    Bitwise operators:
-
-        and                  bitwise and
-        or                   bitwise or
-        xor                  bitwise xor
-        <                    left shift
-        >                    right shift
-
     Percent functions:
 
         %                    percent
@@ -161,44 +150,19 @@ DESCRIPTION
         log10 log1p log2 logb pow round roundtoeven sin sinh tan tanh trunc y0
         y1 copysign dim hypot
 
-    Conversion functions:
+    Commands:
-
-        cm-to-inch
-        inch-to-cm
-        gallons-to-liters
-        liters-to-gallons
-        yards-to-meters
-        meters-to-yards
-        miles-to-kilometers
-        kilometers-to-miles
-
-    Configuration Commands:
 
         [no]batch            toggle batch mode (nobatch turns it off)
         [no]debug            toggle debug output (nodebug turns it off)
         [no]showstack        show the last 5 items of the stack (noshowtack turns it off)
-
-    Show commands:
-
         dump                 display the stack contents
-        hex                  show last stack item in hex form (converted to int)
-        history              display calculation history
-        vars                 show list of variables
-
-    Stack manipulation commands:
-
         clear                clear the whole stack
         shift                remove the last element of the stack
         reverse              reverse the stack elements
         swap                 exchange the last two stack elements
         dup                  duplicate last stack item
-        undo                 undo last operation
+        history              display calculation history
-        edit                 edit the stack interactively using vi or $EDITOR
-
-    Other commands:
-
         help|?               show this message
-        manual               show manual
         quit|exit|c-d|c-c    exit program
 
     Register variables:
@@ -208,17 +172,6 @@ DESCRIPTION
 
     Refer to https://pkg.go.dev/math for details about those functions.
 
-    There are also a number of shortcuts for some commands available:
-
-        d    debug
-        b    batch
-        s    showstack
-        h    history
-        p    dump (aka print)
-        v    vars
-        c    clear
-        u    undo
-
 INTERACTIVE REPL
     While you can use rpn in the command-line, the best experience you'll
     have is the interactive repl (read eval print loop). Just execute "rpn"

rpn.pod

@@ -109,9 +109,6 @@ Example of batch mode usage:
 If the first parameter to rpn is a math operator or function, batch
 mode is enabled automatically, see last example.
 
-You can enter integers, floating  point numbers (positive or negative)
-or hex numbers (prefixed with 0x).
-
 =head2 STACK MANIPULATION
 
 There are lots of stack manipulation commands provided. The most
@@ -139,14 +136,6 @@ Basic operators:
     x                    multiply (alias: *)
     ^                    power
 
-Bitwise operators:
-
-    and                  bitwise and
-    or                   bitwise or
-    xor                  bitwise xor
-    <                    left shift
-    >                    right shift
-
 Percent functions:
 
     %                    percent
@@ -168,44 +157,19 @@ Math functions:
     log10 log1p log2 logb pow round roundtoeven sin sinh tan tanh trunc y0
     y1 copysign dim hypot
 
-Conversion functions:
+Commands:
-
-    cm-to-inch
-    inch-to-cm
-    gallons-to-liters
-    liters-to-gallons
-    yards-to-meters
-    meters-to-yards
-    miles-to-kilometers
-    kilometers-to-miles
-
-Configuration Commands:
 
     [no]batch            toggle batch mode (nobatch turns it off)
     [no]debug            toggle debug output (nodebug turns it off)
     [no]showstack        show the last 5 items of the stack (noshowtack turns it off)
-
-Show commands:
-
     dump                 display the stack contents
-    hex                  show last stack item in hex form (converted to int)
-    history              display calculation history
-    vars                 show list of variables
-
-Stack manipulation commands:
-
     clear                clear the whole stack
     shift                remove the last element of the stack
     reverse              reverse the stack elements
     swap                 exchange the last two stack elements
     dup                  duplicate last stack item
-    undo                 undo last operation
+    history              display calculation history
-    edit                 edit the stack interactively using vi or $EDITOR
-
-Other commands:
-
     help|?               show this message
-    manual               show manual
     quit|exit|c-d|c-c    exit program
 
 
@@ -216,17 +180,6 @@ Register variables:
 
 Refer to https://pkg.go.dev/math for details about those functions.
 
-There are also a number of shortcuts for some commands available:
-
-    d    debug
-    b    batch
-    s    showstack
-    h    history
-    p    dump (aka print)
-    v    vars
-    c    clear
-    u    undo
-
 =head1 INTERACTIVE REPL
 
 While you can use rpn in the command-line, the best experience you'll

t/cmdline-command.txtar

@@ -1,2 +0,0 @@
-exec testrpn 1 2 dump
-stdout 'Stack revision 2 .0x'

t/cmdline-invalidcommand.txtar

@@ -1,2 +0,0 @@
-exec testrpn 1 2 dumb
-stdout 'unknown command or operator'

t/cmdline-short-stack.txtar

@@ -1,2 +0,0 @@
-exec testrpn 4 +
-stdout 'stack doesn''t provide enough arguments'

t/cmdlinecalc-debug.txtar

@@ -1,2 +0,0 @@
-exec testrpn -d 44 55 *
-stdout 'push to stack: 2420.00\n'

t/cmdlinecalc-divzero.txtar

@@ -1,2 +0,0 @@
-exec testrpn 100 50 50 - /
-stdout 'division by null\n'

t/cmdlinecalc-lua.txtar

@@ -1,16 +0,0 @@
-exec testrpn -d -c test.lua 3 5 lower
-stdout '3\n'
-
--- test.lua --
-function lower(a,b)
-    if a < b then
-        return a
-    else
-        return b
-    end
-end
-
-function init()
-    -- expects 2 args
-    register("lower", 2, "lower")
-end

t/cmdlinecalc.txtar

@@ -1,2 +0,0 @@
-exec testrpn 44 55 *
-stdout '2420\n'

t/getman.txtar

@@ -1,2 +0,0 @@
-exec testrpn -m
-stdout 'This software is licensed under the GNU GENERAL PUBLIC LICENSE'

t/getusage.txtar

@@ -1,2 +0,0 @@
-exec testrpn -h
-stdout 'This is rpn'

t/getversion.txtar

@@ -1,2 +0,0 @@
-exec testrpn -v
-stdout 'This is rpn version'

t/stdin-batch-cmd.txtar

@@ -1,4 +0,0 @@
-exec echo 1 2 3 4 5 batch median
-stdin stdout
-exec testrpn
-[unix] stdout '3\n'

t/stdin-batch.txtar

@@ -1,4 +0,0 @@
-exec echo 1 2 3 4 5
-stdin stdout
-[unix] exec testrpn median
-[unix] stdout '3\n'

t/stdin-calc.txtar

@@ -1,4 +0,0 @@
-exec echo 10 10 +
-stdin stdout
-exec testrpn
-[unix] stdout '20\n'

t/stdin-help.txtar

@@ -1,6 +0,0 @@
-stdin input.txt
-exec testrpn
-[unix] stdout 'Available configuration commands'
-
--- input.txt --
-?

t/stdin-use-vars.txtar

@@ -1,13 +0,0 @@
-stdin input.txt
-exec testrpn
-[unix] stdout '28\n'
-
--- input.txt --
-10
-10
-+
->SUM
-clear
-8
-<SUM
-+

t/stdint-explicit-batch.txtar

@@ -1,4 +0,0 @@
-exec echo 1 2 3 4 5 median
-stdin stdout
-exec testrpn -b
-[unix] stdout '3\n'

t/test.lua

@@ -1,13 +0,0 @@
--- simple function, return the lower number of the two operands
-function lower(a,b)
-    if a < b then
-        return a
-    else
-        return b
-    end
-end
-
-function init()
-    -- expects 2 args
-    register("lower", 2, "lower")
-end  

util.go

@@ -23,21 +23,22 @@ import (
 	"strings"
 )
 
-// find an item in a list, generic variant
+// find an item in a list
-func contains[E comparable](s []E, v E) bool {
+func contains(s []string, e string) bool {
-	for _, vs := range s {
+	for _, a := range s {
-		if v == vs {
+		if a == e {
 			return true
 		}
 	}
 	return false
 }
 
-// look if a key in a map exists, generic variant
+func exists(m map[string]interface{}, item string) bool {
-func exists[K comparable, V any](m map[K]V, v K) bool {
+	// FIXME: try to use this for all cases
-	if _, ok := m[v]; ok {
+	if _, ok := m[item]; ok {
 		return true
 	}
+
 	return false
 }