diff --git a/experiments/rpncalc-v4/builtin.mjs b/experiments/rpncalc-v4/builtin.mjs
index 0c5ca5a..9438f1b 100644
--- a/experiments/rpncalc-v4/builtin.mjs
+++ b/experiments/rpncalc-v4/builtin.mjs
@@ -81,12 +81,10 @@ const addDefn = (name, args, fn) => {
}
}
-const add = (args) => [{type:"num", val:args[0] + args[1]}];
-const sub = (args) => [{type:"num", val:args[0] - args[1]}];
-const div = (args) => [{type:"num", val:args[0] / args[1]}];
-const mult = (args) => [{type:"num", val:args[0] * args[1]}];
-const pow = (args) => [{type:"num", val:Math.pow(args[0], args[1])}];
-const root = (args) => [{type:"num", val:Math.sqrt(args[0])}];
+const addBinopDefn = (name, op) => addDefn(name, ["num", "num"], args => [{ type: "num", val: op(args[0], args[1]) }])
+const addUnopDefn = (name, op) => addDefn(name, ["num"], args => [{ type: "num", val: op(args[0]) }])
+const addConstDefn = (name, val) => addDefn(name, [], args => [{ type: "num", val }])
+
const type = (args) => [{type:"type", val:args[0].type}];
const pair = (args) => [{type:"pair", val:{fst:args[0], snd:args[1]}}];
const fst = (args) => [args[0].fst];
@@ -103,12 +101,19 @@ const eq = (args) => {
}
}
-addDefn("+", ["num", "num"], add);
-addDefn("-", ["num", "num"], sub);
-addDefn("/", ["num", "num"], div);
-addDefn("*", ["num", "num"], mult);
-addDefn("^", ["num", "num"], pow);
-addDefn("sqrt", ["num"], root);
+addBinopDefn("+", (x, y) => x + y)
+addBinopDefn("-", (x, y) => x - y)
+addBinopDefn("/", (x, y) => x / y)
+addBinopDefn("*", (x, y) => x * y)
+addBinopDefn("%", (x, y) => x % y)
+addBinopDefn("^", Math.pow)
+addBinopDefn("atan2", Math.atan2)
+for (const func of ["abs", "floor", "log", "asin", "acos", "atan", "sin", "cos", "tan", "exp", "cbrt", "ceil", "sqrt"]) {
+ addUnopDefn(func, Math[func])
+}
+addConstDefn("e", Math.E)
+addConstDefn("pi", Math.PI)
+
addDefn("==", 4, eq);
addDefn("pair", 2, pair);
addDefn("fst", ["pair"], fst);
@@ -125,4 +130,6 @@ addRPNDefn("listthen", "(fn -> (internal; x acc -> '(->acc fn) '(->x acc pair in
addRPNDefn("list", "'(a -> a) listthen");
addRPNDefn("lmap", "(list fn -> list '(->list fst fn list snd 'fn lmap pair) list 0 tuple ==)");
addRPNDefn("unlist", "(l -> (internal; list -> '(->) '(->list fst list snd internal) list 0 tuple ==) stop l internal)");
-addRPNDefn("map", "fn -> '(l->l 'fn lmap unlist) listthen");
\ No newline at end of file
+addRPNDefn("map", "fn -> '(l->l 'fn lmap unlist) listthen");
+addRPNDefn("hypot", "(a b -> a a * b b * + sqrt)")
+addRPNDefn("swap", "(a b -> b a)")
\ No newline at end of file
diff --git a/experiments/rpncalc-v4/index.html b/experiments/rpncalc-v4/index.html
index 39d9045..21cde5a 100644
--- a/experiments/rpncalc-v4/index.html
+++ b/experiments/rpncalc-v4/index.html
@@ -12,8 +12,13 @@ code {
background-color:rgb(230, 230, 230);
padding: 0 0.125rem;
}
+
+button {
+ border: 1px solid gray;
+ padding: 0.3em;
+}
-
+
step
play
load
@@ -26,7 +31,7 @@ code {
use (name; value) to define something. the definition can be recursive. value is executed and name is set to the final state of the stack, i.e. (name; 1 3) is possible
use ' to push instead of apply to the stack, e.g. '(a -> a). This is useful for lazyness, i.e. '(->lazy evaluated thing)
-+, -, *, /, ^, sqrt: mathematical operations+, -, *, /, ^, sqrt, cbrt, exp, log, (a)cos/sin/tan, abs, floor: mathematical operations==: equality (automatically derived for all types); returns a b -> a if true, a b -> b if falsetypeof: returns the type of the objectpair, fst, snd: pairs two objects, gets first or second item of pair