1 files changed, 27 insertions, 16 deletions

@@ -1,28 +1,39 @@
 --- lam.test
--- testing helpers
 
 local test = {}
 local eval = require("eval").eval
 local read = require("read").read
+local luatype = require("type").luatype
 
-function test.lambda ()
-        local ls = {
-                [ [[((lambda (x) (+ x x)) 3)]] ] = 6,
-                [ [[((lambda () 100))]] ] = 100,
-                [ [[((lambda (x) 1 2 3) 4)]] ] = 3,
-                [ [[((lambda () 1 2 3))]] ] = 3,
-                [ [[((lambda (x) x (+ x x) (+ x x x)) 9)]] ] = 27,
-        }
-        for l, target in pairs(ls) do
-                io.write(string.format("%s == %s\n\t", l, target))
-                local value = eval(read(l))
-                if value == target then
-                        print "ok"
-                else
-                        print(string.format("not ok : %s", value))
+function test.test (form, expected)
+        local diag = string.format("%s == %s", form, expected)
+        local value = eval(read(form))
+        if value == expected then
+                print(string.format("ok: %s", diag))
+        else
+                print(string.format("not ok: %s != %s", diag, value))
+        end
+end
+
+function test.runtests ()
+        for name, fn in pairs(test) do
+                if luatype(fn) == "function"
+                        and name ~= "test"
+                        and name ~= "runtests"
+                then
+                        print(">>>", name)
+                        fn()
                 end
         end
 end
 
+function test.lambda ()
+        test.test([[((lambda (x) (+ x x)) 3)]], 6)
+        test.test([[((lambda () 100))]], 100)
+        test.test([[((lambda (x) 1 2 3) 4)]], 3)
+        test.test([[((lambda () 1 2 3))]], 3)
+        test.test([[((lambda (x) x (+ x x) (+ x x x)) 9)]], 27)
+end
+
 ---
 return test