mirror of
https://codeberg.org/scip/rpnc.git
synced 2025-12-16 20:11:02 +01:00
Compare commits
3 Commits
v2.1.3
...
internal/a
| Author | SHA1 | Date | |
|---|---|---|---|
| a7fa0def04 | |||
| c9815e8ba3 | |||
| d0376a63e3 |
4
Makefile
4
Makefile
@@ -57,8 +57,8 @@ test:
|
||||
go test -v ./...
|
||||
|
||||
singletest:
|
||||
@echo "Call like this: ''make singletest TEST=TestPrepareColumns"
|
||||
go test -run $(TEST)
|
||||
@echo "Call like this: make singletest TEST=TestPrepareColumns ARGS=-v"
|
||||
go test -run $(TEST) $(ARGS)
|
||||
|
||||
cover-report:
|
||||
go test ./... -cover -coverprofile=coverage.out
|
||||
|
||||
4
go.mod
4
go.mod
@@ -4,7 +4,9 @@ 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-20220310020820-b874c991c1a5 // indirect
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
|
||||
golang.org/x/tools v0.1.12 // indirect
|
||||
)
|
||||
|
||||
6
go.sum
6
go.sum
@@ -2,9 +2,15 @@ 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=
|
||||
|
||||
22
main.go
22
main.go
@@ -42,6 +42,7 @@ 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
|
||||
|
||||
@@ -51,6 +52,10 @@ 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
|
||||
@@ -74,12 +79,12 @@ func main() {
|
||||
|
||||
if showversion {
|
||||
fmt.Printf("This is rpn version %s\n", VERSION)
|
||||
return
|
||||
return 0
|
||||
}
|
||||
|
||||
if showhelp {
|
||||
fmt.Println(Usage)
|
||||
return
|
||||
return 0
|
||||
}
|
||||
|
||||
if enabledebug {
|
||||
@@ -88,7 +93,7 @@ func main() {
|
||||
|
||||
if showmanual {
|
||||
man()
|
||||
os.Exit(0)
|
||||
return 0
|
||||
}
|
||||
|
||||
// the lua state object is global, instanciate it early
|
||||
@@ -101,6 +106,13 @@ func main() {
|
||||
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 {
|
||||
@@ -108,7 +120,7 @@ func main() {
|
||||
// called like rpn 2 2 +
|
||||
calc.stdin = true
|
||||
calc.Eval(strings.Join(flag.Args(), " "))
|
||||
return
|
||||
return 0
|
||||
}
|
||||
|
||||
// interactive mode, need readline
|
||||
@@ -152,6 +164,8 @@ func main() {
|
||||
calc.batch = true
|
||||
calc.Eval(flag.Args()[0])
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
func inputIsStdin() bool {
|
||||
|
||||
20
main_test.go
Normal file
20
main_test.go
Normal file
@@ -0,0 +1,20 @@
|
||||
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",
|
||||
})
|
||||
}
|
||||
2
t/cmdline-command.txtar
Normal file
2
t/cmdline-command.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn 1 2 dump
|
||||
stdout 'Stack revision 2 .0x'
|
||||
2
t/cmdline-invalidcommand.txtar
Normal file
2
t/cmdline-invalidcommand.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn 1 2 dumb
|
||||
stdout 'unknown command or operator'
|
||||
2
t/cmdline-short-stack.txtar
Normal file
2
t/cmdline-short-stack.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn 4 +
|
||||
stdout 'stack doesn''t provide enough arguments'
|
||||
2
t/cmdlinecalc-debug.txtar
Normal file
2
t/cmdlinecalc-debug.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn -d 44 55 *
|
||||
stdout 'push to stack: 2420.00\n'
|
||||
2
t/cmdlinecalc-divzero.txtar
Normal file
2
t/cmdlinecalc-divzero.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn 100 50 50 - /
|
||||
stdout 'division by null\n'
|
||||
16
t/cmdlinecalc-lua.txtar
Normal file
16
t/cmdlinecalc-lua.txtar
Normal file
@@ -0,0 +1,16 @@
|
||||
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
|
||||
2
t/cmdlinecalc.txtar
Normal file
2
t/cmdlinecalc.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn 44 55 *
|
||||
stdout '2420\n'
|
||||
2
t/getman.txtar
Normal file
2
t/getman.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn -m
|
||||
stdout 'This software is licensed under the GNU GENERAL PUBLIC LICENSE'
|
||||
2
t/getusage.txtar
Normal file
2
t/getusage.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn -h
|
||||
stdout 'This is rpn'
|
||||
2
t/getversion.txtar
Normal file
2
t/getversion.txtar
Normal file
@@ -0,0 +1,2 @@
|
||||
exec testrpn -v
|
||||
stdout 'This is rpn version'
|
||||
4
t/stdin-batch-cmd.txtar
Normal file
4
t/stdin-batch-cmd.txtar
Normal file
@@ -0,0 +1,4 @@
|
||||
exec echo 1 2 3 4 5 batch median
|
||||
stdin stdout
|
||||
exec testrpn
|
||||
[unix] stdout '3\n'
|
||||
4
t/stdin-batch.txtar
Normal file
4
t/stdin-batch.txtar
Normal file
@@ -0,0 +1,4 @@
|
||||
exec echo 1 2 3 4 5
|
||||
stdin stdout
|
||||
[unix] exec testrpn median
|
||||
[unix] stdout '3\n'
|
||||
4
t/stdin-calc.txtar
Normal file
4
t/stdin-calc.txtar
Normal file
@@ -0,0 +1,4 @@
|
||||
exec echo 10 10 +
|
||||
stdin stdout
|
||||
exec testrpn
|
||||
[unix] stdout '20\n'
|
||||
6
t/stdin-help.txtar
Normal file
6
t/stdin-help.txtar
Normal file
@@ -0,0 +1,6 @@
|
||||
stdin input.txt
|
||||
exec testrpn
|
||||
[unix] stdout 'Available configuration commands'
|
||||
|
||||
-- input.txt --
|
||||
?
|
||||
13
t/stdin-use-vars.txtar
Normal file
13
t/stdin-use-vars.txtar
Normal file
@@ -0,0 +1,13 @@
|
||||
stdin input.txt
|
||||
exec testrpn
|
||||
[unix] stdout '28\n'
|
||||
|
||||
-- input.txt --
|
||||
10
|
||||
10
|
||||
+
|
||||
>SUM
|
||||
clear
|
||||
8
|
||||
<SUM
|
||||
+
|
||||
4
t/stdint-explicit-batch.txtar
Normal file
4
t/stdint-explicit-batch.txtar
Normal file
@@ -0,0 +1,4 @@
|
||||
exec echo 1 2 3 4 5 median
|
||||
stdin stdout
|
||||
exec testrpn -b
|
||||
[unix] stdout '3\n'
|
||||
13
t/test.lua
Normal file
13
t/test.lua
Normal file
@@ -0,0 +1,13 @@
|
||||
-- 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
|
||||
Reference in New Issue
Block a user