haskell: classic program fib.hs + source-order top-level binding (+2 tests, 388/388)

lib/haskell/desugar.sx

@@ -0,0 +1,249 @@
+;; Desugar the Haskell surface AST into a smaller core AST.
+;;
+;; Eliminates the three surface-only shapes produced by the parser:
+;;   :where BODY DECLS     →  :let DECLS BODY
+;;   :guarded GUARDS       →  :if C1 E1 (:if C2 E2 … (:app error …))
+;;   :list-comp EXPR QUALS →  concatMap-based expression (§3.11)
+;;
+;; Everything else (:app, :op, :lambda, :let, :case, :do, :tuple,
+;; :list, :range, :if, :neg, :sect-left / :sect-right, plus all
+;; leaf forms and pattern / type nodes) is passed through after
+;; recursing into children.
+
+(define
+  hk-guards-to-if
+  (fn
+    (guards)
+    (cond
+      ((empty? guards)
+        (list
+          :app
+          (list :var "error")
+          (list :string "Non-exhaustive guards")))
+      (:else
+        (let
+          ((g (first guards)))
+          (list
+            :if
+            (hk-desugar (nth g 1))
+            (hk-desugar (nth g 2))
+            (hk-guards-to-if (rest guards))))))))
+
+;; do-notation desugaring (Haskell 98 §3.14):
+;;   do { e }              =  e
+;;   do { e ; ss }         =  e >> do { ss }
+;;   do { p <- e ; ss }    =  e >>= \p -> do { ss }
+;;   do { let decls ; ss } =  let decls in do { ss }
+(define
+  hk-desugar-do
+  (fn
+    (stmts)
+    (cond
+      ((empty? stmts) (raise "empty do block"))
+      ((empty? (rest stmts))
+        (let ((s (first stmts)))
+          (cond
+            ((= (first s) "do-expr") (hk-desugar (nth s 1)))
+            (:else
+              (raise "do block must end with an expression")))))
+      (:else
+        (let
+          ((s (first stmts)) (rest-stmts (rest stmts)))
+          (let
+            ((rest-do (hk-desugar-do rest-stmts)))
+            (cond
+              ((= (first s) "do-expr")
+                (list
+                  :app
+                  (list
+                    :app
+                    (list :var ">>")
+                    (hk-desugar (nth s 1)))
+                  rest-do))
+              ((= (first s) "do-bind")
+                (list
+                  :app
+                  (list
+                    :app
+                    (list :var ">>=")
+                    (hk-desugar (nth s 2)))
+                  (list :lambda (list (nth s 1)) rest-do)))
+              ((= (first s) "do-let")
+                (list
+                  :let
+                  (map hk-desugar (nth s 1))
+                  rest-do))
+              (:else (raise "unknown do-stmt tag")))))))))
+
+;; List-comprehension desugaring (Haskell 98 §3.11):
+;;   [e |             ]  =  [e]
+;;   [e | b,     Q    ]  =  if b then [e | Q] else []
+;;   [e | p <- l, Q    ]  =  concatMap (\p -> [e | Q]) l
+;;   [e | let ds, Q    ]  =  let ds in [e | Q]
+(define
+  hk-lc-desugar
+  (fn
+    (e quals)
+    (cond
+      ((empty? quals) (list :list (list e)))
+      (:else
+        (let
+          ((q (first quals)))
+          (let
+            ((qtag (first q)))
+            (cond
+              ((= qtag "q-guard")
+                (list
+                  :if
+                  (hk-desugar (nth q 1))
+                  (hk-lc-desugar e (rest quals))
+                  (list :list (list))))
+              ((= qtag "q-gen")
+                (list
+                  :app
+                  (list
+                    :app
+                    (list :var "concatMap")
+                    (list
+                      :lambda
+                      (list (nth q 1))
+                      (hk-lc-desugar e (rest quals))))
+                  (hk-desugar (nth q 2))))
+              ((= qtag "q-let")
+                (list
+                  :let
+                  (map hk-desugar (nth q 1))
+                  (hk-lc-desugar e (rest quals))))
+              (:else
+                (raise
+                  (str
+                    "hk-lc-desugar: unknown qualifier tag "
+                    qtag))))))))))
+
+(define
+  hk-desugar
+  (fn
+    (node)
+    (cond
+      ((not (list? node)) node)
+      ((empty? node) node)
+      (:else
+        (let
+          ((tag (first node)))
+          (cond
+            ;; Transformations
+            ((= tag "where")
+              (list
+                :let
+                (map hk-desugar (nth node 2))
+                (hk-desugar (nth node 1))))
+            ((= tag "guarded") (hk-guards-to-if (nth node 1)))
+            ((= tag "list-comp")
+              (hk-lc-desugar
+                (hk-desugar (nth node 1))
+                (nth node 2)))
+
+            ;; Expression nodes
+            ((= tag "app")
+              (list
+                :app
+                (hk-desugar (nth node 1))
+                (hk-desugar (nth node 2))))
+            ((= tag "op")
+              (list
+                :op
+                (nth node 1)
+                (hk-desugar (nth node 2))
+                (hk-desugar (nth node 3))))
+            ((= tag "neg") (list :neg (hk-desugar (nth node 1))))
+            ((= tag "if")
+              (list
+                :if
+                (hk-desugar (nth node 1))
+                (hk-desugar (nth node 2))
+                (hk-desugar (nth node 3))))
+            ((= tag "tuple")
+              (list :tuple (map hk-desugar (nth node 1))))
+            ((= tag "list")
+              (list :list (map hk-desugar (nth node 1))))
+            ((= tag "range")
+              (list
+                :range
+                (hk-desugar (nth node 1))
+                (hk-desugar (nth node 2))))
+            ((= tag "range-step")
+              (list
+                :range-step
+                (hk-desugar (nth node 1))
+                (hk-desugar (nth node 2))
+                (hk-desugar (nth node 3))))
+            ((= tag "lambda")
+              (list
+                :lambda
+                (nth node 1)
+                (hk-desugar (nth node 2))))
+            ((= tag "let")
+              (list
+                :let
+                (map hk-desugar (nth node 1))
+                (hk-desugar (nth node 2))))
+            ((= tag "case")
+              (list
+                :case
+                (hk-desugar (nth node 1))
+                (map hk-desugar (nth node 2))))
+            ((= tag "alt")
+              (list :alt (nth node 1) (hk-desugar (nth node 2))))
+            ((= tag "do") (hk-desugar-do (nth node 1)))
+            ((= tag "sect-left")
+              (list
+                :sect-left
+                (nth node 1)
+                (hk-desugar (nth node 2))))
+            ((= tag "sect-right")
+              (list
+                :sect-right
+                (nth node 1)
+                (hk-desugar (nth node 2))))
+
+            ;; Top-level
+            ((= tag "program")
+              (list :program (map hk-desugar (nth node 1))))
+            ((= tag "module")
+              (list
+                :module
+                (nth node 1)
+                (nth node 2)
+                (nth node 3)
+                (map hk-desugar (nth node 4))))
+
+            ;; Decls carrying a body
+            ((= tag "fun-clause")
+              (list
+                :fun-clause
+                (nth node 1)
+                (nth node 2)
+                (hk-desugar (nth node 3))))
+            ((= tag "pat-bind")
+              (list
+                :pat-bind
+                (nth node 1)
+                (hk-desugar (nth node 2))))
+            ((= tag "bind")
+              (list
+                :bind
+                (nth node 1)
+                (hk-desugar (nth node 2))))
+
+            ;; Everything else: leaf literals, vars, cons, patterns,
+            ;; types, imports, type-sigs, data / newtype / fixity, …
+            (:else node)))))))
+
+;; Convenience — tokenize + layout + parse + desugar.
+(define
+  hk-core
+  (fn (src) (hk-desugar (hk-parse-top src))))
+
+(define
+  hk-core-expr
+  (fn (src) (hk-desugar (hk-parse src))))

lib/haskell/eval.sx

@@ -0,0 +1,785 @@
+;; Haskell strict evaluator (Phase 2).
+;;
+;; Consumes the post-desugar core AST and produces SX values. Strict
+;; throughout — laziness and thunks are Phase 3.
+;;
+;; Value representation:
+;;   numbers / strings / chars      → raw SX values
+;;   constructor values             → tagged lists (con-name first)
+;;   functions: closure / multifun  → {:type "fn" :kind … …}
+;;   constructor partials           → {:type "con-partial" …}
+;;   built-ins                      → {:type "builtin" …}
+;;
+;; Multi-clause top-level definitions are bundled into a single
+;; multifun keyed by name; arguments are gathered through currying
+;; until arity is reached, then each clause's pattern list is matched
+;; in order. Recursive let bindings work because the binding env is
+;; built mutably so closures captured during evaluation see the
+;; eventual full env.
+
+(define
+  hk-dict-copy
+  (fn
+    (d)
+    (let ((nd (dict)))
+      (for-each
+        (fn (k) (dict-set! nd k (get d k)))
+        (keys d))
+      nd)))
+
+;; ── Thunks (Phase 3 — laziness) ─────────────────────────────
+;; A thunk wraps an unevaluated AST plus the env in which it was
+;; created. The first call to `hk-force` evaluates the body, replaces
+;; the body with the cached value, and flips `forced`. Subsequent
+;; forces return the cached value directly.
+(define
+  hk-mk-thunk
+  (fn
+    (body env)
+    {:type "thunk" :body body :env env :forced false :value nil}))
+
+(define
+  hk-is-thunk?
+  (fn (v) (and (dict? v) (= (get v "type") "thunk"))))
+
+(define
+  hk-force
+  (fn
+    (v)
+    (cond
+      ((hk-is-thunk? v)
+        (cond
+          ((get v "forced") (get v "value"))
+          (:else
+            (let
+              ((res (hk-force (hk-eval (get v "body") (get v "env")))))
+              (dict-set! v "forced" true)
+              (dict-set! v "value" res)
+              res))))
+      (:else v))))
+
+;; Recursive force — used at the test/output boundary so test
+;; expectations can compare against fully-evaluated structures.
+(define
+  hk-deep-force
+  (fn
+    (v)
+    (let ((fv (hk-force v)))
+      (cond
+        ((not (list? fv)) fv)
+        ((empty? fv) fv)
+        (:else (map hk-deep-force fv))))))
+
+;; ── Function value constructors ──────────────────────────────
+(define
+  hk-mk-closure
+  (fn
+    (params body env)
+    {:type "fn" :kind "closure" :params params :body body :env env}))
+
+(define
+  hk-mk-multifun
+  (fn
+    (arity clauses env)
+    {:type "fn" :kind "multi" :arity arity :clauses clauses :env env :collected (list)}))
+
+(define
+  hk-mk-builtin
+  (fn
+    (name fn arity)
+    {:type "builtin" :name name :fn fn :arity arity :lazy false :collected (list)}))
+
+;; A lazy built-in receives its collected args as raw thunks (or
+;; values, if those happened to be eager) — the implementation is
+;; responsible for forcing exactly what it needs. Used for `seq`
+;; and `deepseq`, which are non-strict in their second argument.
+(define
+  hk-mk-lazy-builtin
+  (fn
+    (name fn arity)
+    {:type "builtin" :name name :fn fn :arity arity :lazy true :collected (list)}))
+
+;; ── Apply a function value to one argument ──────────────────
+(define
+  hk-apply
+  (fn
+    (f arg)
+    (let ((f (hk-force f)))
+      (cond
+        ((not (dict? f))
+          (raise (str "apply: not a function value: " f)))
+        ((= (get f "type") "fn")
+          (cond
+            ((= (get f "kind") "closure") (hk-apply-closure f arg))
+            ((= (get f "kind") "multi") (hk-apply-multi f arg))
+            (:else (raise "apply: unknown fn kind"))))
+        ((= (get f "type") "con-partial") (hk-apply-con-partial f arg))
+        ((= (get f "type") "builtin") (hk-apply-builtin f arg))
+        (:else (raise "apply: not a function dict"))))))
+
+(define
+  hk-apply-closure
+  (fn
+    (cl arg)
+    (let
+      ((params (get cl "params"))
+        (body (get cl "body"))
+        (env (get cl "env")))
+      (cond
+        ((empty? params) (raise "apply-closure: no params"))
+        (:else
+          (let
+            ((p1 (first params)) (rest-p (rest params)))
+            (let
+              ((env-after (hk-match p1 arg env)))
+              (cond
+                ((nil? env-after)
+                  (raise "pattern match failure in lambda"))
+                ((empty? rest-p) (hk-eval body env-after))
+                (:else
+                  (hk-mk-closure rest-p body env-after))))))))))
+
+(define
+  hk-apply-multi
+  (fn
+    (mf arg)
+    (let
+      ((arity (get mf "arity"))
+        (clauses (get mf "clauses"))
+        (env (get mf "env"))
+        (collected (append (get mf "collected") (list arg))))
+      (cond
+        ((< (len collected) arity)
+          (assoc mf "collected" collected))
+        (:else (hk-dispatch-multi clauses collected env))))))
+
+(define
+  hk-dispatch-multi
+  (fn
+    (clauses args env)
+    (cond
+      ((empty? clauses)
+        (raise "non-exhaustive patterns in function definition"))
+      (:else
+        (let
+          ((c (first clauses)))
+          (let
+            ((pats (first c)) (body (first (rest c))))
+            (let
+              ((env-after (hk-match-args pats args env)))
+              (cond
+                ((nil? env-after)
+                  (hk-dispatch-multi (rest clauses) args env))
+                (:else (hk-eval body env-after))))))))))
+
+(define
+  hk-match-args
+  (fn
+    (pats args env)
+    (cond
+      ((empty? pats) env)
+      (:else
+        (let
+          ((res (hk-match (first pats) (first args) env)))
+          (cond
+            ((nil? res) nil)
+            (:else
+              (hk-match-args (rest pats) (rest args) res))))))))
+
+(define
+  hk-apply-con-partial
+  (fn
+    (cp arg)
+    (let
+      ((name (get cp "name"))
+        (arity (get cp "arity"))
+        (args (append (get cp "args") (list arg))))
+      (cond
+        ((= (len args) arity) (hk-mk-con name args))
+        (:else (assoc cp "args" args))))))
+
+(define
+  hk-apply-builtin
+  (fn
+    (b arg)
+    (let
+      ((arity (get b "arity"))
+        (collected (append (get b "collected") (list arg))))
+      (cond
+        ((< (len collected) arity)
+          (assoc b "collected" collected))
+        (:else
+          ;; Strict built-ins force every collected arg before
+          ;; calling. Lazy ones (`seq`, `deepseq`) receive the raw
+          ;; thunks so they can choose what to force.
+          (cond
+            ((get b "lazy") (apply (get b "fn") collected))
+            (:else
+              (apply
+                (get b "fn")
+                (map hk-force collected)))))))))
+
+;; ── Bool helpers (Bool values are tagged conses) ────────────
+(define
+  hk-truthy?
+  (fn
+    (v)
+    (and (list? v) (not (empty? v)) (= (first v) "True"))))
+
+(define hk-true (hk-mk-con "True" (list)))
+(define hk-false (hk-mk-con "False" (list)))
+(define hk-of-bool (fn (b) (if b hk-true hk-false)))
+
+;; ── Core eval ───────────────────────────────────────────────
+(define
+  hk-eval
+  (fn
+    (node env)
+    (cond
+      ((not (list? node)) (raise (str "eval: not a list: " node)))
+      ((empty? node) (raise "eval: empty list node"))
+      (:else
+        (let
+          ((tag (first node)))
+          (cond
+            ((= tag "int") (nth node 1))
+            ((= tag "float") (nth node 1))
+            ((= tag "string") (nth node 1))
+            ((= tag "char") (nth node 1))
+            ((= tag "var") (hk-eval-var (nth node 1) env))
+            ((= tag "con") (hk-eval-con-ref (nth node 1)))
+            ((= tag "neg")
+              (- 0 (hk-force (hk-eval (nth node 1) env))))
+            ((= tag "if") (hk-eval-if node env))
+            ((= tag "let") (hk-eval-let (nth node 1) (nth node 2) env))
+            ((= tag "lambda")
+              (hk-mk-closure (nth node 1) (nth node 2) env))
+            ((= tag "app")
+              (hk-apply
+                (hk-eval (nth node 1) env)
+                (hk-mk-thunk (nth node 2) env)))
+            ((= tag "op")
+              (hk-eval-op
+                (nth node 1)
+                (nth node 2)
+                (nth node 3)
+                env))
+            ((= tag "case")
+              (hk-eval-case (nth node 1) (nth node 2) env))
+            ((= tag "tuple")
+              (hk-mk-tuple
+                (map (fn (e) (hk-eval e env)) (nth node 1))))
+            ((= tag "list")
+              (hk-mk-list
+                (map (fn (e) (hk-eval e env)) (nth node 1))))
+            ((= tag "range")
+              (let
+                ((from (hk-force (hk-eval (nth node 1) env)))
+                  (to (hk-force (hk-eval (nth node 2) env))))
+                (hk-build-range from to 1)))
+            ((= tag "range-step")
+              (let
+                ((from (hk-force (hk-eval (nth node 1) env)))
+                  (nxt (hk-force (hk-eval (nth node 2) env)))
+                  (to (hk-force (hk-eval (nth node 3) env))))
+                (hk-build-range from to (- nxt from))))
+            ((= tag "range-from")
+              ;; [from..] = iterate (+ 1) from — uses the Prelude.
+              (hk-eval
+                (list
+                  :app
+                  (list
+                    :app
+                    (list :var "iterate")
+                    (list
+                      :sect-right
+                      "+"
+                      (list :int 1)))
+                  (nth node 1))
+                env))
+            ((= tag "sect-left")
+              (hk-eval-sect-left (nth node 1) (nth node 2) env))
+            ((= tag "sect-right")
+              (hk-eval-sect-right (nth node 1) (nth node 2) env))
+            (:else
+              (raise (str "eval: unknown node tag '" tag "'")))))))))
+
+(define
+  hk-eval-var
+  (fn
+    (name env)
+    (cond
+      ((has-key? env name) (get env name))
+      ((hk-is-con? name) (hk-eval-con-ref name))
+      (:else (raise (str "unbound variable: " name))))))
+
+(define
+  hk-eval-con-ref
+  (fn
+    (name)
+    (let ((arity (hk-con-arity name)))
+      (cond
+        ((nil? arity) (raise (str "unknown constructor: " name)))
+        ((= arity 0) (hk-mk-con name (list)))
+        (:else
+          {:type "con-partial" :name name :arity arity :args (list)})))))
+
+(define
+  hk-eval-if
+  (fn
+    (node env)
+    (let ((cv (hk-force (hk-eval (nth node 1) env))))
+      (cond
+        ((hk-truthy? cv) (hk-eval (nth node 2) env))
+        ((and (list? cv) (= (first cv) "False"))
+          (hk-eval (nth node 3) env))
+        ((= cv true) (hk-eval (nth node 2) env))
+        ((= cv false) (hk-eval (nth node 3) env))
+        (:else (raise "if: condition is not Bool"))))))
+
+(define
+  hk-extend-env-with-match!
+  (fn
+    (env match-env)
+    (for-each
+      (fn (k) (dict-set! env k (get match-env k)))
+      (keys match-env))))
+
+(define
+  hk-eval-let-bind!
+  (fn
+    (b env)
+    (let ((tag (first b)))
+      (cond
+        ((= tag "fun-clause")
+          (let
+            ((name (nth b 1))
+              (pats (nth b 2))
+              (body (nth b 3)))
+            (cond
+              ((empty? pats)
+                (dict-set! env name (hk-eval body env)))
+              (:else
+                (dict-set! env name (hk-mk-closure pats body env))))))
+        ((or (= tag "bind") (= tag "pat-bind"))
+          (let ((pat (nth b 1)) (body (nth b 2)))
+            (let ((val (hk-eval body env)))
+              (let ((res (hk-match pat val env)))
+                (cond
+                  ((nil? res)
+                    (raise "let: pattern bind failure"))
+                  (:else
+                    (hk-extend-env-with-match! env res)))))))
+        (:else nil)))))
+
+(define
+  hk-eval-let
+  (fn
+    (binds body env)
+    (let ((new-env (hk-dict-copy env)))
+      ;; Pre-seed names for fn-clauses so closures see themselves
+      ;; (mutual recursion across the whole binding group).
+      (for-each
+        (fn (b)
+          (cond
+            ((= (first b) "fun-clause")
+              (dict-set! new-env (nth b 1) nil))
+            ((and
+                (= (first b) "bind")
+                (list? (nth b 1))
+                (= (first (nth b 1)) "p-var"))
+              (dict-set! new-env (nth (nth b 1) 1) nil))
+            (:else nil)))
+        binds)
+      (for-each (fn (b) (hk-eval-let-bind! b new-env)) binds)
+      (hk-eval body new-env))))
+
+(define
+  hk-eval-case
+  (fn
+    (scrut alts env)
+    (let ((sv (hk-force (hk-eval scrut env))))
+      (hk-try-alts alts sv env))))
+
+(define
+  hk-try-alts
+  (fn
+    (alts val env)
+    (cond
+      ((empty? alts) (raise "case: non-exhaustive patterns"))
+      (:else
+        (let
+          ((alt (first alts)))
+          (let
+            ((pat (nth alt 1)) (body (nth alt 2)))
+            (let
+              ((res (hk-match pat val env)))
+              (cond
+                ((nil? res) (hk-try-alts (rest alts) val env))
+                (:else (hk-eval body res))))))))))
+
+(define
+  hk-eval-op
+  (fn
+    (op left right env)
+    (cond
+      ;; Cons is non-strict in both args: build a cons cell whose
+      ;; head and tail are deferred. This is what makes `repeat x =
+      ;; x : repeat x` and `fibs = 0 : 1 : zipWith (+) fibs (tail
+      ;; fibs)` terminate.
+      ((= op ":")
+        (hk-mk-cons
+          (hk-mk-thunk left env)
+          (hk-mk-thunk right env)))
+      (:else
+        (let
+          ((lv (hk-force (hk-eval left env)))
+            (rv (hk-force (hk-eval right env))))
+          (hk-binop op lv rv))))))
+
+(define
+  hk-list-append
+  (fn
+    (a b)
+    (cond
+      ((and (list? a) (= (first a) "[]")) b)
+      ((and (list? a) (= (first a) ":"))
+        (hk-mk-cons (nth a 1) (hk-list-append (nth a 2) b)))
+      (:else (raise "++: not a list")))))
+
+;; Eager finite-range spine — handles [from..to] and [from,next..to].
+;; Step direction is governed by the sign of `step`; when step > 0 we
+;; stop at to; when step < 0 we stop at to going down.
+(define
+  hk-build-range
+  (fn
+    (from to step)
+    (cond
+      ((and (> step 0) (> from to)) (hk-mk-nil))
+      ((and (< step 0) (< from to)) (hk-mk-nil))
+      ((= step 0) (hk-mk-nil))
+      (:else
+        (hk-mk-cons from (hk-build-range (+ from step) to step))))))
+
+(define
+  hk-binop
+  (fn
+    (op lv rv)
+    (cond
+      ((= op "+") (+ lv rv))
+      ((= op "-") (- lv rv))
+      ((= op "*") (* lv rv))
+      ((= op "/") (/ lv rv))
+      ((= op "==") (hk-of-bool (= lv rv)))
+      ((= op "/=") (hk-of-bool (not (= lv rv))))
+      ((= op "<") (hk-of-bool (< lv rv)))
+      ((= op "<=") (hk-of-bool (<= lv rv)))
+      ((= op ">") (hk-of-bool (> lv rv)))
+      ((= op ">=") (hk-of-bool (>= lv rv)))
+      ((= op "&&") (hk-of-bool (and (hk-truthy? lv) (hk-truthy? rv))))
+      ((= op "||") (hk-of-bool (or (hk-truthy? lv) (hk-truthy? rv))))
+      ((= op ":") (hk-mk-cons lv rv))
+      ((= op "++") (hk-list-append lv rv))
+      (:else (raise (str "unknown operator: " op))))))
+
+(define
+  hk-eval-sect-left
+  (fn
+    (op e env)
+    ;; (e op) = \x -> e op x — bind e once, defer the operator call.
+    (let ((ev (hk-eval e env)))
+      (let ((cenv (hk-dict-copy env)))
+        (dict-set! cenv "__hk-sect-l" ev)
+        (hk-mk-closure
+          (list (list :p-var "__hk-sect-x"))
+          (list
+            :op
+            op
+            (list :var "__hk-sect-l")
+            (list :var "__hk-sect-x"))
+          cenv)))))
+
+(define
+  hk-eval-sect-right
+  (fn
+    (op e env)
+    (let ((ev (hk-eval e env)))
+      (let ((cenv (hk-dict-copy env)))
+        (dict-set! cenv "__hk-sect-r" ev)
+        (hk-mk-closure
+          (list (list :p-var "__hk-sect-x"))
+          (list
+            :op
+            op
+            (list :var "__hk-sect-x")
+            (list :var "__hk-sect-r"))
+          cenv)))))
+
+;; ── Top-level program evaluation ────────────────────────────
+;; Operator-as-value built-ins — let `(+)`, `(*)`, etc. work as
+;; first-class functions for `zipWith (+)` and friends. Strict in
+;; both args (built-ins are forced via hk-apply-builtin).
+(define
+  hk-make-binop-builtin
+  (fn
+    (name op-name)
+    (hk-mk-builtin
+      name
+      (fn (a b) (hk-binop op-name a b))
+      2)))
+
+;; Inline Prelude source — loaded into the initial env so simple
+;; programs can use `head`, `take`, `repeat`, etc. without each
+;; user file redefining them. The Prelude itself uses lazy `:` for
+;; the recursive list-building functions.
+(define
+  hk-prelude-src
+  "head (x:_) = x
+tail (_:xs) = xs
+fst (a, _) = a
+snd (_, b) = b
+take 0 _ = []
+take _ [] = []
+take n (x:xs) = x : take (n - 1) xs
+drop 0 xs = xs
+drop _ [] = []
+drop n (_:xs) = drop (n - 1) xs
+repeat x = x : repeat x
+iterate f x = x : iterate f (f x)
+length [] = 0
+length (_:xs) = 1 + length xs
+map _ [] = []
+map f (x:xs) = f x : map f xs
+filter _ [] = []
+filter p (x:xs) = if p x then x : filter p xs else filter p xs
+zipWith _ [] _ = []
+zipWith _ _ [] = []
+zipWith f (x:xs) (y:ys) = f x y : zipWith f xs ys
+fibs = 0 : 1 : zipWith plus fibs (tail fibs)
+plus a b = a + b
+")
+
+(define
+  hk-load-into!
+  (fn
+    (env src)
+    (let ((ast (hk-core src)))
+      (hk-register-program! ast)
+      (let
+        ((decls
+            (cond
+              ((= (first ast) "program") (nth ast 1))
+              ((= (first ast) "module") (nth ast 4))
+              (:else (list)))))
+        (hk-bind-decls! env decls)))))
+
+(define
+  hk-init-env
+  (fn
+    ()
+    (let ((env (dict)))
+      (dict-set! env "otherwise" hk-true)
+      (dict-set!
+        env
+        "error"
+        (hk-mk-builtin
+          "error"
+          (fn (msg) (raise (str "*** Exception: " msg)))
+          1))
+      (dict-set!
+        env
+        "not"
+        (hk-mk-builtin
+          "not"
+          (fn (b) (hk-of-bool (not (hk-truthy? b))))
+          1))
+      (dict-set!
+        env
+        "id"
+        (hk-mk-builtin "id" (fn (x) x) 1))
+      ;; `seq a b` — strict in `a`, lazy in `b`. Forces `a` to WHNF
+      ;; and returns `b` unchanged (still a thunk if it was one).
+      (dict-set!
+        env
+        "seq"
+        (hk-mk-lazy-builtin
+          "seq"
+          (fn (a b) (do (hk-force a) b))
+          2))
+      ;; `deepseq a b` — like seq but forces `a` to normal form.
+      (dict-set!
+        env
+        "deepseq"
+        (hk-mk-lazy-builtin
+          "deepseq"
+          (fn (a b) (do (hk-deep-force a) b))
+          2))
+      ;; ── Stub IO monad ─────────────────────────────────────
+      ;; IO actions are tagged values `("IO" payload)`; `>>=` and
+      ;; `>>` chain them. Lazy in the action arguments so do-blocks
+      ;; can be deeply structured without forcing the whole chain
+      ;; up front.
+      (dict-set!
+        env
+        "return"
+        (hk-mk-lazy-builtin
+          "return"
+          (fn (x) (list "IO" x))
+          1))
+      (dict-set!
+        env
+        ">>="
+        (hk-mk-lazy-builtin
+          ">>="
+          (fn (m f)
+            (let ((io-val (hk-force m)))
+              (cond
+                ((and
+                    (list? io-val)
+                    (= (first io-val) "IO"))
+                  (hk-apply (hk-force f) (nth io-val 1)))
+                (:else
+                  (raise "(>>=): left side is not an IO action")))))
+          2))
+      (dict-set!
+        env
+        ">>"
+        (hk-mk-lazy-builtin
+          ">>"
+          (fn (m n)
+            (let ((io-val (hk-force m)))
+              (cond
+                ((and
+                    (list? io-val)
+                    (= (first io-val) "IO"))
+                  (hk-force n))
+                (:else
+                  (raise "(>>): left side is not an IO action")))))
+          2))
+      ;; Operators as first-class values
+      (dict-set! env "+" (hk-make-binop-builtin "+" "+"))
+      (dict-set! env "-" (hk-make-binop-builtin "-" "-"))
+      (dict-set! env "*" (hk-make-binop-builtin "*" "*"))
+      (dict-set! env "/" (hk-make-binop-builtin "/" "/"))
+      (dict-set! env "==" (hk-make-binop-builtin "==" "=="))
+      (dict-set! env "/=" (hk-make-binop-builtin "/=" "/="))
+      (dict-set! env "<" (hk-make-binop-builtin "<" "<"))
+      (dict-set! env "<=" (hk-make-binop-builtin "<=" "<="))
+      (dict-set! env ">" (hk-make-binop-builtin ">" ">"))
+      (dict-set! env ">=" (hk-make-binop-builtin ">=" ">="))
+      (dict-set! env "&&" (hk-make-binop-builtin "&&" "&&"))
+      (dict-set! env "||" (hk-make-binop-builtin "||" "||"))
+      (dict-set! env "++" (hk-make-binop-builtin "++" "++"))
+      (hk-load-into! env hk-prelude-src)
+      env)))
+
+(define
+  hk-bind-decls!
+  (fn
+    (env decls)
+    (let
+      ((groups (dict))
+        (group-order (list))
+        (pat-binds (list)))
+      ;; Pass 1: collect fun-clause groups by name; track first-seen
+      ;; order so pass 3 can evaluate 0-arity bodies in source order
+      ;; (forward references to other 0-arity definitions still need
+      ;; the earlier name to be bound first).
+      (for-each
+        (fn (d)
+          (cond
+            ((= (first d) "fun-clause")
+              (let
+                ((name (nth d 1)))
+                (when (not (has-key? groups name))
+                  (append! group-order name))
+                (dict-set!
+                  groups
+                  name
+                  (append
+                    (if
+                      (has-key? groups name)
+                      (get groups name)
+                      (list))
+                    (list (list (nth d 2) (nth d 3)))))
+                (when
+                  (not (has-key? env name))
+                  (dict-set! env name nil))))
+            ((or (= (first d) "bind") (= (first d) "pat-bind"))
+              (append! pat-binds d))
+            (:else nil)))
+        decls)
+      ;; Pass 2: install multifuns (arity > 0) — order doesn't matter
+      ;; because they're closures; collect 0-arity names in source
+      ;; order for pass 3.
+      (let ((zero-arity (list)))
+        (for-each
+          (fn (name)
+            (let ((clauses (get groups name)))
+              (let ((arity (len (first (first clauses)))))
+                (cond
+                  ((> arity 0)
+                    (dict-set!
+                      env
+                      name
+                      (hk-mk-multifun arity clauses env)))
+                  (:else (append! zero-arity name))))))
+          group-order)
+        ;; Pass 3: evaluate 0-arity bodies and pat-binds in source
+        ;; order — forward references to a later 0-arity name will
+        ;; still see its placeholder (nil) and fail noisily, but the
+        ;; common case of a top-down program works.
+        (for-each
+          (fn (name)
+            (let ((clauses (get groups name)))
+              (dict-set!
+                env
+                name
+                (hk-eval (first (rest (first clauses))) env))))
+          zero-arity)
+        (for-each
+          (fn (d)
+            (let ((pat (nth d 1)) (body (nth d 2)))
+              (let ((val (hk-eval body env)))
+                (let ((res (hk-match pat val env)))
+                  (cond
+                    ((nil? res)
+                      (raise "top-level pattern bind failure"))
+                    (:else (hk-extend-env-with-match! env res)))))))
+          pat-binds))
+      env)))
+
+(define
+  hk-eval-program
+  (fn
+    (ast)
+    (cond
+      ((nil? ast) (raise "eval-program: nil ast"))
+      ((not (list? ast)) (raise "eval-program: not a list"))
+      (:else
+        (do
+          (hk-register-program! ast)
+          (let ((env (hk-init-env)))
+            (let
+              ((decls
+                  (cond
+                    ((= (first ast) "program") (nth ast 1))
+                    ((= (first ast) "module") (nth ast 4))
+                    (:else (raise "eval-program: bad shape")))))
+              (hk-bind-decls! env decls))))))))
+
+;; ── Source-level convenience ────────────────────────────────
+(define
+  hk-run
+  (fn
+    (src)
+    (let ((env (hk-eval-program (hk-core src))))
+      (cond
+        ((has-key? env "main") (get env "main"))
+        (:else env)))))
+
+(define
+  hk-eval-expr-source
+  (fn
+    (src)
+    (hk-deep-force (hk-eval (hk-core-expr src) (hk-init-env)))))

lib/haskell/layout.sx

@@ -0,0 +1,329 @@
+;; Haskell 98 layout algorithm (§10.3).
+;;
+;; Consumes the raw token stream produced by hk-tokenize and inserts
+;; virtual braces / semicolons (types vlbrace / vrbrace / vsemi) based
+;; on indentation. Newline tokens are consumed and stripped.
+;;
+;;   (hk-layout (hk-tokenize src))  →  tokens-with-virtual-layout
+
+;; ── Pre-pass ──────────────────────────────────────────────────────
+;;
+;; Walks the raw token list and emits an augmented stream containing
+;; two fresh pseudo-tokens:
+;;
+;;   {:type "layout-open"   :col N :keyword K}
+;;     At stream start (K = "<module>") unless the first real token is
+;;     `module` or `{`. Also immediately after every `let` / `where` /
+;;     `do` / `of` whose following token is NOT `{`. N is the column
+;;     of the token that follows.
+;;
+;;   {:type "layout-indent" :col N}
+;;     Before any token whose line is strictly greater than the line
+;;     of the previously emitted real token, EXCEPT when that token
+;;     is already preceded by a layout-open (Haskell 98 §10.3 note 3).
+;;
+;; Raw newline tokens are dropped.
+
+(define
+  hk-layout-keyword?
+  (fn
+    (tok)
+    (and
+      (= (get tok "type") "reserved")
+      (or
+        (= (get tok "value") "let")
+        (= (get tok "value") "where")
+        (= (get tok "value") "do")
+        (= (get tok "value") "of")))))
+
+(define
+  hk-layout-pre
+  (fn
+    (tokens)
+    (let
+      ((result (list))
+        (n (len tokens))
+        (i 0)
+        (prev-line -1)
+        (first-real-emitted false)
+        (suppress-next-indent false))
+      (define
+        hk-next-real-idx
+        (fn
+          (start)
+          (let
+            ((j start))
+            (define
+              hk-nri-loop
+              (fn
+                ()
+                (when
+                  (and
+                    (< j n)
+                    (= (get (nth tokens j) "type") "newline"))
+                  (do (set! j (+ j 1)) (hk-nri-loop)))))
+            (hk-nri-loop)
+            j)))
+      (define
+        hk-pre-step
+        (fn
+          ()
+          (when
+            (< i n)
+            (let
+              ((tok (nth tokens i)) (ty (get tok "type")))
+              (cond
+                ((= ty "newline") (do (set! i (+ i 1)) (hk-pre-step)))
+                (:else
+                  (do
+                    (when
+                      (not first-real-emitted)
+                      (do
+                        (set! first-real-emitted true)
+                        (when
+                          (not
+                            (or
+                              (and
+                                (= ty "reserved")
+                                (= (get tok "value") "module"))
+                              (= ty "lbrace")))
+                          (do
+                            (append!
+                              result
+                              {:type "layout-open"
+                                :col (get tok "col")
+                                :keyword "<module>"
+                                :line (get tok "line")})
+                            (set! suppress-next-indent true)))))
+                    (when
+                      (and
+                        (>= prev-line 0)
+                        (> (get tok "line") prev-line)
+                        (not suppress-next-indent))
+                      (append!
+                        result
+                        {:type "layout-indent"
+                          :col (get tok "col")
+                          :line (get tok "line")}))
+                    (set! suppress-next-indent false)
+                    (set! prev-line (get tok "line"))
+                    (append! result tok)
+                    (when
+                      (hk-layout-keyword? tok)
+                      (let
+                        ((j (hk-next-real-idx (+ i 1))))
+                        (cond
+                          ((>= j n)
+                            (do
+                              (append!
+                                result
+                                {:type "layout-open"
+                                  :col 0
+                                  :keyword (get tok "value")
+                                  :line (get tok "line")})
+                              (set! suppress-next-indent true)))
+                          ((= (get (nth tokens j) "type") "lbrace") nil)
+                          (:else
+                            (do
+                              (append!
+                                result
+                                {:type "layout-open"
+                                  :col (get (nth tokens j) "col")
+                                  :keyword (get tok "value")
+                                  :line (get tok "line")})
+                              (set! suppress-next-indent true))))))
+                    (set! i (+ i 1))
+                    (hk-pre-step))))))))
+      (hk-pre-step)
+      result)))
+
+;; ── Main pass: L algorithm ────────────────────────────────────────
+;;
+;; Stack is a list; the head is the top of stack. Each entry is
+;; either the keyword :explicit (pushed by an explicit `{`) or a dict
+;; {:col N :keyword K} pushed by a layout-open marker.
+;;
+;; Rules (following Haskell 98 §10.3):
+;;
+;;   layout-open(n)  vs stack:
+;;     empty or explicit top                 → push n; emit {
+;;     n > top-col                           → push n; emit {
+;;     otherwise                             → emit { }; retry as indent(n)
+;;
+;;   layout-indent(n) vs stack:
+;;     empty or explicit top                 → drop
+;;     n == top-col                          → emit ;
+;;     n <  top-col                          → emit }; pop; recurse
+;;     n >  top-col                          → drop
+;;
+;;   lbrace                                  → push :explicit; emit {
+;;   rbrace                                  → pop if :explicit; emit }
+;;   `in` with implicit let on top           → emit }; pop; emit in
+;;   any other token                         → emit
+;;
+;; EOF: emit } for every remaining implicit context.
+
+(define
+  hk-layout-L
+  (fn
+    (pre-toks)
+    (let
+      ((result (list))
+        (stack (list))
+        (n (len pre-toks))
+        (i 0))
+      (define hk-emit (fn (t) (append! result t)))
+      (define
+        hk-indent-at
+        (fn
+          (col line)
+          (cond
+            ((or (empty? stack) (= (first stack) :explicit)) nil)
+            (:else
+              (let
+                ((top-col (get (first stack) "col")))
+                (cond
+                  ((= col top-col)
+                    (hk-emit
+                      {:type "vsemi" :value ";" :line line :col col}))
+                  ((< col top-col)
+                    (do
+                      (hk-emit
+                        {:type "vrbrace" :value "}" :line line :col col})
+                      (set! stack (rest stack))
+                      (hk-indent-at col line)))
+                  (:else nil)))))))
+      (define
+        hk-open-at
+        (fn
+          (col keyword line)
+          (cond
+            ((and
+                (> col 0)
+                (or
+                  (empty? stack)
+                  (= (first stack) :explicit)
+                  (> col (get (first stack) "col"))))
+              (do
+                (hk-emit
+                  {:type "vlbrace" :value "{" :line line :col col})
+                (set! stack (cons {:col col :keyword keyword} stack))))
+            (:else
+              (do
+                (hk-emit
+                  {:type "vlbrace" :value "{" :line line :col col})
+                (hk-emit
+                  {:type "vrbrace" :value "}" :line line :col col})
+                (hk-indent-at col line))))))
+      (define
+        hk-close-eof
+        (fn
+          ()
+          (when
+            (and
+              (not (empty? stack))
+              (not (= (first stack) :explicit)))
+            (do
+              (hk-emit {:type "vrbrace" :value "}" :line 0 :col 0})
+              (set! stack (rest stack))
+              (hk-close-eof)))))
+      ;; Peek past further layout-indent / layout-open markers to find
+      ;; the next real token's value when its type is `reserved`.
+      ;; Returns nil if no such token.
+      (define
+        hk-peek-next-reserved
+        (fn
+          (start)
+          (let ((j (+ start 1)) (found nil) (done false))
+            (define
+              hk-pnr-loop
+              (fn
+                ()
+                (when
+                  (and (not done) (< j n))
+                  (let
+                    ((t (nth pre-toks j)) (ty (get t "type")))
+                    (cond
+                      ((or
+                          (= ty "layout-indent")
+                          (= ty "layout-open"))
+                        (do (set! j (+ j 1)) (hk-pnr-loop)))
+                      ((= ty "reserved")
+                        (do (set! found (get t "value")) (set! done true)))
+                      (:else (set! done true)))))))
+            (hk-pnr-loop)
+            found)))
+      (define
+        hk-layout-step
+        (fn
+          ()
+          (when
+            (< i n)
+            (let
+              ((tok (nth pre-toks i)) (ty (get tok "type")))
+              (cond
+                ((= ty "eof")
+                  (do
+                    (hk-close-eof)
+                    (hk-emit tok)
+                    (set! i (+ i 1))
+                    (hk-layout-step)))
+                ((= ty "layout-open")
+                  (do
+                    (hk-open-at
+                      (get tok "col")
+                      (get tok "keyword")
+                      (get tok "line"))
+                    (set! i (+ i 1))
+                    (hk-layout-step)))
+                ((= ty "layout-indent")
+                  (cond
+                    ((= (hk-peek-next-reserved i) "in")
+                      (do (set! i (+ i 1)) (hk-layout-step)))
+                    (:else
+                      (do
+                        (hk-indent-at (get tok "col") (get tok "line"))
+                        (set! i (+ i 1))
+                        (hk-layout-step)))))
+                ((= ty "lbrace")
+                  (do
+                    (set! stack (cons :explicit stack))
+                    (hk-emit tok)
+                    (set! i (+ i 1))
+                    (hk-layout-step)))
+                ((= ty "rbrace")
+                  (do
+                    (when
+                      (and
+                        (not (empty? stack))
+                        (= (first stack) :explicit))
+                      (set! stack (rest stack)))
+                    (hk-emit tok)
+                    (set! i (+ i 1))
+                    (hk-layout-step)))
+                ((and
+                    (= ty "reserved")
+                    (= (get tok "value") "in")
+                    (not (empty? stack))
+                    (not (= (first stack) :explicit))
+                    (= (get (first stack) "keyword") "let"))
+                  (do
+                    (hk-emit
+                      {:type "vrbrace"
+                        :value "}"
+                        :line (get tok "line")
+                        :col (get tok "col")})
+                    (set! stack (rest stack))
+                    (hk-emit tok)
+                    (set! i (+ i 1))
+                    (hk-layout-step)))
+                (:else
+                  (do
+                    (hk-emit tok)
+                    (set! i (+ i 1))
+                    (hk-layout-step))))))))
+      (hk-layout-step)
+      (hk-close-eof)
+      result)))
+
+(define hk-layout (fn (tokens) (hk-layout-L (hk-layout-pre tokens))))

lib/haskell/match.sx

@@ -0,0 +1,201 @@
+;; Value-level pattern matching.
+;;
+;; Constructor values are tagged lists whose first element is the
+;; constructor name (a string). Tuples use the special tag "Tuple".
+;; Lists use the spine of `:` cons and `[]` nil.
+;;
+;;   Just 5         →  ("Just" 5)
+;;   Nothing        →  ("Nothing")
+;;   (1, 2)         →  ("Tuple" 1 2)
+;;   [1, 2]         →  (":" 1 (":" 2 ("[]")))
+;;   ()             →  ("()")
+;;
+;; Primitive values (numbers, strings, chars) are stored raw.
+;;
+;; The matcher takes a pattern AST node, a value, and an environment
+;; dict; it returns an extended dict on success, or `nil` on failure.
+
+;; ── Value builders ──────────────────────────────────────────
+(define
+  hk-mk-con
+  (fn
+    (cname args)
+    (let ((result (list cname)))
+      (for-each (fn (a) (append! result a)) args)
+      result)))
+
+(define
+  hk-mk-tuple
+  (fn
+    (items)
+    (let ((result (list "Tuple")))
+      (for-each (fn (x) (append! result x)) items)
+      result)))
+
+(define hk-mk-nil (fn () (list "[]")))
+
+(define hk-mk-cons (fn (h t) (list ":" h t)))
+
+(define
+  hk-mk-list
+  (fn
+    (items)
+    (cond
+      ((empty? items) (hk-mk-nil))
+      (:else
+        (hk-mk-cons (first items) (hk-mk-list (rest items)))))))
+
+;; ── Predicates / accessors on constructor values ───────────
+(define
+  hk-is-con-val?
+  (fn
+    (v)
+    (and
+      (list? v)
+      (not (empty? v))
+      (string? (first v)))))
+
+(define hk-val-con-name (fn (v) (first v)))
+
+(define hk-val-con-args (fn (v) (rest v)))
+
+;; ── The matcher ────────────────────────────────────────────
+;;
+;; Pattern match forces the scrutinee to WHNF before inspecting it
+;; — except for `p-wild`, `p-var`, and `p-lazy`, which never need
+;; to look at the value. Args of constructor / tuple / list values
+;; remain thunked (they're forced only when their own pattern needs
+;; to inspect them, recursively).
+(define
+  hk-match
+  (fn
+    (pat val env)
+    (cond
+      ((not (list? pat)) nil)
+      ((empty? pat) nil)
+      (:else
+        (let
+          ((tag (first pat)))
+          (cond
+            ((= tag "p-wild") env)
+            ((= tag "p-var") (assoc env (nth pat 1) val))
+            ((= tag "p-lazy") (hk-match (nth pat 1) val env))
+            ((= tag "p-as")
+              (let
+                ((res (hk-match (nth pat 2) val env)))
+                (cond
+                  ((nil? res) nil)
+                  (:else (assoc res (nth pat 1) val)))))
+            (:else
+              (let ((fv (hk-force val)))
+                (cond
+                  ((= tag "p-int")
+                    (if
+                      (and (number? fv) (= fv (nth pat 1)))
+                      env
+                      nil))
+                  ((= tag "p-float")
+                    (if
+                      (and (number? fv) (= fv (nth pat 1)))
+                      env
+                      nil))
+                  ((= tag "p-string")
+                    (if
+                      (and (string? fv) (= fv (nth pat 1)))
+                      env
+                      nil))
+                  ((= tag "p-char")
+                    (if
+                      (and (string? fv) (= fv (nth pat 1)))
+                      env
+                      nil))
+                  ((= tag "p-con")
+                    (let
+                      ((pat-name (nth pat 1)) (pat-args (nth pat 2)))
+                      (cond
+                        ((not (hk-is-con-val? fv)) nil)
+                        ((not (= (hk-val-con-name fv) pat-name)) nil)
+                        (:else
+                          (let
+                            ((val-args (hk-val-con-args fv)))
+                            (cond
+                              ((not (= (len pat-args) (len val-args)))
+                                nil)
+                              (:else
+                                (hk-match-all
+                                  pat-args
+                                  val-args
+                                  env))))))))
+                  ((= tag "p-tuple")
+                    (let
+                      ((items (nth pat 1)))
+                      (cond
+                        ((not (hk-is-con-val? fv)) nil)
+                        ((not (= (hk-val-con-name fv) "Tuple")) nil)
+                        ((not (= (len (hk-val-con-args fv)) (len items)))
+                          nil)
+                        (:else
+                          (hk-match-all
+                            items
+                            (hk-val-con-args fv)
+                            env)))))
+                  ((= tag "p-list")
+                    (hk-match-list-pat (nth pat 1) fv env))
+                  (:else nil))))))))))
+
+(define
+  hk-match-all
+  (fn
+    (pats vals env)
+    (cond
+      ((empty? pats) env)
+      (:else
+        (let
+          ((res (hk-match (first pats) (first vals) env)))
+          (cond
+            ((nil? res) nil)
+            (:else
+              (hk-match-all (rest pats) (rest vals) res))))))))
+
+(define
+  hk-match-list-pat
+  (fn
+    (items val env)
+    (let ((fv (hk-force val)))
+      (cond
+        ((empty? items)
+          (if
+            (and
+              (hk-is-con-val? fv)
+              (= (hk-val-con-name fv) "[]"))
+            env
+            nil))
+        (:else
+          (cond
+            ((not (hk-is-con-val? fv)) nil)
+            ((not (= (hk-val-con-name fv) ":")) nil)
+            (:else
+              (let
+                ((args (hk-val-con-args fv)))
+                (let
+                  ((h (first args)) (t (first (rest args))))
+                  (let
+                    ((res (hk-match (first items) h env)))
+                    (cond
+                      ((nil? res) nil)
+                      (:else
+                        (hk-match-list-pat
+                          (rest items)
+                          t
+                          res)))))))))))))
+
+;; ── Convenience: parse a pattern from source for tests ─────
+;; (Uses the parser's case-alt entry — `case _ of pat -> 0` —
+;; to extract a pattern AST.)
+(define
+  hk-parse-pat-source
+  (fn
+    (src)
+    (let
+      ((expr (hk-parse (str "case 0 of " src " -> 0"))))
+      (nth (nth (nth expr 2) 0) 1))))

lib/haskell/runtime.sx

@@ -0,0 +1,130 @@
+;; Haskell runtime: constructor registry.
+;;
+;; A mutable dict keyed by constructor name (e.g. "Just", "[]") with
+;; entries of shape  {:arity N :type TYPE-NAME-STRING}.
+;; Populated by ingesting `data` / `newtype` decls from parsed ASTs.
+;; Pre-registers a small set of constructors tied to Haskell syntactic
+;; forms (Bool, list, unit) — every nontrivial program depends on
+;; these, and the parser/desugar pipeline emits them as (:var "True")
+;; etc. without a corresponding `data` decl.
+
+(define hk-constructors (dict))
+
+(define
+  hk-register-con!
+  (fn
+    (cname arity type-name)
+    (dict-set!
+      hk-constructors
+      cname
+      {:arity arity :type type-name})))
+
+(define hk-is-con? (fn (name) (has-key? hk-constructors name)))
+
+(define
+  hk-con-arity
+  (fn
+    (name)
+    (if
+      (has-key? hk-constructors name)
+      (get (get hk-constructors name) "arity")
+      nil)))
+
+(define
+  hk-con-type
+  (fn
+    (name)
+    (if
+      (has-key? hk-constructors name)
+      (get (get hk-constructors name) "type")
+      nil)))
+
+(define hk-con-names (fn () (keys hk-constructors)))
+
+;; ── Registration from AST ────────────────────────────────────
+;; (:data NAME TVARS ((:con-def CNAME FIELDS) …))
+(define
+  hk-register-data!
+  (fn
+    (data-node)
+    (let
+      ((type-name (nth data-node 1))
+        (cons-list (nth data-node 3)))
+      (for-each
+        (fn
+          (cd)
+          (hk-register-con!
+            (nth cd 1)
+            (len (nth cd 2))
+            type-name))
+        cons-list))))
+
+;; (:newtype NAME TVARS CNAME FIELD)
+(define
+  hk-register-newtype!
+  (fn
+    (nt-node)
+    (hk-register-con!
+      (nth nt-node 3)
+      1
+      (nth nt-node 1))))
+
+;; Walk a decls list, registering every `data` / `newtype` decl.
+(define
+  hk-register-decls!
+  (fn
+    (decls)
+    (for-each
+      (fn
+        (d)
+        (cond
+          ((and
+              (list? d)
+              (not (empty? d))
+              (= (first d) "data"))
+            (hk-register-data! d))
+          ((and
+              (list? d)
+              (not (empty? d))
+              (= (first d) "newtype"))
+            (hk-register-newtype! d))
+          (:else nil)))
+      decls)))
+
+(define
+  hk-register-program!
+  (fn
+    (ast)
+    (cond
+      ((nil? ast) nil)
+      ((not (list? ast)) nil)
+      ((empty? ast) nil)
+      ((= (first ast) "program")
+        (hk-register-decls! (nth ast 1)))
+      ((= (first ast) "module")
+        (hk-register-decls! (nth ast 4)))
+      (:else nil))))
+
+;; Convenience: source → AST → desugar → register.
+(define
+  hk-load-source!
+  (fn (src) (hk-register-program! (hk-core src))))
+
+;; ── Built-in constructors pre-registered ─────────────────────
+;; Bool — used implicitly by `if`, comparison operators.
+(hk-register-con! "True" 0 "Bool")
+(hk-register-con! "False" 0 "Bool")
+;; List — used by list literals, range syntax, and cons operator.
+(hk-register-con! "[]" 0 "List")
+(hk-register-con! ":" 2 "List")
+;; Unit — produced by empty parens `()`.
+(hk-register-con! "()" 0 "Unit")
+;; Standard Prelude types — pre-registered so expression-level
+;; programs can use them without a `data` decl.
+(hk-register-con! "Nothing" 0 "Maybe")
+(hk-register-con! "Just"    1 "Maybe")
+(hk-register-con! "Left"    1 "Either")
+(hk-register-con! "Right"   1 "Either")
+(hk-register-con! "LT" 0 "Ordering")
+(hk-register-con! "EQ" 0 "Ordering")
+(hk-register-con! "GT" 0 "Ordering")

lib/haskell/test.sh

@@ -46,6 +46,13 @@ for FILE in "${FILES[@]}"; do
   cat > "$TMPFILE" <<EPOCHS
 (epoch 1)
 (load "lib/haskell/tokenizer.sx")
+(load "lib/haskell/layout.sx")
+(load "lib/haskell/parser.sx")
+(load "lib/haskell/desugar.sx")
+(load "lib/haskell/runtime.sx")
+(load "lib/haskell/match.sx")
+(load "lib/haskell/eval.sx")
+(load "lib/haskell/testlib.sx")
 (epoch 2)
 (load "$FILE")
 (epoch 3)
@@ -81,6 +88,13 @@ EPOCHS
     cat > "$TMPFILE2" <<EPOCHS
 (epoch 1)
 (load "lib/haskell/tokenizer.sx")
+(load "lib/haskell/layout.sx")
+(load "lib/haskell/parser.sx")
+(load "lib/haskell/desugar.sx")
+(load "lib/haskell/runtime.sx")
+(load "lib/haskell/match.sx")
+(load "lib/haskell/eval.sx")
+(load "lib/haskell/testlib.sx")
 (epoch 2)
 (load "$FILE")
 (epoch 3)

lib/haskell/testlib.sx

@@ -0,0 +1,58 @@
+;; Shared test harness for Haskell-on-SX tests.
+;; Each test file expects hk-test / hk-deep=? / counters to already be bound.
+
+(define
+  hk-deep=?
+  (fn
+    (a b)
+    (cond
+      ((= a b) true)
+      ((and (dict? a) (dict? b))
+        (let
+          ((ak (keys a)) (bk (keys b)))
+          (if
+            (not (= (len ak) (len bk)))
+            false
+            (every?
+              (fn
+                (k)
+                (and (has-key? b k) (hk-deep=? (get a k) (get b k))))
+              ak))))
+      ((and (list? a) (list? b))
+        (if
+          (not (= (len a) (len b)))
+          false
+          (let
+            ((i 0) (ok true))
+            (define
+              hk-de-loop
+              (fn
+                ()
+                (when
+                  (and ok (< i (len a)))
+                  (do
+                    (when
+                      (not (hk-deep=? (nth a i) (nth b i)))
+                      (set! ok false))
+                    (set! i (+ i 1))
+                    (hk-de-loop)))))
+            (hk-de-loop)
+            ok)))
+      (:else false))))
+
+(define hk-test-pass 0)
+(define hk-test-fail 0)
+(define hk-test-fails (list))
+
+(define
+  hk-test
+  (fn
+    (name actual expected)
+    (if
+      (hk-deep=? actual expected)
+      (set! hk-test-pass (+ hk-test-pass 1))
+      (do
+        (set! hk-test-fail (+ hk-test-fail 1))
+        (append!
+          hk-test-fails
+          {:actual actual :expected expected :name name})))))

lib/haskell/tests/desugar.sx

@@ -0,0 +1,305 @@
+;; Desugar tests — surface AST → core AST.
+;;   :guarded   →  nested :if
+;;   :where     →  :let
+;;   :list-comp →  concatMap-based tree
+
+(define
+  hk-prog
+  (fn (&rest decls) (list :program decls)))
+
+;; ── Guards → if ──
+(hk-test
+  "two-way guarded rhs"
+  (hk-desugar (hk-parse-top "abs x | x < 0 = - x\n      | otherwise = x"))
+  (hk-prog
+    (list
+      :fun-clause
+      "abs"
+      (list (list :p-var "x"))
+      (list
+        :if
+        (list :op "<" (list :var "x") (list :int 0))
+        (list :neg (list :var "x"))
+        (list
+          :if
+          (list :var "otherwise")
+          (list :var "x")
+          (list
+            :app
+            (list :var "error")
+            (list :string "Non-exhaustive guards")))))))
+
+(hk-test
+  "three-way guarded rhs"
+  (hk-desugar
+    (hk-parse-top "sign n | n > 0 = 1\n       | n < 0 = -1\n       | otherwise = 0"))
+  (hk-prog
+    (list
+      :fun-clause
+      "sign"
+      (list (list :p-var "n"))
+      (list
+        :if
+        (list :op ">" (list :var "n") (list :int 0))
+        (list :int 1)
+        (list
+          :if
+          (list :op "<" (list :var "n") (list :int 0))
+          (list :neg (list :int 1))
+          (list
+            :if
+            (list :var "otherwise")
+            (list :int 0)
+            (list
+              :app
+              (list :var "error")
+              (list :string "Non-exhaustive guards"))))))))
+
+(hk-test
+  "case-alt guards desugared too"
+  (hk-desugar
+    (hk-parse "case x of\n  Just y | y > 0 -> y\n         | otherwise -> 0\n  Nothing -> -1"))
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list
+          :if
+          (list :op ">" (list :var "y") (list :int 0))
+          (list :var "y")
+          (list
+            :if
+            (list :var "otherwise")
+            (list :int 0)
+            (list
+              :app
+              (list :var "error")
+              (list :string "Non-exhaustive guards")))))
+      (list
+        :alt
+        (list :p-con "Nothing" (list))
+        (list :neg (list :int 1))))))
+
+;; ── Where → let ──
+(hk-test
+  "where with single binding"
+  (hk-desugar (hk-parse-top "f x = y\n  where y = x + 1"))
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :let
+        (list
+          (list
+            :fun-clause
+            "y"
+            (list)
+            (list :op "+" (list :var "x") (list :int 1))))
+        (list :var "y")))))
+
+(hk-test
+  "where with two bindings"
+  (hk-desugar
+    (hk-parse-top "f x = y + z\n  where y = x + 1\n        z = x - 1"))
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :let
+        (list
+          (list
+            :fun-clause
+            "y"
+            (list)
+            (list :op "+" (list :var "x") (list :int 1)))
+          (list
+            :fun-clause
+            "z"
+            (list)
+            (list :op "-" (list :var "x") (list :int 1))))
+        (list :op "+" (list :var "y") (list :var "z"))))))
+
+(hk-test
+  "guards + where — guarded body inside let"
+  (hk-desugar
+    (hk-parse-top "f x | x > 0 = y\n    | otherwise = 0\n  where y = 99"))
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :let
+        (list (list :fun-clause "y" (list) (list :int 99)))
+        (list
+          :if
+          (list :op ">" (list :var "x") (list :int 0))
+          (list :var "y")
+          (list
+            :if
+            (list :var "otherwise")
+            (list :int 0)
+            (list
+              :app
+              (list :var "error")
+              (list :string "Non-exhaustive guards"))))))))
+
+;; ── List comprehensions → concatMap / if / let ──
+(hk-test
+  "list-comp: single generator"
+  (hk-core-expr "[x | x <- xs]")
+  (list
+    :app
+    (list
+      :app
+      (list :var "concatMap")
+      (list
+        :lambda
+        (list (list :p-var "x"))
+        (list :list (list (list :var "x")))))
+    (list :var "xs")))
+
+(hk-test
+  "list-comp: generator then guard"
+  (hk-core-expr "[x * 2 | x <- xs, x > 0]")
+  (list
+    :app
+    (list
+      :app
+      (list :var "concatMap")
+      (list
+        :lambda
+        (list (list :p-var "x"))
+        (list
+          :if
+          (list :op ">" (list :var "x") (list :int 0))
+          (list
+            :list
+            (list (list :op "*" (list :var "x") (list :int 2))))
+          (list :list (list)))))
+    (list :var "xs")))
+
+(hk-test
+  "list-comp: generator then let"
+  (hk-core-expr "[y | x <- xs, let y = x + 1]")
+  (list
+    :app
+    (list
+      :app
+      (list :var "concatMap")
+      (list
+        :lambda
+        (list (list :p-var "x"))
+        (list
+          :let
+          (list
+            (list
+              :bind
+              (list :p-var "y")
+              (list :op "+" (list :var "x") (list :int 1))))
+          (list :list (list (list :var "y"))))))
+    (list :var "xs")))
+
+(hk-test
+  "list-comp: two generators (nested concatMap)"
+  (hk-core-expr "[(x, y) | x <- xs, y <- ys]")
+  (list
+    :app
+    (list
+      :app
+      (list :var "concatMap")
+      (list
+        :lambda
+        (list (list :p-var "x"))
+        (list
+          :app
+          (list
+            :app
+            (list :var "concatMap")
+            (list
+              :lambda
+              (list (list :p-var "y"))
+              (list
+                :list
+                (list
+                  (list
+                    :tuple
+                    (list (list :var "x") (list :var "y")))))))
+          (list :var "ys"))))
+    (list :var "xs")))
+
+;; ── Pass-through cases ──
+(hk-test
+  "plain int literal unchanged"
+  (hk-core-expr "42")
+  (list :int 42))
+
+(hk-test
+  "lambda + if passes through"
+  (hk-core-expr "\\x -> if x > 0 then x else - x")
+  (list
+    :lambda
+    (list (list :p-var "x"))
+    (list
+      :if
+      (list :op ">" (list :var "x") (list :int 0))
+      (list :var "x")
+      (list :neg (list :var "x")))))
+
+(hk-test
+  "simple fun-clause (no guards/where) passes through"
+  (hk-desugar (hk-parse-top "id x = x"))
+  (hk-prog
+    (list
+      :fun-clause
+      "id"
+      (list (list :p-var "x"))
+      (list :var "x"))))
+
+(hk-test
+  "data decl passes through"
+  (hk-desugar (hk-parse-top "data Maybe a = Nothing | Just a"))
+  (hk-prog
+    (list
+      :data
+      "Maybe"
+      (list "a")
+      (list
+        (list :con-def "Nothing" (list))
+        (list :con-def "Just" (list (list :t-var "a")))))))
+
+(hk-test
+  "module header passes through, body desugared"
+  (hk-desugar
+    (hk-parse-top "module M where\nf x | x > 0 = 1\n    | otherwise = 0"))
+  (list
+    :module
+    "M"
+    nil
+    (list)
+    (list
+      (list
+        :fun-clause
+        "f"
+        (list (list :p-var "x"))
+        (list
+          :if
+          (list :op ">" (list :var "x") (list :int 0))
+          (list :int 1)
+          (list
+            :if
+            (list :var "otherwise")
+            (list :int 0)
+            (list
+              :app
+              (list :var "error")
+              (list :string "Non-exhaustive guards"))))))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/do-io.sx

@@ -0,0 +1,117 @@
+;; do-notation + stub IO monad. Desugaring is per Haskell 98 §3.14:
+;;   do { e ; ss }      = e >> do { ss }
+;;   do { p <- e ; ss } = e >>= \p -> do { ss }
+;;   do { let ds ; ss } = let ds in do { ss }
+;;   do { e }           = e
+;; The IO type is just `("IO" payload)` for now — no real side
+;; effects yet. `return`, `>>=`, `>>` are built-ins.
+
+(define
+  hk-prog-val
+  (fn
+    (src name)
+    (hk-deep-force (get (hk-eval-program (hk-core src)) name))))
+
+;; ── Single-statement do ──
+(hk-test
+  "do with a single expression"
+  (hk-eval-expr-source "do { return 5 }")
+  (list "IO" 5))
+
+(hk-test
+  "return wraps any expression"
+  (hk-eval-expr-source "return (1 + 2 * 3)")
+  (list "IO" 7))
+
+;; ── Bind threads results ──
+(hk-test
+  "single bind"
+  (hk-eval-expr-source
+    "do { x <- return 5 ; return (x + 1) }")
+  (list "IO" 6))
+
+(hk-test
+  "two binds"
+  (hk-eval-expr-source
+    "do\n  x <- return 5\n  y <- return 7\n  return (x + y)")
+  (list "IO" 12))
+
+(hk-test
+  "three binds — accumulating"
+  (hk-eval-expr-source
+    "do\n  a <- return 1\n  b <- return 2\n  c <- return 3\n  return (a + b + c)")
+  (list "IO" 6))
+
+;; ── Mixing >> and >>= ──
+(hk-test
+  ">> sequencing — last wins"
+  (hk-eval-expr-source
+    "do\n  return 1\n  return 2\n  return 3")
+  (list "IO" 3))
+
+(hk-test
+  ">> then >>= — last bind wins"
+  (hk-eval-expr-source
+    "do\n  return 99\n  x <- return 5\n  return x")
+  (list "IO" 5))
+
+;; ── do-let ──
+(hk-test
+  "do-let single binding"
+  (hk-eval-expr-source
+    "do\n  let x = 3\n  return (x * 2)")
+  (list "IO" 6))
+
+(hk-test
+  "do-let multi-bind, used after"
+  (hk-eval-expr-source
+    "do\n  let x = 4\n      y = 5\n  return (x * y)")
+  (list "IO" 20))
+
+(hk-test
+  "do-let interleaved with bind"
+  (hk-eval-expr-source
+    "do\n  x <- return 10\n  let y = x + 1\n  return (x * y)")
+  (list "IO" 110))
+
+;; ── Bind + pattern ──
+(hk-test
+  "bind to constructor pattern"
+  (hk-eval-expr-source
+    "do\n  Just x <- return (Just 7)\n  return (x + 100)")
+  (list "IO" 107))
+
+(hk-test
+  "bind to tuple pattern"
+  (hk-eval-expr-source
+    "do\n  (a, b) <- return (3, 4)\n  return (a * b)")
+  (list "IO" 12))
+
+;; ── User-defined IO functions ──
+(hk-test
+  "do inside top-level fun"
+  (hk-prog-val
+    "addM x y = do\n  a <- return x\n  b <- return y\n  return (a + b)\nresult = addM 5 6"
+    "result")
+  (list "IO" 11))
+
+(hk-test
+  "nested do"
+  (hk-eval-expr-source
+    "do\n  x <- do { y <- return 3 ; return (y + 1) }\n  return (x * 2)")
+  (list "IO" 8))
+
+;; ── (>>=) and (>>) used directly as functions ──
+(hk-test
+  ">>= used directly"
+  (hk-eval-expr-source
+    "(return 4) >>= (\\x -> return (x + 100))")
+  (list "IO" 104))
+
+(hk-test
+  ">> used directly"
+  (hk-eval-expr-source
+    "(return 1) >> (return 2)")
+  (list "IO" 2))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/eval.sx

@@ -0,0 +1,278 @@
+;; Strict evaluator tests. Each test parses, desugars, and evaluates
+;; either an expression (hk-eval-expr-source) or a full program
+;; (hk-eval-program → look up a named value).
+
+(define
+  hk-prog-val
+  (fn
+    (src name)
+    (hk-deep-force (get (hk-eval-program (hk-core src)) name))))
+
+;; ── Literals ──
+(hk-test "int literal" (hk-eval-expr-source "42") 42)
+(hk-test "float literal" (hk-eval-expr-source "3.14") 3.14)
+(hk-test "string literal" (hk-eval-expr-source "\"hi\"") "hi")
+(hk-test "char literal" (hk-eval-expr-source "'a'") "a")
+(hk-test "negative literal" (hk-eval-expr-source "- 5") -5)
+
+;; ── Arithmetic ──
+(hk-test "addition" (hk-eval-expr-source "1 + 2") 3)
+(hk-test
+  "precedence"
+  (hk-eval-expr-source "1 + 2 * 3")
+  7)
+(hk-test
+  "parens override precedence"
+  (hk-eval-expr-source "(1 + 2) * 3")
+  9)
+(hk-test
+  "subtraction left-assoc"
+  (hk-eval-expr-source "10 - 3 - 2")
+  5)
+
+;; ── Comparison + Bool ──
+(hk-test
+  "less than is True"
+  (hk-eval-expr-source "3 < 5")
+  (list "True"))
+(hk-test
+  "equality is False"
+  (hk-eval-expr-source "1 == 2")
+  (list "False"))
+(hk-test
+  "&& shortcuts"
+  (hk-eval-expr-source "(1 == 1) && (2 == 2)")
+  (list "True"))
+
+;; ── if / otherwise ──
+(hk-test
+  "if True"
+  (hk-eval-expr-source "if True then 1 else 2")
+  1)
+(hk-test
+  "if comparison branch"
+  (hk-eval-expr-source "if 5 > 3 then \"yes\" else \"no\"")
+  "yes")
+(hk-test "otherwise is True" (hk-eval-expr-source "otherwise") (list "True"))
+
+;; ── let ──
+(hk-test
+  "let single binding"
+  (hk-eval-expr-source "let x = 5 in x + 1")
+  6)
+(hk-test
+  "let two bindings"
+  (hk-eval-expr-source "let x = 1; y = 2 in x + y")
+  3)
+(hk-test
+  "let recursive: factorial 5"
+  (hk-eval-expr-source
+    "let f n = if n == 0 then 1 else n * f (n - 1) in f 5")
+  120)
+
+;; ── Lambdas ──
+(hk-test
+  "lambda apply"
+  (hk-eval-expr-source "(\\x -> x + 1) 5")
+  6)
+(hk-test
+  "lambda multi-arg"
+  (hk-eval-expr-source "(\\x y -> x * y) 3 4")
+  12)
+(hk-test
+  "lambda with constructor pattern"
+  (hk-eval-expr-source "(\\(Just x) -> x + 1) (Just 7)")
+  8)
+
+;; ── Constructors ──
+(hk-test
+  "0-arity constructor"
+  (hk-eval-expr-source "Nothing")
+  (list "Nothing"))
+(hk-test
+  "1-arity constructor applied"
+  (hk-eval-expr-source "Just 5")
+  (list "Just" 5))
+(hk-test
+  "True / False as bools"
+  (hk-eval-expr-source "True")
+  (list "True"))
+
+;; ── case ──
+(hk-test
+  "case Just"
+  (hk-eval-expr-source
+    "case Just 7 of Just x -> x ; Nothing -> 0")
+  7)
+(hk-test
+  "case Nothing"
+  (hk-eval-expr-source
+    "case Nothing of Just x -> x ; Nothing -> 99")
+  99)
+(hk-test
+  "case literal pattern"
+  (hk-eval-expr-source
+    "case 0 of 0 -> \"zero\" ; n -> \"other\"")
+  "zero")
+(hk-test
+  "case tuple"
+  (hk-eval-expr-source
+    "case (1, 2) of (a, b) -> a + b")
+  3)
+(hk-test
+  "case wildcard fallback"
+  (hk-eval-expr-source
+    "case 5 of 0 -> \"z\" ; _ -> \"nz\"")
+  "nz")
+
+;; ── List literals + cons ──
+(hk-test
+  "list literal as cons spine"
+  (hk-eval-expr-source "[1, 2, 3]")
+  (list ":" 1 (list ":" 2 (list ":" 3 (list "[]")))))
+(hk-test
+  "empty list literal"
+  (hk-eval-expr-source "[]")
+  (list "[]"))
+(hk-test
+  "cons via :"
+  (hk-eval-expr-source "1 : []")
+  (list ":" 1 (list "[]")))
+(hk-test
+  "++ concatenates lists"
+  (hk-eval-expr-source "[1, 2] ++ [3]")
+  (list ":" 1 (list ":" 2 (list ":" 3 (list "[]")))))
+
+;; ── Tuples ──
+(hk-test
+  "2-tuple"
+  (hk-eval-expr-source "(1, 2)")
+  (list "Tuple" 1 2))
+(hk-test
+  "3-tuple"
+  (hk-eval-expr-source "(\"a\", 5, True)")
+  (list "Tuple" "a" 5 (list "True")))
+
+;; ── Sections ──
+(hk-test
+  "right section (+ 1) applied"
+  (hk-eval-expr-source "(+ 1) 5")
+  6)
+(hk-test
+  "left section (10 -) applied"
+  (hk-eval-expr-source "(10 -) 4")
+  6)
+
+;; ── Multi-clause top-level functions ──
+(hk-test
+  "multi-clause: factorial"
+  (hk-prog-val
+    "fact 0 = 1\nfact n = n * fact (n - 1)\nresult = fact 6"
+    "result")
+  720)
+
+(hk-test
+  "multi-clause: list length via cons pattern"
+  (hk-prog-val
+    "len [] = 0\nlen (x:xs) = 1 + len xs\nresult = len [10, 20, 30, 40]"
+    "result")
+  4)
+
+(hk-test
+  "multi-clause: Maybe handler"
+  (hk-prog-val
+    "fromMaybe d Nothing = d\nfromMaybe _ (Just x) = x\nresult = fromMaybe 0 (Just 9)"
+    "result")
+  9)
+
+(hk-test
+  "multi-clause: Maybe with default"
+  (hk-prog-val
+    "fromMaybe d Nothing = d\nfromMaybe _ (Just x) = x\nresult = fromMaybe 0 Nothing"
+    "result")
+  0)
+
+;; ── User-defined data and matching ──
+(hk-test
+  "custom data with pattern match"
+  (hk-prog-val
+    "data Color = Red | Green | Blue\nname Red = \"red\"\nname Green = \"green\"\nname Blue = \"blue\"\nresult = name Green"
+    "result")
+  "green")
+
+(hk-test
+  "custom binary tree height"
+  (hk-prog-val
+    "data Tree = Leaf | Node Tree Tree\nh Leaf = 0\nh (Node l r) = 1 + max (h l) (h r)\nmax a b = if a > b then a else b\nresult = h (Node (Node Leaf Leaf) Leaf)"
+    "result")
+  2)
+
+;; ── Currying ──
+(hk-test
+  "partial application"
+  (hk-prog-val
+    "add x y = x + y\nadd5 = add 5\nresult = add5 7"
+    "result")
+  12)
+
+;; ── Higher-order ──
+(hk-test
+  "higher-order: function as arg"
+  (hk-prog-val
+    "twice f x = f (f x)\ninc x = x + 1\nresult = twice inc 10"
+    "result")
+  12)
+
+;; ── Error built-in ──
+(hk-test
+  "error short-circuits via if"
+  (hk-eval-expr-source
+    "if True then 1 else error \"unreachable\"")
+  1)
+
+;; ── Laziness: app args evaluate only when forced ──
+(hk-test
+  "second arg never forced"
+  (hk-eval-expr-source
+    "(\\x y -> x) 1 (error \"never\")")
+  1)
+
+(hk-test
+  "first arg never forced"
+  (hk-eval-expr-source
+    "(\\x y -> y) (error \"never\") 99")
+  99)
+
+(hk-test
+  "constructor argument is lazy under wildcard pattern"
+  (hk-eval-expr-source
+    "case Just (error \"deeply\") of Just _ -> 7 ; Nothing -> 0")
+  7)
+
+(hk-test
+  "lazy: const drops its second argument"
+  (hk-prog-val
+    "const x y = x\nresult = const 5 (error \"boom\")"
+    "result")
+  5)
+
+(hk-test
+  "lazy: head ignores tail"
+  (hk-prog-val
+    "myHead (x:_) = x\nresult = myHead (1 : (error \"tail\") : [])"
+    "result")
+  1)
+
+(hk-test
+  "lazy: Just on undefined evaluates only on force"
+  (hk-prog-val
+    "wrapped = Just (error \"oh no\")\nresult = case wrapped of Just _ -> True ; Nothing -> False"
+    "result")
+  (list "True"))
+
+;; ── not / id built-ins ──
+(hk-test "not True" (hk-eval-expr-source "not True") (list "False"))
+(hk-test "not False" (hk-eval-expr-source "not False") (list "True"))
+(hk-test "id" (hk-eval-expr-source "id 42") 42)
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/infinite.sx

@@ -0,0 +1,137 @@
+;; Infinite structures + Prelude tests. The lazy `:` operator builds
+;; cons cells with thunked head/tail so recursive list-defining
+;; functions terminate when only a finite prefix is consumed.
+
+(define
+  hk-prog-val
+  (fn
+    (src name)
+    (hk-deep-force (get (hk-eval-program (hk-core src)) name))))
+
+(define hk-as-list
+  (fn (xs)
+    (cond
+      ((and (list? xs) (= (first xs) "[]")) (list))
+      ((and (list? xs) (= (first xs) ":"))
+        (cons (nth xs 1) (hk-as-list (nth xs 2))))
+      (:else xs))))
+
+(define
+  hk-eval-list
+  (fn (src) (hk-as-list (hk-eval-expr-source src))))
+
+;; ── Prelude basics ──
+(hk-test "head of literal" (hk-eval-expr-source "head [1, 2, 3]") 1)
+(hk-test
+  "tail of literal"
+  (hk-eval-list "tail [1, 2, 3]")
+  (list 2 3))
+(hk-test "length" (hk-eval-expr-source "length [10, 20, 30, 40]") 4)
+(hk-test "length empty" (hk-eval-expr-source "length []") 0)
+(hk-test
+  "map with section"
+  (hk-eval-list "map (+ 1) [1, 2, 3]")
+  (list 2 3 4))
+(hk-test
+  "filter"
+  (hk-eval-list "filter (\\x -> x > 2) [1, 2, 3, 4, 5]")
+  (list 3 4 5))
+(hk-test
+  "drop"
+  (hk-eval-list "drop 2 [10, 20, 30, 40]")
+  (list 30 40))
+(hk-test "fst" (hk-eval-expr-source "fst (7, 9)") 7)
+(hk-test "snd" (hk-eval-expr-source "snd (7, 9)") 9)
+(hk-test
+  "zipWith"
+  (hk-eval-list "zipWith plus [1, 2, 3] [10, 20, 30]")
+  (list 11 22 33))
+
+;; ── Infinite structures ──
+(hk-test
+  "take from repeat"
+  (hk-eval-list "take 5 (repeat 7)")
+  (list 7 7 7 7 7))
+(hk-test
+  "take 0 from repeat returns empty"
+  (hk-eval-list "take 0 (repeat 7)")
+  (list))
+(hk-test
+  "take from iterate"
+  (hk-eval-list "take 5 (iterate (\\x -> x + 1) 0)")
+  (list 0 1 2 3 4))
+(hk-test
+  "iterate with multiplication"
+  (hk-eval-list "take 4 (iterate (\\x -> x * 2) 1)")
+  (list 1 2 4 8))
+(hk-test
+  "head of repeat"
+  (hk-eval-expr-source "head (repeat 99)")
+  99)
+
+;; ── Fibonacci stream ──
+(hk-test
+  "first 10 Fibonacci numbers"
+  (hk-eval-list "take 10 fibs")
+  (list 0 1 1 2 3 5 8 13 21 34))
+(hk-test
+  "fib at position 8"
+  (hk-eval-expr-source "head (drop 8 fibs)")
+  21)
+
+;; ── Building infinite structures in user code ──
+(hk-test
+  "user-defined infinite ones"
+  (hk-prog-val
+    "ones = 1 : ones\nresult = take 6 ones"
+    "result")
+  (list ":" 1 (list ":" 1 (list ":" 1 (list ":" 1 (list ":" 1 (list ":" 1 (list "[]"))))))))
+
+(hk-test
+  "user-defined nats"
+  (hk-prog-val
+    "nats = naturalsFrom 1\nnaturalsFrom n = n : naturalsFrom (n + 1)\nresult = take 5 nats"
+    "result")
+  (list ":" 1 (list ":" 2 (list ":" 3 (list ":" 4 (list ":" 5 (list "[]")))))))
+
+;; ── Range syntax ──
+(hk-test
+  "finite range [1..5]"
+  (hk-eval-list "[1..5]")
+  (list 1 2 3 4 5))
+(hk-test
+  "empty range when from > to"
+  (hk-eval-list "[10..3]")
+  (list))
+(hk-test
+  "stepped range"
+  (hk-eval-list "[1, 3..10]")
+  (list 1 3 5 7 9))
+(hk-test
+  "open range — head"
+  (hk-eval-expr-source "head [1..]")
+  1)
+(hk-test
+  "open range — drop then head"
+  (hk-eval-expr-source "head (drop 99 [1..])")
+  100)
+(hk-test
+  "open range — take 5"
+  (hk-eval-list "take 5 [10..]")
+  (list 10 11 12 13 14))
+
+;; ── Composing Prelude functions ──
+(hk-test
+  "map then filter"
+  (hk-eval-list
+    "filter (\\x -> x > 5) (map (\\x -> x * 2) [1, 2, 3, 4])")
+  (list 6 8))
+
+(hk-test
+  "sum-via-foldless"
+  (hk-prog-val
+    "mySum [] = 0\nmySum (x:xs) = x + mySum xs\nresult = mySum (take 5 (iterate (\\x -> x + 1) 1))"
+    "result")
+  15)
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/layout.sx

@@ -0,0 +1,245 @@
+;; Haskell layout-rule tests. hk-tokenizer + hk-layout produce a
+;; virtual-brace-annotated stream; these tests cover the algorithm
+;; from Haskell 98 §10.3 plus the pragmatic let/in single-line rule.
+
+;; Convenience — tokenize, run layout, strip eof, keep :type/:value.
+(define
+  hk-lay
+  (fn
+    (src)
+    (map
+      (fn (tok) {:value (get tok "value") :type (get tok "type")})
+      (filter
+        (fn (tok) (not (= (get tok "type") "eof")))
+        (hk-layout (hk-tokenize src))))))
+
+;; ── 1. Basics ──
+(hk-test
+  "empty input produces empty module { }"
+  (hk-lay "")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "single token → module open+close"
+  (hk-lay "foo")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "foo" :type "varid"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "two top-level decls get vsemi between"
+  (hk-lay "foo = 1\nbar = 2")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "foo" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value ";" :type "vsemi"}
+    {:value "bar" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 2 :type "integer"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 2. Layout keywords — do / let / where / of ──
+(hk-test
+  "do block with two stmts"
+  (hk-lay "f = do\n  x\n  y")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "do" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value ";" :type "vsemi"}
+    {:value "y" :type "varid"}
+    {:value "}" :type "vrbrace"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "single-line let ... in"
+  (hk-lay "let x = 1 in x")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "let" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value "}" :type "vrbrace"}
+    {:value "in" :type "reserved"}
+    {:value "x" :type "varid"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "where block with two bindings"
+  (hk-lay "f = g\n  where\n    g = 1\n    h = 2")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "g" :type "varid"}
+    {:value "where" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "g" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value ";" :type "vsemi"}
+    {:value "h" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 2 :type "integer"}
+    {:value "}" :type "vrbrace"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "case … of with arms"
+  (hk-lay "f x = case x of\n  Just y -> y\n  Nothing -> 0")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "x" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "case" :type "reserved"}
+    {:value "x" :type "varid"}
+    {:value "of" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "Just" :type "conid"}
+    {:value "y" :type "varid"}
+    {:value "->" :type "reservedop"}
+    {:value "y" :type "varid"}
+    {:value ";" :type "vsemi"}
+    {:value "Nothing" :type "conid"}
+    {:value "->" :type "reservedop"}
+    {:value 0 :type "integer"}
+    {:value "}" :type "vrbrace"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 3. Explicit braces disable layout ──
+(hk-test
+  "explicit braces — no implicit vlbrace/vsemi/vrbrace inside"
+  (hk-lay "do { x ; y }")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "do" :type "reserved"}
+    {:value "{" :type "lbrace"}
+    {:value "x" :type "varid"}
+    {:value ";" :type "semi"}
+    {:value "y" :type "varid"}
+    {:value "}" :type "rbrace"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 4. Dedent closes nested blocks ──
+(hk-test
+  "dedent back to module level closes do block"
+  (hk-lay "f = do\n  x\n  y\ng = 2")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "do" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value ";" :type "vsemi"}
+    {:value "y" :type "varid"}
+    {:value "}" :type "vrbrace"}
+    {:value ";" :type "vsemi"}
+    {:value "g" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 2 :type "integer"}
+    {:value "}" :type "vrbrace"}))
+
+(hk-test
+  "dedent closes inner let, emits vsemi at outer do level"
+  (hk-lay "main = do\n  let x = 1\n  print x")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "main" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "do" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "let" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value "}" :type "vrbrace"}
+    {:value ";" :type "vsemi"}
+    {:value "print" :type "varid"}
+    {:value "x" :type "varid"}
+    {:value "}" :type "vrbrace"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 5. Module header skips outer implicit open ──
+(hk-test
+  "module M where — only where opens a block"
+  (hk-lay "module M where\n  f = 1")
+  (list
+    {:value "module" :type "reserved"}
+    {:value "M" :type "conid"}
+    {:value "where" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 6. Newlines are stripped ──
+(hk-test
+  "newline tokens do not appear in output"
+  (let
+    ((toks (hk-layout (hk-tokenize "foo\nbar"))))
+    (every?
+      (fn (t) (not (= (get t "type") "newline")))
+      toks))
+  true)
+
+;; ── 7. Continuation — deeper indent does NOT emit vsemi ──
+(hk-test
+  "line continuation (deeper indent) just merges"
+  (hk-lay "foo = 1 +\n   2")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "foo" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value "+" :type "varsym"}
+    {:value 2 :type "integer"}
+    {:value "}" :type "vrbrace"}))
+
+;; ── 8. Stack closing at EOF ──
+(hk-test
+  "EOF inside nested do closes all implicit blocks"
+  (let
+    ((toks (hk-lay "main = do\n  do\n    x")))
+    (let
+      ((n (len toks)))
+      (list
+        (get (nth toks (- n 1)) "type")
+        (get (nth toks (- n 2)) "type")
+        (get (nth toks (- n 3)) "type"))))
+  (list "vrbrace" "vrbrace" "vrbrace"))
+
+;; ── 9. Qualified-newline: x at deeper col than stack top does nothing ──
+(hk-test
+  "mixed where + do"
+  (hk-lay "f = do\n    x\n  where\n    x = 1")
+  (list
+    {:value "{" :type "vlbrace"}
+    {:value "f" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value "do" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value "}" :type "vrbrace"}
+    {:value "where" :type "reserved"}
+    {:value "{" :type "vlbrace"}
+    {:value "x" :type "varid"}
+    {:value "=" :type "reservedop"}
+    {:value 1 :type "integer"}
+    {:value "}" :type "vrbrace"}
+    {:value "}" :type "vrbrace"}))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/match.sx

@@ -0,0 +1,256 @@
+;; Pattern-matcher tests. The matcher takes (pat val env) and returns
+;; an extended env dict on success, or `nil` on failure. Constructor
+;; values are tagged lists (con-name first); tuples use the "Tuple"
+;; tag; lists use chained `:` cons with `[]` nil.
+
+;; ── Atomic patterns ──
+(hk-test
+  "wildcard always matches"
+  (hk-match (list :p-wild) 42 (dict))
+  (dict))
+
+(hk-test
+  "var binds value"
+  (hk-match (list :p-var "x") 42 (dict))
+  {:x 42})
+
+(hk-test
+  "var preserves prior env"
+  (hk-match (list :p-var "y") 7 {:x 1})
+  {:x 1 :y 7})
+
+(hk-test
+  "int literal matches equal"
+  (hk-match (list :p-int 5) 5 (dict))
+  (dict))
+
+(hk-test
+  "int literal fails on mismatch"
+  (hk-match (list :p-int 5) 6 (dict))
+  nil)
+
+(hk-test
+  "negative int literal matches"
+  (hk-match (list :p-int -3) -3 (dict))
+  (dict))
+
+(hk-test
+  "string literal matches"
+  (hk-match (list :p-string "hi") "hi" (dict))
+  (dict))
+
+(hk-test
+  "string literal fails"
+  (hk-match (list :p-string "hi") "bye" (dict))
+  nil)
+
+(hk-test
+  "char literal matches"
+  (hk-match (list :p-char "a") "a" (dict))
+  (dict))
+
+;; ── Constructor patterns ──
+(hk-test
+  "0-arity con matches"
+  (hk-match
+    (list :p-con "Nothing" (list))
+    (hk-mk-con "Nothing" (list))
+    (dict))
+  (dict))
+
+(hk-test
+  "1-arity con matches and binds"
+  (hk-match
+    (list :p-con "Just" (list (list :p-var "y")))
+    (hk-mk-con "Just" (list 9))
+    (dict))
+  {:y 9})
+
+(hk-test
+  "con name mismatch fails"
+  (hk-match
+    (list :p-con "Just" (list (list :p-var "y")))
+    (hk-mk-con "Nothing" (list))
+    (dict))
+  nil)
+
+(hk-test
+  "con arity mismatch fails"
+  (hk-match
+    (list :p-con "Pair" (list (list :p-var "a") (list :p-var "b")))
+    (hk-mk-con "Pair" (list 1))
+    (dict))
+  nil)
+
+(hk-test
+  "nested con: Just (Just x)"
+  (hk-match
+    (list
+      :p-con
+      "Just"
+      (list
+        (list
+          :p-con
+          "Just"
+          (list (list :p-var "x")))))
+    (hk-mk-con "Just" (list (hk-mk-con "Just" (list 42))))
+    (dict))
+  {:x 42})
+
+;; ── Tuple patterns ──
+(hk-test
+  "2-tuple matches and binds"
+  (hk-match
+    (list
+      :p-tuple
+      (list (list :p-var "a") (list :p-var "b")))
+    (hk-mk-tuple (list 10 20))
+    (dict))
+  {:a 10 :b 20})
+
+(hk-test
+  "tuple arity mismatch fails"
+  (hk-match
+    (list
+      :p-tuple
+      (list (list :p-var "a") (list :p-var "b")))
+    (hk-mk-tuple (list 10 20 30))
+    (dict))
+  nil)
+
+;; ── List patterns ──
+(hk-test
+  "[] pattern matches empty list"
+  (hk-match (list :p-list (list)) (hk-mk-nil) (dict))
+  (dict))
+
+(hk-test
+  "[] pattern fails on non-empty"
+  (hk-match (list :p-list (list)) (hk-mk-list (list 1)) (dict))
+  nil)
+
+(hk-test
+  "[a] pattern matches singleton"
+  (hk-match
+    (list :p-list (list (list :p-var "a")))
+    (hk-mk-list (list 7))
+    (dict))
+  {:a 7})
+
+(hk-test
+  "[a, b] pattern matches pair-list and binds"
+  (hk-match
+    (list
+      :p-list
+      (list (list :p-var "a") (list :p-var "b")))
+    (hk-mk-list (list 1 2))
+    (dict))
+  {:a 1 :b 2})
+
+(hk-test
+  "[a, b] fails on too-long list"
+  (hk-match
+    (list
+      :p-list
+      (list (list :p-var "a") (list :p-var "b")))
+    (hk-mk-list (list 1 2 3))
+    (dict))
+  nil)
+
+;; Cons-style infix pattern (which the parser produces as :p-con ":")
+(hk-test
+  "cons (h:t) on non-empty list"
+  (hk-match
+    (list
+      :p-con
+      ":"
+      (list (list :p-var "h") (list :p-var "t")))
+    (hk-mk-list (list 1 2 3))
+    (dict))
+  {:h 1 :t (list ":" 2 (list ":" 3 (list "[]")))})
+
+(hk-test
+  "cons fails on empty list"
+  (hk-match
+    (list
+      :p-con
+      ":"
+      (list (list :p-var "h") (list :p-var "t")))
+    (hk-mk-nil)
+    (dict))
+  nil)
+
+;; ── as patterns ──
+(hk-test
+  "as binds whole + sub-pattern"
+  (hk-match
+    (list
+      :p-as
+      "all"
+      (list :p-con "Just" (list (list :p-var "x"))))
+    (hk-mk-con "Just" (list 99))
+    (dict))
+  {:all (list "Just" 99) :x 99})
+
+(hk-test
+  "as on wildcard binds whole"
+  (hk-match
+    (list :p-as "v" (list :p-wild))
+    "anything"
+    (dict))
+  {:v "anything"})
+
+(hk-test
+  "as fails when sub-pattern fails"
+  (hk-match
+    (list
+      :p-as
+      "n"
+      (list :p-con "Just" (list (list :p-var "x"))))
+    (hk-mk-con "Nothing" (list))
+    (dict))
+  nil)
+
+;; ── lazy ~ pattern (eager equivalent for now) ──
+(hk-test
+  "lazy pattern eager-matches its inner"
+  (hk-match
+    (list :p-lazy (list :p-var "y"))
+    42
+    (dict))
+  {:y 42})
+
+;; ── Source-driven: parse a real Haskell pattern, match a value ──
+(hk-test
+  "parsed pattern: Just x against Just 5"
+  (hk-match
+    (hk-parse-pat-source "Just x")
+    (hk-mk-con "Just" (list 5))
+    (dict))
+  {:x 5})
+
+(hk-test
+  "parsed pattern: x : xs against [10, 20, 30]"
+  (hk-match
+    (hk-parse-pat-source "x : xs")
+    (hk-mk-list (list 10 20 30))
+    (dict))
+  {:x 10 :xs (list ":" 20 (list ":" 30 (list "[]")))})
+
+(hk-test
+  "parsed pattern: (a, b) against (1, 2)"
+  (hk-match
+    (hk-parse-pat-source "(a, b)")
+    (hk-mk-tuple (list 1 2))
+    (dict))
+  {:a 1 :b 2})
+
+(hk-test
+  "parsed pattern: n@(Just x) against Just 7"
+  (hk-match
+    (hk-parse-pat-source "n@(Just x)")
+    (hk-mk-con "Just" (list 7))
+    (dict))
+  {:n (list "Just" 7) :x 7})
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parse.sx

@@ -3,60 +3,8 @@
 ;; Lightweight runner: each test checks actual vs expected with
 ;; structural (deep) equality and accumulates pass/fail counters.
 ;; Final value of this file is a summary dict with :pass :fail :fails.
-
+;; The hk-test / hk-deep=? helpers live in lib/haskell/testlib.sx
-(define
+;; and are preloaded by lib/haskell/test.sh.
-  hk-deep=?
-  (fn
-    (a b)
-    (cond
-      ((= a b) true)
-      ((and (dict? a) (dict? b))
-        (let
-          ((ak (keys a)) (bk (keys b)))
-          (if
-            (not (= (len ak) (len bk)))
-            false
-            (every?
-              (fn
-                (k)
-                (and (has-key? b k) (hk-deep=? (get a k) (get b k))))
-              ak))))
-      ((and (list? a) (list? b))
-        (if
-          (not (= (len a) (len b)))
-          false
-          (let
-            ((i 0) (ok true))
-            (define
-              hk-de-loop
-              (fn
-                ()
-                (when
-                  (and ok (< i (len a)))
-                  (do
-                    (when
-                      (not (hk-deep=? (nth a i) (nth b i)))
-                      (set! ok false))
-                    (set! i (+ i 1))
-                    (hk-de-loop)))))
-            (hk-de-loop)
-            ok)))
-      (:else false))))
-
-(define hk-test-pass 0)
-(define hk-test-fail 0)
-(define hk-test-fails (list))
-
-(define
-  hk-test
-  (fn
-    (name actual expected)
-    (if
-      (hk-deep=? actual expected)
-      (set! hk-test-pass (+ hk-test-pass 1))
-      (do
-        (set! hk-test-fail (+ hk-test-fail 1))
-        (append! hk-test-fails {:actual actual :expected expected :name name})))))
 
 ;; Convenience: tokenize and drop newline + eof tokens so tests focus
 ;; on meaningful content. Returns list of {:type :value} pairs.

lib/haskell/tests/parser-case-do.sx

@@ -0,0 +1,278 @@
+;; case-of and do-notation parser tests.
+;; Covers the minimal patterns needed to make these meaningful: var,
+;; wildcard, literal, constructor (with and without args), tuple, list.
+
+;; ── Patterns (in case arms) ──
+(hk-test
+  "wildcard pat"
+  (hk-parse "case x of _ -> 0")
+  (list
+    :case
+    (list :var "x")
+    (list (list :alt (list :p-wild) (list :int 0)))))
+
+(hk-test
+  "var pat"
+  (hk-parse "case x of y -> y")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list :alt (list :p-var "y") (list :var "y")))))
+
+(hk-test
+  "0-arity constructor pat"
+  (hk-parse "case x of\n  Nothing -> 0\n  Just y -> y")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list :alt (list :p-con "Nothing" (list)) (list :int 0))
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list :var "y")))))
+
+(hk-test
+  "int literal pat"
+  (hk-parse "case n of\n  0 -> 1\n  _ -> n")
+  (list
+    :case
+    (list :var "n")
+    (list
+      (list :alt (list :p-int 0) (list :int 1))
+      (list :alt (list :p-wild) (list :var "n")))))
+
+(hk-test
+  "string literal pat"
+  (hk-parse "case s of\n  \"hi\" -> 1\n  _ -> 0")
+  (list
+    :case
+    (list :var "s")
+    (list
+      (list :alt (list :p-string "hi") (list :int 1))
+      (list :alt (list :p-wild) (list :int 0)))))
+
+(hk-test
+  "tuple pat"
+  (hk-parse "case p of (a, b) -> a")
+  (list
+    :case
+    (list :var "p")
+    (list
+      (list
+        :alt
+        (list
+          :p-tuple
+          (list (list :p-var "a") (list :p-var "b")))
+        (list :var "a")))))
+
+(hk-test
+  "list pat"
+  (hk-parse "case xs of\n  [] -> 0\n  [a] -> a")
+  (list
+    :case
+    (list :var "xs")
+    (list
+      (list :alt (list :p-list (list)) (list :int 0))
+      (list
+        :alt
+        (list :p-list (list (list :p-var "a")))
+        (list :var "a")))))
+
+(hk-test
+  "nested constructor pat"
+  (hk-parse "case x of\n  Just (a, b) -> a\n  _ -> 0")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list
+          :p-con
+          "Just"
+          (list
+            (list
+              :p-tuple
+              (list (list :p-var "a") (list :p-var "b")))))
+        (list :var "a"))
+      (list :alt (list :p-wild) (list :int 0)))))
+
+(hk-test
+  "constructor with multiple var args"
+  (hk-parse "case t of Pair a b -> a")
+  (list
+    :case
+    (list :var "t")
+    (list
+      (list
+        :alt
+        (list
+          :p-con
+          "Pair"
+          (list (list :p-var "a") (list :p-var "b")))
+        (list :var "a")))))
+
+;; ── case-of shapes ──
+(hk-test
+  "case with explicit braces"
+  (hk-parse "case x of { Just y -> y ; Nothing -> 0 }")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list :var "y"))
+      (list :alt (list :p-con "Nothing" (list)) (list :int 0)))))
+
+(hk-test
+  "case scrutinee is a full expression"
+  (hk-parse "case f x + 1 of\n  y -> y")
+  (list
+    :case
+    (list
+      :op
+      "+"
+      (list :app (list :var "f") (list :var "x"))
+      (list :int 1))
+    (list (list :alt (list :p-var "y") (list :var "y")))))
+
+(hk-test
+  "case arm body is full expression"
+  (hk-parse "case x of\n  Just y -> y + 1")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list :op "+" (list :var "y") (list :int 1))))))
+
+;; ── do blocks ──
+(hk-test
+  "do with two expressions"
+  (hk-parse "do\n  putStrLn \"hi\"\n  return 0")
+  (list
+    :do
+    (list
+      (list
+        :do-expr
+        (list :app (list :var "putStrLn") (list :string "hi")))
+      (list
+        :do-expr
+        (list :app (list :var "return") (list :int 0))))))
+
+(hk-test
+  "do with bind"
+  (hk-parse "do\n  x <- getLine\n  putStrLn x")
+  (list
+    :do
+    (list
+      (list :do-bind (list :p-var "x") (list :var "getLine"))
+      (list
+        :do-expr
+        (list :app (list :var "putStrLn") (list :var "x"))))))
+
+(hk-test
+  "do with let"
+  (hk-parse "do\n  let y = 5\n  print y")
+  (list
+    :do
+    (list
+      (list
+        :do-let
+        (list (list :bind (list :p-var "y") (list :int 5))))
+      (list
+        :do-expr
+        (list :app (list :var "print") (list :var "y"))))))
+
+(hk-test
+  "do with multiple let bindings"
+  (hk-parse "do\n  let x = 1\n      y = 2\n  print (x + y)")
+  (list
+    :do
+    (list
+      (list
+        :do-let
+        (list
+          (list :bind (list :p-var "x") (list :int 1))
+          (list :bind (list :p-var "y") (list :int 2))))
+      (list
+        :do-expr
+        (list
+          :app
+          (list :var "print")
+          (list :op "+" (list :var "x") (list :var "y")))))))
+
+(hk-test
+  "do with bind using constructor pat"
+  (hk-parse "do\n  Just x <- getMaybe\n  return x")
+  (list
+    :do
+    (list
+      (list
+        :do-bind
+        (list :p-con "Just" (list (list :p-var "x")))
+        (list :var "getMaybe"))
+      (list
+        :do-expr
+        (list :app (list :var "return") (list :var "x"))))))
+
+(hk-test
+  "do with explicit braces"
+  (hk-parse "do { x <- a ; y <- b ; return (x + y) }")
+  (list
+    :do
+    (list
+      (list :do-bind (list :p-var "x") (list :var "a"))
+      (list :do-bind (list :p-var "y") (list :var "b"))
+      (list
+        :do-expr
+        (list
+          :app
+          (list :var "return")
+          (list :op "+" (list :var "x") (list :var "y")))))))
+
+;; ── Mixing case/do inside expressions ──
+(hk-test
+  "case inside let"
+  (hk-parse "let f = \\x -> case x of\n                 Just y -> y\n                 _ -> 0\nin f 5")
+  (list
+    :let
+    (list
+      (list
+        :bind
+        (list :p-var "f")
+        (list
+          :lambda
+          (list (list :p-var "x"))
+          (list
+            :case
+            (list :var "x")
+            (list
+              (list
+                :alt
+                (list :p-con "Just" (list (list :p-var "y")))
+                (list :var "y"))
+              (list :alt (list :p-wild) (list :int 0)))))))
+    (list :app (list :var "f") (list :int 5))))
+
+(hk-test
+  "lambda containing do"
+  (hk-parse "\\x -> do\n  y <- x\n  return y")
+  (list
+    :lambda
+    (list (list :p-var "x"))
+    (list
+      :do
+      (list
+        (list :do-bind (list :p-var "y") (list :var "x"))
+        (list
+          :do-expr
+          (list :app (list :var "return") (list :var "y")))))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-decls.sx

@@ -0,0 +1,273 @@
+;; Top-level declarations: function clauses, type signatures, data,
+;; type, newtype, fixity. Driven by hk-parse-top which produces
+;; a (:program DECLS) node.
+
+(define
+  hk-prog
+  (fn
+    (&rest decls)
+    (list :program decls)))
+
+;; ── Function clauses & pattern bindings ──
+(hk-test
+  "simple fun-clause"
+  (hk-parse-top "f x = x + 1")
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list :op "+" (list :var "x") (list :int 1)))))
+
+(hk-test
+  "nullary decl"
+  (hk-parse-top "answer = 42")
+  (hk-prog
+    (list :fun-clause "answer" (list) (list :int 42))))
+
+(hk-test
+  "multi-clause fn (separate defs for each pattern)"
+  (hk-parse-top "fact 0 = 1\nfact n = n")
+  (hk-prog
+    (list :fun-clause "fact" (list (list :p-int 0)) (list :int 1))
+    (list
+      :fun-clause
+      "fact"
+      (list (list :p-var "n"))
+      (list :var "n"))))
+
+(hk-test
+  "constructor pattern in fn args"
+  (hk-parse-top "fromJust (Just x) = x")
+  (hk-prog
+    (list
+      :fun-clause
+      "fromJust"
+      (list (list :p-con "Just" (list (list :p-var "x"))))
+      (list :var "x"))))
+
+(hk-test
+  "pattern binding at top level"
+  (hk-parse-top "(a, b) = pair")
+  (hk-prog
+    (list
+      :pat-bind
+      (list
+        :p-tuple
+        (list (list :p-var "a") (list :p-var "b")))
+      (list :var "pair"))))
+
+;; ── Type signatures ──
+(hk-test
+  "single-name sig"
+  (hk-parse-top "f :: Int -> Int")
+  (hk-prog
+    (list
+      :type-sig
+      (list "f")
+      (list :t-fun (list :t-con "Int") (list :t-con "Int")))))
+
+(hk-test
+  "multi-name sig"
+  (hk-parse-top "f, g, h :: Int -> Bool")
+  (hk-prog
+    (list
+      :type-sig
+      (list "f" "g" "h")
+      (list :t-fun (list :t-con "Int") (list :t-con "Bool")))))
+
+(hk-test
+  "sig with type application"
+  (hk-parse-top "f :: Maybe a -> a")
+  (hk-prog
+    (list
+      :type-sig
+      (list "f")
+      (list
+        :t-fun
+        (list :t-app (list :t-con "Maybe") (list :t-var "a"))
+        (list :t-var "a")))))
+
+(hk-test
+  "sig with list type"
+  (hk-parse-top "len :: [a] -> Int")
+  (hk-prog
+    (list
+      :type-sig
+      (list "len")
+      (list
+        :t-fun
+        (list :t-list (list :t-var "a"))
+        (list :t-con "Int")))))
+
+(hk-test
+  "sig with tuple and right-assoc ->"
+  (hk-parse-top "pair :: a -> b -> (a, b)")
+  (hk-prog
+    (list
+      :type-sig
+      (list "pair")
+      (list
+        :t-fun
+        (list :t-var "a")
+        (list
+          :t-fun
+          (list :t-var "b")
+          (list
+            :t-tuple
+            (list (list :t-var "a") (list :t-var "b"))))))))
+
+(hk-test
+  "sig + implementation together"
+  (hk-parse-top "id :: a -> a\nid x = x")
+  (hk-prog
+    (list
+      :type-sig
+      (list "id")
+      (list :t-fun (list :t-var "a") (list :t-var "a")))
+    (list
+      :fun-clause
+      "id"
+      (list (list :p-var "x"))
+      (list :var "x"))))
+
+;; ── data declarations ──
+(hk-test
+  "data Maybe"
+  (hk-parse-top "data Maybe a = Nothing | Just a")
+  (hk-prog
+    (list
+      :data
+      "Maybe"
+      (list "a")
+      (list
+        (list :con-def "Nothing" (list))
+        (list :con-def "Just" (list (list :t-var "a")))))))
+
+(hk-test
+  "data Either"
+  (hk-parse-top "data Either a b = Left a | Right b")
+  (hk-prog
+    (list
+      :data
+      "Either"
+      (list "a" "b")
+      (list
+        (list :con-def "Left" (list (list :t-var "a")))
+        (list :con-def "Right" (list (list :t-var "b")))))))
+
+(hk-test
+  "data with no type parameters"
+  (hk-parse-top "data Bool = True | False")
+  (hk-prog
+    (list
+      :data
+      "Bool"
+      (list)
+      (list
+        (list :con-def "True" (list))
+        (list :con-def "False" (list))))))
+
+(hk-test
+  "recursive data type"
+  (hk-parse-top "data Tree a = Leaf | Node (Tree a) a (Tree a)")
+  (hk-prog
+    (list
+      :data
+      "Tree"
+      (list "a")
+      (list
+        (list :con-def "Leaf" (list))
+        (list
+          :con-def
+          "Node"
+          (list
+            (list :t-app (list :t-con "Tree") (list :t-var "a"))
+            (list :t-var "a")
+            (list :t-app (list :t-con "Tree") (list :t-var "a"))))))))
+
+;; ── type synonyms ──
+(hk-test
+  "simple type synonym"
+  (hk-parse-top "type Name = String")
+  (hk-prog
+    (list :type-syn "Name" (list) (list :t-con "String"))))
+
+(hk-test
+  "parameterised type synonym"
+  (hk-parse-top "type Pair a = (a, a)")
+  (hk-prog
+    (list
+      :type-syn
+      "Pair"
+      (list "a")
+      (list
+        :t-tuple
+        (list (list :t-var "a") (list :t-var "a"))))))
+
+;; ── newtype ──
+(hk-test
+  "newtype"
+  (hk-parse-top "newtype Age = Age Int")
+  (hk-prog (list :newtype "Age" (list) "Age" (list :t-con "Int"))))
+
+(hk-test
+  "parameterised newtype"
+  (hk-parse-top "newtype Wrap a = Wrap a")
+  (hk-prog
+    (list :newtype "Wrap" (list "a") "Wrap" (list :t-var "a"))))
+
+;; ── fixity declarations ──
+(hk-test
+  "infixl with precedence"
+  (hk-parse-top "infixl 5 +:, -:")
+  (hk-prog (list :fixity "l" 5 (list "+:" "-:"))))
+
+(hk-test
+  "infixr"
+  (hk-parse-top "infixr 9 .")
+  (hk-prog (list :fixity "r" 9 (list "."))))
+
+(hk-test
+  "infix (non-assoc) default prec"
+  (hk-parse-top "infix ==")
+  (hk-prog (list :fixity "n" 9 (list "=="))))
+
+(hk-test
+  "fixity with backtick operator name"
+  (hk-parse-top "infixl 7 `div`")
+  (hk-prog (list :fixity "l" 7 (list "div"))))
+
+;; ── Several decls combined ──
+(hk-test
+  "mixed: data + sig + fn + type"
+  (hk-parse-top "data Maybe a = Nothing | Just a\ntype Entry = Maybe Int\nf :: Entry -> Int\nf (Just x) = x\nf Nothing = 0")
+  (hk-prog
+    (list
+      :data
+      "Maybe"
+      (list "a")
+      (list
+        (list :con-def "Nothing" (list))
+        (list :con-def "Just" (list (list :t-var "a")))))
+    (list
+      :type-syn
+      "Entry"
+      (list)
+      (list :t-app (list :t-con "Maybe") (list :t-con "Int")))
+    (list
+      :type-sig
+      (list "f")
+      (list :t-fun (list :t-con "Entry") (list :t-con "Int")))
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-con "Just" (list (list :p-var "x"))))
+      (list :var "x"))
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-con "Nothing" (list)))
+      (list :int 0))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-expr.sx

@@ -0,0 +1,258 @@
+;; Haskell expression parser tests.
+;; hk-parse tokenises, runs layout, then parses. Output is an AST
+;; whose head is a keyword tag (evaluates to its string name).
+
+;; ── 1. Literals ──
+(hk-test "integer" (hk-parse "42") (list :int 42))
+(hk-test "float" (hk-parse "3.14") (list :float 3.14))
+(hk-test "string" (hk-parse "\"hi\"") (list :string "hi"))
+(hk-test "char" (hk-parse "'a'") (list :char "a"))
+
+;; ── 2. Variables and constructors ──
+(hk-test "varid" (hk-parse "foo") (list :var "foo"))
+(hk-test "conid" (hk-parse "Nothing") (list :con "Nothing"))
+(hk-test "qvarid" (hk-parse "Data.Map.lookup") (list :var "Data.Map.lookup"))
+(hk-test "qconid" (hk-parse "Data.Map") (list :con "Data.Map"))
+
+;; ── 3. Parens / unit / tuple ──
+(hk-test "parens strip" (hk-parse "(42)") (list :int 42))
+(hk-test "unit" (hk-parse "()") (list :con "()"))
+(hk-test
+  "2-tuple"
+  (hk-parse "(1, 2)")
+  (list :tuple (list (list :int 1) (list :int 2))))
+(hk-test
+  "3-tuple"
+  (hk-parse "(x, y, z)")
+  (list
+    :tuple
+    (list (list :var "x") (list :var "y") (list :var "z"))))
+
+;; ── 4. Lists ──
+(hk-test "empty list" (hk-parse "[]") (list :list (list)))
+(hk-test
+  "singleton list"
+  (hk-parse "[1]")
+  (list :list (list (list :int 1))))
+(hk-test
+  "list of ints"
+  (hk-parse "[1, 2, 3]")
+  (list
+    :list
+    (list (list :int 1) (list :int 2) (list :int 3))))
+(hk-test
+  "range"
+  (hk-parse "[1..10]")
+  (list :range (list :int 1) (list :int 10)))
+(hk-test
+  "range with step"
+  (hk-parse "[1, 3..10]")
+  (list
+    :range-step
+    (list :int 1)
+    (list :int 3)
+    (list :int 10)))
+
+;; ── 5. Application ──
+(hk-test
+  "one-arg app"
+  (hk-parse "f x")
+  (list :app (list :var "f") (list :var "x")))
+(hk-test
+  "multi-arg app is left-assoc"
+  (hk-parse "f x y z")
+  (list
+    :app
+    (list
+      :app
+      (list :app (list :var "f") (list :var "x"))
+      (list :var "y"))
+    (list :var "z")))
+(hk-test
+  "app with con"
+  (hk-parse "Just 5")
+  (list :app (list :con "Just") (list :int 5)))
+
+;; ── 6. Infix operators ──
+(hk-test
+  "simple +"
+  (hk-parse "1 + 2")
+  (list :op "+" (list :int 1) (list :int 2)))
+(hk-test
+  "precedence: * binds tighter than +"
+  (hk-parse "1 + 2 * 3")
+  (list
+    :op
+    "+"
+    (list :int 1)
+    (list :op "*" (list :int 2) (list :int 3))))
+(hk-test
+  "- is left-assoc"
+  (hk-parse "10 - 3 - 2")
+  (list
+    :op
+    "-"
+    (list :op "-" (list :int 10) (list :int 3))
+    (list :int 2)))
+(hk-test
+  ": is right-assoc"
+  (hk-parse "a : b : c")
+  (list
+    :op
+    ":"
+    (list :var "a")
+    (list :op ":" (list :var "b") (list :var "c"))))
+(hk-test
+  "app binds tighter than op"
+  (hk-parse "f x + g y")
+  (list
+    :op
+    "+"
+    (list :app (list :var "f") (list :var "x"))
+    (list :app (list :var "g") (list :var "y"))))
+(hk-test
+  "$ is lowest precedence, right-assoc"
+  (hk-parse "f $ g x")
+  (list
+    :op
+    "$"
+    (list :var "f")
+    (list :app (list :var "g") (list :var "x"))))
+
+;; ── 7. Backticks (varid-as-operator) ──
+(hk-test
+  "backtick operator"
+  (hk-parse "x `mod` 3")
+  (list :op "mod" (list :var "x") (list :int 3)))
+
+;; ── 8. Unary negation ──
+(hk-test
+  "unary -"
+  (hk-parse "- 5")
+  (list :neg (list :int 5)))
+(hk-test
+  "unary - on application"
+  (hk-parse "- f x")
+  (list :neg (list :app (list :var "f") (list :var "x"))))
+(hk-test
+  "- n + m → (- n) + m"
+  (hk-parse "- 1 + 2")
+  (list
+    :op
+    "+"
+    (list :neg (list :int 1))
+    (list :int 2)))
+
+;; ── 9. Lambda ──
+(hk-test
+  "lambda single param"
+  (hk-parse "\\x -> x")
+  (list :lambda (list (list :p-var "x")) (list :var "x")))
+(hk-test
+  "lambda multi-param"
+  (hk-parse "\\x y -> x + y")
+  (list
+    :lambda
+    (list (list :p-var "x") (list :p-var "y"))
+    (list :op "+" (list :var "x") (list :var "y"))))
+(hk-test
+  "lambda body is full expression"
+  (hk-parse "\\f -> f 1 + f 2")
+  (list
+    :lambda
+    (list (list :p-var "f"))
+    (list
+      :op
+      "+"
+      (list :app (list :var "f") (list :int 1))
+      (list :app (list :var "f") (list :int 2)))))
+
+;; ── 10. if-then-else ──
+(hk-test
+  "if basic"
+  (hk-parse "if x then 1 else 2")
+  (list :if (list :var "x") (list :int 1) (list :int 2)))
+(hk-test
+  "if with infix cond"
+  (hk-parse "if x == 0 then y else z")
+  (list
+    :if
+    (list :op "==" (list :var "x") (list :int 0))
+    (list :var "y")
+    (list :var "z")))
+
+;; ── 11. let-in ──
+(hk-test
+  "let single binding"
+  (hk-parse "let x = 1 in x")
+  (list
+    :let
+    (list (list :bind (list :p-var "x") (list :int 1)))
+    (list :var "x")))
+(hk-test
+  "let two bindings (multi-line)"
+  (hk-parse "let x = 1\n    y = 2\nin x + y")
+  (list
+    :let
+    (list
+      (list :bind (list :p-var "x") (list :int 1))
+      (list :bind (list :p-var "y") (list :int 2)))
+    (list :op "+" (list :var "x") (list :var "y"))))
+(hk-test
+  "let with explicit braces"
+  (hk-parse "let { x = 1 ; y = 2 } in x + y")
+  (list
+    :let
+    (list
+      (list :bind (list :p-var "x") (list :int 1))
+      (list :bind (list :p-var "y") (list :int 2)))
+    (list :op "+" (list :var "x") (list :var "y"))))
+
+;; ── 12. Mixed / nesting ──
+(hk-test
+  "nested application"
+  (hk-parse "f (g x) y")
+  (list
+    :app
+    (list
+      :app
+      (list :var "f")
+      (list :app (list :var "g") (list :var "x")))
+    (list :var "y")))
+(hk-test
+  "lambda applied"
+  (hk-parse "(\\x -> x + 1) 5")
+  (list
+    :app
+    (list
+      :lambda
+      (list (list :p-var "x"))
+      (list :op "+" (list :var "x") (list :int 1)))
+    (list :int 5)))
+(hk-test
+  "lambda + if"
+  (hk-parse "\\n -> if n == 0 then 1 else n")
+  (list
+    :lambda
+    (list (list :p-var "n"))
+    (list
+      :if
+      (list :op "==" (list :var "n") (list :int 0))
+      (list :int 1)
+      (list :var "n"))))
+
+;; ── 13. Precedence corners ──
+(hk-test
+  ". is right-assoc (prec 9)"
+  (hk-parse "f . g . h")
+  (list
+    :op
+    "."
+    (list :var "f")
+    (list :op "." (list :var "g") (list :var "h"))))
+(hk-test
+  "== is non-associative (single use)"
+  (hk-parse "x == y")
+  (list :op "==" (list :var "x") (list :var "y")))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-guards-where.sx

@@ -0,0 +1,261 @@
+;; Guards and where-clauses — on fun-clauses, case alts, and
+;; let-bindings (which now also accept funclause-style LHS like
+;; `let f x = e` or `let f x | g = e | g = e`).
+
+(define
+  hk-prog
+  (fn (&rest decls) (list :program decls)))
+
+;; ── Guarded fun-clauses ──
+(hk-test
+  "simple guards (two branches)"
+  (hk-parse-top "abs x | x < 0 = - x\n      | otherwise = x")
+  (hk-prog
+    (list
+      :fun-clause
+      "abs"
+      (list (list :p-var "x"))
+      (list
+        :guarded
+        (list
+          (list
+            :guard
+            (list :op "<" (list :var "x") (list :int 0))
+            (list :neg (list :var "x")))
+          (list :guard (list :var "otherwise") (list :var "x")))))))
+
+(hk-test
+  "three-way guard"
+  (hk-parse-top "sign n | n > 0 = 1\n       | n < 0 = -1\n       | otherwise = 0")
+  (hk-prog
+    (list
+      :fun-clause
+      "sign"
+      (list (list :p-var "n"))
+      (list
+        :guarded
+        (list
+          (list
+            :guard
+            (list :op ">" (list :var "n") (list :int 0))
+            (list :int 1))
+          (list
+            :guard
+            (list :op "<" (list :var "n") (list :int 0))
+            (list :neg (list :int 1)))
+          (list
+            :guard
+            (list :var "otherwise")
+            (list :int 0)))))))
+
+(hk-test
+  "mixed: one eq clause plus one guarded clause"
+  (hk-parse-top "sign 0 = 0\nsign n | n > 0 = 1\n       | otherwise = -1")
+  (hk-prog
+    (list
+      :fun-clause
+      "sign"
+      (list (list :p-int 0))
+      (list :int 0))
+    (list
+      :fun-clause
+      "sign"
+      (list (list :p-var "n"))
+      (list
+        :guarded
+        (list
+          (list
+            :guard
+            (list :op ">" (list :var "n") (list :int 0))
+            (list :int 1))
+          (list
+            :guard
+            (list :var "otherwise")
+            (list :neg (list :int 1))))))))
+
+;; ── where on fun-clauses ──
+(hk-test
+  "where with one binding"
+  (hk-parse-top "f x = y + y\n  where y = x + 1")
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :where
+        (list :op "+" (list :var "y") (list :var "y"))
+        (list
+          (list
+            :fun-clause
+            "y"
+            (list)
+            (list :op "+" (list :var "x") (list :int 1))))))))
+
+(hk-test
+  "where with multiple bindings"
+  (hk-parse-top "f x = y * z\n  where y = x + 1\n        z = x - 1")
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :where
+        (list :op "*" (list :var "y") (list :var "z"))
+        (list
+          (list
+            :fun-clause
+            "y"
+            (list)
+            (list :op "+" (list :var "x") (list :int 1)))
+          (list
+            :fun-clause
+            "z"
+            (list)
+            (list :op "-" (list :var "x") (list :int 1))))))))
+
+(hk-test
+  "guards + where"
+  (hk-parse-top "f x | x > 0 = y\n    | otherwise = 0\n  where y = 99")
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :where
+        (list
+          :guarded
+          (list
+            (list
+              :guard
+              (list :op ">" (list :var "x") (list :int 0))
+              (list :var "y"))
+            (list
+              :guard
+              (list :var "otherwise")
+              (list :int 0))))
+        (list
+          (list :fun-clause "y" (list) (list :int 99)))))))
+
+;; ── Guards in case alts ──
+(hk-test
+  "case alt with guards"
+  (hk-parse "case x of\n  Just y | y > 0 -> y\n         | otherwise -> 0\n  Nothing -> 0")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list
+          :guarded
+          (list
+            (list
+              :guard
+              (list :op ">" (list :var "y") (list :int 0))
+              (list :var "y"))
+            (list
+              :guard
+              (list :var "otherwise")
+              (list :int 0)))))
+      (list :alt (list :p-con "Nothing" (list)) (list :int 0)))))
+
+(hk-test
+  "case alt with where"
+  (hk-parse "case x of\n  Just y -> y + z where z = 5\n  Nothing -> 0")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-con "Just" (list (list :p-var "y")))
+        (list
+          :where
+          (list :op "+" (list :var "y") (list :var "z"))
+          (list
+            (list :fun-clause "z" (list) (list :int 5)))))
+      (list :alt (list :p-con "Nothing" (list)) (list :int 0)))))
+
+;; ── let-bindings: funclause form, guards, where ──
+(hk-test
+  "let with funclause shorthand"
+  (hk-parse "let f x = x + 1 in f 5")
+  (list
+    :let
+    (list
+      (list
+        :fun-clause
+        "f"
+        (list (list :p-var "x"))
+        (list :op "+" (list :var "x") (list :int 1))))
+    (list :app (list :var "f") (list :int 5))))
+
+(hk-test
+  "let with guards"
+  (hk-parse "let f x | x > 0 = x\n        | otherwise = 0\nin f 3")
+  (list
+    :let
+    (list
+      (list
+        :fun-clause
+        "f"
+        (list (list :p-var "x"))
+        (list
+          :guarded
+          (list
+            (list
+              :guard
+              (list :op ">" (list :var "x") (list :int 0))
+              (list :var "x"))
+            (list
+              :guard
+              (list :var "otherwise")
+              (list :int 0))))))
+    (list :app (list :var "f") (list :int 3))))
+
+(hk-test
+  "let funclause + where"
+  (hk-parse "let f x = y where y = x + 1\nin f 7")
+  (list
+    :let
+    (list
+      (list
+        :fun-clause
+        "f"
+        (list (list :p-var "x"))
+        (list
+          :where
+          (list :var "y")
+          (list
+            (list
+              :fun-clause
+              "y"
+              (list)
+              (list :op "+" (list :var "x") (list :int 1)))))))
+    (list :app (list :var "f") (list :int 7))))
+
+;; ── Nested: where inside where (via recursive hk-parse-decl) ──
+(hk-test
+  "where block can contain a type signature"
+  (hk-parse-top "f x = y\n  where y :: Int\n        y = x")
+  (hk-prog
+    (list
+      :fun-clause
+      "f"
+      (list (list :p-var "x"))
+      (list
+        :where
+        (list :var "y")
+        (list
+          (list :type-sig (list "y") (list :t-con "Int"))
+          (list
+            :fun-clause
+            "y"
+            (list)
+            (list :var "x")))))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-module.sx

@@ -0,0 +1,202 @@
+;; Module header + imports. The parser switches from (:program DECLS)
+;; to (:module NAME EXPORTS IMPORTS DECLS) as soon as a module header
+;; or any `import` decl appears.
+
+;; ── Module header ──
+(hk-test
+  "simple module, no exports"
+  (hk-parse-top "module M where\n  f = 1")
+  (list
+    :module
+    "M"
+    nil
+    (list)
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "module with dotted name"
+  (hk-parse-top "module Data.Map where\nf = 1")
+  (list
+    :module
+    "Data.Map"
+    nil
+    (list)
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "module with empty export list"
+  (hk-parse-top "module M () where\nf = 1")
+  (list
+    :module
+    "M"
+    (list)
+    (list)
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "module with exports (var, tycon-all, tycon-with)"
+  (hk-parse-top "module M (f, g, Maybe(..), List(Cons, Nil)) where\nf = 1\ng = 2")
+  (list
+    :module
+    "M"
+    (list
+      (list :ent-var "f")
+      (list :ent-var "g")
+      (list :ent-all "Maybe")
+      (list :ent-with "List" (list "Cons" "Nil")))
+    (list)
+    (list
+      (list :fun-clause "f" (list) (list :int 1))
+      (list :fun-clause "g" (list) (list :int 2)))))
+
+(hk-test
+  "module export list including another module"
+  (hk-parse-top "module M (module Foo, f) where\nf = 1")
+  (list
+    :module
+    "M"
+    (list (list :ent-module "Foo") (list :ent-var "f"))
+    (list)
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "module export with operator"
+  (hk-parse-top "module M ((+:), f) where\nf = 1")
+  (list
+    :module
+    "M"
+    (list (list :ent-var "+:") (list :ent-var "f"))
+    (list)
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "empty module body"
+  (hk-parse-top "module M where")
+  (list :module "M" nil (list) (list)))
+
+;; ── Imports ──
+(hk-test
+  "plain import"
+  (hk-parse-top "import Foo")
+  (list
+    :module
+    nil
+    nil
+    (list (list :import false "Foo" nil nil))
+    (list)))
+
+(hk-test
+  "qualified import"
+  (hk-parse-top "import qualified Data.Map")
+  (list
+    :module
+    nil
+    nil
+    (list (list :import true "Data.Map" nil nil))
+    (list)))
+
+(hk-test
+  "import with alias"
+  (hk-parse-top "import Data.Map as M")
+  (list
+    :module
+    nil
+    nil
+    (list (list :import false "Data.Map" "M" nil))
+    (list)))
+
+(hk-test
+  "import with explicit list"
+  (hk-parse-top "import Foo (bar, Baz(..), Quux(X, Y))")
+  (list
+    :module
+    nil
+    nil
+    (list
+      (list
+        :import
+        false
+        "Foo"
+        nil
+        (list
+          :spec-items
+          (list
+            (list :ent-var "bar")
+            (list :ent-all "Baz")
+            (list :ent-with "Quux" (list "X" "Y"))))))
+    (list)))
+
+(hk-test
+  "import hiding"
+  (hk-parse-top "import Foo hiding (x, y)")
+  (list
+    :module
+    nil
+    nil
+    (list
+      (list
+        :import
+        false
+        "Foo"
+        nil
+        (list
+          :spec-hiding
+          (list (list :ent-var "x") (list :ent-var "y")))))
+    (list)))
+
+(hk-test
+  "qualified + alias + hiding"
+  (hk-parse-top "import qualified Data.List as L hiding (sort)")
+  (list
+    :module
+    nil
+    nil
+    (list
+      (list
+        :import
+        true
+        "Data.List"
+        "L"
+        (list :spec-hiding (list (list :ent-var "sort")))))
+    (list)))
+
+;; ── Combinations ──
+(hk-test
+  "module with multiple imports and a decl"
+  (hk-parse-top "module M where\nimport Foo\nimport qualified Bar as B\nf = 1")
+  (list
+    :module
+    "M"
+    nil
+    (list
+      (list :import false "Foo" nil nil)
+      (list :import true "Bar" "B" nil))
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "headerless file with imports"
+  (hk-parse-top "import Foo\nimport Bar (baz)\nf = 1")
+  (list
+    :module
+    nil
+    nil
+    (list
+      (list :import false "Foo" nil nil)
+      (list
+        :import
+        false
+        "Bar"
+        nil
+        (list :spec-items (list (list :ent-var "baz")))))
+    (list (list :fun-clause "f" (list) (list :int 1)))))
+
+(hk-test
+  "plain program (no header, no imports) still uses :program"
+  (hk-parse-top "f = 1\ng = 2")
+  (list
+    :program
+    (list
+      (list :fun-clause "f" (list) (list :int 1))
+      (list :fun-clause "g" (list) (list :int 2)))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-patterns.sx

@@ -0,0 +1,234 @@
+;; Full-pattern parser tests: as-patterns, lazy ~, negative literals,
+;; infix constructor patterns (`:`, any consym), lambda pattern args,
+;; and let pattern-bindings.
+
+;; ── as-patterns ──
+(hk-test
+  "as pattern, wraps constructor"
+  (hk-parse "case x of n@(Just y) -> n")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list
+          :p-as
+          "n"
+          (list :p-con "Just" (list (list :p-var "y"))))
+        (list :var "n")))))
+
+(hk-test
+  "as pattern, wraps wildcard"
+  (hk-parse "case x of all@_ -> all")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list
+        :alt
+        (list :p-as "all" (list :p-wild))
+        (list :var "all")))))
+
+(hk-test
+  "as in lambda"
+  (hk-parse "\\xs@(a : rest) -> xs")
+  (list
+    :lambda
+    (list
+      (list
+        :p-as
+        "xs"
+        (list
+          :p-con
+          ":"
+          (list (list :p-var "a") (list :p-var "rest")))))
+    (list :var "xs")))
+
+;; ── lazy patterns ──
+(hk-test
+  "lazy var"
+  (hk-parse "case x of ~y -> y")
+  (list
+    :case
+    (list :var "x")
+    (list
+      (list :alt (list :p-lazy (list :p-var "y")) (list :var "y")))))
+
+(hk-test
+  "lazy constructor"
+  (hk-parse "\\(~(Just x)) -> x")
+  (list
+    :lambda
+    (list
+      (list
+        :p-lazy
+        (list :p-con "Just" (list (list :p-var "x")))))
+    (list :var "x")))
+
+;; ── negative literal patterns ──
+(hk-test
+  "negative int pattern"
+  (hk-parse "case n of\n  -1 -> 0\n  _ -> n")
+  (list
+    :case
+    (list :var "n")
+    (list
+      (list :alt (list :p-int -1) (list :int 0))
+      (list :alt (list :p-wild) (list :var "n")))))
+
+(hk-test
+  "negative float pattern"
+  (hk-parse "case x of -0.5 -> 1")
+  (list
+    :case
+    (list :var "x")
+    (list (list :alt (list :p-float -0.5) (list :int 1)))))
+
+;; ── infix constructor patterns (`:` and any consym) ──
+(hk-test
+  "cons pattern"
+  (hk-parse "case xs of x : rest -> x")
+  (list
+    :case
+    (list :var "xs")
+    (list
+      (list
+        :alt
+        (list
+          :p-con
+          ":"
+          (list (list :p-var "x") (list :p-var "rest")))
+        (list :var "x")))))
+
+(hk-test
+  "cons is right-associative in pats"
+  (hk-parse "case xs of a : b : rest -> rest")
+  (list
+    :case
+    (list :var "xs")
+    (list
+      (list
+        :alt
+        (list
+          :p-con
+          ":"
+          (list
+            (list :p-var "a")
+            (list
+              :p-con
+              ":"
+              (list (list :p-var "b") (list :p-var "rest")))))
+        (list :var "rest")))))
+
+(hk-test
+  "consym pattern"
+  (hk-parse "case p of a :+: b -> a")
+  (list
+    :case
+    (list :var "p")
+    (list
+      (list
+        :alt
+        (list
+          :p-con
+          ":+:"
+          (list (list :p-var "a") (list :p-var "b")))
+        (list :var "a")))))
+
+;; ── lambda with pattern args ──
+(hk-test
+  "lambda with constructor pattern"
+  (hk-parse "\\(Just x) -> x")
+  (list
+    :lambda
+    (list (list :p-con "Just" (list (list :p-var "x"))))
+    (list :var "x")))
+
+(hk-test
+  "lambda with tuple pattern"
+  (hk-parse "\\(a, b) -> a + b")
+  (list
+    :lambda
+    (list
+      (list
+        :p-tuple
+        (list (list :p-var "a") (list :p-var "b"))))
+    (list :op "+" (list :var "a") (list :var "b"))))
+
+(hk-test
+  "lambda with wildcard"
+  (hk-parse "\\_ -> 42")
+  (list :lambda (list (list :p-wild)) (list :int 42)))
+
+(hk-test
+  "lambda with mixed apats"
+  (hk-parse "\\x _ (Just y) -> y")
+  (list
+    :lambda
+    (list
+      (list :p-var "x")
+      (list :p-wild)
+      (list :p-con "Just" (list (list :p-var "y"))))
+    (list :var "y")))
+
+;; ── let pattern-bindings ──
+(hk-test
+  "let tuple pattern-binding"
+  (hk-parse "let (x, y) = pair in x + y")
+  (list
+    :let
+    (list
+      (list
+        :bind
+        (list
+          :p-tuple
+          (list (list :p-var "x") (list :p-var "y")))
+        (list :var "pair")))
+    (list :op "+" (list :var "x") (list :var "y"))))
+
+(hk-test
+  "let constructor pattern-binding"
+  (hk-parse "let Just x = m in x")
+  (list
+    :let
+    (list
+      (list
+        :bind
+        (list :p-con "Just" (list (list :p-var "x")))
+        (list :var "m")))
+    (list :var "x")))
+
+(hk-test
+  "let cons pattern-binding"
+  (hk-parse "let (x : rest) = xs in x")
+  (list
+    :let
+    (list
+      (list
+        :bind
+        (list
+          :p-con
+          ":"
+          (list (list :p-var "x") (list :p-var "rest")))
+        (list :var "xs")))
+    (list :var "x")))
+
+;; ── do with constructor-pattern binds ──
+(hk-test
+  "do bind to tuple pattern"
+  (hk-parse "do\n  (a, b) <- pairs\n  return a")
+  (list
+    :do
+    (list
+      (list
+        :do-bind
+        (list
+          :p-tuple
+          (list (list :p-var "a") (list :p-var "b")))
+        (list :var "pairs"))
+      (list
+        :do-expr
+        (list :app (list :var "return") (list :var "a"))))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/parser-sect-comp.sx

@@ -0,0 +1,191 @@
+;; Operator sections and list comprehensions.
+
+;; ── Operator references (unchanged expr shape) ──
+(hk-test
+  "op as value (+)"
+  (hk-parse "(+)")
+  (list :var "+"))
+
+(hk-test
+  "op as value (-)"
+  (hk-parse "(-)")
+  (list :var "-"))
+
+(hk-test
+  "op as value (:)"
+  (hk-parse "(:)")
+  (list :var ":"))
+
+(hk-test
+  "backtick op as value"
+  (hk-parse "(`div`)")
+  (list :var "div"))
+
+;; ── Right sections (op expr) ──
+(hk-test
+  "right section (+ 5)"
+  (hk-parse "(+ 5)")
+  (list :sect-right "+" (list :int 5)))
+
+(hk-test
+  "right section (* x)"
+  (hk-parse "(* x)")
+  (list :sect-right "*" (list :var "x")))
+
+(hk-test
+  "right section with backtick op"
+  (hk-parse "(`div` 2)")
+  (list :sect-right "div" (list :int 2)))
+
+;; `-` is unary in expr position — (- 5) is negation, not a right section
+(hk-test
+  "(- 5) is negation, not a section"
+  (hk-parse "(- 5)")
+  (list :neg (list :int 5)))
+
+;; ── Left sections (expr op) ──
+(hk-test
+  "left section (5 +)"
+  (hk-parse "(5 +)")
+  (list :sect-left "+" (list :int 5)))
+
+(hk-test
+  "left section with backtick"
+  (hk-parse "(x `mod`)")
+  (list :sect-left "mod" (list :var "x")))
+
+(hk-test
+  "left section with cons (x :)"
+  (hk-parse "(x :)")
+  (list :sect-left ":" (list :var "x")))
+
+;; ── Mixed / nesting ──
+(hk-test
+  "map (+ 1) xs"
+  (hk-parse "map (+ 1) xs")
+  (list
+    :app
+    (list
+      :app
+      (list :var "map")
+      (list :sect-right "+" (list :int 1)))
+    (list :var "xs")))
+
+(hk-test
+  "filter (< 0) xs"
+  (hk-parse "filter (< 0) xs")
+  (list
+    :app
+    (list
+      :app
+      (list :var "filter")
+      (list :sect-right "<" (list :int 0)))
+    (list :var "xs")))
+
+;; ── Plain parens and tuples still work ──
+(hk-test
+  "plain parens unwrap"
+  (hk-parse "(1 + 2)")
+  (list :op "+" (list :int 1) (list :int 2)))
+
+(hk-test
+  "tuple still parses"
+  (hk-parse "(a, b, c)")
+  (list
+    :tuple
+    (list (list :var "a") (list :var "b") (list :var "c"))))
+
+;; ── List comprehensions ──
+(hk-test
+  "simple list comprehension"
+  (hk-parse "[x | x <- xs]")
+  (list
+    :list-comp
+    (list :var "x")
+    (list
+      (list :q-gen (list :p-var "x") (list :var "xs")))))
+
+(hk-test
+  "comprehension with filter"
+  (hk-parse "[x * 2 | x <- xs, x > 0]")
+  (list
+    :list-comp
+    (list :op "*" (list :var "x") (list :int 2))
+    (list
+      (list :q-gen (list :p-var "x") (list :var "xs"))
+      (list
+        :q-guard
+        (list :op ">" (list :var "x") (list :int 0))))))
+
+(hk-test
+  "comprehension with let"
+  (hk-parse "[y | x <- xs, let y = x + 1]")
+  (list
+    :list-comp
+    (list :var "y")
+    (list
+      (list :q-gen (list :p-var "x") (list :var "xs"))
+      (list
+        :q-let
+        (list
+          (list
+            :bind
+            (list :p-var "y")
+            (list :op "+" (list :var "x") (list :int 1))))))))
+
+(hk-test
+  "nested generators"
+  (hk-parse "[(x, y) | x <- xs, y <- ys]")
+  (list
+    :list-comp
+    (list :tuple (list (list :var "x") (list :var "y")))
+    (list
+      (list :q-gen (list :p-var "x") (list :var "xs"))
+      (list :q-gen (list :p-var "y") (list :var "ys")))))
+
+(hk-test
+  "comprehension with constructor pattern"
+  (hk-parse "[v | Just v <- xs]")
+  (list
+    :list-comp
+    (list :var "v")
+    (list
+      (list
+        :q-gen
+        (list :p-con "Just" (list (list :p-var "v")))
+        (list :var "xs")))))
+
+(hk-test
+  "comprehension with tuple pattern"
+  (hk-parse "[x + y | (x, y) <- pairs]")
+  (list
+    :list-comp
+    (list :op "+" (list :var "x") (list :var "y"))
+    (list
+      (list
+        :q-gen
+        (list
+          :p-tuple
+          (list (list :p-var "x") (list :p-var "y")))
+        (list :var "pairs")))))
+
+(hk-test
+  "combination: generator, let, guard"
+  (hk-parse "[z | x <- xs, let z = x * 2, z > 10]")
+  (list
+    :list-comp
+    (list :var "z")
+    (list
+      (list :q-gen (list :p-var "x") (list :var "xs"))
+      (list
+        :q-let
+        (list
+          (list
+            :bind
+            (list :p-var "z")
+            (list :op "*" (list :var "x") (list :int 2)))))
+      (list
+        :q-guard
+        (list :op ">" (list :var "z") (list :int 10))))))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/program-fib.sx

@@ -0,0 +1,45 @@
+;; fib.hs — infinite Fibonacci stream classic program.
+;;
+;; The canonical artefact lives at lib/haskell/tests/programs/fib.hs.
+;; The source is mirrored here as an SX string because the evaluator
+;; doesn't have read-file in the default env. If you change one, keep
+;; the other in sync — there's a runner-level cross-check against the
+;; expected first-15 list.
+
+(define
+  hk-prog-val
+  (fn
+    (src name)
+    (hk-deep-force (get (hk-eval-program (hk-core src)) name))))
+
+(define hk-as-list
+  (fn (xs)
+    (cond
+      ((and (list? xs) (= (first xs) "[]")) (list))
+      ((and (list? xs) (= (first xs) ":"))
+        (cons (nth xs 1) (hk-as-list (nth xs 2))))
+      (:else xs))))
+
+(define
+  hk-fib-source
+  "zipPlus (x:xs) (y:ys) = x + y : zipPlus xs ys
+zipPlus _ _ = []
+myFibs = 0 : 1 : zipPlus myFibs (tail myFibs)
+result = take 15 myFibs
+")
+
+(hk-test
+  "fib.hs — first 15 Fibonacci numbers"
+  (hk-as-list (hk-prog-val hk-fib-source "result"))
+  (list 0 1 1 2 3 5 8 13 21 34 55 89 144 233 377))
+
+;; Spot-check that the user-defined zipPlus is also reachable
+(hk-test
+  "fib.hs — zipPlus is a multi-clause user fn"
+  (hk-as-list
+    (hk-prog-val
+      (str hk-fib-source "extra = zipPlus [1, 2, 3] [10, 20, 30]\n")
+      "extra"))
+  (list 11 22 33))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/programs/fib.hs

@@ -0,0 +1,15 @@
+-- fib.hs — infinite Fibonacci stream.
+--
+-- The classic two-line definition: `fibs` is a self-referential
+-- lazy list built by zipping itself with its own tail, summing the
+-- pair at each step. Without lazy `:` (cons cell with thunked head
+-- and tail) this would diverge before producing any output; with
+-- it, `take 15 fibs` evaluates exactly as much of the spine as
+-- demanded.
+
+zipPlus (x:xs) (y:ys) = x + y : zipPlus xs ys
+zipPlus _ _ = []
+
+myFibs = 0 : 1 : zipPlus myFibs (tail myFibs)
+
+result = take 15 myFibs

lib/haskell/tests/runtime.sx

@@ -0,0 +1,127 @@
+;; Runtime constructor-registry tests. Built-ins are pre-registered
+;; when lib/haskell/runtime.sx loads; user types are registered by
+;; walking a parsed+desugared AST with hk-register-program! (or the
+;; `hk-load-source!` convenience).
+
+;; ── Pre-registered built-ins ──
+(hk-test "True is a con" (hk-is-con? "True") true)
+(hk-test "False is a con" (hk-is-con? "False") true)
+(hk-test "[] is a con" (hk-is-con? "[]") true)
+(hk-test ": (cons) is a con" (hk-is-con? ":") true)
+(hk-test "() is a con" (hk-is-con? "()") true)
+
+(hk-test "True arity 0" (hk-con-arity "True") 0)
+(hk-test ": arity 2" (hk-con-arity ":") 2)
+(hk-test "[] arity 0" (hk-con-arity "[]") 0)
+(hk-test "True type Bool" (hk-con-type "True") "Bool")
+(hk-test "False type Bool" (hk-con-type "False") "Bool")
+(hk-test ": type List" (hk-con-type ":") "List")
+(hk-test "() type Unit" (hk-con-type "()") "Unit")
+
+;; ── Unknown names ──
+(hk-test "is-con? false for varid" (hk-is-con? "foo") false)
+(hk-test "arity nil for unknown" (hk-con-arity "NotACon") nil)
+(hk-test "type nil for unknown" (hk-con-type "NotACon") nil)
+
+;; ── data MyBool = Yes | No ──
+(hk-test
+  "register simple data"
+  (do
+    (hk-load-source! "data MyBool = Yes | No")
+    (list
+      (hk-con-arity "Yes")
+      (hk-con-arity "No")
+      (hk-con-type "Yes")
+      (hk-con-type "No")))
+  (list 0 0 "MyBool" "MyBool"))
+
+;; ── data Maybe a = Nothing | Just a ──
+(hk-test
+  "register Maybe"
+  (do
+    (hk-load-source! "data Maybe a = Nothing | Just a")
+    (list
+      (hk-con-arity "Nothing")
+      (hk-con-arity "Just")
+      (hk-con-type "Nothing")
+      (hk-con-type "Just")))
+  (list 0 1 "Maybe" "Maybe"))
+
+;; ── data Either a b = Left a | Right b ──
+(hk-test
+  "register Either"
+  (do
+    (hk-load-source! "data Either a b = Left a | Right b")
+    (list
+      (hk-con-arity "Left")
+      (hk-con-arity "Right")
+      (hk-con-type "Left")
+      (hk-con-type "Right")))
+  (list 1 1 "Either" "Either"))
+
+;; ── Recursive data ──
+(hk-test
+  "register recursive Tree"
+  (do
+    (hk-load-source!
+      "data Tree a = Leaf | Node (Tree a) a (Tree a)")
+    (list
+      (hk-con-arity "Leaf")
+      (hk-con-arity "Node")
+      (hk-con-type "Leaf")
+      (hk-con-type "Node")))
+  (list 0 3 "Tree" "Tree"))
+
+;; ── newtype ──
+(hk-test
+  "register newtype"
+  (do
+    (hk-load-source! "newtype Age = MkAge Int")
+    (list
+      (hk-con-arity "MkAge")
+      (hk-con-type "MkAge")))
+  (list 1 "Age"))
+
+;; ── Multiple data decls in one program ──
+(hk-test
+  "multiple data decls"
+  (do
+    (hk-load-source!
+      "data Color = Red | Green | Blue\ndata Shape = Circle | Square\nf x = x")
+    (list
+      (hk-con-type "Red")
+      (hk-con-type "Green")
+      (hk-con-type "Blue")
+      (hk-con-type "Circle")
+      (hk-con-type "Square")))
+  (list "Color" "Color" "Color" "Shape" "Shape"))
+
+;; ── Inside a module header ──
+(hk-test
+  "register from module body"
+  (do
+    (hk-load-source!
+      "module M where\ndata Pair a = Pair a a")
+    (list
+      (hk-con-arity "Pair")
+      (hk-con-type "Pair")))
+  (list 2 "Pair"))
+
+;; ── Non-data decls are ignored ──
+(hk-test
+  "program with only fun-decl leaves registry unchanged for that name"
+  (do
+    (hk-load-source! "myFunctionNotACon x = x + 1")
+    (hk-is-con? "myFunctionNotACon"))
+  false)
+
+;; ── Re-registering overwrites (last wins) ──
+(hk-test
+  "re-registration overwrites the entry"
+  (do
+    (hk-load-source! "data Foo = Bar Int")
+    (hk-load-source! "data Foo = Bar Int Int")
+    (hk-con-arity "Bar"))
+  2)
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/haskell/tests/seq.sx

@@ -0,0 +1,85 @@
+;; seq / deepseq tests. seq is strict in its first arg (forces to
+;; WHNF) and returns the second arg unchanged. deepseq additionally
+;; forces the first arg to normal form.
+
+(define
+  hk-prog-val
+  (fn
+    (src name)
+    (hk-deep-force (get (hk-eval-program (hk-core src)) name))))
+
+(define hk-as-list
+  (fn (xs)
+    (cond
+      ((and (list? xs) (= (first xs) "[]")) (list))
+      ((and (list? xs) (= (first xs) ":"))
+        (cons (nth xs 1) (hk-as-list (nth xs 2))))
+      (:else xs))))
+
+(define
+  hk-eval-list
+  (fn (src) (hk-as-list (hk-eval-expr-source src))))
+
+;; ── seq returns its second arg ──
+(hk-test
+  "seq with primitive first arg"
+  (hk-eval-expr-source "seq 1 99")
+  99)
+
+(hk-test
+  "seq forces first arg via let"
+  (hk-eval-expr-source "let x = 1 + 2 in seq x x")
+  3)
+
+(hk-test
+  "seq second arg is whatever shape"
+  (hk-eval-expr-source "seq 0 \"hello\"")
+  "hello")
+
+;; ── seq enables previously-lazy bottom to be forced ──
+;; Without seq the let-binding `x = error …` is never forced;
+;; with seq it must be forced because seq is strict in its first
+;; argument. We don't run that error case here (it would terminate
+;; the test), but we do verify the negative — that without seq,
+;; the bottom bound is never demanded.
+(hk-test
+  "lazy let — bottom never forced when unused"
+  (hk-eval-expr-source "let x = error \"never\" in 42")
+  42)
+
+;; ── deepseq forces nested structure ──
+(hk-test
+  "deepseq with finite list"
+  (hk-eval-expr-source "deepseq [1, 2, 3] 7")
+  7)
+
+(hk-test
+  "deepseq with constructor value"
+  (hk-eval-expr-source "deepseq (Just 5) 11")
+  11)
+
+(hk-test
+  "deepseq with tuple"
+  (hk-eval-expr-source "deepseq (1, 2) 13")
+  13)
+
+;; ── seq + arithmetic ──
+(hk-test
+  "seq used inside arithmetic doesn't poison the result"
+  (hk-eval-expr-source "(seq 1 5) + (seq 2 7)")
+  12)
+
+;; ── seq in user code ──
+(hk-test
+  "seq via fun-clause"
+  (hk-prog-val
+    "f x = seq x (x + 1)\nresult = f 10"
+    "result")
+  11)
+
+(hk-test
+  "seq sequences list construction"
+  (hk-eval-list "[seq 1 10, seq 2 20]")
+  (list 10 20))
+
+{:fails hk-test-fails :pass hk-test-pass :fail hk-test-fail}

lib/lua/conformance.py

@@ -1,348 +0,0 @@
-#!/usr/bin/env python3
-"""lua-conformance — run the PUC-Rio Lua 5.1 test suite against Lua-on-SX.
-
-Walks lib/lua/lua-tests/*.lua, evaluates each via `lua-eval-ast` on a
-long-lived sx_server.exe subprocess, classifies pass/fail/timeout per file,
-and writes lib/lua/scoreboard.{json,md}.
-
-Modelled on lib/js/test262-runner.py but much simpler: each Lua test file is
-its own unit (they're self-contained assertion scripts; they pass if they
-complete without raising). No harness stub, no frontmatter, no worker pool.
-
-Usage:
-    python3 lib/lua/conformance.py
-    python3 lib/lua/conformance.py --filter locals
-    python3 lib/lua/conformance.py --per-test-timeout 3 -v
-"""
-from __future__ import annotations
-
-import argparse
-import json
-import os
-import re
-import select
-import subprocess
-import sys
-import time
-from collections import Counter
-from pathlib import Path
-
-REPO = Path(__file__).resolve().parents[2]
-SX_SERVER_PRIMARY = REPO / "hosts" / "ocaml" / "_build" / "default" / "bin" / "sx_server.exe"
-SX_SERVER_FALLBACK = Path("/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe")
-TESTS_DIR = REPO / "lib" / "lua" / "lua-tests"
-
-DEFAULT_TIMEOUT = 8.0
-
-# Files that require facilities we don't (and won't soon) support.
-# Still classified as skip rather than fail so the scoreboard stays honest.
-HARDCODED_SKIP = {
-    "all.lua":        "driver uses dofile to chain other tests",
-    "api.lua":        "requires testC (C debug library)",
-    "checktable.lua": "internal debug helpers",
-    "code.lua":       "bytecode inspection via debug library",
-    "db.lua":         "debug library",
-    "files.lua":      "io library",
-    "gc.lua":         "collectgarbage / finalisers",
-    "main.lua":       "standalone interpreter driver",
-}
-
-RX_OK_INLINE = re.compile(r"^\(ok (\d+) (.*)\)\s*$")
-RX_OK_LEN = re.compile(r"^\(ok-len (\d+) \d+\)\s*$")
-RX_ERR = re.compile(r"^\(error (\d+) (.*)\)\s*$")
-
-
-def pick_sx_server() -> Path:
-    if SX_SERVER_PRIMARY.exists():
-        return SX_SERVER_PRIMARY
-    return SX_SERVER_FALLBACK
-
-
-def sx_escape_nested(s: str) -> str:
-    """Two-level escape: (eval "(lua-eval-ast \"<src>\")").
-
-    Outer literal is consumed by `eval` then the inner literal by `lua-eval-ast`.
-    """
-    inner = (
-        s.replace("\\", "\\\\")
-        .replace('"', '\\"')
-        .replace("\n", "\\n")
-        .replace("\r", "\\r")
-        .replace("\t", "\\t")
-    )
-    return inner.replace("\\", "\\\\").replace('"', '\\"')
-
-
-def classify_error(msg: str) -> str:
-    m = msg.lower()
-    sym = re.search(r"undefined symbol:\s*\\?\"?([^\"\s)]+)", msg, re.I)
-    if sym:
-        return f"undefined symbol: {sym.group(1).strip(chr(34))}"
-    if "undefined symbol" in m:
-        return "undefined symbol"
-    if "lua: arith" in m:
-        return "arith type error"
-    if "lua-transpile" in m:
-        return "transpile: unsupported node"
-    if "lua-parse" in m:
-        return "parse error"
-    if "lua-tokenize" in m:
-        return "tokenize error"
-    if "unknown node" in m:
-        return "unknown AST node"
-    if "not yet supported" in m:
-        return "not yet supported"
-    if "nth: index out" in m or "nth:" in m:
-        return "nth index error"
-    if "timeout" in m:
-        return "timeout"
-    # Strip SX-side wrapping and trim
-    trimmed = msg.strip('"').strip()
-    return f"other: {trimmed[:80]}"
-
-
-class Session:
-    def __init__(self, sx_server: Path, timeout: float):
-        self.sx_server = sx_server
-        self.timeout = timeout
-        self.proc: subprocess.Popen | None = None
-        self._buf = b""
-        self._fd = -1
-
-    def start(self) -> None:
-        self.proc = subprocess.Popen(
-            [str(self.sx_server)],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL,
-            cwd=str(REPO),
-            bufsize=0,
-        )
-        self._fd = self.proc.stdout.fileno()
-        self._buf = b""
-        os.set_blocking(self._fd, False)
-        self._wait_for("(ready)", timeout=15.0)
-        self._run(1, '(load "lib/lua/tokenizer.sx")', 60)
-        self._run(2, '(load "lib/lua/parser.sx")', 60)
-        self._run(3, '(load "lib/lua/runtime.sx")', 60)
-        self._run(4, '(load "lib/lua/transpile.sx")', 60)
-
-    def stop(self) -> None:
-        if self.proc is None:
-            return
-        try:
-            self.proc.stdin.close()
-        except Exception:
-            pass
-        try:
-            self.proc.terminate()
-            self.proc.wait(timeout=3)
-        except Exception:
-            try:
-                self.proc.kill()
-            except Exception:
-                pass
-        self.proc = None
-
-    def _readline(self, timeout: float) -> str | None:
-        deadline = time.monotonic() + timeout
-        while True:
-            nl = self._buf.find(b"\n")
-            if nl >= 0:
-                line = self._buf[: nl + 1]
-                self._buf = self._buf[nl + 1 :]
-                return line.decode("utf-8", errors="replace")
-            remaining = deadline - time.monotonic()
-            if remaining <= 0:
-                raise TimeoutError("readline timeout")
-            try:
-                rlist, _, _ = select.select([self._fd], [], [], remaining)
-            except (OSError, ValueError):
-                return None
-            if not rlist:
-                raise TimeoutError("readline timeout")
-            try:
-                chunk = os.read(self._fd, 65536)
-            except (BlockingIOError, InterruptedError):
-                continue
-            except OSError:
-                return None
-            if not chunk:
-                if self._buf:
-                    rv = self._buf.decode("utf-8", errors="replace")
-                    self._buf = b""
-                    return rv
-                return None
-            self._buf += chunk
-
-    def _wait_for(self, token: str, timeout: float) -> None:
-        start = time.monotonic()
-        while time.monotonic() - start < timeout:
-            line = self._readline(timeout - (time.monotonic() - start))
-            if line is None:
-                raise RuntimeError("sx_server closed stdout before ready")
-            if token in line:
-                return
-        raise TimeoutError(f"timeout waiting for {token}")
-
-    def _run(self, epoch: int, cmd: str, timeout: float):
-        payload = f"(epoch {epoch})\n{cmd}\n".encode("utf-8")
-        try:
-            self.proc.stdin.write(payload)
-            self.proc.stdin.flush()
-        except (BrokenPipeError, OSError):
-            raise RuntimeError("sx_server stdin closed")
-        deadline = time.monotonic() + timeout
-        while time.monotonic() < deadline:
-            remaining = deadline - time.monotonic()
-            if remaining <= 0:
-                raise TimeoutError(f"epoch {epoch} timeout")
-            line = self._readline(remaining)
-            if line is None:
-                raise RuntimeError("sx_server closed stdout mid-epoch")
-            m = RX_OK_INLINE.match(line)
-            if m and int(m.group(1)) == epoch:
-                return "ok", m.group(2)
-            m = RX_OK_LEN.match(line)
-            if m and int(m.group(1)) == epoch:
-                val = self._readline(deadline - time.monotonic()) or ""
-                return "ok", val.rstrip("\n")
-            m = RX_ERR.match(line)
-            if m and int(m.group(1)) == epoch:
-                return "error", m.group(2)
-        raise TimeoutError(f"epoch {epoch} timeout")
-
-    def run_lua(self, epoch: int, src: str):
-        escaped = sx_escape_nested(src)
-        cmd = f'(eval "(lua-eval-ast \\"{escaped}\\")")'
-        return self._run(epoch, cmd, self.timeout)
-
-
-def main() -> int:
-    ap = argparse.ArgumentParser()
-    ap.add_argument("--per-test-timeout", type=float, default=DEFAULT_TIMEOUT)
-    ap.add_argument("--filter", type=str, default=None,
-                    help="only run tests whose filename contains this substring")
-    ap.add_argument("-v", "--verbose", action="store_true")
-    ap.add_argument("--no-scoreboard", action="store_true",
-                    help="do not write scoreboard.{json,md}")
-    args = ap.parse_args()
-
-    sx_server = pick_sx_server()
-    if not sx_server.exists():
-        print(f"ERROR: sx_server not found at {sx_server}", file=sys.stderr)
-        return 1
-    if not TESTS_DIR.exists():
-        print(f"ERROR: no tests dir at {TESTS_DIR}", file=sys.stderr)
-        return 1
-
-    tests = sorted(TESTS_DIR.glob("*.lua"))
-    if args.filter:
-        tests = [p for p in tests if args.filter in p.name]
-    if not tests:
-        print("No tests matched.", file=sys.stderr)
-        return 1
-
-    print(f"Running {len(tests)} Lua test file(s)…", file=sys.stderr)
-    session = Session(sx_server, args.per_test_timeout)
-    session.start()
-
-    results = []
-    failure_modes: Counter = Counter()
-
-    try:
-        for i, path in enumerate(tests, start=1):
-            name = path.name
-            skip_reason = HARDCODED_SKIP.get(name)
-            if skip_reason:
-                results.append({"name": name, "status": "skip", "reason": skip_reason, "ms": 0})
-                if args.verbose:
-                    print(f"  - {name}: SKIP ({skip_reason})")
-                continue
-
-            try:
-                src = path.read_text(encoding="utf-8")
-            except UnicodeDecodeError:
-                src = path.read_text(encoding="latin-1")
-            t0 = time.monotonic()
-            try:
-                kind, payload = session.run_lua(100 + i, src)
-                ms = int((time.monotonic() - t0) * 1000)
-                if kind == "ok":
-                    results.append({"name": name, "status": "pass", "reason": "", "ms": ms})
-                    if args.verbose:
-                        print(f"  + {name}: PASS ({ms}ms)")
-                else:
-                    reason = classify_error(payload)
-                    failure_modes[reason] += 1
-                    results.append({"name": name, "status": "fail", "reason": reason, "ms": ms})
-                    if args.verbose:
-                        print(f"  - {name}: FAIL — {reason}")
-            except TimeoutError:
-                ms = int((time.monotonic() - t0) * 1000)
-                failure_modes["timeout"] += 1
-                results.append({"name": name, "status": "timeout", "reason": "per-test timeout",
-                                "ms": ms})
-                if args.verbose:
-                    print(f"  - {name}: TIMEOUT ({ms}ms)")
-                # Restart after a timeout to shed any stuck state.
-                session.stop()
-                session.start()
-    finally:
-        session.stop()
-
-    n_pass = sum(1 for r in results if r["status"] == "pass")
-    n_fail = sum(1 for r in results if r["status"] == "fail")
-    n_timeout = sum(1 for r in results if r["status"] == "timeout")
-    n_skip = sum(1 for r in results if r["status"] == "skip")
-    n_total = len(results)
-    n_runnable = n_total - n_skip
-    pct = (n_pass / n_runnable * 100.0) if n_runnable else 0.0
-
-    print()
-    print(f"Lua-on-SX conformance: {n_pass}/{n_runnable} runnable pass ({pct:.1f}%)  "
-          f"fail={n_fail} timeout={n_timeout} skip={n_skip} total={n_total}")
-    if failure_modes:
-        print("Top failure modes:")
-        for mode, count in failure_modes.most_common(10):
-            print(f"  {count}x  {mode}")
-
-    if not args.no_scoreboard:
-        sb = {
-            "totals": {
-                "pass": n_pass, "fail": n_fail, "timeout": n_timeout,
-                "skip": n_skip, "total": n_total, "runnable": n_runnable,
-                "pass_rate": round(pct, 1),
-            },
-            "top_failure_modes": failure_modes.most_common(20),
-            "results": results,
-        }
-        (REPO / "lib" / "lua" / "scoreboard.json").write_text(
-            json.dumps(sb, indent=2), encoding="utf-8"
-        )
-        md = [
-            "# Lua-on-SX conformance scoreboard",
-            "",
-            f"**Pass rate:** {n_pass}/{n_runnable} runnable ({pct:.1f}%)",
-            f"fail={n_fail} timeout={n_timeout} skip={n_skip} total={n_total}",
-            "",
-            "## Top failure modes",
-            "",
-        ]
-        for mode, count in failure_modes.most_common(10):
-            md.append(f"- **{count}x** {mode}")
-        md.extend(["", "## Per-test results", "",
-                   "| Test | Status | Reason | ms |",
-                   "|---|---|---|---:|"])
-        for r in results:
-            reason = r["reason"] or "-"
-            md.append(f"| {r['name']} | {r['status']} | {reason} | {r['ms']} |")
-        (REPO / "lib" / "lua" / "scoreboard.md").write_text(
-            "\n".join(md) + "\n", encoding="utf-8"
-        )
-
-    return 0 if (n_fail == 0 and n_timeout == 0) else 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

lib/lua/conformance.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Lua-on-SX conformance runner — walks lib/lua/lua-tests/*.lua, runs each via
-# `lua-eval-ast` on a long-lived sx_server.exe subprocess, classifies
-# pass/fail/timeout, and writes lib/lua/scoreboard.{json,md}.
-#
-# Usage:
-#   bash lib/lua/conformance.sh               # full suite
-#   bash lib/lua/conformance.sh --filter sort # filter by filename substring
-#   bash lib/lua/conformance.sh -v            # per-file verbose
-
-set -uo pipefail
-cd "$(git rev-parse --show-toplevel)"
-exec python3 lib/lua/conformance.py "$@"

lib/lua/lua-tests/README

@@ -1,41 +0,0 @@
-This tarball contains the official test scripts for Lua 5.1.
-Unlike Lua itself, these tests do not aim portability, small footprint,
-or easy of use. (Their main goal is to try to crash Lua.) They are not
-intended for general use. You are wellcome to use them, but expect to
-have to "dirt your hands".
-
-The tarball should expand in the following contents:
-  - several .lua scripts with the tests
-  - a main "all.lua" Lua script that invokes all the other scripts
-  - a subdirectory "libs" with an empty subdirectory "libs/P1",
-    to be used by the scripts
-  - a subdirectory "etc" with some extra files
-
-To run the tests, do as follows:
-
-- go to the test directory
-
-- set LUA_PATH to "?;./?.lua" (or, better yet, set LUA_PATH to "./?.lua;;"
-  and LUA_INIT to "package.path = '?;'..package.path")
-
-- run "lua all.lua"
-
-
---------------------------------------------
-Internal tests
---------------------------------------------
-
-Some tests need a special library, "testC", that gives access to
-several internal structures in Lua.
-This library is only available when Lua is compiled in debug mode.
-The scripts automatically detect its absence and skip those tests.
-
-If you want to run these tests, move etc/ltests.c and etc/ltests.h to
-the directory with the source Lua files, and recompile Lua with
-the option -DLUA_USER_H='"ltests.h"' (or its equivalent to define
-LUA_USER_H as the string "ltests.h", including the quotes). This
-option not only adds the testC library, but it adds several other
-internal tests as well. After the recompilation, run the tests
-as before.
-
-

lib/lua/lua-tests/all.lua

@@ -1,137 +0,0 @@
-#!../lua
-
-math.randomseed(0)
-
-collectgarbage("setstepmul", 180)
-collectgarbage("setpause", 190)
-
-
---[=[
-  example of a long [comment],
-  [[spanning several [lines]]]
-
-]=]
-
-print("current path:\n  " .. string.gsub(package.path, ";", "\n  "))
-
-
-local msgs = {}
-function Message (m)
-  print(m)
-  msgs[#msgs+1] = string.sub(m, 3, -3)
-end
-
-
-local c = os.clock()
-
-assert(os.setlocale"C")
-
-local T,print,gcinfo,format,write,assert,type =
-      T,print,gcinfo,string.format,io.write,assert,type
-
-local function formatmem (m)
-  if m < 1024 then return m
-  else
-    m = m/1024 - m/1024%1
-    if m < 1024 then return m.."K"
-    else
-      m = m/1024 - m/1024%1
-      return m.."M"
-    end
-  end
-end
-
-local showmem = function ()
-  if not T then
-    print(format("    ---- total memory: %s ----\n", formatmem(gcinfo())))
-  else
-    T.checkmemory()
-    local a,b,c = T.totalmem()
-    local d,e = gcinfo()
-    print(format(
-  "\n    ---- total memory: %s (%dK), max use: %s,  blocks: %d\n",
-                        formatmem(a),  d,      formatmem(c),           b))
-  end
-end
-
-
---
--- redefine dofile to run files through dump/undump
---
-dofile = function (n)
-  showmem()
-  local f = assert(loadfile(n))
-  local b = string.dump(f)
-  f = assert(loadstring(b))
-  return f()
-end
-
-dofile('main.lua')
-
-do
-  local u = newproxy(true)
-  local newproxy, stderr = newproxy, io.stderr
-  getmetatable(u).__gc = function (o)
-    stderr:write'.'
-    newproxy(o)
-  end
-end
-
-local f = assert(loadfile('gc.lua'))
-f()
-dofile('db.lua')
-assert(dofile('calls.lua') == deep and deep)
-dofile('strings.lua')
-dofile('literals.lua')
-assert(dofile('attrib.lua') == 27)
-assert(dofile('locals.lua') == 5)
-dofile('constructs.lua')
-dofile('code.lua')
-do
-  local f = coroutine.wrap(assert(loadfile('big.lua')))
-  assert(f() == 'b')
-  assert(f() == 'a')
-end
-dofile('nextvar.lua')
-dofile('pm.lua')
-dofile('api.lua')
-assert(dofile('events.lua') == 12)
-dofile('vararg.lua')
-dofile('closure.lua')
-dofile('errors.lua')
-dofile('math.lua')
-dofile('sort.lua')
-assert(dofile('verybig.lua') == 10); collectgarbage()
-dofile('files.lua')
-
-if #msgs > 0 then
-  print("\ntests not performed:")
-  for i=1,#msgs do
-    print(msgs[i])
-  end
-  print()
-end
-
-print("final OK !!!")
-print('cleaning all!!!!')
-
-debug.sethook(function (a) assert(type(a) == 'string') end, "cr")
-
-local _G, collectgarbage, showmem, print, format, clock =
-      _G, collectgarbage, showmem, print, format, os.clock
-
-local a={}
-for n in pairs(_G) do a[n] = 1 end
-a.tostring = nil
-a.___Glob = nil
-for n in pairs(a) do _G[n] = nil end
-
-a = nil
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage();showmem()
-
-print(format("\n\ntotal time: %.2f\n", clock()-c))

lib/lua/lua-tests/api.lua

@@ -1,711 +0,0 @@
-
-if T==nil then
-  (Message or print)('\a\n >>> testC not active: skipping API tests <<<\n\a')
-  return
-end
-
-
-
-function tcheck (t1, t2)
-  table.remove(t1, 1)  -- remove code
-  assert(table.getn(t1) == table.getn(t2))
-  for i=1,table.getn(t1) do assert(t1[i] == t2[i]) end
-end
-
-function pack(...) return arg end
-
-
-print('testing C API')
-
--- testing allignment
-a = T.d2s(12458954321123)
-assert(string.len(a) == 8)   -- sizeof(double)
-assert(T.s2d(a) == 12458954321123)
-
-a,b,c = T.testC("pushnum 1; pushnum 2; pushnum 3; return 2")
-assert(a == 2 and b == 3 and not c)
-
--- test that all trues are equal
-a,b,c = T.testC("pushbool 1; pushbool 2; pushbool 0; return 3")
-assert(a == b and a == true and c == false)
-a,b,c = T.testC"pushbool 0; pushbool 10; pushnil;\
-                      tobool -3; tobool -3; tobool -3; return 3"
-assert(a==0 and b==1 and c==0)
-
-
-a,b,c = T.testC("gettop; return 2", 10, 20, 30, 40)
-assert(a == 40 and b == 5 and not c)
-
-t = pack(T.testC("settop 5; gettop; return .", 2, 3))
-tcheck(t, {n=4,2,3})
-
-t = pack(T.testC("settop 0; settop 15; return 10", 3, 1, 23))
-assert(t.n == 10 and t[1] == nil and t[10] == nil)
-
-t = pack(T.testC("remove -2; gettop; return .", 2, 3, 4))
-tcheck(t, {n=2,2,4})
-
-t = pack(T.testC("insert -1; gettop; return .", 2, 3))
-tcheck(t, {n=2,2,3})
-
-t = pack(T.testC("insert 3; gettop; return .", 2, 3, 4, 5))
-tcheck(t, {n=4,2,5,3,4})
-
-t = pack(T.testC("replace 2; gettop; return .", 2, 3, 4, 5))
-tcheck(t, {n=3,5,3,4})
-
-t = pack(T.testC("replace -2; gettop; return .", 2, 3, 4, 5))
-tcheck(t, {n=3,2,3,5})
-
-t = pack(T.testC("remove 3; gettop; return .", 2, 3, 4, 5))
-tcheck(t, {n=3,2,4,5})
-
-t = pack(T.testC("insert 3; pushvalue 3; remove 3; pushvalue 2; remove 2; \
-                  insert 2; pushvalue 1; remove 1; insert 1; \
-      insert -2; pushvalue -2; remove -3; gettop; return .",
-      2, 3, 4, 5, 10, 40, 90))
-tcheck(t, {n=7,2,3,4,5,10,40,90})
-
-t = pack(T.testC("concat 5; gettop; return .", "alo", 2, 3, "joao", 12))
-tcheck(t, {n=1,"alo23joao12"})
-
--- testing MULTRET
-t = pack(T.testC("rawcall 2,-1; gettop; return .",
-     function (a,b) return 1,2,3,4,a,b end, "alo", "joao"))
-tcheck(t, {n=6,1,2,3,4,"alo", "joao"})
-
-do  -- test returning more results than fit in the caller stack
-  local a = {}
-  for i=1,1000 do a[i] = true end; a[999] = 10
-  local b = T.testC([[call 1 -1; pop 1; tostring -1; return 1]], unpack, a)
-  assert(b == "10")
-end
-
-
--- testing lessthan
-assert(T.testC("lessthan 2 5, return 1", 3, 2, 2, 4, 2, 2))
-assert(T.testC("lessthan 5 2, return 1", 4, 2, 2, 3, 2, 2))
-assert(not T.testC("lessthan 2 -3, return 1", "4", "2", "2", "3", "2", "2"))
-assert(not T.testC("lessthan -3 2, return 1", "3", "2", "2", "4", "2", "2"))
-
-local b = {__lt = function (a,b) return a[1] < b[1] end}
-local a1,a3,a4 = setmetatable({1}, b),
-                 setmetatable({3}, b),
-                 setmetatable({4}, b)
-assert(T.testC("lessthan 2 5, return 1", a3, 2, 2, a4, 2, 2))
-assert(T.testC("lessthan 5 -6, return 1", a4, 2, 2, a3, 2, 2))
-a,b = T.testC("lessthan 5 -6, return 2", a1, 2, 2, a3, 2, 20)
-assert(a == 20 and b == false)
-
-
--- testing lua_is
-
-function count (x, n)
-  n = n or 2
-  local prog = [[
-    isnumber %d;
-    isstring %d;
-    isfunction %d;
-    iscfunction %d;
-    istable %d;
-    isuserdata %d;
-    isnil %d;
-    isnull %d;
-    return 8
-  ]]
-  prog = string.format(prog, n, n, n, n, n, n, n, n)
-  local a,b,c,d,e,f,g,h = T.testC(prog, x)
-  return a+b+c+d+e+f+g+(100*h)
-end
-
-assert(count(3) == 2)
-assert(count('alo') == 1)
-assert(count('32') == 2)
-assert(count({}) == 1)
-assert(count(print) == 2)
-assert(count(function () end) == 1)
-assert(count(nil) == 1)
-assert(count(io.stdin) == 1)
-assert(count(nil, 15) == 100)
-
--- testing lua_to...
-
-function to (s, x, n)
-  n = n or 2
-  return T.testC(string.format("%s %d; return 1", s, n), x)
-end
-
-assert(to("tostring", {}) == nil)
-assert(to("tostring", "alo") == "alo")
-assert(to("tostring", 12) == "12")
-assert(to("tostring", 12, 3) == nil)
-assert(to("objsize", {}) == 0)
-assert(to("objsize", "alo\0\0a") == 6)
-assert(to("objsize", T.newuserdata(0)) == 0)
-assert(to("objsize", T.newuserdata(101)) == 101)
-assert(to("objsize", 12) == 2)
-assert(to("objsize", 12, 3) == 0)
-assert(to("tonumber", {}) == 0)
-assert(to("tonumber", "12") == 12)
-assert(to("tonumber", "s2") == 0)
-assert(to("tonumber", 1, 20) == 0)
-a = to("tocfunction", math.deg)
-assert(a(3) == math.deg(3) and a ~= math.deg)
-
-
--- testing errors
-
-a = T.testC([[
-  loadstring 2; call 0,1;
-  pushvalue 3; insert -2; call 1, 1;
-  call 0, 0;
-  return 1
-]], "x=150", function (a) assert(a==nil); return 3 end)
-
-assert(type(a) == 'string' and x == 150)
-
-function check3(p, ...)
-  assert(arg.n == 3)
-  assert(string.find(arg[3], p))
-end
-check3(":1:", T.testC("loadstring 2; gettop; return .", "x="))
-check3("cannot read", T.testC("loadfile 2; gettop; return .", "."))
-check3("cannot open xxxx", T.testC("loadfile 2; gettop; return .", "xxxx"))
-
--- testing table access
-
-a = {x=0, y=12}
-x, y = T.testC("gettable 2; pushvalue 4; gettable 2; return 2",
-                a, 3, "y", 4, "x")
-assert(x == 0 and y == 12)
-T.testC("settable -5", a, 3, 4, "x", 15)
-assert(a.x == 15)
-a[a] = print
-x = T.testC("gettable 2; return 1", a)  -- table and key are the same object!
-assert(x == print)
-T.testC("settable 2", a, "x")    -- table and key are the same object!
-assert(a[a] == "x")
-
-b = setmetatable({p = a}, {})
-getmetatable(b).__index = function (t, i) return t.p[i] end
-k, x = T.testC("gettable 3, return 2", 4, b, 20, 35, "x")
-assert(x == 15 and k == 35)
-getmetatable(b).__index = function (t, i) return a[i] end
-getmetatable(b).__newindex = function (t, i,v ) a[i] = v end
-y = T.testC("insert 2; gettable -5; return 1", 2, 3, 4, "y", b)
-assert(y == 12)
-k = T.testC("settable -5, return 1", b, 3, 4, "x", 16)
-assert(a.x == 16 and k == 4)
-a[b] = 'xuxu'
-y = T.testC("gettable 2, return 1", b)
-assert(y == 'xuxu')
-T.testC("settable 2", b, 19)
-assert(a[b] == 19)
-
--- testing next
-a = {}
-t = pack(T.testC("next; gettop; return .", a, nil))
-tcheck(t, {n=1,a})
-a = {a=3}
-t = pack(T.testC("next; gettop; return .", a, nil))
-tcheck(t, {n=3,a,'a',3})
-t = pack(T.testC("next; pop 1; next; gettop; return .", a, nil))
-tcheck(t, {n=1,a})
-
-
-
--- testing upvalues
-
-do
-  local A = T.testC[[ pushnum 10; pushnum 20; pushcclosure 2; return 1]]
-  t, b, c = A([[pushvalue U0; pushvalue U1; pushvalue U2; return 3]])
-  assert(b == 10 and c == 20 and type(t) == 'table')
-  a, b = A([[tostring U3; tonumber U4; return 2]])
-  assert(a == nil and b == 0)
-  A([[pushnum 100; pushnum 200; replace U2; replace U1]])
-  b, c = A([[pushvalue U1; pushvalue U2; return 2]])
-  assert(b == 100 and c == 200)
-  A([[replace U2; replace U1]], {x=1}, {x=2})
-  b, c = A([[pushvalue U1; pushvalue U2; return 2]])
-  assert(b.x == 1 and c.x == 2)
-  T.checkmemory()
-end
-
-local f = T.testC[[ pushnum 10; pushnum 20; pushcclosure 2; return 1]]
-assert(T.upvalue(f, 1) == 10 and
-       T.upvalue(f, 2) == 20 and
-       T.upvalue(f, 3) == nil)
-T.upvalue(f, 2, "xuxu")
-assert(T.upvalue(f, 2) == "xuxu")
-
-
--- testing environments
-
-assert(T.testC"pushvalue G; return 1" == _G)
-assert(T.testC"pushvalue E; return 1" == _G)
-local a = {}
-T.testC("replace E; return 1", a)
-assert(T.testC"pushvalue G; return 1" == _G)
-assert(T.testC"pushvalue E; return 1" == a)
-assert(debug.getfenv(T.testC) == a)
-assert(debug.getfenv(T.upvalue) == _G)
--- userdata inherit environment
-local u = T.testC"newuserdata 0; return 1"
-assert(debug.getfenv(u) == a)
--- functions inherit environment
-u = T.testC"pushcclosure 0; return 1"
-assert(debug.getfenv(u) == a)
-debug.setfenv(T.testC, _G)
-assert(T.testC"pushvalue E; return 1" == _G)
-
-local b = newproxy()
-assert(debug.getfenv(b) == _G)
-assert(debug.setfenv(b, a))
-assert(debug.getfenv(b) == a)
-
-
-
--- testing locks (refs)
-
--- reuse of references
-local i = T.ref{}
-T.unref(i)
-assert(T.ref{} == i)
-
-Arr = {}
-Lim = 100
-for i=1,Lim do   -- lock many objects
-  Arr[i] = T.ref({})
-end
-
-assert(T.ref(nil) == -1 and T.getref(-1) == nil)
-T.unref(-1); T.unref(-1)
-
-for i=1,Lim do   -- unlock all them
-  T.unref(Arr[i])
-end
-
-function printlocks ()
-  local n = T.testC("gettable R; return 1", "n")
-  print("n", n)
-  for i=0,n do
-    print(i, T.testC("gettable R; return 1", i))
-  end
-end
-
-
-for i=1,Lim do   -- lock many objects
-  Arr[i] = T.ref({})
-end
-
-for i=1,Lim,2 do   -- unlock half of them
-  T.unref(Arr[i])
-end
-
-assert(type(T.getref(Arr[2])) == 'table')
-
-
-assert(T.getref(-1) == nil)
-
-
-a = T.ref({})
-
-collectgarbage()
-
-assert(type(T.getref(a)) == 'table')
-
-
--- colect in cl the `val' of all collected userdata
-tt = {}
-cl = {n=0}
-A = nil; B = nil
-local F
-F = function (x)
-  local udval = T.udataval(x)
-  table.insert(cl, udval)
-  local d = T.newuserdata(100)   -- cria lixo
-  d = nil
-  assert(debug.getmetatable(x).__gc == F)
-  loadstring("table.insert({}, {})")()   -- cria mais lixo
-  collectgarbage()   -- forca coleta de lixo durante coleta!
-  assert(debug.getmetatable(x).__gc == F)   -- coleta anterior nao melou isso?
-  local dummy = {}    -- cria lixo durante coleta
-  if A ~= nil then
-    assert(type(A) == "userdata")
-    assert(T.udataval(A) == B)
-    debug.getmetatable(A)    -- just acess it
-  end
-  A = x   -- ressucita userdata
-  B = udval
-  return 1,2,3
-end
-tt.__gc = F
-
--- test whether udate collection frees memory in the right time
-do
-  collectgarbage();
-  collectgarbage();
-  local x = collectgarbage("count");
-  local a = T.newuserdata(5001)
-  assert(T.testC("objsize 2; return 1", a) == 5001)
-  assert(collectgarbage("count") >= x+4) 
-  a = nil
-  collectgarbage();
-  assert(collectgarbage("count") <= x+1)
-  -- udata without finalizer
-  x = collectgarbage("count")
-  collectgarbage("stop")
-  for i=1,1000 do newproxy(false) end
-  assert(collectgarbage("count") > x+10)
-  collectgarbage()
-  assert(collectgarbage("count") <= x+1)
-  -- udata with finalizer
-  x = collectgarbage("count")
-  collectgarbage()
-  collectgarbage("stop")
-  a = newproxy(true)
-  getmetatable(a).__gc = function () end
-  for i=1,1000 do newproxy(a) end
-  assert(collectgarbage("count") >= x+10)
-  collectgarbage()  -- this collection only calls TM, without freeing memory
-  assert(collectgarbage("count") >= x+10)
-  collectgarbage()  -- now frees memory
-  assert(collectgarbage("count") <= x+1)
-end
-
-
-collectgarbage("stop")
-
--- create 3 userdatas with tag `tt'
-a = T.newuserdata(0); debug.setmetatable(a, tt); na = T.udataval(a)
-b = T.newuserdata(0); debug.setmetatable(b, tt); nb = T.udataval(b)
-c = T.newuserdata(0); debug.setmetatable(c, tt); nc = T.udataval(c)
-
--- create userdata without meta table
-x = T.newuserdata(4)
-y = T.newuserdata(0)
-
-assert(debug.getmetatable(x) == nil and debug.getmetatable(y) == nil)
-
-d=T.ref(a);
-e=T.ref(b);
-f=T.ref(c);
-t = {T.getref(d), T.getref(e), T.getref(f)}
-assert(t[1] == a and t[2] == b and t[3] == c)
-
-t=nil; a=nil; c=nil;
-T.unref(e); T.unref(f)
-
-collectgarbage()
-
--- check that unref objects have been collected
-assert(table.getn(cl) == 1 and cl[1] == nc)
-
-x = T.getref(d)
-assert(type(x) == 'userdata' and debug.getmetatable(x) == tt)
-x =nil
-tt.b = b  -- create cycle
-tt=nil    -- frees tt for GC
-A = nil
-b = nil
-T.unref(d);
-n5 = T.newuserdata(0)
-debug.setmetatable(n5, {__gc=F})
-n5 = T.udataval(n5)
-collectgarbage()
-assert(table.getn(cl) == 4)
--- check order of collection
-assert(cl[2] == n5 and cl[3] == nb and cl[4] == na)
-
-
-a, na = {}, {}
-for i=30,1,-1 do
-  a[i] = T.newuserdata(0)
-  debug.setmetatable(a[i], {__gc=F})
-  na[i] = T.udataval(a[i])
-end
-cl = {}
-a = nil; collectgarbage()
-assert(table.getn(cl) == 30)
-for i=1,30 do assert(cl[i] == na[i]) end
-na = nil
-
-
-for i=2,Lim,2 do   -- unlock the other half
-  T.unref(Arr[i])
-end
-
-x = T.newuserdata(41); debug.setmetatable(x, {__gc=F})
-assert(T.testC("objsize 2; return 1", x) == 41)
-cl = {}
-a = {[x] = 1}
-x = T.udataval(x)
-collectgarbage()
--- old `x' cannot be collected (`a' still uses it)
-assert(table.getn(cl) == 0)
-for n in pairs(a) do a[n] = nil end
-collectgarbage()
-assert(table.getn(cl) == 1 and cl[1] == x)   -- old `x' must be collected
-
--- testing lua_equal
-assert(T.testC("equal 2 4; return 1", print, 1, print, 20))
-assert(T.testC("equal 3 2; return 1", 'alo', "alo"))
-assert(T.testC("equal 2 3; return 1", nil, nil))
-assert(not T.testC("equal 2 3; return 1", {}, {}))
-assert(not T.testC("equal 2 3; return 1"))
-assert(not T.testC("equal 2 3; return 1", 3))
-
--- testing lua_equal with fallbacks
-do
-  local map = {}
-  local t = {__eq = function (a,b) return map[a] == map[b] end}
-  local function f(x)
-    local u = T.newuserdata(0)
-    debug.setmetatable(u, t)
-    map[u] = x
-    return u
-  end
-  assert(f(10) == f(10))
-  assert(f(10) ~= f(11))
-  assert(T.testC("equal 2 3; return 1", f(10), f(10)))
-  assert(not T.testC("equal 2 3; return 1", f(10), f(20)))
-  t.__eq = nil
-  assert(f(10) ~= f(10))
-end
-
-print'+'
-
-
-
--------------------------------------------------------------------------
-do   -- testing errors during GC
-  local a = {}
-  for i=1,20 do
-    a[i] = T.newuserdata(i)   -- creates several udata
-  end
-  for i=1,20,2 do   -- mark half of them to raise error during GC
-    debug.setmetatable(a[i], {__gc = function (x) error("error inside gc") end})
-  end
-  for i=2,20,2 do   -- mark the other half to count and to create more garbage
-    debug.setmetatable(a[i], {__gc = function (x) loadstring("A=A+1")() end})
-  end
-  _G.A = 0
-  a = 0
-  while 1 do
-  if xpcall(collectgarbage, function (s) a=a+1 end) then
-    break   -- stop if no more errors
-  end
-  end
-  assert(a == 10)  -- number of errors
-  assert(A == 10)  -- number of normal collections
-end
--------------------------------------------------------------------------
--- test for userdata vals
-do
-  local a = {}; local lim = 30
-  for i=0,lim do a[i] = T.pushuserdata(i) end
-  for i=0,lim do assert(T.udataval(a[i]) == i) end
-  for i=0,lim do assert(T.pushuserdata(i) == a[i]) end
-  for i=0,lim do a[a[i]] = i end
-  for i=0,lim do a[T.pushuserdata(i)] = i end
-  assert(type(tostring(a[1])) == "string")
-end
-
-
--------------------------------------------------------------------------
--- testing multiple states
-T.closestate(T.newstate());
-L1 = T.newstate()
-assert(L1)
-assert(pack(T.doremote(L1, "function f () return 'alo', 3 end; f()")).n == 0)
-
-a, b = T.doremote(L1, "return f()")
-assert(a == 'alo' and b == '3')
-
-T.doremote(L1, "_ERRORMESSAGE = nil")
--- error: `sin' is not defined
-a, b = T.doremote(L1, "return sin(1)")
-assert(a == nil and b == 2)   -- 2 == run-time error
-
--- error: syntax error
-a, b, c = T.doremote(L1, "return a+")
-assert(a == nil and b == 3 and type(c) == "string")   -- 3 == syntax error
-
-T.loadlib(L1)
-a, b = T.doremote(L1, [[
-  a = strlibopen()
-  a = packageopen()
-  a = baselibopen(); assert(a == _G and require("_G") == a)
-  a = iolibopen(); assert(type(a.read) == "function")
-  assert(require("io") == a)
-  a = tablibopen(); assert(type(a.insert) == "function")
-  a = dblibopen(); assert(type(a.getlocal) == "function")
-  a = mathlibopen(); assert(type(a.sin) == "function")
-  return string.sub('okinama', 1, 2)
-]])
-assert(a == "ok")
-
-T.closestate(L1);
-
-L1 = T.newstate()
-T.loadlib(L1)
-T.doremote(L1, "a = {}")
-T.testC(L1, [[pushstring a; gettable G; pushstring x; pushnum 1;
-             settable -3]])
-assert(T.doremote(L1, "return a.x") == "1")
-
-T.closestate(L1)
-
-L1 = nil
-
-print('+')
-
--------------------------------------------------------------------------
--- testing memory limits
--------------------------------------------------------------------------
-collectgarbage()
-T.totalmem(T.totalmem()+5000)   -- set low memory limit (+5k)
-assert(not pcall(loadstring"local a={}; for i=1,100000 do a[i]=i end"))
-T.totalmem(1000000000)          -- restore high limit
-
-
-local function stack(x) if x>0 then stack(x-1) end end
-
--- test memory errors; increase memory limit in small steps, so that
--- we get memory errors in different parts of a given task, up to there
--- is enough memory to complete the task without errors
-function testamem (s, f)
-  collectgarbage()
-  stack(10)    -- ensure minimum stack size
-  local M = T.totalmem()
-  local oldM = M
-  local a,b = nil
-  while 1 do
-    M = M+3   -- increase memory limit in small steps
-    T.totalmem(M)
-    a, b = pcall(f)
-    if a and b then break end       -- stop when no more errors
-    collectgarbage()
-    if not a and not string.find(b, "memory") then   -- `real' error?
-      T.totalmem(1000000000)  -- restore high limit
-      error(b, 0)
-    end
-  end
-  T.totalmem(1000000000)  -- restore high limit
-  print("\nlimit for " .. s .. ": " .. M-oldM)
-  return b
-end
-
-
--- testing memory errors when creating a new state
-
-b = testamem("state creation", T.newstate)
-T.closestate(b);  -- close new state
-
-
--- testing threads
-
-function expand (n,s)
-  if n==0 then return "" end
-  local e = string.rep("=", n)
-  return string.format("T.doonnewstack([%s[ %s;\n collectgarbage(); %s]%s])\n",
-                              e, s, expand(n-1,s), e)
-end
-
-G=0; collectgarbage(); a =collectgarbage("count")
-loadstring(expand(20,"G=G+1"))()
-assert(G==20); collectgarbage();  -- assert(gcinfo() <= a+1)
-
-testamem("thread creation", function ()
-  return T.doonnewstack("x=1") == 0  -- try to create thread
-end)
-
-
--- testing memory x compiler
-
-testamem("loadstring", function ()
-  return loadstring("x=1")  -- try to do a loadstring
-end)
-
-
-local testprog = [[
-local function foo () return end
-local t = {"x"}
-a = "aaa"
-for _, v in ipairs(t) do a=a..v end
-return true
-]]
-
--- testing memory x dofile
-_G.a = nil
-local t =os.tmpname()
-local f = assert(io.open(t, "w"))
-f:write(testprog)
-f:close()
-testamem("dofile", function ()
-  local a = loadfile(t)
-  return a and a()
-end)
-assert(os.remove(t))
-assert(_G.a == "aaax")
-
-
--- other generic tests
-
-testamem("string creation", function ()
-  local a, b = string.gsub("alo alo", "(a)", function (x) return x..'b' end)
-  return (a == 'ablo ablo')
-end)
-
-testamem("dump/undump", function ()
-  local a = loadstring(testprog)
-  local b = a and string.dump(a)
-  a = b and loadstring(b)
-  return a and a()
-end)
-
-local t = os.tmpname()
-testamem("file creation", function ()
-  local f = assert(io.open(t, 'w'))
-  assert (not io.open"nomenaoexistente")
-  io.close(f);
-  return not loadfile'nomenaoexistente'
-end)
-assert(os.remove(t))
-
-testamem("table creation", function ()
-  local a, lim = {}, 10
-  for i=1,lim do a[i] = i; a[i..'a'] = {} end
-  return (type(a[lim..'a']) == 'table' and a[lim] == lim)
-end)
-
-local a = 1
-close = nil
-testamem("closure creation", function ()
-  function close (b,c)
-   return function (x) return a+b+c+x end
-  end
-  return (close(2,3)(4) == 10)
-end)
-
-testamem("coroutines", function ()
-  local a = coroutine.wrap(function ()
-              coroutine.yield(string.rep("a", 10))
-              return {}
-            end)
-  assert(string.len(a()) == 10)
-  return a()
-end)
-
-print'+'
-
--- testing some auxlib functions
-assert(T.gsub("alo.alo.uhuh.", ".", "//") == "alo//alo//uhuh//")
-assert(T.gsub("alo.alo.uhuh.", "alo", "//") == "//.//.uhuh.")
-assert(T.gsub("", "alo", "//") == "")
-assert(T.gsub("...", ".", "/.") == "/././.")
-assert(T.gsub("...", "...", "") == "")
-
-
-print'OK'
-

lib/lua/lua-tests/attrib.lua

@@ -1,339 +0,0 @@
-do --[
-
-print "testing require"
-
-assert(require"string" == string)
-assert(require"math" == math)
-assert(require"table" == table)
-assert(require"io" == io)
-assert(require"os" == os)
-assert(require"debug" == debug)
-assert(require"coroutine" == coroutine)
-
-assert(type(package.path) == "string")
-assert(type(package.cpath) == "string")
-assert(type(package.loaded) == "table")
-assert(type(package.preload) == "table")
-
-
-local DIR = "libs/"
-
-local function createfiles (files, preextras, posextras)
-  for n,c in pairs(files) do
-    io.output(DIR..n)
-    io.write(string.format(preextras, n))
-    io.write(c)
-    io.write(string.format(posextras, n))
-    io.close(io.output())
-  end
-end
-
-function removefiles (files)
-  for n in pairs(files) do
-    os.remove(DIR..n)
-  end
-end
-
-local files = {
-  ["A.lua"] = "",
-  ["B.lua"] = "assert(...=='B');require 'A'",
-  ["A.lc"] = "",
-  ["A"] = "",
-  ["L"] = "",
-  ["XXxX"] = "",
-  ["C.lua"] = "package.loaded[...] = 25; require'C'"
-}
-
-AA = nil
-local extras = [[
-NAME = '%s'
-REQUIRED = ...
-return AA]]
-
-createfiles(files, "", extras)
-
-
-local oldpath = package.path
-
-package.path = string.gsub("D/?.lua;D/?.lc;D/?;D/??x?;D/L", "D/", DIR)
-
-local try = function (p, n, r)
-  NAME = nil
-  local rr = require(p)
-  assert(NAME == n)
-  assert(REQUIRED == p)
-  assert(rr == r)
-end
-
-assert(require"C" == 25)
-assert(require"C" == 25)
-AA = nil
-try('B', 'B.lua', true)
-assert(package.loaded.B)
-assert(require"B" == true)
-assert(package.loaded.A)
-package.loaded.A = nil
-try('B', nil, true)   -- should not reload package
-try('A', 'A.lua', true)
-package.loaded.A = nil
-os.remove(DIR..'A.lua')
-AA = {}
-try('A', 'A.lc', AA)  -- now must find second option
-assert(require("A") == AA)
-AA = false
-try('K', 'L', false)     -- default option
-try('K', 'L', false)     -- default option (should reload it)
-assert(rawget(_G, "_REQUIREDNAME") == nil)
-
-AA = "x"
-try("X", "XXxX", AA)
-
-
-removefiles(files)
-
-
--- testing require of sub-packages
-
-package.path = string.gsub("D/?.lua;D/?/init.lua", "D/", DIR)
-
-files = {
-  ["P1/init.lua"] = "AA = 10",
-  ["P1/xuxu.lua"] = "AA = 20",
-}
-
-createfiles(files, "module(..., package.seeall)\n", "")
-AA = 0
-
-local m = assert(require"P1")
-assert(m == P1 and m._NAME == "P1" and AA == 0 and m.AA == 10)
-assert(require"P1" == P1 and P1 == m)
-assert(require"P1" == P1)
-assert(P1._PACKAGE == "")
-
-local m = assert(require"P1.xuxu")
-assert(m == P1.xuxu and m._NAME == "P1.xuxu" and AA == 0 and m.AA == 20)
-assert(require"P1.xuxu" == P1.xuxu and P1.xuxu == m)
-assert(require"P1.xuxu" == P1.xuxu)
-assert(require"P1" == P1)
-assert(P1.xuxu._PACKAGE == "P1.")
-assert(P1.AA == 10 and P1._PACKAGE == "")
-assert(P1._G == _G and P1.xuxu._G == _G)
-
-
-
-removefiles(files)
-
-
-package.path = ""
-assert(not pcall(require, "file_does_not_exist"))
-package.path = "??\0?"
-assert(not pcall(require, "file_does_not_exist1"))
-
-package.path = oldpath
-
--- check 'require' error message
-local fname = "file_does_not_exist2"
-local m, err = pcall(require, fname)
-for t in string.gmatch(package.path..";"..package.cpath, "[^;]+") do
-  t = string.gsub(t, "?", fname)
-  assert(string.find(err, t, 1, true))
-end
-
-
-local function import(...)
-  local f = {...}
-  return function (m)
-    for i=1, #f do m[f[i]] = _G[f[i]] end
-  end
-end
-
-local assert, module, package = assert, module, package
-X = nil; x = 0; assert(_G.x == 0)   -- `x' must be a global variable
-module"X"; x = 1; assert(_M.x == 1)
-module"X.a.b.c"; x = 2; assert(_M.x == 2)
-module("X.a.b", package.seeall); x = 3
-assert(X._NAME == "X" and X.a.b.c._NAME == "X.a.b.c" and X.a.b._NAME == "X.a.b")
-assert(X._M == X and X.a.b.c._M == X.a.b.c and X.a.b._M == X.a.b)
-assert(X.x == 1 and X.a.b.c.x == 2 and X.a.b.x == 3)
-assert(X._PACKAGE == "" and X.a.b.c._PACKAGE == "X.a.b." and
-       X.a.b._PACKAGE == "X.a.")
-assert(_PACKAGE.."c" == "X.a.c")
-assert(X.a._NAME == nil and X.a._M == nil)
-module("X.a", import("X")) ; x = 4
-assert(X.a._NAME == "X.a" and X.a.x == 4 and X.a._M == X.a)
-module("X.a.b", package.seeall); assert(x == 3); x = 5
-assert(_NAME == "X.a.b" and X.a.b.x == 5)
-
-assert(X._G == nil and X.a._G == nil and X.a.b._G == _G and X.a.b.c._G == nil)
-
-setfenv(1, _G)
-assert(x == 0)
-
-assert(not pcall(module, "x"))
-assert(not pcall(module, "math.sin"))
-
-
--- testing C libraries
-
-
-local p = ""   -- On Mac OS X, redefine this to "_"
-
--- assert(loadlib == package.loadlib)   -- only for compatibility
-local f, err, when = package.loadlib("libs/lib1.so", p.."luaopen_lib1")
-if not f then
-  (Message or print)('\a\n >>> cannot load dynamic library <<<\n\a')
-  print(err, when)
-else
-  f()   -- open library
-  assert(require("lib1") == lib1)
-  collectgarbage()
-  assert(lib1.id("x") == "x")
-  f = assert(package.loadlib("libs/lib1.so", p.."anotherfunc"))
-  assert(f(10, 20) == "1020\n")
-  f, err, when = package.loadlib("libs/lib1.so", p.."xuxu")
-  assert(not f and type(err) == "string" and when == "init")
-  package.cpath = "libs/?.so"
-  require"lib2"
-  assert(lib2.id("x") == "x")
-  local fs = require"lib1.sub"
-  assert(fs == lib1.sub and next(lib1.sub) == nil)
-  module("lib2", package.seeall)
-  f = require"-lib2"
-  assert(f.id("x") == "x" and _M == f and _NAME == "lib2")
-  module("lib1.sub", package.seeall)
-  assert(_M == fs)
-  setfenv(1, _G)
- 
-end
-f, err, when = package.loadlib("donotexist", p.."xuxu")
-assert(not f and type(err) == "string" and (when == "open" or when == "absent"))
-
-
--- testing preload
-
-do
-  local p = package
-  package = {}
-  p.preload.pl = function (...)
-    module(...)
-    function xuxu (x) return x+20 end
-  end
-
-  require"pl"
-  assert(require"pl" == pl)
-  assert(pl.xuxu(10) == 30)
-
-  package = p
-  assert(type(package.path) == "string")
-end
-
-
-
-end  --]
-
-print('+')
-
-print("testing assignments, logical operators, and constructors")
-
-local res, res2 = 27
-
-a, b = 1, 2+3
-assert(a==1 and b==5)
-a={}
-function f() return 10, 11, 12 end
-a.x, b, a[1] = 1, 2, f()
-assert(a.x==1 and b==2 and a[1]==10)
-a[f()], b, a[f()+3] = f(), a, 'x'
-assert(a[10] == 10 and b == a and a[13] == 'x')
-
-do
-  local f = function (n) local x = {}; for i=1,n do x[i]=i end;
-                         return unpack(x) end;
-  local a,b,c
-  a,b = 0, f(1)
-  assert(a == 0 and b == 1)
-  A,b = 0, f(1)
-  assert(A == 0 and b == 1)
-  a,b,c = 0,5,f(4)
-  assert(a==0 and b==5 and c==1)
-  a,b,c = 0,5,f(0)
-  assert(a==0 and b==5 and c==nil)
-end
-
-
-a, b, c, d = 1 and nil, 1 or nil, (1 and (nil or 1)), 6
-assert(not a and b and c and d==6)
-
-d = 20
-a, b, c, d = f()
-assert(a==10 and b==11 and c==12 and d==nil)
-a,b = f(), 1, 2, 3, f()
-assert(a==10 and b==1)
-
-assert(a<b == false and a>b == true)
-assert((10 and 2) == 2)
-assert((10 or 2) == 10)
-assert((10 or assert(nil)) == 10)
-assert(not (nil and assert(nil)))
-assert((nil or "alo") == "alo")
-assert((nil and 10) == nil)
-assert((false and 10) == false)
-assert((true or 10) == true)
-assert((false or 10) == 10)
-assert(false ~= nil)
-assert(nil ~= false)
-assert(not nil == true)
-assert(not not nil == false)
-assert(not not 1 == true)
-assert(not not a == true)
-assert(not not (6 or nil) == true)
-assert(not not (nil and 56) == false)
-assert(not not (nil and true) == false)
-print('+')
-
-a = {}
-a[true] = 20
-a[false] = 10
-assert(a[1<2] == 20 and a[1>2] == 10)
-
-function f(a) return a end
-
-local a = {}
-for i=3000,-3000,-1 do a[i] = i; end
-a[10e30] = "alo"; a[true] = 10; a[false] = 20
-assert(a[10e30] == 'alo' and a[not 1] == 20 and a[10<20] == 10)
-for i=3000,-3000,-1 do assert(a[i] == i); end
-a[print] = assert
-a[f] = print
-a[a] = a
-assert(a[a][a][a][a][print] == assert)
-a[print](a[a[f]] == a[print])
-a = nil
-
-a = {10,9,8,7,6,5,4,3,2; [-3]='a', [f]=print, a='a', b='ab'}
-a, a.x, a.y = a, a[-3]
-assert(a[1]==10 and a[-3]==a.a and a[f]==print and a.x=='a' and not a.y)
-a[1], f(a)[2], b, c = {['alo']=assert}, 10, a[1], a[f], 6, 10, 23, f(a), 2
-a[1].alo(a[2]==10 and b==10 and c==print)
-
-a[2^31] = 10; a[2^31+1] = 11; a[-2^31] = 12;
-a[2^32] = 13; a[-2^32] = 14; a[2^32+1] = 15; a[10^33] = 16;
-
-assert(a[2^31] == 10 and a[2^31+1] == 11 and a[-2^31] == 12 and
-       a[2^32] == 13 and a[-2^32] == 14 and a[2^32+1] == 15 and
-       a[10^33] == 16)
-
-a = nil
-
-
-do
-  local a,i,j,b
-  a = {'a', 'b'}; i=1; j=2; b=a
-  i, a[i], a, j, a[j], a[i+j] = j, i, i, b, j, i
-  assert(i == 2 and b[1] == 1 and a == 1 and j == b and b[2] == 2 and
-         b[3] == 1)
-end
-
-print('OK')
-
-return res

lib/lua/lua-tests/big.lua

@@ -1,381 +0,0 @@
-print "testing string length overflow"
-
-local longs = string.rep("\0", 2^25)
-local function catter (i)
-  return assert(loadstring(
-    string.format("return function(a) return a%s end",
-                     string.rep("..a", i-1))))()
-end
-rep129 = catter(129)
-local a, b = pcall(rep129, longs)
-assert(not a and string.find(b, "overflow"))
-print('+')
-
-
-require "checktable"
-
---[[ lots of empty lines (to force SETLINEW)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
---]]
-
-
-a,b = nil,nil
-while not b do
-if a then
-b = {  -- lots of strings (to force JMPW and PUSHCONSTANTW)
-"n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9", "n10",
-"n11", "n12", "j301", "j302", "j303", "j304", "j305", "j306", "j307", "j308",
-"j309", "a310", "n311", "n312", "n313", "n314", "n315", "n316", "n317", "n318",
-"n319", "n320", "n321", "n322", "n323", "n324", "n325", "n326", "n327", "n328",
-"a329", "n330", "n331", "n332", "n333", "n334", "n335", "n336", "n337", "n338",
-"n339", "n340", "n341", "z342", "n343", "n344", "n345", "n346", "n347", "n348",
-"n349", "n350", "n351", "n352", "r353", "n354", "n355", "n356", "n357", "n358",
-"n359", "n360", "n361", "n362", "n363", "n364", "n365", "n366", "z367", "n368",
-"n369", "n370", "n371", "n372", "n373", "n374", "n375", "a376", "n377", "n378",
-"n379", "n380", "n381", "n382", "n383", "n384", "n385", "n386", "n387", "n388",
-"n389", "n390", "n391", "n392", "n393", "n394", "n395", "n396", "n397", "n398",
-"n399", "n400", "n13", "n14", "n15", "n16", "n17", "n18", "n19", "n20",
-"n21", "n22", "n23", "a24", "n25", "n26", "n27", "n28", "n29", "j30",
-"n31", "n32", "n33", "n34", "n35", "n36", "n37", "n38", "n39", "n40",
-"n41", "n42", "n43", "n44", "n45", "n46", "n47", "n48", "n49", "n50",
-"n51", "n52", "n53", "n54", "n55", "n56", "n57", "n58", "n59", "n60",
-"n61", "n62", "n63", "n64", "n65", "a66", "z67", "n68", "n69", "n70",
-"n71", "n72", "n73", "n74", "n75", "n76", "n77", "n78", "n79", "n80",
-"n81", "n82", "n83", "n84", "n85", "n86", "n87", "n88", "n89", "n90",
-"n91", "n92", "n93", "n94", "n95", "n96", "n97", "n98", "n99", "n100",
-"n201", "n202", "n203", "n204", "n205", "n206", "n207", "n208", "n209", "n210",
-"n211", "n212", "n213", "n214", "n215", "n216", "n217", "n218", "n219", "n220",
-"n221", "n222", "n223", "n224", "n225", "n226", "n227", "n228", "n229", "n230",
-"n231", "n232", "n233", "n234", "n235", "n236", "n237", "n238", "n239", "a240",
-"a241", "a242", "a243", "a244", "a245", "a246", "a247", "a248", "a249", "n250",
-"n251", "n252", "n253", "n254", "n255", "n256", "n257", "n258", "n259", "n260",
-"n261", "n262", "n263", "n264", "n265", "n266", "n267", "n268", "n269", "n270",
-"n271", "n272", "n273", "n274", "n275", "n276", "n277", "n278", "n279", "n280",
-"n281", "n282", "n283", "n284", "n285", "n286", "n287", "n288", "n289", "n290",
-"n291", "n292", "n293", "n294", "n295", "n296", "n297", "n298", "n299"
-; x=23}
-else a = 1 end
-
-
-end
-
-assert(b.x == 23)
-print('+')
-
-stat(b)
-
-repeat
-a = {
-n1 = 1.5, n2 = 2.5, n3 = 3.5, n4 = 4.5, n5 = 5.5, n6 = 6.5, n7 = 7.5,
-n8 = 8.5, n9 = 9.5, n10 = 10.5, n11 = 11.5, n12 = 12.5,
-j301 = 301.5, j302 = 302.5, j303 = 303.5, j304 = 304.5, j305 = 305.5,
-j306 = 306.5, j307 = 307.5, j308 = 308.5, j309 = 309.5, a310 = 310.5,
-n311 = 311.5, n312 = 312.5, n313 = 313.5, n314 = 314.5, n315 = 315.5,
-n316 = 316.5, n317 = 317.5, n318 = 318.5, n319 = 319.5, n320 = 320.5,
-n321 = 321.5, n322 = 322.5, n323 = 323.5, n324 = 324.5, n325 = 325.5,
-n326 = 326.5, n327 = 327.5, n328 = 328.5, a329 = 329.5, n330 = 330.5,
-n331 = 331.5, n332 = 332.5, n333 = 333.5, n334 = 334.5, n335 = 335.5,
-n336 = 336.5, n337 = 337.5, n338 = 338.5, n339 = 339.5, n340 = 340.5,
-n341 = 341.5, z342 = 342.5, n343 = 343.5, n344 = 344.5, n345 = 345.5,
-n346 = 346.5, n347 = 347.5, n348 = 348.5, n349 = 349.5, n350 = 350.5,
-n351 = 351.5, n352 = 352.5, r353 = 353.5, n354 = 354.5, n355 = 355.5,
-n356 = 356.5, n357 = 357.5, n358 = 358.5, n359 = 359.5, n360 = 360.5,
-n361 = 361.5, n362 = 362.5, n363 = 363.5, n364 = 364.5, n365 = 365.5,
-n366 = 366.5, z367 = 367.5, n368 = 368.5, n369 = 369.5, n370 = 370.5,
-n371 = 371.5, n372 = 372.5, n373 = 373.5, n374 = 374.5, n375 = 375.5,
-a376 = 376.5, n377 = 377.5, n378 = 378.5, n379 = 379.5, n380 = 380.5,
-n381 = 381.5, n382 = 382.5, n383 = 383.5, n384 = 384.5, n385 = 385.5,
-n386 = 386.5, n387 = 387.5, n388 = 388.5, n389 = 389.5, n390 = 390.5,
-n391 = 391.5, n392 = 392.5, n393 = 393.5, n394 = 394.5, n395 = 395.5,
-n396 = 396.5, n397 = 397.5, n398 = 398.5, n399 = 399.5, n400 = 400.5,
-n13 = 13.5, n14 = 14.5, n15 = 15.5, n16 = 16.5, n17 = 17.5,
-n18 = 18.5, n19 = 19.5, n20 = 20.5, n21 = 21.5, n22 = 22.5,
-n23 = 23.5, a24 = 24.5, n25 = 25.5, n26 = 26.5, n27 = 27.5,
-n28 = 28.5, n29 = 29.5, j30 = 30.5, n31 = 31.5, n32 = 32.5,
-n33 = 33.5, n34 = 34.5, n35 = 35.5, n36 = 36.5, n37 = 37.5,
-n38 = 38.5, n39 = 39.5, n40 = 40.5, n41 = 41.5, n42 = 42.5,
-n43 = 43.5, n44 = 44.5, n45 = 45.5, n46 = 46.5, n47 = 47.5,
-n48 = 48.5, n49 = 49.5, n50 = 50.5, n51 = 51.5, n52 = 52.5,
-n53 = 53.5, n54 = 54.5, n55 = 55.5, n56 = 56.5, n57 = 57.5,
-n58 = 58.5, n59 = 59.5, n60 = 60.5, n61 = 61.5, n62 = 62.5,
-n63 = 63.5, n64 = 64.5, n65 = 65.5, a66 = 66.5, z67 = 67.5,
-n68 = 68.5, n69 = 69.5, n70 = 70.5, n71 = 71.5, n72 = 72.5,
-n73 = 73.5, n74 = 74.5, n75 = 75.5, n76 = 76.5, n77 = 77.5,
-n78 = 78.5, n79 = 79.5, n80 = 80.5, n81 = 81.5, n82 = 82.5,
-n83 = 83.5, n84 = 84.5, n85 = 85.5, n86 = 86.5, n87 = 87.5,
-n88 = 88.5, n89 = 89.5, n90 = 90.5, n91 = 91.5, n92 = 92.5,
-n93 = 93.5, n94 = 94.5, n95 = 95.5, n96 = 96.5, n97 = 97.5,
-n98 = 98.5, n99 = 99.5, n100 = 100.5, n201 = 201.5, n202 = 202.5,
-n203 = 203.5, n204 = 204.5, n205 = 205.5, n206 = 206.5, n207 = 207.5,
-n208 = 208.5, n209 = 209.5, n210 = 210.5, n211 = 211.5, n212 = 212.5,
-n213 = 213.5, n214 = 214.5, n215 = 215.5, n216 = 216.5, n217 = 217.5,
-n218 = 218.5, n219 = 219.5, n220 = 220.5, n221 = 221.5, n222 = 222.5,
-n223 = 223.5, n224 = 224.5, n225 = 225.5, n226 = 226.5, n227 = 227.5,
-n228 = 228.5, n229 = 229.5, n230 = 230.5, n231 = 231.5, n232 = 232.5,
-n233 = 233.5, n234 = 234.5, n235 = 235.5, n236 = 236.5, n237 = 237.5,
-n238 = 238.5, n239 = 239.5, a240 = 240.5, a241 = 241.5, a242 = 242.5,
-a243 = 243.5, a244 = 244.5, a245 = 245.5, a246 = 246.5, a247 = 247.5,
-a248 = 248.5, a249 = 249.5, n250 = 250.5, n251 = 251.5, n252 = 252.5,
-n253 = 253.5, n254 = 254.5, n255 = 255.5, n256 = 256.5, n257 = 257.5,
-n258 = 258.5, n259 = 259.5, n260 = 260.5, n261 = 261.5, n262 = 262.5,
-n263 = 263.5, n264 = 264.5, n265 = 265.5, n266 = 266.5, n267 = 267.5,
-n268 = 268.5, n269 = 269.5, n270 = 270.5, n271 = 271.5, n272 = 272.5,
-n273 = 273.5, n274 = 274.5, n275 = 275.5, n276 = 276.5, n277 = 277.5,
-n278 = 278.5, n279 = 279.5, n280 = 280.5, n281 = 281.5, n282 = 282.5,
-n283 = 283.5, n284 = 284.5, n285 = 285.5, n286 = 286.5, n287 = 287.5,
-n288 = 288.5, n289 = 289.5, n290 = 290.5, n291 = 291.5, n292 = 292.5,
-n293 = 293.5, n294 = 294.5, n295 = 295.5, n296 = 296.5, n297 = 297.5,
-n298 = 298.5, n299 = 299.5, j300 = 300} or 1
-until 1
-
-assert(a.n299 == 299.5)
-xxx = 1
-assert(xxx == 1)
-
-stat(a)
-
-function a:findfield (f)
-  local i,v = next(self, nil)
-  while i ~= f do
-    if not i then return end
-    i,v = next(self, i)
-  end
-  return v
-end
-
-local ii = 0
-i = 1
-while b[i] do
-  local r = a:findfield(b[i]);
-  assert(a[b[i]] == r)
-  ii = math.max(ii,i)
-  i = i+1
-end
-
-assert(ii == 299)
-
-function xxxx (x) coroutine.yield('b'); return ii+x end
-
-assert(xxxx(10) == 309)
-
-a = nil
-b = nil
-a1 = nil
-
-print("tables with table indices:")
-i = 1; a={}
-while i <= 1023 do a[{}] = i; i=i+1 end
-stat(a)
-a = nil
-
-print("tables with function indices:")
-a={}
-for i=1,511 do local x; a[function () return x end] = i end
-stat(a)
-a = nil
-
-print'OK'
-
-return 'a'

lib/lua/lua-tests/calls.lua

@@ -1,294 +0,0 @@
-print("testing functions and calls")
-
--- get the opportunity to test 'type' too ;)
-
-assert(type(1<2) == 'boolean')
-assert(type(true) == 'boolean' and type(false) == 'boolean')
-assert(type(nil) == 'nil' and type(-3) == 'number' and type'x' == 'string' and
-       type{} == 'table' and type(type) == 'function')
-
-assert(type(assert) == type(print))
-f = nil
-function f (x) return a:x (x) end
-assert(type(f) == 'function')
-
-
--- testing local-function recursion
-fact = false
-do
-  local res = 1
-  local function fact (n)
-    if n==0 then return res
-    else return n*fact(n-1)
-    end
-  end
-  assert(fact(5) == 120)
-end
-assert(fact == false)
-
--- testing declarations
-a = {i = 10}
-self = 20
-function a:x (x) return x+self.i end
-function a.y (x) return x+self end
-
-assert(a:x(1)+10 == a.y(1))
-
-a.t = {i=-100}
-a["t"].x = function (self, a,b) return self.i+a+b end
-
-assert(a.t:x(2,3) == -95)
-
-do
-  local a = {x=0}
-  function a:add (x) self.x, a.y = self.x+x, 20; return self end
-  assert(a:add(10):add(20):add(30).x == 60 and a.y == 20)
-end
-
-local a = {b={c={}}}
-
-function a.b.c.f1 (x) return x+1 end
-function a.b.c:f2 (x,y) self[x] = y end
-assert(a.b.c.f1(4) == 5)
-a.b.c:f2('k', 12); assert(a.b.c.k == 12)
-
-print('+')
-
-t = nil   -- 'declare' t
-function f(a,b,c) local d = 'a'; t={a,b,c,d} end
-
-f(      -- this line change must be valid
-  1,2)
-assert(t[1] == 1 and t[2] == 2 and t[3] == nil and t[4] == 'a')
-f(1,2,   -- this one too
-      3,4)
-assert(t[1] == 1 and t[2] == 2 and t[3] == 3 and t[4] == 'a')
-
-function fat(x)
-  if x <= 1 then return 1
-  else return x*loadstring("return fat(" .. x-1 .. ")")()
-  end
-end
-
-assert(loadstring "loadstring 'assert(fat(6)==720)' () ")()
-a = loadstring('return fat(5), 3')
-a,b = a()
-assert(a == 120 and b == 3)
-print('+')
-
-function err_on_n (n)
-  if n==0 then error(); exit(1);
-  else err_on_n (n-1); exit(1);
-  end
-end
-
-do
-  function dummy (n)
-    if n > 0 then
-      assert(not pcall(err_on_n, n))
-      dummy(n-1)
-    end
-  end
-end
-
-dummy(10)
-
-function deep (n)
-  if n>0 then deep(n-1) end
-end
-deep(10)
-deep(200)
-
--- testing tail call
-function deep (n) if n>0 then return deep(n-1) else return 101 end end
-assert(deep(30000) == 101)
-a = {}
-function a:deep (n) if n>0 then return self:deep(n-1) else return 101 end end
-assert(a:deep(30000) == 101)
-
-print('+')
-
-
-a = nil
-(function (x) a=x end)(23)
-assert(a == 23 and (function (x) return x*2 end)(20) == 40)
-
-
-local x,y,z,a
-a = {}; lim = 2000
-for i=1, lim do a[i]=i end
-assert(select(lim, unpack(a)) == lim and select('#', unpack(a)) == lim)
-x = unpack(a)
-assert(x == 1)
-x = {unpack(a)}
-assert(table.getn(x) == lim and x[1] == 1 and x[lim] == lim)
-x = {unpack(a, lim-2)}
-assert(table.getn(x) == 3 and x[1] == lim-2 and x[3] == lim)
-x = {unpack(a, 10, 6)}
-assert(next(x) == nil)   -- no elements
-x = {unpack(a, 11, 10)}
-assert(next(x) == nil)   -- no elements
-x,y = unpack(a, 10, 10)
-assert(x == 10 and y == nil)
-x,y,z = unpack(a, 10, 11)
-assert(x == 10 and y == 11 and z == nil)
-a,x = unpack{1}
-assert(a==1 and x==nil)
-a,x = unpack({1,2}, 1, 1)
-assert(a==1 and x==nil)
-
-
--- testing closures
-
--- fixed-point operator
-Y = function (le)
-      local function a (f)
-        return le(function (x) return f(f)(x) end)
-      end
-      return a(a)
-    end
-
-
--- non-recursive factorial
-
-F = function (f)
-      return function (n)
-               if n == 0 then return 1
-               else return n*f(n-1) end
-             end
-    end
-
-fat = Y(F)
-
-assert(fat(0) == 1 and fat(4) == 24 and Y(F)(5)==5*Y(F)(4))
-
-local function g (z)
-  local function f (a,b,c,d)
-    return function (x,y) return a+b+c+d+a+x+y+z end
-  end
-  return f(z,z+1,z+2,z+3)
-end
-
-f = g(10)
-assert(f(9, 16) == 10+11+12+13+10+9+16+10)
-
-Y, F, f = nil
-print('+')
-
--- testing multiple returns
-
-function unlpack (t, i)
-  i = i or 1
-  if (i <= table.getn(t)) then
-    return t[i], unlpack(t, i+1)
-  end
-end
-
-function equaltab (t1, t2)
-  assert(table.getn(t1) == table.getn(t2))
-  for i,v1 in ipairs(t1) do
-    assert(v1 == t2[i])
-  end
-end
-
-local function pack (...)
-  local x = {...}
-  x.n = select('#', ...)
-  return x
-end
-
-function f() return 1,2,30,4 end
-function ret2 (a,b) return a,b end
-
-local a,b,c,d = unlpack{1,2,3}
-assert(a==1 and b==2 and c==3 and d==nil)
-a = {1,2,3,4,false,10,'alo',false,assert}
-equaltab(pack(unlpack(a)), a)
-equaltab(pack(unlpack(a), -1), {1,-1})
-a,b,c,d = ret2(f()), ret2(f())
-assert(a==1 and b==1 and c==2 and d==nil)
-a,b,c,d = unlpack(pack(ret2(f()), ret2(f())))
-assert(a==1 and b==1 and c==2 and d==nil)
-a,b,c,d = unlpack(pack(ret2(f()), (ret2(f()))))
-assert(a==1 and b==1 and c==nil and d==nil)
-
-a = ret2{ unlpack{1,2,3}, unlpack{3,2,1}, unlpack{"a", "b"}}
-assert(a[1] == 1 and a[2] == 3 and a[3] == "a" and a[4] == "b")
-
-
--- testing calls with 'incorrect' arguments
-rawget({}, "x", 1)
-rawset({}, "x", 1, 2)
-assert(math.sin(1,2) == math.sin(1))
-table.sort({10,9,8,4,19,23,0,0}, function (a,b) return a<b end, "extra arg")
-
-
--- test for generic load
-x = "-- a comment\0\0\0\n  x = 10 + \n23; \
-     local a = function () x = 'hi' end; \
-     return '\0'"
-local i = 0
-function read1 (x)
-  return function ()
-    collectgarbage()
-    i=i+1
-    return string.sub(x, i, i)
-  end
-end
-
-a = assert(load(read1(x), "modname"))
-assert(a() == "\0" and _G.x == 33)
-assert(debug.getinfo(a).source == "modname")
-
-x = string.dump(loadstring("x = 1; return x"))
-i = 0
-a = assert(load(read1(x)))
-assert(a() == 1 and _G.x == 1)
-
-i = 0
-local a, b = load(read1("*a = 123"))
-assert(not a and type(b) == "string" and i == 2)
-
-a, b = load(function () error("hhi") end)
-assert(not a and string.find(b, "hhi"))
-
--- test generic load with nested functions
-x = [[
-  return function (x)
-    return function (y)
-     return function (z)
-       return x+y+z
-     end
-   end
-  end
-]]
-
-a = assert(load(read1(x)))
-assert(a()(2)(3)(10) == 15)
-
-
--- test for dump/undump with upvalues
-local a, b = 20, 30
-x = loadstring(string.dump(function (x)
-  if x == "set" then a = 10+b; b = b+1 else
-  return a
-  end
-end))
-assert(x() == nil)
-assert(debug.setupvalue(x, 1, "hi") == "a")
-assert(x() == "hi")
-assert(debug.setupvalue(x, 2, 13) == "b")
-assert(not debug.setupvalue(x, 3, 10))   -- only 2 upvalues
-x("set")
-assert(x() == 23)
-x("set")
-assert(x() == 24)
-
-
--- test for bug in parameter adjustment
-assert((function () return nil end)(4) == nil)
-assert((function () local a; return a end)(4) == nil)
-assert((function (a) return a end)() == nil)
-
-print('OK')
-return deep

lib/lua/lua-tests/checktable.lua

@@ -1,77 +0,0 @@
-
-assert(rawget(_G, "stat") == nil)  -- module not loaded before
-
-if T == nil then
-  stat = function () print"`querytab' nao ativo" end
-  return
-end
-
-
-function checktable (t)
-  local asize, hsize, ff = T.querytab(t)
-  local l = {}
-  for i=0,hsize-1 do
-    local key,val,next = T.querytab(t, i + asize)
-    if key == nil then
-      assert(l[i] == nil and val==nil and next==nil)
-    elseif key == "<undef>" then
-      assert(val==nil)
-    else
-      assert(t[key] == val)
-      local mp = T.hash(key, t)
-      if l[i] then
-        assert(l[i] == mp)
-      elseif mp ~= i then
-        l[i] = mp
-      else  -- list head
-        l[mp] = {mp}   -- first element
-        while next do
-          assert(ff <= next and next < hsize)
-          if l[next] then assert(l[next] == mp) else l[next] = mp end
-          table.insert(l[mp], next)
-          key,val,next = T.querytab(t, next)
-          assert(key)
-        end
-      end
-    end
-  end
-  l.asize = asize; l.hsize = hsize; l.ff = ff
-  return l
-end
-
-function mostra (t)
-  local asize, hsize, ff = T.querytab(t)
-  print(asize, hsize, ff)
-  print'------'
-  for i=0,asize-1 do
-    local _, v = T.querytab(t, i)
-    print(string.format("[%d] -", i), v)
-  end
-  print'------'
-  for i=0,hsize-1 do
-    print(i, T.querytab(t, i+asize))
-  end
-  print'-------------'
-end
-
-function stat (t)
-  t = checktable(t)
-  local nelem, nlist = 0, 0
-  local maxlist = {}
-  for i=0,t.hsize-1 do
-    if type(t[i]) == 'table' then
-      local n = table.getn(t[i])
-      nlist = nlist+1
-      nelem = nelem + n
-      if not maxlist[n] then maxlist[n] = 0 end
-      maxlist[n] = maxlist[n]+1
-    end
-  end
-  print(string.format("hsize=%d  elements=%d  load=%.2f  med.len=%.2f (asize=%d)",
-          t.hsize, nelem, nelem/t.hsize, nelem/nlist, t.asize))
-  for i=1,table.getn(maxlist) do
-    local n = maxlist[i] or 0
-    print(string.format("%5d %10d %.2f%%", i, n, n*100/nlist))
-  end
-end
-

lib/lua/lua-tests/closure.lua

@@ -1,422 +0,0 @@
-print "testing closures and coroutines"
-
-local A,B = 0,{g=10}
-function f(x)
-  local a = {}
-  for i=1,1000 do
-    local y = 0
-    do
-      a[i] = function () B.g = B.g+1; y = y+x; return y+A end
-    end
-  end
-  local dummy = function () return a[A] end
-  collectgarbage()
-  A = 1; assert(dummy() == a[1]); A = 0;
-  assert(a[1]() == x)
-  assert(a[3]() == x)
-  collectgarbage()
-  assert(B.g == 12)
-  return a
-end
-
-a = f(10)
--- force a GC in this level
-local x = {[1] = {}}   -- to detect a GC
-setmetatable(x, {__mode = 'kv'})
-while x[1] do   -- repeat until GC
-  local a = A..A..A..A  -- create garbage
-  A = A+1
-end
-assert(a[1]() == 20+A)
-assert(a[1]() == 30+A)
-assert(a[2]() == 10+A)
-collectgarbage()
-assert(a[2]() == 20+A)
-assert(a[2]() == 30+A)
-assert(a[3]() == 20+A)
-assert(a[8]() == 10+A)
-assert(getmetatable(x).__mode == 'kv')
-assert(B.g == 19)
-
--- testing closures with 'for' control variable
-a = {}
-for i=1,10 do
-  a[i] = {set = function(x) i=x end, get = function () return i end}
-  if i == 3 then break end
-end
-assert(a[4] == nil)
-a[1].set(10)
-assert(a[2].get() == 2)
-a[2].set('a')
-assert(a[3].get() == 3)
-assert(a[2].get() == 'a')
-
-a = {}
-for i, k in pairs{'a', 'b'} do
-  a[i] = {set = function(x, y) i=x; k=y end,
-          get = function () return i, k end}
-  if i == 2 then break end
-end
-a[1].set(10, 20)
-local r,s = a[2].get()
-assert(r == 2 and s == 'b')
-r,s = a[1].get()
-assert(r == 10 and s == 20)
-a[2].set('a', 'b')
-r,s = a[2].get()
-assert(r == "a" and s == "b")
-
-
--- testing closures with 'for' control variable x break
-for i=1,3 do
-  f = function () return i end
-  break
-end
-assert(f() == 1)
-
-for k, v in pairs{"a", "b"} do
-  f = function () return k, v end
-  break
-end
-assert(({f()})[1] == 1)
-assert(({f()})[2] == "a")
-
-
--- testing closure x break x return x errors
-
-local b
-function f(x)
-  local first = 1
-  while 1 do
-    if x == 3 and not first then return end
-    local a = 'xuxu'
-    b = function (op, y)
-          if op == 'set' then
-            a = x+y
-          else
-            return a
-          end
-        end
-    if x == 1 then do break end
-    elseif x == 2 then return
-    else if x ~= 3 then error() end
-    end
-    first = nil
-  end
-end
-
-for i=1,3 do
-  f(i)
-  assert(b('get') == 'xuxu')
-  b('set', 10); assert(b('get') == 10+i)
-  b = nil
-end
-
-pcall(f, 4);
-assert(b('get') == 'xuxu')
-b('set', 10); assert(b('get') == 14)
-
-
-local w
--- testing multi-level closure
-function f(x)
-  return function (y)
-    return function (z) return w+x+y+z end
-  end
-end
-
-y = f(10)
-w = 1.345
-assert(y(20)(30) == 60+w)
-
--- testing closures x repeat-until
-
-local a = {}
-local i = 1
-repeat
-  local x = i
-  a[i] = function () i = x+1; return x end
-until i > 10 or a[i]() ~= x
-assert(i == 11 and a[1]() == 1 and a[3]() == 3 and i == 4)
-
-print'+'
-
-
--- test for correctly closing upvalues in tail calls of vararg functions
-local function t ()
-  local function c(a,b) assert(a=="test" and b=="OK") end
-  local function v(f, ...) c("test", f() ~= 1 and "FAILED" or "OK") end
-  local x = 1
-  return v(function() return x end)
-end
-t()
-
-
--- coroutine tests
-
-local f
-
-assert(coroutine.running() == nil)
-
-
--- tests for global environment
-
-local function foo (a)
-  setfenv(0, a)
-  coroutine.yield(getfenv())
-  assert(getfenv(0) == a)
-  assert(getfenv(1) == _G)
-  assert(getfenv(loadstring"") == a)
-  return getfenv()
-end
-
-f = coroutine.wrap(foo)
-local a = {}
-assert(f(a) == _G)
-local a,b = pcall(f)
-assert(a and b == _G)
-
-
--- tests for multiple yield/resume arguments
-
-local function eqtab (t1, t2)
-  assert(table.getn(t1) == table.getn(t2))
-  for i,v in ipairs(t1) do
-    assert(t2[i] == v)
-  end
-end
-
-_G.x = nil   -- declare x
-function foo (a, ...)
-  assert(coroutine.running() == f)
-  assert(coroutine.status(f) == "running")
-  local arg = {...}
-  for i=1,table.getn(arg) do
-    _G.x = {coroutine.yield(unpack(arg[i]))}
-  end
-  return unpack(a)
-end
-
-f = coroutine.create(foo)
-assert(type(f) == "thread" and coroutine.status(f) == "suspended")
-assert(string.find(tostring(f), "thread"))
-local s,a,b,c,d
-s,a,b,c,d = coroutine.resume(f, {1,2,3}, {}, {1}, {'a', 'b', 'c'})
-assert(s and a == nil and coroutine.status(f) == "suspended")
-s,a,b,c,d = coroutine.resume(f)
-eqtab(_G.x, {})
-assert(s and a == 1 and b == nil)
-s,a,b,c,d = coroutine.resume(f, 1, 2, 3)
-eqtab(_G.x, {1, 2, 3})
-assert(s and a == 'a' and b == 'b' and c == 'c' and d == nil)
-s,a,b,c,d = coroutine.resume(f, "xuxu")
-eqtab(_G.x, {"xuxu"})
-assert(s and a == 1 and b == 2 and c == 3 and d == nil)
-assert(coroutine.status(f) == "dead")
-s, a = coroutine.resume(f, "xuxu")
-assert(not s and string.find(a, "dead") and coroutine.status(f) == "dead")
-
-
--- yields in tail calls
-local function foo (i) return coroutine.yield(i) end
-f = coroutine.wrap(function ()
-  for i=1,10 do
-    assert(foo(i) == _G.x)
-  end
-  return 'a'
-end)
-for i=1,10 do _G.x = i; assert(f(i) == i) end
-_G.x = 'xuxu'; assert(f('xuxu') == 'a')
-
--- recursive
-function pf (n, i)
-  coroutine.yield(n)
-  pf(n*i, i+1)
-end
-
-f = coroutine.wrap(pf)
-local s=1
-for i=1,10 do
-  assert(f(1, 1) == s)
-  s = s*i
-end
-
--- sieve
-function gen (n)
-  return coroutine.wrap(function ()
-    for i=2,n do coroutine.yield(i) end
-  end)
-end
-
-
-function filter (p, g)
-  return coroutine.wrap(function ()
-    while 1 do
-      local n = g()
-      if n == nil then return end
-      if math.mod(n, p) ~= 0 then coroutine.yield(n) end
-    end
-  end)
-end
-
-local x = gen(100)
-local a = {}
-while 1 do
-  local n = x()
-  if n == nil then break end
-  table.insert(a, n)
-  x = filter(n, x)
-end
-
-assert(table.getn(a) == 25 and a[table.getn(a)] == 97)
-
-
--- errors in coroutines
-function foo ()
-  assert(debug.getinfo(1).currentline == debug.getinfo(foo).linedefined + 1)
-  assert(debug.getinfo(2).currentline == debug.getinfo(goo).linedefined)
-  coroutine.yield(3)
-  error(foo)
-end
-
-function goo() foo() end
-x = coroutine.wrap(goo)
-assert(x() == 3)
-local a,b = pcall(x)
-assert(not a and b == foo)
-
-x = coroutine.create(goo)
-a,b = coroutine.resume(x)
-assert(a and b == 3)
-a,b = coroutine.resume(x)
-assert(not a and b == foo and coroutine.status(x) == "dead")
-a,b = coroutine.resume(x)
-assert(not a and string.find(b, "dead") and coroutine.status(x) == "dead")
-
-
--- co-routines x for loop
-function all (a, n, k)
-  if k == 0 then coroutine.yield(a)
-  else
-    for i=1,n do
-      a[k] = i
-      all(a, n, k-1)
-    end
-  end
-end
-
-local a = 0
-for t in coroutine.wrap(function () all({}, 5, 4) end) do
-  a = a+1
-end
-assert(a == 5^4)
-
-
--- access to locals of collected corroutines
-local C = {}; setmetatable(C, {__mode = "kv"})
-local x = coroutine.wrap (function ()
-            local a = 10
-            local function f () a = a+10; return a end
-            while true do
-              a = a+1
-              coroutine.yield(f)
-            end
-          end)
-
-C[1] = x;
-
-local f = x()
-assert(f() == 21 and x()() == 32 and x() == f)
-x = nil
-collectgarbage()
-assert(C[1] == nil)
-assert(f() == 43 and f() == 53)
-
-
--- old bug: attempt to resume itself
-
-function co_func (current_co)
-  assert(coroutine.running() == current_co)
-  assert(coroutine.resume(current_co) == false)
-  assert(coroutine.resume(current_co) == false)
-  return 10
-end
-
-local co = coroutine.create(co_func)
-local a,b = coroutine.resume(co, co)
-assert(a == true and b == 10)
-assert(coroutine.resume(co, co) == false)
-assert(coroutine.resume(co, co) == false)
-
--- access to locals of erroneous coroutines
-local x = coroutine.create (function ()
-            local a = 10
-            _G.f = function () a=a+1; return a end
-            error('x')
-          end)
-
-assert(not coroutine.resume(x))
--- overwrite previous position of local `a'
-assert(not coroutine.resume(x, 1, 1, 1, 1, 1, 1, 1))
-assert(_G.f() == 11)
-assert(_G.f() == 12)
-
-
-if not T then
-  (Message or print)('\a\n >>> testC not active: skipping yield/hook tests <<<\n\a')
-else
-
-  local turn
-  
-  function fact (t, x)
-    assert(turn == t)
-    if x == 0 then return 1
-    else return x*fact(t, x-1)
-    end
-  end
-
-  local A,B,a,b = 0,0,0,0
-
-  local x = coroutine.create(function ()
-    T.setyhook("", 2)
-    A = fact("A", 10)
-  end)
-
-  local y = coroutine.create(function ()
-    T.setyhook("", 3)
-    B = fact("B", 11)
-  end)
-
-  while A==0 or B==0 do
-    if A==0 then turn = "A"; T.resume(x) end
-    if B==0 then turn = "B"; T.resume(y) end
-  end
-
-  assert(B/A == 11)
-end
-
-
--- leaving a pending coroutine open
-_X = coroutine.wrap(function ()
-      local a = 10
-      local x = function () a = a+1 end
-      coroutine.yield()
-    end)
-
-_X()
-
-
--- coroutine environments
-co = coroutine.create(function ()
-       coroutine.yield(getfenv(0))
-       return loadstring("return a")()
-     end)
-
-a = {a = 15}
-debug.setfenv(co, a)
-assert(debug.getfenv(co) == a)
-assert(select(2, coroutine.resume(co)) == a)
-assert(select(2, coroutine.resume(co)) == a.a)
-
-
-print'OK'

lib/lua/lua-tests/code.lua

@@ -1,143 +0,0 @@
-
-if T==nil then
-  (Message or print)('\a\n >>> testC not active: skipping opcode tests <<<\n\a')
-  return
-end
-print "testing code generation and optimizations"
-
-
--- this code gave an error for the code checker
-do
-  local function f (a)
-  for k,v,w in a do end
-  end
-end
-
-
-function check (f, ...)
-  local c = T.listcode(f)
-  for i=1, arg.n do
-    -- print(arg[i], c[i])
-    assert(string.find(c[i], '- '..arg[i]..' *%d'))
-  end
-  assert(c[arg.n+2] == nil)
-end
-
-
-function checkequal (a, b)
-  a = T.listcode(a)
-  b = T.listcode(b)
-  for i = 1, table.getn(a) do
-    a[i] = string.gsub(a[i], '%b()', '')   -- remove line number
-    b[i] = string.gsub(b[i], '%b()', '')   -- remove line number
-    assert(a[i] == b[i])
-  end
-end
-
-
--- some basic instructions
-check(function ()
-  (function () end){f()}
-end, 'CLOSURE', 'NEWTABLE', 'GETGLOBAL', 'CALL', 'SETLIST', 'CALL', 'RETURN')
-
-
--- sequence of LOADNILs
-check(function ()
-  local a,b,c
-  local d; local e;
-  a = nil; d=nil
-end, 'RETURN')
-
-
--- single return
-check (function (a,b,c) return a end, 'RETURN')
-
-
--- infinite loops
-check(function () while true do local a = -1 end end,
-'LOADK', 'JMP', 'RETURN')
-
-check(function () while 1 do local a = -1 end end,
-'LOADK', 'JMP', 'RETURN')
-
-check(function () repeat local x = 1 until false end,
-'LOADK', 'JMP', 'RETURN')
-
-check(function () repeat local x until nil end,
-'LOADNIL', 'JMP', 'RETURN')
-
-check(function () repeat local x = 1 until true end,
-'LOADK', 'RETURN')
-
-
--- concat optimization
-check(function (a,b,c,d) return a..b..c..d end,
-  'MOVE', 'MOVE', 'MOVE', 'MOVE', 'CONCAT', 'RETURN')
-
--- not
-check(function () return not not nil end, 'LOADBOOL', 'RETURN')
-check(function () return not not false end, 'LOADBOOL', 'RETURN')
-check(function () return not not true end, 'LOADBOOL', 'RETURN')
-check(function () return not not 1 end, 'LOADBOOL', 'RETURN')
-
--- direct access to locals
-check(function ()
-  local a,b,c,d
-  a = b*2
-  c[4], a[b] = -((a + d/-20.5 - a[b]) ^ a.x), b
-end,
-  'MUL',
-  'DIV', 'ADD', 'GETTABLE', 'SUB', 'GETTABLE', 'POW',
-    'UNM', 'SETTABLE', 'SETTABLE', 'RETURN')
-
-
--- direct access to constants
-check(function ()
-  local a,b
-  a.x = 0
-  a.x = b
-  a[b] = 'y'
-  a = 1 - a
-  b = 1/a
-  b = 5+4
-  a[true] = false
-end,
-  'SETTABLE', 'SETTABLE', 'SETTABLE', 'SUB', 'DIV', 'LOADK',
-  'SETTABLE', 'RETURN')
-
-local function f () return -((2^8 + -(-1)) % 8)/2 * 4 - 3 end
-
-check(f, 'LOADK', 'RETURN')
-assert(f() == -5)
-
-check(function ()
-  local a,b,c
-  b[c], a = c, b
-  b[a], a = c, b
-  a, b = c, a
-  a = a
-end, 
-  'MOVE', 'MOVE', 'SETTABLE',
-  'MOVE', 'MOVE', 'MOVE', 'SETTABLE',
-  'MOVE', 'MOVE', 'MOVE',
-  -- no code for a = a
-  'RETURN')
-
-
--- x == nil , x ~= nil
-checkequal(function () if (a==nil) then a=1 end; if a~=nil then a=1 end end,
-           function () if (a==9) then a=1 end; if a~=9 then a=1 end end)
-
-check(function () if a==nil then a=1 end end,
-'GETGLOBAL', 'EQ', 'JMP', 'LOADK', 'SETGLOBAL', 'RETURN')
-
--- de morgan
-checkequal(function () local a; if not (a or b) then b=a end end,
-           function () local a; if (not a and not b) then b=a end end)
-
-checkequal(function (l) local a; return 0 <= a and a <= l end,
-           function (l) local a; return not (not(a >= 0) or not(a <= l)) end)
-
-
-print 'OK'
-

lib/lua/lua-tests/constructs.lua

@@ -1,240 +0,0 @@
-print "testing syntax"
-
--- testing priorities
-
-assert(2^3^2 == 2^(3^2));
-assert(2^3*4 == (2^3)*4);
-assert(2^-2 == 1/4 and -2^- -2 == - - -4);
-assert(not nil and 2 and not(2>3 or 3<2));
-assert(-3-1-5 == 0+0-9);
-assert(-2^2 == -4 and (-2)^2 == 4 and 2*2-3-1 == 0);
-assert(2*1+3/3 == 3 and 1+2 .. 3*1 == "33");
-assert(not(2+1 > 3*1) and "a".."b" > "a");
-
-assert(not ((true or false) and nil))
-assert(      true or false  and nil)
-
-local a,b = 1,nil;
-assert(-(1 or 2) == -1 and (1 and 2)+(-1.25 or -4) == 0.75);
-x = ((b or a)+1 == 2 and (10 or a)+1 == 11); assert(x);
-x = (((2<3) or 1) == true and (2<3 and 4) == 4); assert(x);
-
-x,y=1,2;
-assert((x>y) and x or y == 2);
-x,y=2,1;
-assert((x>y) and x or y == 2);
-
-assert(1234567890 == tonumber('1234567890') and 1234567890+1 == 1234567891)
-
-
--- silly loops
-repeat until 1; repeat until true;
-while false do end; while nil do end;
-
-do  -- test old bug (first name could not be an `upvalue')
- local a; function f(x) x={a=1}; x={x=1}; x={G=1} end
-end
-
-function f (i)
-  if type(i) ~= 'number' then return i,'jojo'; end;
-  if i > 0 then return i, f(i-1); end;
-end
-
-x = {f(3), f(5), f(10);};
-assert(x[1] == 3 and x[2] == 5 and x[3] == 10 and x[4] == 9 and x[12] == 1);
-assert(x[nil] == nil)
-x = {f'alo', f'xixi', nil};
-assert(x[1] == 'alo' and x[2] == 'xixi' and x[3] == nil);
-x = {f'alo'..'xixi'};
-assert(x[1] == 'aloxixi')
-x = {f{}}
-assert(x[2] == 'jojo' and type(x[1]) == 'table')
-
-
-local f = function (i)
-  if i < 10 then return 'a';
-  elseif i < 20 then return 'b';
-  elseif i < 30 then return 'c';
-  end;
-end
-
-assert(f(3) == 'a' and f(12) == 'b' and f(26) == 'c' and f(100) == nil)
-
-for i=1,1000 do break; end;
-n=100;
-i=3;
-t = {};
-a=nil
-while not a do
-  a=0; for i=1,n do for i=i,1,-1 do a=a+1; t[i]=1; end; end;
-end
-assert(a == n*(n+1)/2 and i==3);
-assert(t[1] and t[n] and not t[0] and not t[n+1])
-
-function f(b)
-  local x = 1;
-  repeat
-    local a;
-    if b==1 then local b=1; x=10; break
-    elseif b==2 then x=20; break;
-    elseif b==3 then x=30;
-    else local a,b,c,d=math.sin(1); x=x+1;
-    end
-  until x>=12;
-  return x;
-end;
-
-assert(f(1) == 10 and f(2) == 20 and f(3) == 30 and f(4)==12)
-
-
-local f = function (i)
-  if i < 10 then return 'a'
-  elseif i < 20 then return 'b'
-  elseif i < 30 then return 'c'
-  else return 8
-  end
-end
-
-assert(f(3) == 'a' and f(12) == 'b' and f(26) == 'c' and f(100) == 8)
-
-local a, b = nil, 23
-x = {f(100)*2+3 or a, a or b+2}
-assert(x[1] == 19 and x[2] == 25)
-x = {f=2+3 or a, a = b+2}
-assert(x.f == 5 and x.a == 25)
-
-a={y=1}
-x = {a.y}
-assert(x[1] == 1)
-
-function f(i)
-  while 1 do
-    if i>0 then i=i-1;
-    else return; end;
-  end;
-end;
-
-function g(i)
-  while 1 do
-    if i>0 then i=i-1
-    else return end
-  end
-end
-
-f(10); g(10);
-
-do
-  function f () return 1,2,3; end
-  local a, b, c = f();
-  assert(a==1 and b==2 and c==3)
-  a, b, c = (f());
-  assert(a==1 and b==nil and c==nil)
-end
-
-local a,b = 3 and f();
-assert(a==1 and b==nil)
-
-function g() f(); return; end;
-assert(g() == nil)
-function g() return nil or f() end
-a,b = g()
-assert(a==1 and b==nil)
-
-print'+';
-
-
-f = [[
-return function ( a , b , c , d , e )
-  local x = a >= b or c or ( d and e ) or nil
-  return x
-end , { a = 1 , b = 2 >= 1 , } or { 1 };
-]]
-f = string.gsub(f, "%s+", "\n");   -- force a SETLINE between opcodes
-f,a = loadstring(f)();
-assert(a.a == 1 and a.b)
-
-function g (a,b,c,d,e)
-  if not (a>=b or c or d and e or nil) then return 0; else return 1; end;
-end
-
-function h (a,b,c,d,e)
-  while (a>=b or c or (d and e) or nil) do return 1; end;
-  return 0;
-end;
-
-assert(f(2,1) == true and g(2,1) == 1 and h(2,1) == 1)
-assert(f(1,2,'a') == 'a' and g(1,2,'a') == 1 and h(1,2,'a') == 1)
-assert(f(1,2,'a')
-~=          -- force SETLINE before nil
-nil, "")
-assert(f(1,2,'a') == 'a' and g(1,2,'a') == 1 and h(1,2,'a') == 1)
-assert(f(1,2,nil,1,'x') == 'x' and g(1,2,nil,1,'x') == 1 and
-                                   h(1,2,nil,1,'x') == 1)
-assert(f(1,2,nil,nil,'x') == nil and g(1,2,nil,nil,'x') == 0 and
-                                     h(1,2,nil,nil,'x') == 0)
-assert(f(1,2,nil,1,nil) == nil and g(1,2,nil,1,nil) == 0 and
-                                   h(1,2,nil,1,nil) == 0)
-
-assert(1 and 2<3 == true and 2<3 and 'a'<'b' == true)
-x = 2<3 and not 3; assert(x==false)
-x = 2<1 or (2>1 and 'a'); assert(x=='a')
-
-
-do
-  local a; if nil then a=1; else a=2; end;    -- this nil comes as PUSHNIL 2
-  assert(a==2)
-end
-
-function F(a)
-  assert(debug.getinfo(1, "n").name == 'F')
-  return a,2,3
-end
-
-a,b = F(1)~=nil; assert(a == true and b == nil);
-a,b = F(nil)==nil; assert(a == true and b == nil)
-
-----------------------------------------------------------------
--- creates all combinations of 
--- [not] ([not] arg op [not] (arg op [not] arg ))
--- and tests each one
-
-function ID(x) return x end
-
-function f(t, i)
-  local b = t.n
-  local res = math.mod(math.floor(i/c), b)+1
-  c = c*b
-  return t[res]
-end
-
-local arg = {" ( 1 < 2 ) ", " ( 1 >= 2 ) ", " F ( ) ", "  nil "; n=4}
-
-local op = {" and ", " or ", " == ", " ~= "; n=4}
-
-local neg = {" ", " not "; n=2}
-
-local i = 0
-repeat
-  c = 1
-  local s = f(neg, i)..'ID('..f(neg, i)..f(arg, i)..f(op, i)..
-            f(neg, i)..'ID('..f(arg, i)..f(op, i)..f(neg, i)..f(arg, i)..'))'
-  local s1 = string.gsub(s, 'ID', '')
-  K,X,NX,WX1,WX2 = nil
-  s = string.format([[
-      local a = %s
-      local b = not %s
-      K = b
-      local xxx; 
-      if %s then X = a  else X = b end
-      if %s then NX = b  else NX = a end
-      while %s do WX1 = a; break end
-      while %s do WX2 = a; break end
-      repeat if (%s) then break end; assert(b)  until not(%s)
-  ]], s1, s, s1, s, s1, s, s1, s, s)
-  assert(loadstring(s))()
-  assert(X and not NX and not WX1 == K and not WX2 == K)
-  if math.mod(i,4000) == 0 then print('+') end
-  i = i+1
-until i==c
-
-print'OK'

lib/lua/lua-tests/db.lua

@@ -1,499 +0,0 @@
--- testing debug library
-
-local function dostring(s) return assert(loadstring(s))() end
-
-print"testing debug library and debug information"
-
-do
-local a=1
-end
-
-function test (s, l, p)
-  collectgarbage()   -- avoid gc during trace
-  local function f (event, line)
-    assert(event == 'line')
-    local l = table.remove(l, 1)
-    if p then print(l, line) end
-    assert(l == line, "wrong trace!!")
-  end
-  debug.sethook(f,"l"); loadstring(s)(); debug.sethook()
-  assert(table.getn(l) == 0)
-end
-
-
-do
-  local a = debug.getinfo(print)
-  assert(a.what == "C" and a.short_src == "[C]")
-  local b = debug.getinfo(test, "SfL")
-  assert(b.name == nil and b.what == "Lua" and b.linedefined == 11 and
-         b.lastlinedefined == b.linedefined + 10 and
-         b.func == test and not string.find(b.short_src, "%["))
-  assert(b.activelines[b.linedefined + 1] and
-         b.activelines[b.lastlinedefined])
-  assert(not b.activelines[b.linedefined] and
-         not b.activelines[b.lastlinedefined + 1])
-end
-
-
--- test file and string names truncation
-a = "function f () end"
-local function dostring (s, x) return loadstring(s, x)() end
-dostring(a)
-assert(debug.getinfo(f).short_src == string.format('[string "%s"]', a))
-dostring(a..string.format("; %s\n=1", string.rep('p', 400)))
-assert(string.find(debug.getinfo(f).short_src, '^%[string [^\n]*%.%.%."%]$'))
-dostring("\n"..a)
-assert(debug.getinfo(f).short_src == '[string "..."]')
-dostring(a, "")
-assert(debug.getinfo(f).short_src == '[string ""]')
-dostring(a, "@xuxu")
-assert(debug.getinfo(f).short_src == "xuxu")
-dostring(a, "@"..string.rep('p', 1000)..'t')
-assert(string.find(debug.getinfo(f).short_src, "^%.%.%.p*t$"))
-dostring(a, "=xuxu")
-assert(debug.getinfo(f).short_src == "xuxu")
-dostring(a, string.format("=%s", string.rep('x', 500)))
-assert(string.find(debug.getinfo(f).short_src, "^x*"))
-dostring(a, "=")
-assert(debug.getinfo(f).short_src == "")
-a = nil; f = nil;
-
-
-repeat
-  local g = {x = function ()
-    local a = debug.getinfo(2)
-    assert(a.name == 'f' and a.namewhat == 'local')
-    a = debug.getinfo(1)
-    assert(a.name == 'x' and a.namewhat == 'field')
-    return 'xixi'
-  end}
-  local f = function () return 1+1 and (not 1 or g.x()) end
-  assert(f() == 'xixi')
-  g = debug.getinfo(f)
-  assert(g.what == "Lua" and g.func == f and g.namewhat == "" and not g.name)
-
-  function f (x, name)   -- local!
-    name = name or 'f'
-    local a = debug.getinfo(1)
-    assert(a.name == name and a.namewhat == 'local')
-    return x
-  end
-
-  -- breaks in different conditions
-  if 3>4 then break end; f()
-  if 3<4 then a=1 else break end; f()
-  while 1 do local x=10; break end; f()
-  local b = 1
-  if 3>4 then return math.sin(1) end; f()
-  a = 3<4; f()
-  a = 3<4 or 1; f()
-  repeat local x=20; if 4>3 then f() else break end; f() until 1
-  g = {}
-  f(g).x = f(2) and f(10)+f(9)
-  assert(g.x == f(19))
-  function g(x) if not x then return 3 end return (x('a', 'x')) end
-  assert(g(f) == 'a')
-until 1
-
-test([[if
-math.sin(1)
-then
-  a=1
-else
-  a=2
-end
-]], {2,4,7})
-
-test([[--
-if nil then
-  a=1
-else
-  a=2
-end
-]], {2,5,6})
-
-test([[a=1
-repeat
-  a=a+1
-until a==3
-]], {1,3,4,3,4})
-
-test([[ do
-  return
-end
-]], {2})
-
-test([[local a
-a=1
-while a<=3 do
-  a=a+1
-end
-]], {2,3,4,3,4,3,4,3,5})
-
-test([[while math.sin(1) do
-  if math.sin(1)
-  then
-    break
-  end
-end
-a=1]], {1,2,4,7})
-
-test([[for i=1,3 do
-  a=i
-end
-]], {1,2,1,2,1,2,1,3})
-
-test([[for i,v in pairs{'a','b'} do
-  a=i..v
-end
-]], {1,2,1,2,1,3})
-
-test([[for i=1,4 do a=1 end]], {1,1,1,1,1})
-
-
-
-print'+'
-
-a = {}; L = nil
-local glob = 1
-local oldglob = glob
-debug.sethook(function (e,l)
-  collectgarbage()   -- force GC during a hook
-  local f, m, c = debug.gethook()
-  assert(m == 'crl' and c == 0)
-  if e == "line" then
-    if glob ~= oldglob then
-      L = l-1   -- get the first line where "glob" has changed
-      oldglob = glob
-    end
-  elseif e == "call" then
-      local f = debug.getinfo(2, "f").func
-      a[f] = 1
-  else assert(e == "return")
-  end
-end, "crl")
-
-function f(a,b)
-  collectgarbage()
-  local _, x = debug.getlocal(1, 1)
-  local _, y = debug.getlocal(1, 2)
-  assert(x == a and y == b)
-  assert(debug.setlocal(2, 3, "pera") == "AA".."AA")
-  assert(debug.setlocal(2, 4, "maçã") == "B")
-  x = debug.getinfo(2)
-  assert(x.func == g and x.what == "Lua" and x.name == 'g' and
-         x.nups == 0 and string.find(x.source, "^@.*db%.lua"))
-  glob = glob+1
-  assert(debug.getinfo(1, "l").currentline == L+1)
-  assert(debug.getinfo(1, "l").currentline == L+2)
-end
-
-function foo()
-  glob = glob+1
-  assert(debug.getinfo(1, "l").currentline == L+1)
-end; foo()  -- set L
--- check line counting inside strings and empty lines
-
-_ = 'alo\
-alo' .. [[
-
-]]
---[[
-]]
-assert(debug.getinfo(1, "l").currentline == L+11)  -- check count of lines
-
-
-function g(...)
-  do local a,b,c; a=math.sin(40); end
-  local feijao
-  local AAAA,B = "xuxu", "mamão"
-  f(AAAA,B)
-  assert(AAAA == "pera" and B == "maçã")
-  do
-     local B = 13
-     local x,y = debug.getlocal(1,5)
-     assert(x == 'B' and y == 13)
-  end
-end
-
-g()
-
-
-assert(a[f] and a[g] and a[assert] and a[debug.getlocal] and not a[print])
-
-
--- tests for manipulating non-registered locals (C and Lua temporaries)
-
-local n, v = debug.getlocal(0, 1)
-assert(v == 0 and n == "(*temporary)")
-local n, v = debug.getlocal(0, 2)
-assert(v == 2 and n == "(*temporary)")
-assert(not debug.getlocal(0, 3))
-assert(not debug.getlocal(0, 0))
-
-function f()
-  assert(select(2, debug.getlocal(2,3)) == 1)
-  assert(not debug.getlocal(2,4))
-  debug.setlocal(2, 3, 10)
-  return 20
-end
-
-function g(a,b) return (a+1) + f() end
-
-assert(g(0,0) == 30)
- 
-
-debug.sethook(nil);
-assert(debug.gethook() == nil)
-
-
--- testing access to function arguments
-
-X = nil
-a = {}
-function a:f (a, b, ...) local c = 13 end
-debug.sethook(function (e)
-  assert(e == "call")
-  dostring("XX = 12")  -- test dostring inside hooks
-  -- testing errors inside hooks
-  assert(not pcall(loadstring("a='joao'+1")))
-  debug.sethook(function (e, l) 
-    assert(debug.getinfo(2, "l").currentline == l)
-    local f,m,c = debug.gethook()
-    assert(e == "line")
-    assert(m == 'l' and c == 0)
-    debug.sethook(nil)  -- hook is called only once
-    assert(not X)       -- check that
-    X = {}; local i = 1
-    local x,y
-    while 1 do
-      x,y = debug.getlocal(2, i)
-      if x==nil then break end
-      X[x] = y
-      i = i+1
-    end
-  end, "l")
-end, "c")
-
-a:f(1,2,3,4,5)
-assert(X.self == a and X.a == 1   and X.b == 2 and X.arg.n == 3 and X.c == nil)
-assert(XX == 12)
-assert(debug.gethook() == nil)
-
-
--- testing upvalue access
-local function getupvalues (f)
-  local t = {}
-  local i = 1
-  while true do
-    local name, value = debug.getupvalue(f, i)
-    if not name then break end
-    assert(not t[name])
-    t[name] = value
-    i = i + 1
-  end
-  return t
-end
-
-local a,b,c = 1,2,3
-local function foo1 (a) b = a; return c end
-local function foo2 (x) a = x; return c+b end
-assert(debug.getupvalue(foo1, 3) == nil)
-assert(debug.getupvalue(foo1, 0) == nil)
-assert(debug.setupvalue(foo1, 3, "xuxu") == nil)
-local t = getupvalues(foo1)
-assert(t.a == nil and t.b == 2 and t.c == 3)
-t = getupvalues(foo2)
-assert(t.a == 1 and t.b == 2 and t.c == 3)
-assert(debug.setupvalue(foo1, 1, "xuxu") == "b")
-assert(({debug.getupvalue(foo2, 3)})[2] == "xuxu")
--- cannot manipulate C upvalues from Lua
-assert(debug.getupvalue(io.read, 1) == nil)  
-assert(debug.setupvalue(io.read, 1, 10) == nil)  
-
-
--- testing count hooks
-local a=0
-debug.sethook(function (e) a=a+1 end, "", 1)
-a=0; for i=1,1000 do end; assert(1000 < a and a < 1012)
-debug.sethook(function (e) a=a+1 end, "", 4)
-a=0; for i=1,1000 do end; assert(250 < a and a < 255)
-local f,m,c = debug.gethook()
-assert(m == "" and c == 4)
-debug.sethook(function (e) a=a+1 end, "", 4000)
-a=0; for i=1,1000 do end; assert(a == 0)
-debug.sethook(print, "", 2^24 - 1)   -- count upperbound
-local f,m,c = debug.gethook()
-assert(({debug.gethook()})[3] == 2^24 - 1)
-debug.sethook()
-
-
--- tests for tail calls
-local function f (x)
-  if x then
-    assert(debug.getinfo(1, "S").what == "Lua")
-    local tail = debug.getinfo(2)
-    assert(not pcall(getfenv, 3))
-    assert(tail.what == "tail" and tail.short_src == "(tail call)" and
-           tail.linedefined == -1 and tail.func == nil)
-    assert(debug.getinfo(3, "f").func == g1)
-    assert(getfenv(3))
-    assert(debug.getinfo(4, "S").what == "tail")
-    assert(not pcall(getfenv, 5))
-    assert(debug.getinfo(5, "S").what == "main")
-    assert(getfenv(5))
-    print"+"
-    end
-end
-
-function g(x) return f(x) end
-
-function g1(x) g(x) end
-
-local function h (x) local f=g1; return f(x) end
-
-h(true)
-
-local b = {}
-debug.sethook(function (e) table.insert(b, e) end, "cr")
-h(false)
-debug.sethook()
-local res = {"return",   -- first return (from sethook)
-  "call", "call", "call", "call",
-  "return", "tail return", "return", "tail return",
-  "call",    -- last call (to sethook)
-}
-for _, k in ipairs(res) do assert(k == table.remove(b, 1)) end
-
-
-lim = 30000
-local function foo (x)
-  if x==0 then
-    assert(debug.getinfo(lim+2).what == "main")
-    for i=2,lim do assert(debug.getinfo(i, "S").what == "tail") end
-  else return foo(x-1)
-  end
-end
-
-foo(lim)
-
-
-print"+"
-
-
--- testing traceback
-
-assert(debug.traceback(print) == print)
-assert(debug.traceback(print, 4) == print)
-assert(string.find(debug.traceback("hi", 4), "^hi\n"))
-assert(string.find(debug.traceback("hi"), "^hi\n"))
-assert(not string.find(debug.traceback("hi"), "'traceback'"))
-assert(string.find(debug.traceback("hi", 0), "'traceback'"))
-assert(string.find(debug.traceback(), "^stack traceback:\n"))
-
--- testing debugging of coroutines
-
-local function checktraceback (co, p)
-  local tb = debug.traceback(co)
-  local i = 0
-  for l in string.gmatch(tb, "[^\n]+\n?") do
-    assert(i == 0 or string.find(l, p[i]))
-    i = i+1
-  end
-  assert(p[i] == nil)
-end
-
-
-local function f (n)
-  if n > 0 then return f(n-1)
-  else coroutine.yield() end
-end
-
-local co = coroutine.create(f)
-coroutine.resume(co, 3)
-checktraceback(co, {"yield", "db.lua", "tail", "tail", "tail"})
-
-
-co = coroutine.create(function (x)
-       local a = 1
-       coroutine.yield(debug.getinfo(1, "l"))
-       coroutine.yield(debug.getinfo(1, "l").currentline)
-       return a
-     end)
-
-local tr = {}
-local foo = function (e, l) table.insert(tr, l) end
-debug.sethook(co, foo, "l")
-
-local _, l = coroutine.resume(co, 10)
-local x = debug.getinfo(co, 1, "lfLS")
-assert(x.currentline == l.currentline and x.activelines[x.currentline])
-assert(type(x.func) == "function")
-for i=x.linedefined + 1, x.lastlinedefined do
-  assert(x.activelines[i])
-  x.activelines[i] = nil
-end
-assert(next(x.activelines) == nil)   -- no 'extra' elements
-assert(debug.getinfo(co, 2) == nil)
-local a,b = debug.getlocal(co, 1, 1)
-assert(a == "x" and b == 10)
-a,b = debug.getlocal(co, 1, 2)
-assert(a == "a" and b == 1)
-debug.setlocal(co, 1, 2, "hi")
-assert(debug.gethook(co) == foo)
-assert(table.getn(tr) == 2 and
-       tr[1] == l.currentline-1 and tr[2] == l.currentline)
-
-a,b,c = pcall(coroutine.resume, co)
-assert(a and b and c == l.currentline+1)
-checktraceback(co, {"yield", "in function <"})
-
-a,b = coroutine.resume(co)
-assert(a and b == "hi")
-assert(table.getn(tr) == 4 and tr[4] == l.currentline+2)
-assert(debug.gethook(co) == foo)
-assert(debug.gethook() == nil)
-checktraceback(co, {})
-
-
--- check traceback of suspended (or dead with error) coroutines
-
-function f(i) if i==0 then error(i) else coroutine.yield(); f(i-1) end end
-
-co = coroutine.create(function (x) f(x) end)
-a, b = coroutine.resume(co, 3)
-t = {"'yield'", "'f'", "in function <"}
-while coroutine.status(co) == "suspended" do
-  checktraceback(co, t)
-  a, b = coroutine.resume(co)
-  table.insert(t, 2, "'f'")   -- one more recursive call to 'f'
-end
-t[1] = "'error'"
-checktraceback(co, t)
-
-
--- test acessing line numbers of a coroutine from a resume inside
--- a C function (this is a known bug in Lua 5.0)
-
-local function g(x)
-    coroutine.yield(x)
-end
-
-local function f (i)
-  debug.sethook(function () end, "l")
-  for j=1,1000 do
-    g(i+j)
-  end
-end
-
-local co = coroutine.wrap(f)
-co(10)
-pcall(co)
-pcall(co)
-
-
-assert(type(debug.getregistry()) == "table")
-
-
-print"OK"
-

lib/lua/lua-tests/errors.lua

@@ -1,250 +0,0 @@
-print("testing errors")
-
-function doit (s)
-  local f, msg = loadstring(s)
-  if f == nil then return msg end
-  local cond, msg = pcall(f)
-  return (not cond) and msg
-end
-
-
-function checkmessage (prog, msg)
-  assert(string.find(doit(prog), msg, 1, true))
-end
-
-function checksyntax (prog, extra, token, line)
-  local msg = doit(prog)
-  token = string.gsub(token, "(%p)", "%%%1")
-  local pt = string.format([[^%%[string ".*"%%]:%d: .- near '%s'$]],
-                           line, token)
-  assert(string.find(msg, pt))
-  assert(string.find(msg, msg, 1, true))
-end
-
-
--- test error message with no extra info
-assert(doit("error('hi', 0)") == 'hi')
-
--- test error message with no info
-assert(doit("error()") == nil)
-
-
--- test common errors/errors that crashed in the past
-assert(doit("unpack({}, 1, n=2^30)"))
-assert(doit("a=math.sin()"))
-assert(not doit("tostring(1)") and doit("tostring()"))
-assert(doit"tonumber()")
-assert(doit"repeat until 1; a")
-checksyntax("break label", "", "label", 1)
-assert(doit";")
-assert(doit"a=1;;")
-assert(doit"return;;")
-assert(doit"assert(false)")
-assert(doit"assert(nil)")
-assert(doit"a=math.sin\n(3)")
-assert(doit("function a (... , ...) end"))
-assert(doit("function a (, ...) end"))
-
-checksyntax([[
-  local a = {4
-
-]], "'}' expected (to close '{' at line 1)", "<eof>", 3)
-
-
--- tests for better error messages
-
-checkmessage("a=1; bbbb=2; a=math.sin(3)+bbbb(3)", "global 'bbbb'")
-checkmessage("a=1; local a,bbbb=2,3; a = math.sin(1) and bbbb(3)",
-       "local 'bbbb'")
-checkmessage("a={}; do local a=1 end a:bbbb(3)", "method 'bbbb'")
-checkmessage("local a={}; a.bbbb(3)", "field 'bbbb'")
-assert(not string.find(doit"a={13}; local bbbb=1; a[bbbb](3)", "'bbbb'"))
-checkmessage("a={13}; local bbbb=1; a[bbbb](3)", "number")
-
-aaa = nil
-checkmessage("aaa.bbb:ddd(9)", "global 'aaa'")
-checkmessage("local aaa={bbb=1}; aaa.bbb:ddd(9)", "field 'bbb'")
-checkmessage("local aaa={bbb={}}; aaa.bbb:ddd(9)", "method 'ddd'")
-checkmessage("local a,b,c; (function () a = b+1 end)()", "upvalue 'b'")
-assert(not doit"local aaa={bbb={ddd=next}}; aaa.bbb:ddd(nil)")
-
-checkmessage("b=1; local aaa='a'; x=aaa+b", "local 'aaa'")
-checkmessage("aaa={}; x=3/aaa", "global 'aaa'")
-checkmessage("aaa='2'; b=nil;x=aaa*b", "global 'b'")
-checkmessage("aaa={}; x=-aaa", "global 'aaa'")
-assert(not string.find(doit"aaa={}; x=(aaa or aaa)+(aaa and aaa)", "'aaa'"))
-assert(not string.find(doit"aaa={}; (aaa or aaa)()", "'aaa'"))
-
-checkmessage([[aaa=9
-repeat until 3==3
-local x=math.sin(math.cos(3))
-if math.sin(1) == x then return math.sin(1) end   -- tail call
-local a,b = 1, {
-  {x='a'..'b'..'c', y='b', z=x},
-  {1,2,3,4,5} or 3+3<=3+3,
-  3+1>3+1,
-  {d = x and aaa[x or y]}}
-]], "global 'aaa'")
-
-checkmessage([[
-local x,y = {},1
-if math.sin(1) == 0 then return 3 end    -- return
-x.a()]], "field 'a'")
-
-checkmessage([[
-prefix = nil
-insert = nil
-while 1 do  
-  local a
-  if nil then break end
-  insert(prefix, a)
-end]], "global 'insert'")
-
-checkmessage([[  -- tail call
-  return math.sin("a")
-]], "'sin'")
-
-checkmessage([[collectgarbage("nooption")]], "invalid option")
-
-checkmessage([[x = print .. "a"]], "concatenate")
-
-checkmessage("getmetatable(io.stdin).__gc()", "no value")
-
-print'+'
-
-
--- testing line error
-
-function lineerror (s)
-  local err,msg = pcall(loadstring(s))
-  local line = string.match(msg, ":(%d+):")
-  return line and line+0
-end
-
-assert(lineerror"local a\n for i=1,'a' do \n print(i) \n end" == 2)
-assert(lineerror"\n local a \n for k,v in 3 \n do \n print(k) \n end" == 3)
-assert(lineerror"\n\n for k,v in \n 3 \n do \n print(k) \n end" == 4)
-assert(lineerror"function a.x.y ()\na=a+1\nend" == 1)
-
-local p = [[
-function g() f() end
-function f(x) error('a', X) end
-g()
-]]
-X=3;assert(lineerror(p) == 3)
-X=0;assert(lineerror(p) == nil)
-X=1;assert(lineerror(p) == 2)
-X=2;assert(lineerror(p) == 1)
-
-lineerror = nil
-
-C = 0
-local l = debug.getinfo(1, "l").currentline; function y () C=C+1; y() end
-
-local function checkstackmessage (m)
-  return (string.find(m, "^.-:%d+: stack overflow"))
-end
-assert(checkstackmessage(doit('y()')))
-assert(checkstackmessage(doit('y()')))
-assert(checkstackmessage(doit('y()')))
--- teste de linhas em erro
-C = 0
-local l1
-local function g()
-  l1 = debug.getinfo(1, "l").currentline; y()
-end
-local _, stackmsg = xpcall(g, debug.traceback)
-local stack = {}
-for line in string.gmatch(stackmsg, "[^\n]*") do
-  local curr = string.match(line, ":(%d+):")
-  if curr then table.insert(stack, tonumber(curr)) end
-end
-local i=1
-while stack[i] ~= l1 do
-  assert(stack[i] == l)
-  i = i+1
-end
-assert(i > 15)
-
-
--- error in error handling
-local res, msg = xpcall(error, error)
-assert(not res and type(msg) == 'string')
-
-local function f (x)
-  if x==0 then error('a\n')
-  else
-    local aux = function () return f(x-1) end
-    local a,b = xpcall(aux, aux)
-    return a,b
-  end
-end
-f(3)
-
--- non string messages
-function f() error{msg='x'} end
-res, msg = xpcall(f, function (r) return {msg=r.msg..'y'} end)
-assert(msg.msg == 'xy')
-
-print('+')
-checksyntax("syntax error", "", "error", 1)
-checksyntax("1.000", "", "1.000", 1)
-checksyntax("[[a]]", "", "[[a]]", 1)
-checksyntax("'aa'", "", "'aa'", 1)
-
--- test 255 as first char in a chunk
-checksyntax("\255a = 1", "", "\255", 1)
-
-doit('I = loadstring("a=9+"); a=3')
-assert(a==3 and I == nil)
-print('+')
-
-lim = 1000
-if rawget(_G, "_soft") then lim = 100 end
-for i=1,lim do
-  doit('a = ')
-  doit('a = 4+nil')
-end
-
-
--- testing syntax limits
-local function testrep (init, rep)
-  local s = "local a; "..init .. string.rep(rep, 400)
-  local a,b = loadstring(s)
-  assert(not a and string.find(b, "syntax levels"))
-end
-testrep("a=", "{")
-testrep("a=", "(")
-testrep("", "a(")
-testrep("", "do ")
-testrep("", "while a do ")
-testrep("", "if a then else ")
-testrep("", "function foo () ")
-testrep("a=", "a..")
-testrep("a=", "a^")
-
-
--- testing other limits
--- upvalues
-local  s = "function foo ()\n  local "
-for j = 1,70 do
-  s = s.."a"..j..", "
-end
-s = s.."b\n"
-for j = 1,70 do
-  s = s.."function foo"..j.." ()\n a"..j.."=3\n"
-end
-local a,b = loadstring(s)
-assert(string.find(b, "line 3"))
-
--- local variables
-s = "\nfunction foo ()\n  local "
-for j = 1,300 do
-  s = s.."a"..j..", " 
-end
-s = s.."b\n"
-local a,b = loadstring(s)
-assert(string.find(b, "line 2"))
-
-
-print('OK')

lib/lua/lua-tests/events.lua

@@ -1,360 +0,0 @@
-print('testing metatables')
-
-X = 20; B = 30
-
-setfenv(1, setmetatable({}, {__index=_G}))
-
-collectgarbage()
-
-X = X+10
-assert(X == 30 and _G.X == 20)
-B = false
-assert(B == false)
-B = nil
-assert(B == 30)
-
-assert(getmetatable{} == nil)
-assert(getmetatable(4) == nil)
-assert(getmetatable(nil) == nil)
-a={}; setmetatable(a, {__metatable = "xuxu",
-                    __tostring=function(x) return x.name end})
-assert(getmetatable(a) == "xuxu")
-assert(tostring(a) == nil)
--- cannot change a protected metatable
-assert(pcall(setmetatable, a, {}) == false)
-a.name = "gororoba"
-assert(tostring(a) == "gororoba")
-
-local a, t = {10,20,30; x="10", y="20"}, {}
-assert(setmetatable(a,t) == a)
-assert(getmetatable(a) == t)
-assert(setmetatable(a,nil) == a)
-assert(getmetatable(a) == nil)
-assert(setmetatable(a,t) == a)
-
-
-function f (t, i, e)
-  assert(not e)
-  local p = rawget(t, "parent")
-  return (p and p[i]+3), "dummy return"
-end
-
-t.__index = f
-
-a.parent = {z=25, x=12, [4] = 24}
-assert(a[1] == 10 and a.z == 28 and a[4] == 27 and a.x == "10")
-
-collectgarbage()
-
-a = setmetatable({}, t)
-function f(t, i, v) rawset(t, i, v-3) end
-t.__newindex = f
-a[1] = 30; a.x = "101"; a[5] = 200
-assert(a[1] == 27 and a.x == 98 and a[5] == 197)
-
-
-local c = {}
-a = setmetatable({}, t)
-t.__newindex = c
-a[1] = 10; a[2] = 20; a[3] = 90
-assert(c[1] == 10 and c[2] == 20 and c[3] == 90)
-
-
-do
-  local a;
-  a = setmetatable({}, {__index = setmetatable({},
-                     {__index = setmetatable({},
-                     {__index = function (_,n) return a[n-3]+4, "lixo" end})})})
-  a[0] = 20
-  for i=0,10 do
-    assert(a[i*3] == 20 + i*4)
-  end
-end
-
-
-do  -- newindex
-  local foi
-  local a = {}
-  for i=1,10 do a[i] = 0; a['a'..i] = 0; end
-  setmetatable(a, {__newindex = function (t,k,v) foi=true; rawset(t,k,v) end})
-  foi = false; a[1]=0; assert(not foi)
-  foi = false; a['a1']=0; assert(not foi)
-  foi = false; a['a11']=0; assert(foi)
-  foi = false; a[11]=0; assert(foi)
-  foi = false; a[1]=nil; assert(not foi)
-  foi = false; a[1]=nil; assert(foi)
-end
-
-
-function f (t, ...) return t, {...} end
-t.__call = f
-
-do
-  local x,y = a(unpack{'a', 1})
-  assert(x==a and y[1]=='a' and y[2]==1 and y[3]==nil)
-  x,y = a()
-  assert(x==a and y[1]==nil)
-end
-
-
-local b = setmetatable({}, t)
-setmetatable(b,t)
-
-function f(op)
-  return function (...) cap = {[0] = op, ...} ; return (...) end
-end
-t.__add = f("add")
-t.__sub = f("sub")
-t.__mul = f("mul")
-t.__div = f("div")
-t.__mod = f("mod")
-t.__unm = f("unm")
-t.__pow = f("pow")
-
-assert(b+5 == b)
-assert(cap[0] == "add" and cap[1] == b and cap[2] == 5 and cap[3]==nil)
-assert(b+'5' == b)
-assert(cap[0] == "add" and cap[1] == b and cap[2] == '5' and cap[3]==nil)
-assert(5+b == 5)
-assert(cap[0] == "add" and cap[1] == 5 and cap[2] == b and cap[3]==nil)
-assert('5'+b == '5')
-assert(cap[0] == "add" and cap[1] == '5' and cap[2] == b and cap[3]==nil)
-b=b-3; assert(getmetatable(b) == t)
-assert(5-a == 5)
-assert(cap[0] == "sub" and cap[1] == 5 and cap[2] == a and cap[3]==nil)
-assert('5'-a == '5')
-assert(cap[0] == "sub" and cap[1] == '5' and cap[2] == a and cap[3]==nil)
-assert(a*a == a)
-assert(cap[0] == "mul" and cap[1] == a and cap[2] == a and cap[3]==nil)
-assert(a/0 == a)
-assert(cap[0] == "div" and cap[1] == a and cap[2] == 0 and cap[3]==nil)
-assert(a%2 == a)
-assert(cap[0] == "mod" and cap[1] == a and cap[2] == 2 and cap[3]==nil)
-assert(-a == a)
-assert(cap[0] == "unm" and cap[1] == a)
-assert(a^4 == a)
-assert(cap[0] == "pow" and cap[1] == a and cap[2] == 4 and cap[3]==nil)
-assert(a^'4' == a)
-assert(cap[0] == "pow" and cap[1] == a and cap[2] == '4' and cap[3]==nil)
-assert(4^a == 4)
-assert(cap[0] == "pow" and cap[1] == 4 and cap[2] == a and cap[3]==nil)
-assert('4'^a == '4')
-assert(cap[0] == "pow" and cap[1] == '4' and cap[2] == a and cap[3]==nil)
-
-
-t = {}
-t.__lt = function (a,b,c)
-  collectgarbage()
-  assert(c == nil)
-  if type(a) == 'table' then a = a.x end
-  if type(b) == 'table' then b = b.x end
- return a<b, "dummy"
-end
-
-function Op(x) return setmetatable({x=x}, t) end
-
-local function test ()
-  assert(not(Op(1)<Op(1)) and (Op(1)<Op(2)) and not(Op(2)<Op(1)))
-  assert(not(Op('a')<Op('a')) and (Op('a')<Op('b')) and not(Op('b')<Op('a')))
-  assert((Op(1)<=Op(1)) and (Op(1)<=Op(2)) and not(Op(2)<=Op(1)))
-  assert((Op('a')<=Op('a')) and (Op('a')<=Op('b')) and not(Op('b')<=Op('a')))
-  assert(not(Op(1)>Op(1)) and not(Op(1)>Op(2)) and (Op(2)>Op(1)))
-  assert(not(Op('a')>Op('a')) and not(Op('a')>Op('b')) and (Op('b')>Op('a')))
-  assert((Op(1)>=Op(1)) and not(Op(1)>=Op(2)) and (Op(2)>=Op(1)))
-  assert((Op('a')>=Op('a')) and not(Op('a')>=Op('b')) and (Op('b')>=Op('a')))
-end
-
-test()
-
-t.__le = function (a,b,c)
-  assert(c == nil)
-  if type(a) == 'table' then a = a.x end
-  if type(b) == 'table' then b = b.x end
- return a<=b, "dummy"
-end
-
-test()  -- retest comparisons, now using both `lt' and `le'
-
-
--- test `partial order'
-
-local function Set(x)
-  local y = {}
-  for _,k in pairs(x) do y[k] = 1 end
-  return setmetatable(y, t)
-end
-
-t.__lt = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-    b[k] = nil
-  end
-  return next(b) ~= nil
-end
-
-t.__le = nil
-
-assert(Set{1,2,3} < Set{1,2,3,4})
-assert(not(Set{1,2,3,4} < Set{1,2,3,4}))
-assert((Set{1,2,3,4} <= Set{1,2,3,4}))
-assert((Set{1,2,3,4} >= Set{1,2,3,4}))
-assert((Set{1,3} <= Set{3,5}))   -- wrong!! model needs a `le' method ;-)
-
-t.__le = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-  end
-  return true
-end
-
-assert(not (Set{1,3} <= Set{3,5}))   -- now its OK!
-assert(not(Set{1,3} <= Set{3,5}))
-assert(not(Set{1,3} >= Set{3,5}))
-
-t.__eq = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-    b[k] = nil
-  end
-  return next(b) == nil
-end
-
-local s = Set{1,3,5}
-assert(s == Set{3,5,1})
-assert(not rawequal(s, Set{3,5,1}))
-assert(rawequal(s, s))
-assert(Set{1,3,5,1} == Set{3,5,1})
-assert(Set{1,3,5} ~= Set{3,5,1,6})
-t[Set{1,3,5}] = 1
-assert(t[Set{1,3,5}] == nil)   -- `__eq' is not valid for table accesses
-
-
-t.__concat = function (a,b,c)
-  assert(c == nil)
-  if type(a) == 'table' then a = a.val end
-  if type(b) == 'table' then b = b.val end
-  if A then return a..b
-  else
-    return setmetatable({val=a..b}, t)
-  end
-end
-
-c = {val="c"}; setmetatable(c, t)
-d = {val="d"}; setmetatable(d, t)
-
-A = true
-assert(c..d == 'cd')
-assert(0 .."a".."b"..c..d.."e".."f"..(5+3).."g" == "0abcdef8g")
-
-A = false
-x = c..d
-assert(getmetatable(x) == t and x.val == 'cd')
-x = 0 .."a".."b"..c..d.."e".."f".."g"
-assert(x.val == "0abcdefg")
-
-
--- test comparison compatibilities
-local t1, t2, c, d
-t1 = {};  c = {}; setmetatable(c, t1)
-d = {}
-t1.__eq = function () return true end
-t1.__lt = function () return true end
-assert(c ~= d and not pcall(function () return c < d end))
-setmetatable(d, t1)
-assert(c == d and c < d and not(d <= c))
-t2 = {}
-t2.__eq = t1.__eq
-t2.__lt = t1.__lt
-setmetatable(d, t2)
-assert(c == d and c < d and not(d <= c))
-
-
-
--- test for several levels of calls
-local i
-local tt = {
-  __call = function (t, ...)
-    i = i+1
-    if t.f then return t.f(...)
-    else return {...}
-    end
-  end
-}
-
-local a = setmetatable({}, tt)
-local b = setmetatable({f=a}, tt)
-local c = setmetatable({f=b}, tt)
-
-i = 0
-x = c(3,4,5)
-assert(i == 3 and x[1] == 3 and x[3] == 5)
-
-
-assert(_G.X == 20)
-assert(_G == getfenv(0))
-
-print'+'
-
-local _g = _G
-setfenv(1, setmetatable({}, {__index=function (_,k) return _g[k] end}))
-
--- testing proxies
-assert(getmetatable(newproxy()) == nil)
-assert(getmetatable(newproxy(false)) == nil)
-
-local u = newproxy(true)
-
-getmetatable(u).__newindex = function (u,k,v)
-  getmetatable(u)[k] = v
-end
-
-getmetatable(u).__index = function (u,k)
-  return getmetatable(u)[k]
-end
-
-for i=1,10 do u[i] = i end
-for i=1,10 do assert(u[i] == i) end
-
-local k = newproxy(u)
-assert(getmetatable(k) == getmetatable(u))
-
-
-a = {}
-rawset(a, "x", 1, 2, 3)
-assert(a.x == 1 and rawget(a, "x", 3) == 1)
-
-print '+'
-
--- testing metatables for basic types
-mt = {}
-debug.setmetatable(10, mt)
-assert(getmetatable(-2) == mt)
-mt.__index = function (a,b) return a+b end
-assert((10)[3] == 13)
-assert((10)["3"] == 13)
-debug.setmetatable(23, nil)
-assert(getmetatable(-2) == nil)
-
-debug.setmetatable(true, mt)
-assert(getmetatable(false) == mt)
-mt.__index = function (a,b) return a or b end
-assert((true)[false] == true)
-assert((false)[false] == false)
-debug.setmetatable(false, nil)
-assert(getmetatable(true) == nil)
-
-debug.setmetatable(nil, mt)
-assert(getmetatable(nil) == mt)
-mt.__add = function (a,b) return (a or 0) + (b or 0) end
-assert(10 + nil == 10)
-assert(nil + 23 == 23)
-assert(nil + nil == 0)
-debug.setmetatable(nil, nil)
-assert(getmetatable(nil) == nil)
-
-debug.setmetatable(nil, {})
-
-
-print 'OK'
-
-return 12

lib/lua/lua-tests/files.lua

@@ -1,324 +0,0 @@
-
-print('testing i/o')
-
-assert(io.input(io.stdin) == io.stdin)
-assert(io.output(io.stdout) == io.stdout)
-
-
-assert(type(io.input()) == "userdata" and io.type(io.output()) == "file")
-assert(io.type(8) == nil)
-local a = {}; setmetatable(a, {})
-assert(io.type(a) == nil)
-
-local a,b,c = io.open('xuxu_nao_existe')
-assert(not a and type(b) == "string" and type(c) == "number")
-
-a,b,c = io.open('/a/b/c/d', 'w')
-assert(not a and type(b) == "string" and type(c) == "number")
-
-local file = os.tmpname()
-local otherfile = os.tmpname()
-
-assert(os.setlocale('C', 'all'))
-
-io.input(io.stdin); io.output(io.stdout);
-
-os.remove(file)
-assert(loadfile(file) == nil)
-assert(io.open(file) == nil)
-io.output(file)
-assert(io.output() ~= io.stdout)
-
-assert(io.output():seek() == 0)
-assert(io.write("alo alo"))
-assert(io.output():seek() == string.len("alo alo"))
-assert(io.output():seek("cur", -3) == string.len("alo alo")-3)
-assert(io.write("joao"))
-assert(io.output():seek("end") == string.len("alo joao"))
-
-assert(io.output():seek("set") == 0)
-
-assert(io.write('"álo"', "{a}\n", "second line\n", "third line \n"))
-assert(io.write('çfourth_line'))
-io.output(io.stdout)
-collectgarbage()  -- file should be closed by GC
-assert(io.input() == io.stdin and rawequal(io.output(), io.stdout))
-print('+')
-
--- test GC for files
-collectgarbage()
-for i=1,120 do
-  for i=1,5 do
-    io.input(file)
-    assert(io.open(file, 'r'))
-    io.lines(file)
-  end
-  collectgarbage()
-end
-
-assert(os.rename(file, otherfile))
-assert(os.rename(file, otherfile) == nil)
-
-io.output(io.open(otherfile, "a"))
-assert(io.write("\n\n\t\t  3450\n"));
-io.close()
-
--- test line generators
-assert(os.rename(otherfile, file))
-io.output(otherfile)
-local f = io.lines(file)
-while f() do end;
-assert(not pcall(f))  -- read lines after EOF
-assert(not pcall(f))  -- read lines after EOF
--- copy from file to otherfile
-for l in io.lines(file) do io.write(l, "\n") end
-io.close()
--- copy from otherfile back to file
-local f = assert(io.open(otherfile))
-assert(io.type(f) == "file")
-io.output(file)
-assert(io.output():read() == nil)
-for l in f:lines() do io.write(l, "\n") end
-assert(f:close()); io.close()
-assert(not pcall(io.close, f))   -- error trying to close again
-assert(tostring(f) == "file (closed)")
-assert(io.type(f) == "closed file")
-io.input(file)
-f = io.open(otherfile):lines()
-for l in io.lines() do assert(l == f()) end
-assert(os.remove(otherfile))
-
-io.input(file)
-do  -- test error returns
-  local a,b,c = io.input():write("xuxu")
-  assert(not a and type(b) == "string" and type(c) == "number")
-end
-assert(io.read(0) == "")   -- not eof
-assert(io.read(5, '*l') == '"álo"')
-assert(io.read(0) == "")
-assert(io.read() == "second line")
-local x = io.input():seek()
-assert(io.read() == "third line ")
-assert(io.input():seek("set", x))
-assert(io.read('*l') == "third line ")
-assert(io.read(1) == "ç")
-assert(io.read(string.len"fourth_line") == "fourth_line")
-assert(io.input():seek("cur", -string.len"fourth_line"))
-assert(io.read() == "fourth_line")
-assert(io.read() == "")  -- empty line
-assert(io.read('*n') == 3450)
-assert(io.read(1) == '\n')
-assert(io.read(0) == nil)  -- end of file
-assert(io.read(1) == nil)  -- end of file
-assert(({io.read(1)})[2] == nil)
-assert(io.read() == nil)  -- end of file
-assert(({io.read()})[2] == nil)
-assert(io.read('*n') == nil)  -- end of file
-assert(({io.read('*n')})[2] == nil)
-assert(io.read('*a') == '')  -- end of file (OK for `*a')
-assert(io.read('*a') == '')  -- end of file (OK for `*a')
-collectgarbage()
-print('+')
-io.close(io.input())
-assert(not pcall(io.read))
-
-assert(os.remove(file))
-
-local t = '0123456789'
-for i=1,12 do t = t..t; end
-assert(string.len(t) == 10*2^12)
-
-io.output(file)
-io.write("alo\n")
-io.close()
-assert(not pcall(io.write))
-local f = io.open(file, "a")
-io.output(f)
-collectgarbage()
-
-assert(io.write(' ' .. t .. ' '))
-assert(io.write(';', 'end of file\n'))
-f:flush(); io.flush()
-f:close()
-print('+')
-
-io.input(file)
-assert(io.read() == "alo")
-assert(io.read(1) == ' ')
-assert(io.read(string.len(t)) == t)
-assert(io.read(1) == ' ')
-assert(io.read(0))
-assert(io.read('*a') == ';end of file\n')
-assert(io.read(0) == nil)
-assert(io.close(io.input()))
-
-assert(os.remove(file))
-print('+')
-
-local x1 = "string\n\n\\com \"\"''coisas [[estranhas]] ]]'"
-io.output(file)
-assert(io.write(string.format("x2 = %q\n-- comment without ending EOS", x1)))
-io.close()
-assert(loadfile(file))()
-assert(x1 == x2)
-print('+')
-assert(os.remove(file))
-assert(os.remove(file) == nil)
-assert(os.remove(otherfile) == nil)
-
-io.output(file)
-assert(io.write("qualquer coisa\n"))
-assert(io.write("mais qualquer coisa"))
-io.close()
-io.output(assert(io.open(otherfile, 'wb')))
-assert(io.write("outra coisa\0\1\3\0\0\0\0\255\0"))
-io.close()
-
-local filehandle = assert(io.open(file, 'r'))
-local otherfilehandle = assert(io.open(otherfile, 'rb'))
-assert(filehandle ~= otherfilehandle)
-assert(type(filehandle) == "userdata")
-assert(filehandle:read('*l') == "qualquer coisa")
-io.input(otherfilehandle)
-assert(io.read(string.len"outra coisa") == "outra coisa")
-assert(filehandle:read('*l') == "mais qualquer coisa")
-filehandle:close();
-assert(type(filehandle) == "userdata")
-io.input(otherfilehandle)
-assert(io.read(4) == "\0\1\3\0")
-assert(io.read(3) == "\0\0\0")
-assert(io.read(0) == "")        -- 255 is not eof
-assert(io.read(1) == "\255")
-assert(io.read('*a') == "\0")
-assert(not io.read(0))
-assert(otherfilehandle == io.input())
-otherfilehandle:close()
-assert(os.remove(file))
-assert(os.remove(otherfile))
-collectgarbage()
-
-io.output(file)
-io.write[[
- 123.4	-56e-2  not a number
-second line
-third line
-
-and the rest of the file
-]]
-io.close()
-io.input(file)
-local _,a,b,c,d,e,h,__ = io.read(1, '*n', '*n', '*l', '*l', '*l', '*a', 10)
-assert(io.close(io.input()))
-assert(_ == ' ' and __ == nil)
-assert(type(a) == 'number' and a==123.4 and b==-56e-2)
-assert(d=='second line' and e=='third line')
-assert(h==[[
-
-and the rest of the file
-]])
-assert(os.remove(file))
-collectgarbage()
-
--- testing buffers
-do
-  local f = assert(io.open(file, "w"))
-  local fr = assert(io.open(file, "r"))
-  assert(f:setvbuf("full", 2000))
-  f:write("x")
-  assert(fr:read("*all") == "")  -- full buffer; output not written yet
-  f:close()
-  fr:seek("set")
-  assert(fr:read("*all") == "x")   -- `close' flushes it
-  f = assert(io.open(file), "w")
-  assert(f:setvbuf("no"))
-  f:write("x")
-  fr:seek("set")
-  assert(fr:read("*all") == "x")  -- no buffer; output is ready
-  f:close()
-  f = assert(io.open(file, "a"))
-  assert(f:setvbuf("line"))
-  f:write("x")
-  fr:seek("set", 1)
-  assert(fr:read("*all") == "")   -- line buffer; no output without `\n'
-  f:write("a\n")
-  fr:seek("set", 1)
-  assert(fr:read("*all") == "xa\n")  -- now we have a whole line
-  f:close(); fr:close()
-end
-
-
--- testing large files (> BUFSIZ)
-io.output(file)
-for i=1,5001 do io.write('0123456789123') end
-io.write('\n12346')
-io.close()
-io.input(file)
-local x = io.read('*a')
-io.input():seek('set', 0)
-local y = io.read(30001)..io.read(1005)..io.read(0)..io.read(1)..io.read(100003)
-assert(x == y and string.len(x) == 5001*13 + 6)
-io.input():seek('set', 0)
-y = io.read()  -- huge line
-assert(x == y..'\n'..io.read())
-assert(io.read() == nil)
-io.close(io.input())
-assert(os.remove(file))
-x = nil; y = nil
-
-x, y = pcall(io.popen, "ls")
-if x then
-  assert(y:read("*a"))
-  assert(y:close())
-else
-  (Message or print)('\a\n >>> popen not available<<<\n\a')
-end
-
-print'+'
-
-local t = os.time()
-T = os.date("*t", t)
-loadstring(os.date([[assert(T.year==%Y and T.month==%m and T.day==%d and
-  T.hour==%H and T.min==%M and T.sec==%S and
-  T.wday==%w+1 and T.yday==%j and type(T.isdst) == 'boolean')]], t))()
-
-assert(os.time(T) == t)
-
-T = os.date("!*t", t)
-loadstring(os.date([[!assert(T.year==%Y and T.month==%m and T.day==%d and
-  T.hour==%H and T.min==%M and T.sec==%S and
-  T.wday==%w+1 and T.yday==%j and type(T.isdst) == 'boolean')]], t))()
-
-do
-  local T = os.date("*t")
-  local t = os.time(T)
-  assert(type(T.isdst) == 'boolean')
-  T.isdst = nil
-  local t1 = os.time(T)
-  assert(t == t1)   -- if isdst is absent uses correct default
-end   
-
-t = os.time(T)
-T.year = T.year-1;
-local t1 = os.time(T)
--- allow for leap years
-assert(math.abs(os.difftime(t,t1)/(24*3600) - 365) < 2)
-
-t = os.time()
-t1 = os.time(os.date("*t"))
-assert(os.difftime(t1,t) <= 2)
-
-local t1 = os.time{year=2000, month=10, day=1, hour=23, min=12, sec=17}
-local t2 = os.time{year=2000, month=10, day=1, hour=23, min=10, sec=19}
-assert(os.difftime(t1,t2) == 60*2-2)
-
-io.output(io.stdout)
-local d = os.date('%d')
-local m = os.date('%m')
-local a = os.date('%Y')
-local ds = os.date('%w') + 1
-local h = os.date('%H')
-local min = os.date('%M')
-local s = os.date('%S')
-io.write(string.format('test done on %2.2d/%2.2d/%d', d, m, a))
-io.write(string.format(', at %2.2d:%2.2d:%2.2d\n', h, min, s))
-io.write(string.format('%s\n', _VERSION))

lib/lua/lua-tests/gc.lua

@@ -1,312 +0,0 @@
-print('testing garbage collection')
-
-collectgarbage()
-
-_G["while"] = 234
-
-limit = 5000
-
-
-
-contCreate = 0
-
-print('tables')
-while contCreate <= limit do
-  local a = {}; a = nil
-  contCreate = contCreate+1
-end
-
-a = "a"
-
-contCreate = 0
-print('strings')
-while contCreate <= limit do
-  a = contCreate .. "b";
-  a = string.gsub(a, '(%d%d*)', string.upper)
-  a = "a"
-  contCreate = contCreate+1
-end
-
-
-contCreate = 0
-
-a = {}
-
-print('functions')
-function a:test ()
-  while contCreate <= limit do
-    loadstring(string.format("function temp(a) return 'a%d' end", contCreate))()
-    assert(temp() == string.format('a%d', contCreate))
-    contCreate = contCreate+1
-  end
-end
-
-a:test()
-
--- collection of functions without locals, globals, etc.
-do local f = function () end end
-
-
-print("functions with errors")
-prog = [[
-do
-  a = 10;
-  function foo(x,y)
-    a = sin(a+0.456-0.23e-12);
-    return function (z) return sin(%x+z) end
-  end
-  local x = function (w) a=a+w; end
-end
-]]
-do
-  local step = 1
-  if rawget(_G, "_soft") then step = 13 end
-  for i=1, string.len(prog), step do
-    for j=i, string.len(prog), step do
-      pcall(loadstring(string.sub(prog, i, j)))
-    end
-  end
-end
-
-print('long strings')
-x = "01234567890123456789012345678901234567890123456789012345678901234567890123456789"
-assert(string.len(x)==80)
-s = ''
-n = 0
-k = 300
-while n < k do s = s..x; n=n+1; j=tostring(n)  end
-assert(string.len(s) == k*80)
-s = string.sub(s, 1, 20000)
-s, i = string.gsub(s, '(%d%d%d%d)', math.sin)
-assert(i==20000/4)
-s = nil
-x = nil
-
-assert(_G["while"] == 234)
-
-
-local bytes = gcinfo()
-while 1 do
-  local nbytes = gcinfo()
-  if nbytes < bytes then break end   -- run until gc
-  bytes = nbytes
-  a = {}
-end
-
-
-local function dosteps (siz)
-  collectgarbage()
-  collectgarbage"stop"
-  local a = {}
-  for i=1,100 do a[i] = {{}}; local b = {} end
-  local x = gcinfo()
-  local i = 0
-  repeat
-    i = i+1
-  until collectgarbage("step", siz)
-  assert(gcinfo() < x)
-  return i
-end
-
-assert(dosteps(0) > 10)
-assert(dosteps(6) < dosteps(2))
-assert(dosteps(10000) == 1)
-assert(collectgarbage("step", 1000000) == true)
-assert(collectgarbage("step", 1000000))
-
-
-do
-  local x = gcinfo()
-  collectgarbage()
-  collectgarbage"stop"
-  repeat
-    local a = {}
-  until gcinfo() > 1000
-  collectgarbage"restart"
-  repeat
-    local a = {}
-  until gcinfo() < 1000
-end
-
-lim = 15
-a = {}
--- fill a with `collectable' indices
-for i=1,lim do a[{}] = i end
-b = {}
-for k,v in pairs(a) do b[k]=v end
--- remove all indices and collect them
-for n in pairs(b) do
-  a[n] = nil
-  assert(type(n) == 'table' and next(n) == nil)
-  collectgarbage()
-end
-b = nil
-collectgarbage()
-for n in pairs(a) do error'cannot be here' end
-for i=1,lim do a[i] = i end
-for i=1,lim do assert(a[i] == i) end
-
-
-print('weak tables')
-a = {}; setmetatable(a, {__mode = 'k'});
--- fill a with some `collectable' indices
-for i=1,lim do a[{}] = i end
--- and some non-collectable ones
-for i=1,lim do local t={}; a[t]=t end
-for i=1,lim do a[i] = i end
-for i=1,lim do local s=string.rep('@', i); a[s] = s..'#' end
-collectgarbage()
-local i = 0
-for k,v in pairs(a) do assert(k==v or k..'#'==v); i=i+1 end
-assert(i == 3*lim)
-
-a = {}; setmetatable(a, {__mode = 'v'});
-a[1] = string.rep('b', 21)
-collectgarbage()
-assert(a[1])   -- strings are *values*
-a[1] = nil
--- fill a with some `collectable' values (in both parts of the table)
-for i=1,lim do a[i] = {} end
-for i=1,lim do a[i..'x'] = {} end
--- and some non-collectable ones
-for i=1,lim do local t={}; a[t]=t end
-for i=1,lim do a[i+lim]=i..'x' end
-collectgarbage()
-local i = 0
-for k,v in pairs(a) do assert(k==v or k-lim..'x' == v); i=i+1 end
-assert(i == 2*lim)
-
-a = {}; setmetatable(a, {__mode = 'vk'});
-local x, y, z = {}, {}, {}
--- keep only some items
-a[1], a[2], a[3] = x, y, z
-a[string.rep('$', 11)] = string.rep('$', 11)
--- fill a with some `collectable' values
-for i=4,lim do a[i] = {} end
-for i=1,lim do a[{}] = i end
-for i=1,lim do local t={}; a[t]=t end
-collectgarbage()
-assert(next(a) ~= nil)
-local i = 0
-for k,v in pairs(a) do
-  assert((k == 1 and v == x) or
-         (k == 2 and v == y) or
-         (k == 3 and v == z) or k==v);
-  i = i+1
-end
-assert(i == 4)
-x,y,z=nil
-collectgarbage()
-assert(next(a) == string.rep('$', 11))
-
-
--- testing userdata
-collectgarbage("stop")   -- stop collection
-local u = newproxy(true)
-local s = 0
-local a = {[u] = 0}; setmetatable(a, {__mode = 'vk'})
-for i=1,10 do a[newproxy(u)] = i end
-for k in pairs(a) do assert(getmetatable(k) == getmetatable(u)) end
-local a1 = {}; for k,v in pairs(a) do a1[k] = v end
-for k,v in pairs(a1) do a[v] = k end
-for i =1,10 do assert(a[i]) end
-getmetatable(u).a = a1
-getmetatable(u).u = u
-do
-  local u = u
-  getmetatable(u).__gc = function (o)
-    assert(a[o] == 10-s)
-    assert(a[10-s] == nil) -- udata already removed from weak table
-    assert(getmetatable(o) == getmetatable(u))
-    assert(getmetatable(o).a[o] == 10-s)
-    s=s+1
-  end
-end
-a1, u = nil
-assert(next(a) ~= nil)
-collectgarbage()
-assert(s==11)
-collectgarbage()
-assert(next(a) == nil)  -- finalized keys are removed in two cycles
-
-
--- __gc x weak tables
-local u = newproxy(true)
-setmetatable(getmetatable(u), {__mode = "v"})
-getmetatable(u).__gc = function (o) os.exit(1) end  -- cannot happen
-collectgarbage()
-
-local u = newproxy(true)
-local m = getmetatable(u)
-m.x = {[{0}] = 1; [0] = {1}}; setmetatable(m.x, {__mode = "kv"});
-m.__gc = function (o)
-  assert(next(getmetatable(o).x) == nil)
-  m = 10
-end
-u, m = nil
-collectgarbage()
-assert(m==10)
-
-
--- errors during collection
-u = newproxy(true)
-getmetatable(u).__gc = function () error "!!!" end
-u = nil
-assert(not pcall(collectgarbage))
-
-
-if not rawget(_G, "_soft") then
-  print("deep structures")
-  local a = {}
-  for i = 1,200000 do
-    a = {next = a}
-  end
-  collectgarbage()
-end
-
--- create many threads with self-references and open upvalues
-local thread_id = 0
-local threads = {}
-
-function fn(thread)
-    local x = {}
-    threads[thread_id] = function()
-                             thread = x
-                         end
-    coroutine.yield()
-end
-
-while thread_id < 1000 do
-    local thread = coroutine.create(fn)
-    coroutine.resume(thread, thread)
-    thread_id = thread_id + 1
-end
-
-
-
--- create a userdata to be collected when state is closed
-do
-  local newproxy,assert,type,print,getmetatable =
-        newproxy,assert,type,print,getmetatable
-  local u = newproxy(true)
-  local tt = getmetatable(u)
-  ___Glob = {u}   -- avoid udata being collected before program end
-  tt.__gc = function (o)
-    assert(getmetatable(o) == tt)
-    -- create new objects during GC
-    local a = 'xuxu'..(10+3)..'joao', {}
-    ___Glob = o  -- ressurect object!
-    newproxy(o)  -- creates a new one with same metatable
-    print(">>> closing state " .. "<<<\n")
-  end
-end
-
--- create several udata to raise errors when collected while closing state
-do
-  local u = newproxy(true)
-  getmetatable(u).__gc = function (o) return o + 1 end
-  table.insert(___Glob, u)  -- preserve udata until the end
-  for i = 1,10 do table.insert(___Glob, newproxy(u)) end
-end
-
-print('OK')

lib/lua/lua-tests/literals.lua

@@ -1,176 +0,0 @@
-print('testing scanner')
-
-local function dostring (x) return assert(loadstring(x))() end
-
-dostring("x = 'a\0a'")
-assert(x == 'a\0a' and string.len(x) == 3)
-
--- escape sequences
-assert('\n\"\'\\' == [[
-
-"'\]])
-
-assert(string.find("\a\b\f\n\r\t\v", "^%c%c%c%c%c%c%c$"))
-
--- assume ASCII just for tests:
-assert("\09912" == 'c12')
-assert("\99ab" == 'cab')
-assert("\099" == '\99')
-assert("\099\n" == 'c\10')
-assert('\0\0\0alo' == '\0' .. '\0\0' .. 'alo')
-
-assert(010 .. 020 .. -030 == "1020-30")
-
--- long variable names
-
-var = string.rep('a', 15000)
-prog = string.format("%s = 5", var)
-dostring(prog)
-assert(_G[var] == 5)
-var = nil
-print('+')
-
--- escapes --
-assert("\n\t" == [[
-
-	]])
-assert([[
-
- $debug]] == "\n $debug")
-assert([[ [ ]] ~= [[ ] ]])
--- long strings --
-b = "001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789"
-assert(string.len(b) == 960)
-prog = [=[
-print('+')
-
-a1 = [["isto e' um string com várias 'aspas'"]]
-a2 = "'aspas'"
-
-assert(string.find(a1, a2) == 31)
-print('+')
-
-a1 = [==[temp = [[um valor qualquer]]; ]==]
-assert(loadstring(a1))()
-assert(temp == 'um valor qualquer')
--- long strings --
-b = "001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789"
-assert(string.len(b) == 960)
-print('+')
-
-a = [[00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-]]
-assert(string.len(a) == 1863)
-assert(string.sub(a, 1, 40) == string.sub(b, 1, 40))
-x = 1
-]=]
-
-print('+')
-x = nil
-dostring(prog)
-assert(x)
-
-prog = nil
-a = nil
-b = nil
-
-
--- testing line ends
-prog = [[
-a = 1        -- a comment
-b = 2
-
-
-x = [=[
-hi
-]=]
-y = "\
-hello\r\n\
-"
-return debug.getinfo(1).currentline
-]]
-
-for _, n in pairs{"\n", "\r", "\n\r", "\r\n"} do
-  local prog, nn = string.gsub(prog, "\n", n)
-  assert(dostring(prog) == nn)
-  assert(_G.x == "hi\n" and _G.y == "\nhello\r\n\n")
-end
-
-
--- testing comments and strings with long brackets
-a = [==[]=]==]
-assert(a == "]=")
-
-a = [==[[===[[=[]]=][====[]]===]===]==]
-assert(a == "[===[[=[]]=][====[]]===]===")
-
-a = [====[[===[[=[]]=][====[]]===]===]====]
-assert(a == "[===[[=[]]=][====[]]===]===")
-
-a = [=[]]]]]]]]]=]
-assert(a == "]]]]]]]]")
-
-
---[===[
-x y z [==[ blu foo
-]==
-]
-]=]==]
-error error]=]===]
-
--- generate all strings of four of these chars
-local x = {"=", "[", "]", "\n"}
-local len = 4
-local function gen (c, n)
-  if n==0 then coroutine.yield(c)
-  else
-    for _, a in pairs(x) do
-      gen(c..a, n-1)
-    end
-  end
-end
-
-for s in coroutine.wrap(function () gen("", len) end) do
-  assert(s == loadstring("return [====[\n"..s.."]====]")())
-end
-
-
--- testing decimal point locale
-if os.setlocale("pt_BR") or os.setlocale("ptb") then
-  assert(tonumber("3,4") == 3.4 and tonumber"3.4" == nil)
-  assert(assert(loadstring("return 3.4"))() == 3.4)
-  assert(assert(loadstring("return .4,3"))() == .4)
-  assert(assert(loadstring("return 4."))() == 4.)
-  assert(assert(loadstring("return 4.+.5"))() == 4.5)
-  local a,b = loadstring("return 4.5.")
-  assert(string.find(b, "'4%.5%.'"))
-  assert(os.setlocale("C"))
-else
-  (Message or print)(
-   '\a\n >>> pt_BR locale not available: skipping decimal point tests <<<\n\a')
-end
-
-
-print('OK')

lib/lua/lua-tests/locals.lua

@@ -1,127 +0,0 @@
-print('testing local variables plus some extra stuff')
-
-do
-  local i = 10
-  do local i = 100; assert(i==100) end
-  do local i = 1000; assert(i==1000) end
-  assert(i == 10)
-  if i ~= 10 then
-    local i = 20
-  else
-    local i = 30
-    assert(i == 30)
-  end
-end
-
-
-
-f = nil
-
-local f
-x = 1
-
-a = nil
-loadstring('local a = {}')()
-assert(type(a) ~= 'table')
-
-function f (a)
-  local _1, _2, _3, _4, _5
-  local _6, _7, _8, _9, _10
-  local x = 3
-  local b = a
-  local c,d = a,b
-  if (d == b) then
-    local x = 'q'
-    x = b
-    assert(x == 2)
-  else
-    assert(nil)
-  end
-  assert(x == 3)
-  local f = 10
-end
-
-local b=10
-local a; repeat local b; a,b=1,2; assert(a+1==b); until a+b==3
-
-
-assert(x == 1)
-
-f(2)
-assert(type(f) == 'function')
-
-
--- testing globals ;-)
-do
-  local f = {}
-  local _G = _G
-  for i=1,10 do f[i] = function (x) A=A+1; return A, _G.getfenv(x) end end
-  A=10; assert(f[1]() == 11)
-  for i=1,10 do assert(setfenv(f[i], {A=i}) == f[i]) end
-  assert(f[3]() == 4 and A == 11)
-  local a,b = f[8](1)
-  assert(b.A == 9)
-  a,b = f[8](0)
-  assert(b.A == 11)   -- `real' global
-  local g
-  local function f () assert(setfenv(2, {a='10'}) == g) end
-  g = function () f(); _G.assert(_G.getfenv(1).a == '10') end
-  g(); assert(getfenv(g).a == '10')
-end
-
--- test for global table of loaded chunks
-local function foo (s)
-  return loadstring(s)
-end
-
-assert(getfenv(foo("")) == _G)
-local a = {loadstring = loadstring} 
-setfenv(foo, a)
-assert(getfenv(foo("")) == _G)
-setfenv(0, a)  -- change global environment
-assert(getfenv(foo("")) == a)
-setfenv(0, _G)
-
-
--- testing limits for special instructions
-
-local a
-local p = 4
-for i=2,31 do
-  for j=-3,3 do
-    assert(loadstring(string.format([[local a=%s;a=a+
-                                            %s;
-                                      assert(a
-                                      ==2^%s)]], j, p-j, i))) ()
-    assert(loadstring(string.format([[local a=%s;
-                                      a=a-%s;
-                                      assert(a==-2^%s)]], -j, p-j, i))) ()
-    assert(loadstring(string.format([[local a,b=0,%s;
-                                      a=b-%s;
-                                      assert(a==-2^%s)]], -j, p-j, i))) ()
-  end
-  p =2*p
-end
-
-print'+'
-
-
-if rawget(_G, "querytab") then
-  -- testing clearing of dead elements from tables
-  collectgarbage("stop")   -- stop GC
-  local a = {[{}] = 4, [3] = 0, alo = 1, 
-             a1234567890123456789012345678901234567890 = 10}
-
-  local t = querytab(a)
-
-  for k,_ in pairs(a) do a[k] = nil end
-  collectgarbage()   -- restore GC and collect dead fiels in `a'
-  for i=0,t-1 do
-    local k = querytab(a, i)
-    assert(k == nil or type(k) == 'number' or k == 'alo')
-  end
-end
-
-print('OK')
-
-return 5,f

lib/lua/lua-tests/main.lua

@@ -1,159 +0,0 @@
-# testing special comment on first line
-
-print ("testing lua.c options")
-
-assert(os.execute() ~= 0)   -- machine has a system command
-
-prog = os.tmpname()
-otherprog = os.tmpname()
-out = os.tmpname()
-
-do
-  local i = 0
-  while arg[i] do i=i-1 end
-  progname = '"'..arg[i+1]..'"'
-end
-print(progname)
-
-local prepfile = function (s, p)
-  p = p or prog
-  io.output(p)
-  io.write(s)
-  assert(io.close())
-end
-
-function checkout (s)
-  io.input(out)
-  local t = io.read("*a")
-  io.input():close()
-  assert(os.remove(out))
-  if s ~= t then print(string.format("'%s' - '%s'\n", s, t)) end
-  assert(s == t)
-  return t
-end
-
-function auxrun (...)
-  local s = string.format(...)
-  s = string.gsub(s, "lua", progname, 1)
-  return os.execute(s)
-end
-
-function RUN (...)
-  assert(auxrun(...) == 0)
-end
-
-function NoRun (...)
-  print("\n(the next error is expected by the test)")
-  assert(auxrun(...) ~= 0)
-end
-
--- test 2 files
-prepfile("print(1); a=2")
-prepfile("print(a)", otherprog)
-RUN("lua -l %s -l%s -lstring -l io %s > %s", prog, otherprog, otherprog, out)
-checkout("1\n2\n2\n")
-
-local a = [[
-  assert(table.getn(arg) == 3 and arg[1] == 'a' and
-         arg[2] == 'b' and arg[3] == 'c')
-  assert(arg[-1] == '--' and arg[-2] == "-e " and arg[-3] == %s)
-  assert(arg[4] == nil and arg[-4] == nil)
-  local a, b, c = ...
-  assert(... == 'a' and a == 'a' and b == 'b' and c == 'c')
-]]
-a = string.format(a, progname)
-prepfile(a)
-RUN('lua "-e " -- %s a b c', prog)
-
-prepfile"assert(arg==nil)"
-prepfile("assert(arg)", otherprog)
-RUN("lua -l%s - < %s", prog, otherprog)
-
-prepfile""
-RUN("lua - < %s > %s", prog, out)
-checkout("")
-
--- test many arguments
-prepfile[[print(({...})[30])]]
-RUN("lua %s %s > %s", prog, string.rep(" a", 30), out)
-checkout("a\n")
-
-RUN([[lua "-eprint(1)" -ea=3 -e "print(a)" > %s]], out)
-checkout("1\n3\n")
-
-prepfile[[
-  print(
-1, a
-)
-]]
-RUN("lua - < %s > %s", prog, out)
-checkout("1\tnil\n")
-
-prepfile[[
-= (6*2-6) -- ===
-a 
-= 10
-print(a)
-= a]]
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkout("6\n10\n10\n\n")
-
-prepfile("a = [[b\nc\nd\ne]]\n=a")
-print(prog)
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkout("b\nc\nd\ne\n\n")
-
-prompt = "alo"
-prepfile[[ --
-a = 2
-]]
-RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out)
-checkout(string.rep(prompt, 3).."\n")
-
-s = [=[ -- 
-function f ( x ) 
-  local a = [[
-xuxu
-]]
-  local b = "\
-xuxu\n"
-  if x == 11 then return 1 , 2 end  --[[ test multiple returns ]]
-  return x + 1 
-  --\\
-end
-=( f( 10 ) )
-assert( a == b )
-=f( 11 )  ]=]
-s = string.gsub(s, ' ', '\n\n')
-prepfile(s)
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkout("11\n1\t2\n\n")
-  
-prepfile[[#comment in 1st line without \n at the end]]
-RUN("lua %s", prog)
-
-prepfile("#comment with a binary file\n"..string.dump(loadstring("print(1)")))
-RUN("lua %s > %s", prog, out)
-checkout("1\n")
-
-prepfile("#comment with a binary file\r\n"..string.dump(loadstring("print(1)")))
-RUN("lua %s > %s", prog, out)
-checkout("1\n")
-
--- close Lua with an open file
-prepfile(string.format([[io.output(%q); io.write('alo')]], out))
-RUN("lua %s", prog)
-checkout('alo')
-
-assert(os.remove(prog))
-assert(os.remove(otherprog))
-assert(not os.remove(out))
-
-RUN("lua -v")
-
-NoRun("lua -h")
-NoRun("lua -e")
-NoRun("lua -e a")
-NoRun("lua -f")
-
-print("OK")

lib/lua/lua-tests/math.lua

@@ -1,208 +0,0 @@
-print("testing numbers and math lib")
-
-do
-  local a,b,c = "2", " 3e0 ", " 10  "
-  assert(a+b == 5 and -b == -3 and b+"2" == 5 and "10"-c == 0)
-  assert(type(a) == 'string' and type(b) == 'string' and type(c) == 'string')
-  assert(a == "2" and b == " 3e0 " and c == " 10  " and -c == -"  10 ")
-  assert(c%a == 0 and a^b == 8)
-end
-
-
-do
-  local a,b = math.modf(3.5)
-  assert(a == 3 and b == 0.5)
-  assert(math.huge > 10e30)
-  assert(-math.huge < -10e30)
-end
-
-function f(...)
-  if select('#', ...) == 1 then
-    return (...)
-  else
-    return "***"
-  end
-end
-
-assert(tonumber{} == nil)
-assert(tonumber'+0.01' == 1/100 and tonumber'+.01' == 0.01 and
-       tonumber'.01' == 0.01    and tonumber'-1.' == -1 and
-       tonumber'+1.' == 1)
-assert(tonumber'+ 0.01' == nil and tonumber'+.e1' == nil and
-       tonumber'1e' == nil     and tonumber'1.0e+' == nil and
-       tonumber'.' == nil)
-assert(tonumber('-12') == -10-2)
-assert(tonumber('-1.2e2') == - - -120)
-assert(f(tonumber('1  a')) == nil)
-assert(f(tonumber('e1')) == nil)
-assert(f(tonumber('e  1')) == nil)
-assert(f(tonumber(' 3.4.5 ')) == nil)
-assert(f(tonumber('')) == nil)
-assert(f(tonumber('', 8)) == nil)
-assert(f(tonumber('  ')) == nil)
-assert(f(tonumber('  ', 9)) == nil)
-assert(f(tonumber('99', 8)) == nil)
-assert(tonumber('  1010  ', 2) == 10)
-assert(tonumber('10', 36) == 36)
---assert(tonumber('\n  -10  \n', 36) == -36)
---assert(tonumber('-fFfa', 16) == -(10+(16*(15+(16*(15+(16*15)))))))
-assert(tonumber('fFfa', 15) == nil)
---assert(tonumber(string.rep('1', 42), 2) + 1 == 2^42)
-assert(tonumber(string.rep('1', 32), 2) + 1 == 2^32)
---assert(tonumber('-fffffFFFFF', 16)-1 == -2^40)
-assert(tonumber('ffffFFFF', 16)+1 == 2^32)
-
-assert(1.1 == 1.+.1)
-assert(100.0 == 1E2 and .01 == 1e-2)
-assert(1111111111111111-1111111111111110== 1000.00e-03)
---     1234567890123456
-assert(1.1 == '1.'+'.1')
-assert('1111111111111111'-'1111111111111110' == tonumber"  +0.001e+3 \n\t")
-
-function eq (a,b,limit)
-  if not limit then limit = 10E-10 end
-  return math.abs(a-b) <= limit
-end
-
-assert(0.1e-30 > 0.9E-31 and 0.9E30 < 0.1e31)
-
-assert(0.123456 > 0.123455)
-
-assert(tonumber('+1.23E30') == 1.23*10^30)
-
--- testing order operators
-assert(not(1<1) and (1<2) and not(2<1))
-assert(not('a'<'a') and ('a'<'b') and not('b'<'a'))
-assert((1<=1) and (1<=2) and not(2<=1))
-assert(('a'<='a') and ('a'<='b') and not('b'<='a'))
-assert(not(1>1) and not(1>2) and (2>1))
-assert(not('a'>'a') and not('a'>'b') and ('b'>'a'))
-assert((1>=1) and not(1>=2) and (2>=1))
-assert(('a'>='a') and not('a'>='b') and ('b'>='a'))
-
--- testing mod operator
-assert(-4%3 == 2)
-assert(4%-3 == -2)
-assert(math.pi - math.pi % 1 == 3)
-assert(math.pi - math.pi % 0.001 == 3.141)
-
-local function testbit(a, n)
-  return a/2^n % 2 >= 1
-end
-
-assert(eq(math.sin(-9.8)^2 + math.cos(-9.8)^2, 1))
-assert(eq(math.tan(math.pi/4), 1))
-assert(eq(math.sin(math.pi/2), 1) and eq(math.cos(math.pi/2), 0))
-assert(eq(math.atan(1), math.pi/4) and eq(math.acos(0), math.pi/2) and
-       eq(math.asin(1), math.pi/2))
-assert(eq(math.deg(math.pi/2), 90) and eq(math.rad(90), math.pi/2))
-assert(math.abs(-10) == 10)
-assert(eq(math.atan2(1,0), math.pi/2))
-assert(math.ceil(4.5) == 5.0)
-assert(math.floor(4.5) == 4.0)
-assert(math.mod(10,3) == 1)
-assert(eq(math.sqrt(10)^2, 10))
-assert(eq(math.log10(2), math.log(2)/math.log(10)))
-assert(eq(math.exp(0), 1))
-assert(eq(math.sin(10), math.sin(10%(2*math.pi))))
-local v,e = math.frexp(math.pi)
-assert(eq(math.ldexp(v,e), math.pi))
-
-assert(eq(math.tanh(3.5), math.sinh(3.5)/math.cosh(3.5)))
-
-assert(tonumber(' 1.3e-2 ') == 1.3e-2)
-assert(tonumber(' -1.00000000000001 ') == -1.00000000000001)
-
--- testing constant limits
--- 2^23 = 8388608
-assert(8388609 + -8388609 == 0)
-assert(8388608 + -8388608 == 0)
-assert(8388607 + -8388607 == 0)
-
-if rawget(_G, "_soft") then return end
-
-f = io.tmpfile()
-assert(f)
-f:write("a = {")
-i = 1
-repeat
-  f:write("{", math.sin(i), ", ", math.cos(i), ", ", i/3, "},\n")
-  i=i+1
-until i > 1000
-f:write("}")
-f:seek("set", 0)
-assert(loadstring(f:read('*a')))()
-assert(f:close())
-
-assert(eq(a[300][1], math.sin(300)))
-assert(eq(a[600][1], math.sin(600)))
-assert(eq(a[500][2], math.cos(500)))
-assert(eq(a[800][2], math.cos(800)))
-assert(eq(a[200][3], 200/3))
-assert(eq(a[1000][3], 1000/3, 0.001))
-print('+')
-
-do   -- testing NaN
-  local NaN = 10e500 - 10e400
-  assert(NaN ~= NaN)
-  assert(not (NaN < NaN))
-  assert(not (NaN <= NaN))
-  assert(not (NaN > NaN))
-  assert(not (NaN >= NaN))
-  assert(not (0 < NaN))
-  assert(not (NaN < 0))
-  local a = {}
-  assert(not pcall(function () a[NaN] = 1 end))
-  assert(a[NaN] == nil)
-  a[1] = 1
-  assert(not pcall(function () a[NaN] = 1 end))
-  assert(a[NaN] == nil)
-end
-
-require "checktable"
-stat(a)
-
-a = nil
-
--- testing implicit convertions
-
-local a,b = '10', '20'
-assert(a*b == 200 and a+b == 30 and a-b == -10 and a/b == 0.5 and -b == -20)
-assert(a == '10' and b == '20')
-
-
-math.randomseed(0)
-
-local i = 0
-local Max = 0
-local Min = 2
-repeat
-  local t = math.random()
-  Max = math.max(Max, t)
-  Min = math.min(Min, t)
-  i=i+1
-  flag = eq(Max, 1, 0.001) and eq(Min, 0, 0.001)
-until flag or i>10000
-assert(0 <= Min and Max<1)
-assert(flag);
-
-for i=1,10 do
-  local t = math.random(5)
-  assert(1 <= t and t <= 5)
-end
-
-i = 0
-Max = -200
-Min = 200
-repeat
-  local t = math.random(-10,0)
-  Max = math.max(Max, t)
-  Min = math.min(Min, t)
-  i=i+1
-  flag = (Max == 0 and Min == -10)
-until flag or i>10000
-assert(-10 <= Min and Max<=0)
-assert(flag);
-
-
-print('OK')

lib/lua/lua-tests/nextvar.lua

@@ -1,396 +0,0 @@
-print('testing tables, next, and for')
-
-local a = {}
-
--- make sure table has lots of space in hash part
-for i=1,100 do a[i.."+"] = true end
-for i=1,100 do a[i.."+"] = nil end
--- fill hash part with numeric indices testing size operator
-for i=1,100 do
-  a[i] = true
-  assert(#a == i)
-end
-
-
-if T then
--- testing table sizes
-
-local l2 = math.log(2)
-local function log2 (x) return math.log(x)/l2 end
-
-local function mp2 (n)   -- minimum power of 2 >= n
-  local mp = 2^math.ceil(log2(n))
-  assert(n == 0 or (mp/2 < n and n <= mp))
-  return mp
-end
-
-local function fb (n)
-  local r, nn = T.int2fb(n)
-  assert(r < 256)
-  return nn
-end
-
--- test fb function
-local a = 1
-local lim = 2^30
-while a < lim do
-  local n = fb(a)
-  assert(a <= n and n <= a*1.125)
-  a = math.ceil(a*1.3)
-end
-
- 
-local function check (t, na, nh)
-  local a, h = T.querytab(t)
-  if a ~= na or h ~= nh then
-    print(na, nh, a, h)
-    assert(nil)
-  end
-end
-
--- testing constructor sizes
-local lim = 40
-local s = 'return {'
-for i=1,lim do
-  s = s..i..','
-  local s = s
-  for k=0,lim do 
-    local t = loadstring(s..'}')()
-    assert(#t == i)
-    check(t, fb(i), mp2(k))
-    s = string.format('%sa%d=%d,', s, k, k)
-  end
-end
-
-
--- tests with unknown number of elements
-local a = {}
-for i=1,lim do a[i] = i end   -- build auxiliary table
-for k=0,lim do
-  local a = {unpack(a,1,k)}
-  assert(#a == k)
-  check(a, k, 0)
-  a = {1,2,3,unpack(a,1,k)}
-  check(a, k+3, 0)
-  assert(#a == k + 3)
-end
-
-
-print'+'
-
--- testing tables dynamically built
-local lim = 130
-local a = {}; a[2] = 1; check(a, 0, 1)
-a = {}; a[0] = 1; check(a, 0, 1); a[2] = 1; check(a, 0, 2)
-a = {}; a[0] = 1; a[1] = 1; check(a, 1, 1)
-a = {}
-for i = 1,lim do
-  a[i] = 1
-  assert(#a == i)
-  check(a, mp2(i), 0)
-end
-
-a = {}
-for i = 1,lim do
-  a['a'..i] = 1
-  assert(#a == 0)
-  check(a, 0, mp2(i))
-end
-
-a = {}
-for i=1,16 do a[i] = i end
-check(a, 16, 0)
-for i=1,11 do a[i] = nil end
-for i=30,40 do a[i] = nil end   -- force a rehash (?)
-check(a, 0, 8)
-a[10] = 1
-for i=30,40 do a[i] = nil end   -- force a rehash (?)
-check(a, 0, 8)
-for i=1,14 do a[i] = nil end
-for i=30,50 do a[i] = nil end   -- force a rehash (?)
-check(a, 0, 4)
-
--- reverse filling
-for i=1,lim do
-  local a = {}
-  for i=i,1,-1 do a[i] = i end   -- fill in reverse
-  check(a, mp2(i), 0)
-end
-
--- size tests for vararg
-lim = 35
-function foo (n, ...)
-  local arg = {...}
-  check(arg, n, 0)
-  assert(select('#', ...) == n)
-  arg[n+1] = true
-  check(arg, mp2(n+1), 0)
-  arg.x = true
-  check(arg, mp2(n+1), 1)
-end
-local a = {}
-for i=1,lim do a[i] = true; foo(i, unpack(a)) end
-
-end
-
-
--- test size operation on empty tables
-assert(#{} == 0)
-assert(#{nil} == 0)
-assert(#{nil, nil} == 0)
-assert(#{nil, nil, nil} == 0)
-assert(#{nil, nil, nil, nil} == 0)
-print'+'
-
-
-local nofind = {}
-
-a,b,c = 1,2,3
-a,b,c = nil
-
-local function find (name)
-  local n,v
-  while 1 do
-    n,v = next(_G, n)
-    if not n then return nofind end
-    assert(v ~= nil)
-    if n == name then return v end
-  end
-end
-
-local function find1 (name)
-  for n,v in pairs(_G) do
-    if n==name then return v end
-  end
-  return nil  -- not found
-end
-
-do   -- create 10000 new global variables
-  for i=1,10000 do _G[i] = i end
-end
-
-
-a = {x=90, y=8, z=23}
-assert(table.foreach(a, function(i,v) if i=='x' then return v end end) == 90)
-assert(table.foreach(a, function(i,v) if i=='a' then return v end end) == nil)
-table.foreach({}, error)
-
-table.foreachi({x=10, y=20}, error)
-local a = {n = 1}
-table.foreachi({n=3}, function (i, v)
-  assert(a.n == i and not v)
-  a.n=a.n+1
-end)
-a = {10,20,30,nil,50}
-table.foreachi(a, function (i,v) assert(a[i] == v) end)
-assert(table.foreachi({'a', 'b', 'c'}, function (i,v)
-         if i==2 then return v end
-       end) == 'b')
-
-
-assert(print==find("print") and print == find1("print"))
-assert(_G["print"]==find("print"))
-assert(assert==find1("assert"))
-assert(nofind==find("return"))
-assert(not find1("return"))
-_G["ret" .. "urn"] = nil
-assert(nofind==find("return"))
-_G["xxx"] = 1
-assert(xxx==find("xxx"))
-print('+')
-
-a = {}
-for i=0,10000 do
-  if math.mod(i,10) ~= 0 then
-    a['x'..i] = i
-  end
-end
-
-n = {n=0}
-for i,v in pairs(a) do
-  n.n = n.n+1
-  assert(i and v and a[i] == v)
-end
-assert(n.n == 9000)
-a = nil
-
--- remove those 10000 new global variables
-for i=1,10000 do _G[i] = nil end
-
-do   -- clear global table
-  local a = {}
-  local preserve = {io = 1, string = 1, debug = 1, os = 1,
-                    coroutine = 1, table = 1, math = 1}
-  for n,v in pairs(_G) do a[n]=v end
-  for n,v in pairs(a) do
-    if not preserve[n] and type(v) ~= "function" and
-       not string.find(n, "^[%u_]") then
-     _G[n] = nil
-    end
-    collectgarbage()
-  end
-end
-
-local function foo ()
-  local getfenv, setfenv, assert, next =
-        getfenv, setfenv, assert, next
-  local n = {gl1=3}
-  setfenv(foo, n)
-  assert(getfenv(foo) == getfenv(1))
-  assert(getfenv(foo) == n)
-  assert(print == nil and gl1 == 3)
-  gl1 = nil
-  gl = 1
-  assert(n.gl == 1 and next(n, 'gl') == nil)
-end
-foo()
-
-print'+'
-
-local function checknext (a)
-  local b = {}
-  table.foreach(a, function (k,v) b[k] = v end)
-  for k,v in pairs(b) do assert(a[k] == v) end
-  for k,v in pairs(a) do assert(b[k] == v) end
-  b = {}
-  do local k,v = next(a); while k do b[k] = v; k,v = next(a,k) end end
-  for k,v in pairs(b) do assert(a[k] == v) end
-  for k,v in pairs(a) do assert(b[k] == v) end
-end
-
-checknext{1,x=1,y=2,z=3}
-checknext{1,2,x=1,y=2,z=3}
-checknext{1,2,3,x=1,y=2,z=3}
-checknext{1,2,3,4,x=1,y=2,z=3}
-checknext{1,2,3,4,5,x=1,y=2,z=3}
-
-assert(table.getn{} == 0)
-assert(table.getn{[-1] = 2} == 0)
-assert(table.getn{1,2,3,nil,nil} == 3)
-for i=0,40 do
-  local a = {}
-  for j=1,i do a[j]=j end
-  assert(table.getn(a) == i)
-end
-
-
-assert(table.maxn{} == 0)
-assert(table.maxn{["1000"] = true} == 0)
-assert(table.maxn{["1000"] = true, [24.5] = 3} == 24.5)
-assert(table.maxn{[1000] = true} == 1000)
-assert(table.maxn{[10] = true, [100*math.pi] = print} == 100*math.pi)
-
-
--- int overflow
-a = {}
-for i=0,50 do a[math.pow(2,i)] = true end
-assert(a[table.getn(a)])
-
-print("+")
-
-
--- erasing values
-local t = {[{1}] = 1, [{2}] = 2, [string.rep("x ", 4)] = 3,
-           [100.3] = 4, [4] = 5}
-
-local n = 0
-for k, v in pairs( t ) do
-  n = n+1
-  assert(t[k] == v)
-  t[k] = nil
-  collectgarbage()
-  assert(t[k] == nil)
-end
-assert(n == 5)
-
-
-local function test (a)
-  table.insert(a, 10); table.insert(a, 2, 20);
-  table.insert(a, 1, -1); table.insert(a, 40);
-  table.insert(a, table.getn(a)+1, 50)
-  table.insert(a, 2, -2)
-  assert(table.remove(a,1) == -1)
-  assert(table.remove(a,1) == -2)
-  assert(table.remove(a,1) == 10)
-  assert(table.remove(a,1) == 20)
-  assert(table.remove(a,1) == 40)
-  assert(table.remove(a,1) == 50)
-  assert(table.remove(a,1) == nil)
-end
-
-a = {n=0, [-7] = "ban"}
-test(a)
-assert(a.n == 0 and a[-7] == "ban")
-
-a = {[-7] = "ban"};
-test(a)
-assert(a.n == nil and table.getn(a) == 0 and a[-7] == "ban")
-
-
-table.insert(a, 1, 10); table.insert(a, 1, 20); table.insert(a, 1, -1)
-assert(table.remove(a) == 10)
-assert(table.remove(a) == 20)
-assert(table.remove(a) == -1)
-
-a = {'c', 'd'}
-table.insert(a, 3, 'a')
-table.insert(a, 'b')
-assert(table.remove(a, 1) == 'c')
-assert(table.remove(a, 1) == 'd')
-assert(table.remove(a, 1) == 'a')
-assert(table.remove(a, 1) == 'b')
-assert(table.getn(a) == 0 and a.n == nil)
-print("+")
-
-a = {}
-for i=1,1000 do
-  a[i] = i; a[i-1] = nil
-end
-assert(next(a,nil) == 1000 and next(a,1000) == nil)
-
-assert(next({}) == nil)
-assert(next({}, nil) == nil)
-
-for a,b in pairs{} do error"not here" end
-for i=1,0 do error'not here' end
-for i=0,1,-1 do error'not here' end
-a = nil; for i=1,1 do assert(not a); a=1 end; assert(a)
-a = nil; for i=1,1,-1 do assert(not a); a=1 end; assert(a)
-
-a = 0; for i=0, 1, 0.1 do a=a+1 end; assert(a==11)
--- precision problems
---a = 0; for i=1, 0, -0.01 do a=a+1 end; assert(a==101)
-a = 0; for i=0, 0.999999999, 0.1 do a=a+1 end; assert(a==10)
-a = 0; for i=1, 1, 1 do a=a+1 end; assert(a==1)
-a = 0; for i=1e10, 1e10, -1 do a=a+1 end; assert(a==1)
-a = 0; for i=1, 0.99999, 1 do a=a+1 end; assert(a==0)
-a = 0; for i=99999, 1e5, -1 do a=a+1 end; assert(a==0)
-a = 0; for i=1, 0.99999, -1 do a=a+1 end; assert(a==1)
-
--- conversion
-a = 0; for i="10","1","-2" do a=a+1 end; assert(a==5)
-
-
-collectgarbage()
-
-
--- testing generic 'for'
-
-local function f (n, p)
-  local t = {}; for i=1,p do t[i] = i*10 end
-  return function (_,n)
-           if n > 0 then
-             n = n-1
-             return n, unpack(t)
-           end
-         end, nil, n
-end
-
-local x = 0
-for n,a,b,c,d in f(5,3) do
-  x = x+1
-  assert(a == 10 and b == 20 and c == 30 and d == nil)
-end
-assert(x == 5)
-
-print"OK"

lib/lua/lua-tests/pm.lua

@@ -1,273 +0,0 @@
-print('testing pattern matching')
-
-function f(s, p)
-  local i,e = string.find(s, p)
-  if i then return string.sub(s, i, e) end
-end
-
-function f1(s, p)
-  p = string.gsub(p, "%%([0-9])", function (s) return "%" .. (s+1) end)
-  p = string.gsub(p, "^(^?)", "%1()", 1)
-  p = string.gsub(p, "($?)$", "()%1", 1)
-  local t = {string.match(s, p)}
-  return string.sub(s, t[1], t[#t] - 1)
-end
-
-a,b = string.find('', '')    -- empty patterns are tricky
-assert(a == 1 and b == 0);
-a,b = string.find('alo', '')
-assert(a == 1 and b == 0)
-a,b = string.find('a\0o a\0o a\0o', 'a', 1)   -- first position
-assert(a == 1 and b == 1)
-a,b = string.find('a\0o a\0o a\0o', 'a\0o', 2)   -- starts in the midle
-assert(a == 5 and b == 7)
-a,b = string.find('a\0o a\0o a\0o', 'a\0o', 9)   -- starts in the midle
-assert(a == 9 and b == 11)
-a,b = string.find('a\0a\0a\0a\0\0ab', '\0ab', 2);  -- finds at the end
-assert(a == 9 and b == 11);
-a,b = string.find('a\0a\0a\0a\0\0ab', 'b')    -- last position
-assert(a == 11 and b == 11)
-assert(string.find('a\0a\0a\0a\0\0ab', 'b\0') == nil)   -- check ending
-assert(string.find('', '\0') == nil)
-assert(string.find('alo123alo', '12') == 4)
-assert(string.find('alo123alo', '^12') == nil)
-
-assert(f('aloALO', '%l*') == 'alo')
-assert(f('aLo_ALO', '%a*') == 'aLo')
-
-assert(f('aaab', 'a*') == 'aaa');
-assert(f('aaa', '^.*$') == 'aaa');
-assert(f('aaa', 'b*') == '');
-assert(f('aaa', 'ab*a') == 'aa')
-assert(f('aba', 'ab*a') == 'aba')
-assert(f('aaab', 'a+') == 'aaa')
-assert(f('aaa', '^.+$') == 'aaa')
-assert(f('aaa', 'b+') == nil)
-assert(f('aaa', 'ab+a') == nil)
-assert(f('aba', 'ab+a') == 'aba')
-assert(f('a$a', '.$') == 'a')
-assert(f('a$a', '.%$') == 'a$')
-assert(f('a$a', '.$.') == 'a$a')
-assert(f('a$a', '$$') == nil)
-assert(f('a$b', 'a$') == nil)
-assert(f('a$a', '$') == '')
-assert(f('', 'b*') == '')
-assert(f('aaa', 'bb*') == nil)
-assert(f('aaab', 'a-') == '')
-assert(f('aaa', '^.-$') == 'aaa')
-assert(f('aabaaabaaabaaaba', 'b.*b') == 'baaabaaabaaab')
-assert(f('aabaaabaaabaaaba', 'b.-b') == 'baaab')
-assert(f('alo xo', '.o$') == 'xo')
-assert(f(' \n isto é assim', '%S%S*') == 'isto')
-assert(f(' \n isto é assim', '%S*$') == 'assim')
-assert(f(' \n isto é assim', '[a-z]*$') == 'assim')
-assert(f('um caracter ? extra', '[^%sa-z]') == '?')
-assert(f('', 'a?') == '')
-assert(f('á', 'á?') == 'á')
-assert(f('ábl', 'á?b?l?') == 'ábl')
-assert(f('  ábl', 'á?b?l?') == '')
-assert(f('aa', '^aa?a?a') == 'aa')
-assert(f(']]]áb', '[^]]') == 'á')
-assert(f("0alo alo", "%x*") == "0a")
-assert(f("alo alo", "%C+") == "alo alo")
-print('+')
-
-assert(f1('alo alx 123 b\0o b\0o', '(..*) %1') == "b\0o b\0o")
-assert(f1('axz123= 4= 4 34', '(.+)=(.*)=%2 %1') == '3= 4= 4 3')
-assert(f1('=======', '^(=*)=%1$') == '=======')
-assert(string.match('==========', '^([=]*)=%1$') == nil)
-
-local function range (i, j)
-  if i <= j then
-    return i, range(i+1, j)
-  end
-end
-
-local abc = string.char(range(0, 255));
-
-assert(string.len(abc) == 256)
-
-function strset (p)
-  local res = {s=''}
-  string.gsub(abc, p, function (c) res.s = res.s .. c end)
-  return res.s
-end;
-
-assert(string.len(strset('[\200-\210]')) == 11)
-
-assert(strset('[a-z]') == "abcdefghijklmnopqrstuvwxyz")
-assert(strset('[a-z%d]') == strset('[%da-uu-z]'))
-assert(strset('[a-]') == "-a")
-assert(strset('[^%W]') == strset('[%w]'))
-assert(strset('[]%%]') == '%]')
-assert(strset('[a%-z]') == '-az')
-assert(strset('[%^%[%-a%]%-b]') == '-[]^ab')
-assert(strset('%Z') == strset('[\1-\255]'))
-assert(strset('.') == strset('[\1-\255%z]'))
-print('+');
-
-assert(string.match("alo xyzK", "(%w+)K") == "xyz")
-assert(string.match("254 K", "(%d*)K") == "")
-assert(string.match("alo ", "(%w*)$") == "")
-assert(string.match("alo ", "(%w+)$") == nil)
-assert(string.find("(álo)", "%(á") == 1)
-local a, b, c, d, e = string.match("âlo alo", "^(((.).).* (%w*))$")
-assert(a == 'âlo alo' and b == 'âl' and c == 'â' and d == 'alo' and e == nil)
-a, b, c, d  = string.match('0123456789', '(.+(.?)())')
-assert(a == '0123456789' and b == '' and c == 11 and d == nil)
-print('+')
-
-assert(string.gsub('ülo ülo', 'ü', 'x') == 'xlo xlo')
-assert(string.gsub('alo úlo  ', ' +$', '') == 'alo úlo')  -- trim
-assert(string.gsub('  alo alo  ', '^%s*(.-)%s*$', '%1') == 'alo alo')  -- double trim
-assert(string.gsub('alo  alo  \n 123\n ', '%s+', ' ') == 'alo alo 123 ')
-t = "abç d"
-a, b = string.gsub(t, '(.)', '%1@')
-assert('@'..a == string.gsub(t, '', '@') and b == 5)
-a, b = string.gsub('abçd', '(.)', '%0@', 2)
-assert(a == 'a@b@çd' and b == 2)
-assert(string.gsub('alo alo', '()[al]', '%1') == '12o 56o')
-assert(string.gsub("abc=xyz", "(%w*)(%p)(%w+)", "%3%2%1-%0") ==
-              "xyz=abc-abc=xyz")
-assert(string.gsub("abc", "%w", "%1%0") == "aabbcc")
-assert(string.gsub("abc", "%w+", "%0%1") == "abcabc")
-assert(string.gsub('áéí', '$', '\0óú') == 'áéí\0óú')
-assert(string.gsub('', '^', 'r') == 'r')
-assert(string.gsub('', '$', 'r') == 'r')
-print('+')
-
-assert(string.gsub("um (dois) tres (quatro)", "(%(%w+%))", string.upper) ==
-            "um (DOIS) tres (QUATRO)")
-
-do
-  local function setglobal (n,v) rawset(_G, n, v) end
-  string.gsub("a=roberto,roberto=a", "(%w+)=(%w%w*)", setglobal)
-  assert(_G.a=="roberto" and _G.roberto=="a")
-end
-
-function f(a,b) return string.gsub(a,'.',b) end
-assert(string.gsub("trocar tudo em |teste|b| é |beleza|al|", "|([^|]*)|([^|]*)|", f) ==
-            "trocar tudo em bbbbb é alalalalalal")
-
-local function dostring (s) return loadstring(s)() or "" end
-assert(string.gsub("alo $a=1$ novamente $return a$", "$([^$]*)%$", dostring) ==
-            "alo  novamente 1")
-
-x = string.gsub("$x=string.gsub('alo', '.', string.upper)$ assim vai para $return x$",
-         "$([^$]*)%$", dostring)
-assert(x == ' assim vai para ALO')
-
-t = {}
-s = 'a alo jose  joao'
-r = string.gsub(s, '()(%w+)()', function (a,w,b)
-      assert(string.len(w) == b-a);
-      t[a] = b-a;
-    end)
-assert(s == r and t[1] == 1 and t[3] == 3 and t[7] == 4 and t[13] == 4)
-
-
-function isbalanced (s)
-  return string.find(string.gsub(s, "%b()", ""), "[()]") == nil
-end
-
-assert(isbalanced("(9 ((8))(\0) 7) \0\0 a b ()(c)() a"))
-assert(not isbalanced("(9 ((8) 7) a b (\0 c) a"))
-assert(string.gsub("alo 'oi' alo", "%b''", '"') == 'alo " alo')
-
-
-local t = {"apple", "orange", "lime"; n=0}
-assert(string.gsub("x and x and x", "x", function () t.n=t.n+1; return t[t.n] end)
-        == "apple and orange and lime")
-
-t = {n=0}
-string.gsub("first second word", "%w%w*", function (w) t.n=t.n+1; t[t.n] = w end)
-assert(t[1] == "first" and t[2] == "second" and t[3] == "word" and t.n == 3)
-
-t = {n=0}
-assert(string.gsub("first second word", "%w+",
-         function (w) t.n=t.n+1; t[t.n] = w end, 2) == "first second word")
-assert(t[1] == "first" and t[2] == "second" and t[3] == nil)
-
-assert(not pcall(string.gsub, "alo", "(.", print))
-assert(not pcall(string.gsub, "alo", ".)", print))
-assert(not pcall(string.gsub, "alo", "(.", {}))
-assert(not pcall(string.gsub, "alo", "(.)", "%2"))
-assert(not pcall(string.gsub, "alo", "(%1)", "a"))
-assert(not pcall(string.gsub, "alo", "(%0)", "a"))
-
--- big strings
-local a = string.rep('a', 300000)
-assert(string.find(a, '^a*.?$'))
-assert(not string.find(a, '^a*.?b$'))
-assert(string.find(a, '^a-.?$'))
-
--- deep nest of gsubs
-function rev (s)
-  return string.gsub(s, "(.)(.+)", function (c,s1) return rev(s1)..c end)
-end
-
-local x = string.rep('012345', 10)
-assert(rev(rev(x)) == x)
-
-
--- gsub with tables
-assert(string.gsub("alo alo", ".", {}) == "alo alo")
-assert(string.gsub("alo alo", "(.)", {a="AA", l=""}) == "AAo AAo")
-assert(string.gsub("alo alo", "(.).", {a="AA", l="K"}) == "AAo AAo")
-assert(string.gsub("alo alo", "((.)(.?))", {al="AA", o=false}) == "AAo AAo")
-
-assert(string.gsub("alo alo", "().", {2,5,6}) == "256 alo")
-
-t = {}; setmetatable(t, {__index = function (t,s) return string.upper(s) end})
-assert(string.gsub("a alo b hi", "%w%w+", t) == "a ALO b HI")
-
-
--- tests for gmatch
-assert(string.gfind == string.gmatch)
-local a = 0
-for i in string.gmatch('abcde', '()') do assert(i == a+1); a=i end
-assert(a==6)
-
-t = {n=0}
-for w in string.gmatch("first second word", "%w+") do
-      t.n=t.n+1; t[t.n] = w
-end
-assert(t[1] == "first" and t[2] == "second" and t[3] == "word")
-
-t = {3, 6, 9}
-for i in string.gmatch ("xuxx uu ppar r", "()(.)%2") do
-  assert(i == table.remove(t, 1))
-end
-assert(table.getn(t) == 0)
-
-t = {}
-for i,j in string.gmatch("13 14 10 = 11, 15= 16, 22=23", "(%d+)%s*=%s*(%d+)") do
-  t[i] = j
-end
-a = 0
-for k,v in pairs(t) do assert(k+1 == v+0); a=a+1 end
-assert(a == 3)
-
-
--- tests for `%f' (`frontiers')
-
-assert(string.gsub("aaa aa a aaa a", "%f[%w]a", "x") == "xaa xa x xaa x")
-assert(string.gsub("[[]] [][] [[[[", "%f[[].", "x") == "x[]] x]x] x[[[")
-assert(string.gsub("01abc45de3", "%f[%d]", ".") == ".01abc.45de.3")
-assert(string.gsub("01abc45 de3x", "%f[%D]%w", ".") == "01.bc45 de3.")
-assert(string.gsub("function", "%f[\1-\255]%w", ".") == ".unction")
-assert(string.gsub("function", "%f[^\1-\255]", ".") == "function.")
-
-local i, e = string.find(" alo aalo allo", "%f[%S].-%f[%s].-%f[%S]")
-assert(i == 2 and e == 5)
-local k = string.match(" alo aalo allo", "%f[%S](.-%f[%s].-%f[%S])")
-assert(k == 'alo ')
-
-local a = {1, 5, 9, 14, 17,}
-for k in string.gmatch("alo alo th02 is 1hat", "()%f[%w%d]") do
-  assert(table.remove(a, 1) == k)
-end
-assert(table.getn(a) == 0)
-
-
-print('OK')

lib/lua/lua-tests/sort.lua

@@ -1,74 +0,0 @@
-print"testing sort"
-
-
-function check (a, f)
-  f = f or function (x,y) return x<y end;
-  for n=table.getn(a),2,-1 do
-    assert(not f(a[n], a[n-1]))
-  end
-end
-
-a = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep",
-     "Oct", "Nov", "Dec"}
-
-table.sort(a)
-check(a)
-
-limit = 30000
-if rawget(_G, "_soft") then limit = 5000 end
-
-a = {}
-for i=1,limit do
-  a[i] = math.random()
-end
-
-local x = os.clock()
-table.sort(a)
-print(string.format("Sorting %d elements in %.2f sec.", limit, os.clock()-x))
-check(a)
-
-x = os.clock()
-table.sort(a)
-print(string.format("Re-sorting %d elements in %.2f sec.", limit, os.clock()-x))
-check(a)
-
-a = {}
-for i=1,limit do
-  a[i] = math.random()
-end
-
-x = os.clock(); i=0
-table.sort(a, function(x,y) i=i+1; return y<x end)
-print(string.format("Invert-sorting other %d elements in %.2f sec., with %i comparisons",
-      limit, os.clock()-x, i))
-check(a, function(x,y) return y<x end)
-
-
-table.sort{}  -- empty array
-
-for i=1,limit do a[i] = false end
-x = os.clock();
-table.sort(a, function(x,y) return nil end)
-print(string.format("Sorting %d equal elements in %.2f sec.", limit, os.clock()-x))
-check(a, function(x,y) return nil end)
-for i,v in pairs(a) do assert(not v or i=='n' and v==limit) end
-
-a = {"álo", "\0first :-)", "alo", "then this one", "45", "and a new"}
-table.sort(a)
-check(a)
-
-table.sort(a, function (x, y)
-          loadstring(string.format("a[%q] = ''", x))()
-          collectgarbage()
-          return x<y
-        end)
-
-
-tt = {__lt = function (a,b) return a.val < b.val end}
-a = {}
-for i=1,10 do  a[i] = {val=math.random(100)}; setmetatable(a[i], tt); end
-table.sort(a)
-check(a, tt.__lt)
-check(a)
-
-print"OK"

lib/lua/lua-tests/strings.lua

@@ -1,176 +0,0 @@
-print('testing strings and string library')
-
-assert('alo' < 'alo1')
-assert('' < 'a')
-assert('alo\0alo' < 'alo\0b')
-assert('alo\0alo\0\0' > 'alo\0alo\0')
-assert('alo' < 'alo\0')
-assert('alo\0' > 'alo')
-assert('\0' < '\1')
-assert('\0\0' < '\0\1')
-assert('\1\0a\0a' <= '\1\0a\0a')
-assert(not ('\1\0a\0b' <= '\1\0a\0a'))
-assert('\0\0\0' < '\0\0\0\0')
-assert(not('\0\0\0\0' < '\0\0\0'))
-assert('\0\0\0' <= '\0\0\0\0')
-assert(not('\0\0\0\0' <= '\0\0\0'))
-assert('\0\0\0' <= '\0\0\0')
-assert('\0\0\0' >= '\0\0\0')
-assert(not ('\0\0b' < '\0\0a\0'))
-print('+')
-
-assert(string.sub("123456789",2,4) == "234")
-assert(string.sub("123456789",7) == "789")
-assert(string.sub("123456789",7,6) == "")
-assert(string.sub("123456789",7,7) == "7")
-assert(string.sub("123456789",0,0) == "")
-assert(string.sub("123456789",-10,10) == "123456789")
-assert(string.sub("123456789",1,9) == "123456789")
-assert(string.sub("123456789",-10,-20) == "")
-assert(string.sub("123456789",-1) == "9")
-assert(string.sub("123456789",-4) == "6789")
-assert(string.sub("123456789",-6, -4) == "456")
-assert(string.sub("\000123456789",3,5) == "234")
-assert(("\000123456789"):sub(8) == "789")
-print('+')
-
-assert(string.find("123456789", "345") == 3)
-a,b = string.find("123456789", "345")
-assert(string.sub("123456789", a, b) == "345")
-assert(string.find("1234567890123456789", "345", 3) == 3)
-assert(string.find("1234567890123456789", "345", 4) == 13)
-assert(string.find("1234567890123456789", "346", 4) == nil)
-assert(string.find("1234567890123456789", ".45", -9) == 13)
-assert(string.find("abcdefg", "\0", 5, 1) == nil)
-assert(string.find("", "") == 1)
-assert(string.find('', 'aaa', 1) == nil)
-assert(('alo(.)alo'):find('(.)', 1, 1) == 4)
-print('+')
-
-assert(string.len("") == 0)
-assert(string.len("\0\0\0") == 3)
-assert(string.len("1234567890") == 10)
-
-assert(#"" == 0)
-assert(#"\0\0\0" == 3)
-assert(#"1234567890" == 10)
-
-assert(string.byte("a") == 97)
-assert(string.byte("á") > 127)
-assert(string.byte(string.char(255)) == 255)
-assert(string.byte(string.char(0)) == 0)
-assert(string.byte("\0") == 0)
-assert(string.byte("\0\0alo\0x", -1) == string.byte('x'))
-assert(string.byte("ba", 2) == 97)
-assert(string.byte("\n\n", 2, -1) == 10)
-assert(string.byte("\n\n", 2, 2) == 10)
-assert(string.byte("") == nil)
-assert(string.byte("hi", -3) == nil)
-assert(string.byte("hi", 3) == nil)
-assert(string.byte("hi", 9, 10) == nil)
-assert(string.byte("hi", 2, 1) == nil)
-assert(string.char() == "")
-assert(string.char(0, 255, 0) == "\0\255\0")
-assert(string.char(0, string.byte("á"), 0) == "\0á\0")
-assert(string.char(string.byte("ál\0óu", 1, -1)) == "ál\0óu")
-assert(string.char(string.byte("ál\0óu", 1, 0)) == "")
-assert(string.char(string.byte("ál\0óu", -10, 100)) == "ál\0óu")
-print('+')
-
-assert(string.upper("ab\0c") == "AB\0C")
-assert(string.lower("\0ABCc%$") == "\0abcc%$")
-assert(string.rep('teste', 0) == '')
-assert(string.rep('tés\00tê', 2) == 'tés\0têtés\000tê')
-assert(string.rep('', 10) == '')
-
-assert(string.reverse"" == "")
-assert(string.reverse"\0\1\2\3" == "\3\2\1\0")
-assert(string.reverse"\0001234" == "4321\0")
-
-for i=0,30 do assert(string.len(string.rep('a', i)) == i) end
-
-assert(type(tostring(nil)) == 'string')
-assert(type(tostring(12)) == 'string')
-assert(''..12 == '12' and type(12 .. '') == 'string')
-assert(string.find(tostring{}, 'table:'))
-assert(string.find(tostring(print), 'function:'))
-assert(tostring(1234567890123) == '1234567890123')
-assert(#tostring('\0') == 1)
-assert(tostring(true) == "true")
-assert(tostring(false) == "false")
-print('+')
-
-x = '"ílo"\n\\'
-assert(string.format('%q%s', x, x) == '"\\"ílo\\"\\\n\\\\""ílo"\n\\')
-assert(string.format('%q', "\0") == [["\000"]])
-assert(string.format("\0%c\0%c%x\0", string.byte("á"), string.byte("b"), 140) ==
-              "\0á\0b8c\0")
-assert(string.format('') == "")
-assert(string.format("%c",34)..string.format("%c",48)..string.format("%c",90)..string.format("%c",100) ==
-       string.format("%c%c%c%c", 34, 48, 90, 100))
-assert(string.format("%s\0 is not \0%s", 'not be', 'be') == 'not be\0 is not \0be')
-assert(string.format("%%%d %010d", 10, 23) == "%10 0000000023")
-assert(tonumber(string.format("%f", 10.3)) == 10.3)
-x = string.format('"%-50s"', 'a')
-assert(#x == 52)
-assert(string.sub(x, 1, 4) == '"a  ')
-
-assert(string.format("-%.20s.20s", string.rep("%", 2000)) == "-"..string.rep("%", 20)..".20s")
-assert(string.format('"-%20s.20s"', string.rep("%", 2000)) ==
-       string.format("%q", "-"..string.rep("%", 2000)..".20s"))
-
-
--- longest number that can be formated
-assert(string.len(string.format('%99.99f', -1e308)) >= 100)
-
-assert(loadstring("return 1\n--comentário sem EOL no final")() == 1)
-
-
-assert(table.concat{} == "")
-assert(table.concat({}, 'x') == "")
-assert(table.concat({'\0', '\0\1', '\0\1\2'}, '.\0.') == "\0.\0.\0\1.\0.\0\1\2")
-local a = {}; for i=1,3000 do a[i] = "xuxu" end
-assert(table.concat(a, "123").."123" == string.rep("xuxu123", 3000))
-assert(table.concat(a, "b", 20, 20) == "xuxu")
-assert(table.concat(a, "", 20, 21) == "xuxuxuxu")
-assert(table.concat(a, "", 22, 21) == "")
-assert(table.concat(a, "3", 2999) == "xuxu3xuxu")
-
-a = {"a","b","c"}
-assert(table.concat(a, ",", 1, 0) == "")
-assert(table.concat(a, ",", 1, 1) == "a")
-assert(table.concat(a, ",", 1, 2) == "a,b")
-assert(table.concat(a, ",", 2) == "b,c")
-assert(table.concat(a, ",", 3) == "c")
-assert(table.concat(a, ",", 4) == "")
-
-local locales = { "ptb", "ISO-8859-1", "pt_BR" }
-local function trylocale (w)
-  for _, l in ipairs(locales) do
-    if os.setlocale(l, w) then return true end
-  end
-  return false
-end
-
-if not trylocale("collate")  then
-  print("locale not supported")
-else
-  assert("alo" < "álo" and "álo" < "amo")
-end
-
-if not trylocale("ctype") then
-  print("locale not supported")
-else
-  assert(string.gsub("áéíóú", "%a", "x") == "xxxxx")
-  assert(string.gsub("áÁéÉ", "%l", "x") == "xÁxÉ")
-  assert(string.gsub("áÁéÉ", "%u", "x") == "áxéx")
-  assert(string.upper"áÁé{xuxu}ção" == "ÁÁÉ{XUXU}ÇÃO")
-end
-
-os.setlocale("C")
-assert(os.setlocale() == 'C')
-assert(os.setlocale(nil, "numeric") == 'C')
-
-print('OK')
-
-

lib/lua/lua-tests/vararg.lua

@@ -1,126 +0,0 @@
-print('testing vararg')
-
-_G.arg = nil
-
-function f(a, ...)
-  assert(type(arg) == 'table')
-  assert(type(arg.n) == 'number')
-  for i=1,arg.n do assert(a[i]==arg[i]) end
-  return arg.n
-end
-
-function c12 (...)
-  assert(arg == nil)
-  local x = {...}; x.n = table.getn(x)
-  local res = (x.n==2 and x[1] == 1 and x[2] == 2)
-  if res then res = 55 end
-  return res, 2
-end
-
-function vararg (...) return arg end
-
-local call = function (f, args) return f(unpack(args, 1, args.n)) end
-
-assert(f() == 0)
-assert(f({1,2,3}, 1, 2, 3) == 3)
-assert(f({"alo", nil, 45, f, nil}, "alo", nil, 45, f, nil) == 5)
-
-assert(c12(1,2)==55)
-a,b = assert(call(c12, {1,2}))
-assert(a == 55 and b == 2)
-a = call(c12, {1,2;n=2})
-assert(a == 55 and b == 2)
-a = call(c12, {1,2;n=1})
-assert(not a)
-assert(c12(1,2,3) == false)
-local a = vararg(call(next, {_G,nil;n=2}))
-local b,c = next(_G)
-assert(a[1] == b and a[2] == c and a.n == 2)
-a = vararg(call(call, {c12, {1,2}}))
-assert(a.n == 2 and a[1] == 55 and a[2] == 2)
-a = call(print, {'+'})
-assert(a == nil)
-
-local t = {1, 10}
-function t:f (...) return self[arg[1]]+arg.n end
-assert(t:f(1,4) == 3 and t:f(2) == 11)
-print('+')
-
-lim = 20
-local i, a = 1, {}
-while i <= lim do a[i] = i+0.3; i=i+1 end
-
-function f(a, b, c, d, ...)
-  local more = {...}
-  assert(a == 1.3 and more[1] == 5.3 and
-         more[lim-4] == lim+0.3 and not more[lim-3])
-end
-
-function g(a,b,c)
-  assert(a == 1.3 and b == 2.3 and c == 3.3)
-end
-
-call(f, a)
-call(g, a)
-
-a = {}
-i = 1
-while i <= lim do a[i] = i; i=i+1 end
-assert(call(math.max, a) == lim)
-
-print("+")
-
-
--- new-style varargs
-
-function oneless (a, ...) return ... end
-
-function f (n, a, ...)
-  local b
-  assert(arg == nil)
-  if n == 0 then
-    local b, c, d = ...
-    return a, b, c, d, oneless(oneless(oneless(...)))
-  else
-    n, b, a = n-1, ..., a
-    assert(b == ...)
-    return f(n, a, ...)
-  end
-end
-
-a,b,c,d,e = assert(f(10,5,4,3,2,1))
-assert(a==5 and b==4 and c==3 and d==2 and e==1)
-
-a,b,c,d,e = f(4)
-assert(a==nil and b==nil and c==nil and d==nil and e==nil)
-
-
--- varargs for main chunks
-f = loadstring[[ return {...} ]]
-x = f(2,3)
-assert(x[1] == 2 and x[2] == 3 and x[3] == nil)
-
-
-f = loadstring[[
-  local x = {...}
-  for i=1,select('#', ...) do assert(x[i] == select(i, ...)) end
-  assert(x[select('#', ...)+1] == nil)
-  return true
-]]
-
-assert(f("a", "b", nil, {}, assert))
-assert(f())
-
-a = {select(3, unpack{10,20,30,40})}
-assert(table.getn(a) == 2 and a[1] == 30 and a[2] == 40)
-a = {select(1)}
-assert(next(a) == nil)
-a = {select(-1, 3, 5, 7)}
-assert(a[1] == 7 and a[2] == nil)
-a = {select(-2, 3, 5, 7)}
-assert(a[1] == 5 and a[2] == 7 and a[3] == nil)
-pcall(select, 10000)
-pcall(select, -10000)
-
-print('OK')
-

lib/lua/lua-tests/verybig.lua

@@ -1,100 +0,0 @@
-if rawget(_G, "_soft") then return 10 end
-
-print "testing large programs (>64k)"
-
--- template to create a very big test file
-prog = [[$
-
-local a,b
-
-b = {$1$
-  b30009 = 65534,
-  b30010 = 65535,
-  b30011 = 65536,
-  b30012 = 65537,
-  b30013 = 16777214,
-  b30014 = 16777215,
-  b30015 = 16777216,
-  b30016 = 16777217,
-  b30017 = 4294967294,
-  b30018 = 4294967295,
-  b30019 = 4294967296,
-  b30020 = 4294967297,
-  b30021 = -65534,
-  b30022 = -65535,
-  b30023 = -65536,
-  b30024 = -4294967297,
-  b30025 = 15012.5,
-  $2$
-};
-
-assert(b.a50008 == 25004 and b["a11"] == 5.5)
-assert(b.a33007 == 16503.5 and b.a50009 == 25004.5)
-assert(b["b"..30024] == -4294967297)
-
-function b:xxx (a,b) return a+b end
-assert(b:xxx(10, 12) == 22)   -- pushself with non-constant index
-b.xxx = nil
-
-s = 0; n=0
-for a,b in pairs(b) do s=s+b; n=n+1 end
-assert(s==13977183656.5  and n==70001)
-
-require "checktable"
-stat(b)
-
-a = nil; b = nil
-print'+'
-
-function f(x) b=x end
-
-a = f{$3$} or 10
-
-assert(a==10)
-assert(b[1] == "a10" and b[2] == 5 and b[table.getn(b)-1] == "a50009")
-
-
-function xxxx (x) return b[x] end
-
-assert(xxxx(3) == "a11")
-
-a = nil; b=nil
-xxxx = nil
-
-return 10
-
-]]
-
--- functions to fill in the $n$
-F = {
-function ()   -- $1$
-  for i=10,50009 do
-    io.write('a', i, ' = ', 5+((i-10)/2), ',\n')
-  end
-end,
-
-function ()   -- $2$
-  for i=30026,50009 do
-    io.write('b', i, ' = ', 15013+((i-30026)/2), ',\n')
-  end
-end,
-
-function ()   -- $3$
-  for i=10,50009 do
-    io.write('"a', i, '", ', 5+((i-10)/2), ',\n')
-  end
-end,
-}
-
-file = os.tmpname()
-io.output(file)
-for s in string.gmatch(prog, "$([^$]+)") do
-  local n = tonumber(s)
-  if not n then io.write(s) else F[n]() end
-end
-io.close()
-result = dofile(file)
-assert(os.remove(file))
-print'OK'
-return result
-

lib/lua/parser.sx

@@ -211,8 +211,6 @@
                       (lua-tok-type t)
                       " "
                       (lua-tok-value t))))))))
-        (define parse-pow-chain
-          (fn () (let ((lhs (parse-primary))) (parse-binop-rhs 10 lhs))))
         (set!
           parse-unary
           (fn
@@ -230,7 +228,7 @@
                 (begin
                   (advance-tok!)
                   (list (quote lua-unop) "not" (parse-unary))))
-              (else (parse-pow-chain)))))
+              (else (parse-primary)))))
         (define
           parse-binop-rhs
           (fn
@@ -281,7 +279,7 @@
                 ((at-op? "(")
                   (begin
                     (advance-tok!)
-                    (set! base (list (quote lua-paren) (parse-expr)))
+                    (set! base (parse-expr))
                     (consume! "op" ")")))
                 (else (error "lua-parse: expected prefixexp")))
               (define
@@ -536,73 +534,50 @@
             (let
               ((body (parse-block)))
               (begin (consume! "keyword" "end") (list (quote lua-do) body))))))
-      (define parse-for-num-rest
+      (define
-        (fn (name)
+        parse-for
+        (fn
+          ()
           (begin
+            (consume! "keyword" "for")
+            (let
+              ((t (peek-tok)))
+              (begin
+                (when
+                  (not (= (lua-tok-type t) "ident"))
+                  (error "lua-parse: expected name in for"))
+                (let
+                  ((name (lua-tok-value t)))
+                  (begin
+                    (advance-tok!)
+                    (when
+                      (not (at-op? "="))
+                      (error "lua-parse: only numeric for supported"))
                     (consume! "op" "=")
-            (let ((start (parse-expr)))
+                    (let
+                      ((start (parse-expr)))
                       (begin
                         (consume! "op" ",")
-                (let ((stop (parse-expr)) (step nil))
+                        (let
+                          ((stop (parse-expr)) (step nil))
                           (begin
-                    (when (at-op? ",")
+                            (when
+                              (at-op? ",")
                               (begin
                                 (advance-tok!)
                                 (set! step (parse-expr))))
                             (consume! "keyword" "do")
-                    (let ((body (parse-block)))
+                            (let
+                              ((body (parse-block)))
                               (begin
                                 (consume! "keyword" "end")
-                        (list (quote lua-for-num) name start stop step body))))))))))
+                                (list
-      (define parse-for-in-names
+                                  (quote lua-for-num)
-        (fn (names)
+                                  name
-          (cond
+                                  start
-            ((at-op? ",")
+                                  stop
-              (begin
+                                  step
-                (advance-tok!)
+                                  body))))))))))))))
-                (let ((nt (peek-tok)))
-                  (begin
-                    (when (not (= (lua-tok-type nt) "ident"))
-                      (error "lua-parse: expected name after , in for"))
-                    (let ((nm (lua-tok-value nt)))
-                      (begin
-                        (advance-tok!)
-                        (parse-for-in-names (append names (list nm)))))))))
-            (else names))))
-      (define parse-for-in-exps
-        (fn (exps)
-          (cond
-            ((at-op? ",")
-              (begin
-                (advance-tok!)
-                (parse-for-in-exps (append exps (list (parse-expr))))))
-            (else exps))))
-      (define parse-for-in-rest
-        (fn (names)
-          (begin
-            (consume! "keyword" "in")
-            (let ((exps (parse-for-in-exps (list (parse-expr)))))
-              (begin
-                (consume! "keyword" "do")
-                (let ((body (parse-block)))
-                  (begin
-                    (consume! "keyword" "end")
-                    (list (quote lua-for-in) names exps body))))))))
-      (define parse-for
-        (fn ()
-          (begin
-            (consume! "keyword" "for")
-            (let ((t (peek-tok)))
-              (begin
-                (when (not (= (lua-tok-type t) "ident"))
-                  (error "lua-parse: expected name in for"))
-                (let ((name (lua-tok-value t)))
-                  (begin
-                    (advance-tok!)
-                    (cond
-                      ((at-op? "=") (parse-for-num-rest name))
-                      (else
-                        (parse-for-in-rest (parse-for-in-names (list name))))))))))))
       (define
         parse-funcname
         (fn
@@ -735,7 +710,6 @@
                       (check-tok? "eof" nil)
                       (at-op? ";")))
                   (set! exps (parse-explist)))
-                (when (at-op? ";") (advance-tok!))
                 (list (quote lua-return) exps))))))
       (define
         parse-assign-or-call

lib/lua/scoreboard.json

@@ -1,179 +0,0 @@
-{
-  "totals": {
-    "pass": 1,
-    "fail": 9,
-    "timeout": 6,
-    "skip": 8,
-    "total": 24,
-    "runnable": 16,
-    "pass_rate": 6.2
-  },
-  "top_failure_modes": [
-    [
-      "timeout",
-      6
-    ],
-    [
-      "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      5
-    ],
-    [
-      "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      2
-    ],
-    [
-      "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: module 'C' not found\\\\\\\"\\",
-      1
-    ],
-    [
-      "undefined symbol: fat\\",
-      1
-    ]
-  ],
-  "results": [
-    {
-      "name": "all.lua",
-      "status": "skip",
-      "reason": "driver uses dofile to chain other tests",
-      "ms": 0
-    },
-    {
-      "name": "api.lua",
-      "status": "skip",
-      "reason": "requires testC (C debug library)",
-      "ms": 0
-    },
-    {
-      "name": "attrib.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: module 'C' not found\\\\\\\"\\",
-      "ms": 6174
-    },
-    {
-      "name": "big.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8007
-    },
-    {
-      "name": "calls.lua",
-      "status": "fail",
-      "reason": "undefined symbol: fat\\",
-      "ms": 5270
-    },
-    {
-      "name": "checktable.lua",
-      "status": "skip",
-      "reason": "internal debug helpers",
-      "ms": 0
-    },
-    {
-      "name": "closure.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8006
-    },
-    {
-      "name": "code.lua",
-      "status": "skip",
-      "reason": "bytecode inspection via debug library",
-      "ms": 0
-    },
-    {
-      "name": "constructs.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8007
-    },
-    {
-      "name": "db.lua",
-      "status": "skip",
-      "reason": "debug library",
-      "ms": 0
-    },
-    {
-      "name": "errors.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4731
-    },
-    {
-      "name": "events.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8007
-    },
-    {
-      "name": "files.lua",
-      "status": "skip",
-      "reason": "io library",
-      "ms": 0
-    },
-    {
-      "name": "gc.lua",
-      "status": "skip",
-      "reason": "collectgarbage / finalisers",
-      "ms": 0
-    },
-    {
-      "name": "literals.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 1996
-    },
-    {
-      "name": "locals.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      "ms": 1785
-    },
-    {
-      "name": "main.lua",
-      "status": "skip",
-      "reason": "standalone interpreter driver",
-      "ms": 0
-    },
-    {
-      "name": "math.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      "ms": 4610
-    },
-    {
-      "name": "nextvar.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8007
-    },
-    {
-      "name": "pm.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7860
-    },
-    {
-      "name": "sort.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8003
-    },
-    {
-      "name": "strings.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4636
-    },
-    {
-      "name": "vararg.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 2770
-    },
-    {
-      "name": "verybig.lua",
-      "status": "pass",
-      "reason": "",
-      "ms": 1319
-    }
-  ]
-}

lib/lua/scoreboard.md

@@ -1,41 +0,0 @@
-# Lua-on-SX conformance scoreboard
-
-**Pass rate:** 1/16 runnable (6.2%)
-fail=9 timeout=6 skip=8 total=24
-
-## Top failure modes
-
-- **6x** timeout
-- **5x** other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\
-- **2x** other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio
-- **1x** other: Unhandled exception: \"Unhandled exception: \\\"lua: module 'C' not found\\\"\
-- **1x** undefined symbol: fat\
-
-## Per-test results
-
-| Test | Status | Reason | ms |
-|---|---|---|---:|
-| all.lua | skip | driver uses dofile to chain other tests | 0 |
-| api.lua | skip | requires testC (C debug library) | 0 |
-| attrib.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: module 'C' not found\\\"\ | 6174 |
-| big.lua | timeout | per-test timeout | 8007 |
-| calls.lua | fail | undefined symbol: fat\ | 5270 |
-| checktable.lua | skip | internal debug helpers | 0 |
-| closure.lua | timeout | per-test timeout | 8006 |
-| code.lua | skip | bytecode inspection via debug library | 0 |
-| constructs.lua | timeout | per-test timeout | 8007 |
-| db.lua | skip | debug library | 0 |
-| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4731 |
-| events.lua | timeout | per-test timeout | 8007 |
-| files.lua | skip | io library | 0 |
-| gc.lua | skip | collectgarbage / finalisers | 0 |
-| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1996 |
-| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 1785 |
-| main.lua | skip | standalone interpreter driver | 0 |
-| math.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 4610 |
-| nextvar.lua | timeout | per-test timeout | 8007 |
-| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 7860 |
-| sort.lua | timeout | per-test timeout | 8003 |
-| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4636 |
-| vararg.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2770 |
-| verybig.lua | pass | - | 1319 |

lib/lua/test.sh

@@ -409,605 +409,6 @@ cat > "$TMPFILE" << 'EPOCHS'
 (epoch 484)
 (eval "(lua-eval-ast \"local s = 0 for i = 1, 100 do s = s + i end return s\")")
 
-;; ── Phase 3: functions + closures ─────────────────────────────
-;; Anonymous
-(epoch 500)
-(eval "(lua-eval-ast \"local f = function(x) return x + 1 end return f(5)\")")
-(epoch 501)
-(eval "(lua-eval-ast \"local f = function() return 42 end return f()\")")
-(epoch 502)
-(eval "(lua-eval-ast \"return (function(a, b) return a * b end)(3, 4)\")")
-
-;; Local function
-(epoch 510)
-(eval "(lua-eval-ast \"local function double(x) return x * 2 end return double(7)\")")
-(epoch 511)
-(eval "(lua-eval-ast \"local function sum3(a, b, c) return a + b + c end return sum3(1, 2, 3)\")")
-(epoch 512)
-(eval "(lua-eval-ast \"local function greet() return \\\"hi\\\" end return greet()\")")
-
-;; Top-level function decl
-(epoch 520)
-(eval "(lua-eval-ast \"function add(a, b) return a + b end return add(3, 4)\")")
-(epoch 521)
-(eval "(lua-eval-ast \"function id(x) return x end return id(\\\"abc\\\")\")")
-
-;; Closures — lexical capture
-(epoch 530)
-(eval "(lua-eval-ast \"local x = 10 local function getx() return x end return getx()\")")
-(epoch 531)
-(eval "(lua-eval-ast \"local function make_adder(n) return function(x) return x + n end end local add5 = make_adder(5) return add5(10)\")")
-(epoch 532)
-(eval "(lua-eval-ast \"local function counter() local n = 0 return function() n = n + 1 return n end end local c = counter() c() c() return c()\")")
-(epoch 533)
-(eval "(lua-eval-ast \"local a = 1 local b = 2 local function f() return a + b end a = 10 return f()\")")
-
-;; Recursion
-(epoch 540)
-(eval "(lua-eval-ast \"local function fact(n) if n <= 1 then return 1 else return n * fact(n - 1) end end return fact(5)\")")
-(epoch 541)
-(eval "(lua-eval-ast \"function fib(n) if n < 2 then return n else return fib(n-1) + fib(n-2) end end return fib(10)\")")
-
-;; Higher-order
-(epoch 550)
-(eval "(lua-eval-ast \"local function apply(f, x) return f(x) end local function sq(n) return n * n end return apply(sq, 4)\")")
-(epoch 551)
-(eval "(lua-eval-ast \"local function twice(f, x) return f(f(x)) end return twice(function(n) return n + 1 end, 5)\")")
-
-;; Mixed with control flow
-(epoch 560)
-(eval "(lua-eval-ast \"local function max(a, b) if a > b then return a else return b end end return max(7, 3)\")")
-(epoch 561)
-(eval "(lua-eval-ast \"local function sum_to(n) local s = 0 for i = 1, n do s = s + i end return s end return sum_to(10)\")")
-
-;; ── Phase 3: multi-return + unpack ────────────────────────────
-(epoch 570)
-(eval "(lua-eval-ast \"local a, b = (function() return 1, 2 end)() return a + b\")")
-(epoch 571)
-(eval "(lua-eval-ast \"local function two() return 10, 20 end local a, b = two() return b - a\")")
-(epoch 572)
-(eval "(lua-eval-ast \"function swap(a, b) return b, a end local x, y = swap(1, 2) return x * 10 + y\")")
-(epoch 573)
-(eval "(lua-eval-ast \"local function three() return 1, 2, 3 end local a, b = three() return a * 10 + b\")")
-(epoch 574)
-(eval "(lua-eval-ast \"local function two() return 1, 2 end local a, b, c = two() if c == nil then return a + b else return 0 end\")")
-(epoch 575)
-(eval "(lua-eval-ast \"local function two() return 5, 7 end local function outer() return two() end local a, b = outer() return a + b\")")
-(epoch 576)
-(eval "(lua-eval-ast \"local function two() return 9, 9 end local a, b = two(), 5 return a * 10 + b\")")
-(epoch 577)
-(eval "(lua-eval-ast \"local function pair() return 4, 5 end local x = pair() return x + 1\")")
-(epoch 578)
-(eval "(lua-eval-ast \"local function none() return end local a, b = none() if a == nil and b == nil then return 99 else return 0 end\")")
-(epoch 579)
-(eval "(lua-eval-ast \"local a = 0 local b = 0 local function m() return 7, 11 end a, b = m() return a + b\")")
-
-;; ── Phase 3: table constructors ────────────────────────────────
-;; Array part
-(epoch 600)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} return t[1]\")")
-(epoch 601)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} return t[3]\")")
-(epoch 602)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} if t[4] == nil then return 1 else return 0 end\")")
-
-;; Hash part
-(epoch 610)
-(eval "(lua-eval-ast \"local t = {x = 1, y = 2} return t.x + t.y\")")
-(epoch 611)
-(eval "(lua-eval-ast \"local t = {name = \\\"bob\\\", age = 30} return t.name\")")
-(epoch 612)
-(eval "(lua-eval-ast \"local t = {name = \\\"bob\\\", age = 30} return t.age\")")
-
-;; Computed keys
-(epoch 620)
-(eval "(lua-eval-ast \"local k = \\\"answer\\\" local t = {[k] = 42} return t.answer\")")
-(epoch 621)
-(eval "(lua-eval-ast \"local t = {[1+1] = \\\"two\\\"} return t[2]\")")
-(epoch 622)
-(eval "(lua-eval-ast \"local t = {[\\\"a\\\" .. \\\"b\\\"] = 99} return t.ab\")")
-(epoch 623)
-(eval "(lua-eval-ast \"local t = {[true] = \\\"yes\\\", [false] = \\\"no\\\"} return t[true]\")")
-
-;; Mixed array + hash
-(epoch 630)
-(eval "(lua-eval-ast \"local t = {1, 2, 3, key = \\\"v\\\"} return t[2]\")")
-(epoch 631)
-(eval "(lua-eval-ast \"local t = {1, 2, 3, key = \\\"v\\\"} return t.key\")")
-
-;; Separators
-(epoch 640)
-(eval "(lua-eval-ast \"local t = {1, 2, 3,} return t[3]\")")
-(epoch 641)
-(eval "(lua-eval-ast \"local t = {1; 2; 3} return t[2]\")")
-(epoch 642)
-(eval "(lua-eval-ast \"local t = {1, 2; 3, 4} return t[4]\")")
-
-;; Nested
-(epoch 650)
-(eval "(lua-eval-ast \"local t = {{1, 2}, {3, 4}} return t[2][1]\")")
-(epoch 651)
-(eval "(lua-eval-ast \"local t = {inner = {a = 1, b = 2}} return t.inner.b\")")
-
-;; Dynamic values
-(epoch 660)
-(eval "(lua-eval-ast \"local x = 7 local t = {x, x * 2, x * 3} return t[2]\")")
-(epoch 661)
-(eval "(lua-eval-ast \"local function f(n) return n + 1 end local t = {f(1), f(2), f(3)} return t[3]\")")
-
-;; Functions as values
-(epoch 670)
-(eval "(lua-eval-ast \"local t = {fn = function(x) return x * 2 end} return t.fn(5)\")")
-
-;; ── Phase 3: raw table access (read + write + #) ───────────────
-;; Write then read array index
-(epoch 700)
-(eval "(lua-eval-ast \"local t = {} t[1] = \\\"a\\\" t[2] = \\\"b\\\" return t[1]\")")
-(epoch 701)
-(eval "(lua-eval-ast \"local t = {} t[1] = 10 t[2] = 20 return t[1] + t[2]\")")
-
-;; Write then read field
-(epoch 710)
-(eval "(lua-eval-ast \"local t = {} t.x = 100 return t.x\")")
-(epoch 711)
-(eval "(lua-eval-ast \"local t = {} t.name = \\\"alice\\\" t.age = 30 return t.name\")")
-(epoch 712)
-(eval "(lua-eval-ast \"local t = {x = 1} t.x = 99 return t.x\")")
-
-;; Missing key is nil
-(epoch 720)
-(eval "(lua-eval-ast \"local t = {x = 1} if t.y == nil then return 99 else return 0 end\")")
-(epoch 721)
-(eval "(lua-eval-ast \"local t = {} if t[1] == nil then return 1 else return 0 end\")")
-
-;; Length operator
-(epoch 730)
-(eval "(lua-eval-ast \"local t = {10, 20, 30, 40, 50} return #t\")")
-(epoch 731)
-(eval "(lua-eval-ast \"local t = {} return #t\")")
-(epoch 732)
-(eval "(lua-eval-ast \"local t = {} t[1] = 5 t[2] = 10 return #t\")")
-(epoch 733)
-(eval "(lua-eval-ast \"return #\\\"hello\\\"\")")
-
-;; Mixed read/write
-(epoch 740)
-(eval "(lua-eval-ast \"local t = {count = 0} t.count = t.count + 1 t.count = t.count + 1 return t.count\")")
-(epoch 741)
-(eval "(lua-eval-ast \"local t = {} for i = 1, 5 do t[i] = i * i end return t[3]\")")
-(epoch 742)
-(eval "(lua-eval-ast \"local t = {} for i = 1, 10 do t[i] = i end return #t\")")
-
-;; Chained field read/write
-(epoch 750)
-(eval "(lua-eval-ast \"local t = {a = {b = {c = 42}}} return t.a.b.c\")")
-(epoch 751)
-(eval "(lua-eval-ast \"local t = {a = {}} t.a.x = 7 return t.a.x\")")
-
-;; Computed key read/write
-(epoch 760)
-(eval "(lua-eval-ast \"local k = \\\"foo\\\" local t = {} t[k] = 88 return t.foo\")")
-(epoch 761)
-(eval "(lua-eval-ast \"local t = {} t[\\\"x\\\" .. \\\"y\\\"] = 7 return t.xy\")")
-
-;; Reference semantics
-(epoch 770)
-(eval "(lua-eval-ast \"local t = {} local s = t s.x = 42 return t.x\")")
-
-;; ── Phase 4: metatables ────────────────────────────────────────
-;; setmetatable / getmetatable
-(epoch 800)
-(eval "(lua-eval-ast \"local t = {} local r = setmetatable(t, {}) if r == t then return 1 else return 0 end\")")
-(epoch 801)
-(eval "(lua-eval-ast \"local mt = {} local t = setmetatable({}, mt) if getmetatable(t) == mt then return 1 else return 0 end\")")
-
-;; type()
-(epoch 810)
-(eval "(lua-eval-ast \"return type(1)\")")
-(epoch 811)
-(eval "(lua-eval-ast \"return type(\\\"s\\\")\")")
-(epoch 812)
-(eval "(lua-eval-ast \"return type({})\")")
-(epoch 813)
-(eval "(lua-eval-ast \"return type(nil)\")")
-(epoch 814)
-(eval "(lua-eval-ast \"return type(true)\")")
-(epoch 815)
-(eval "(lua-eval-ast \"return type(function() end)\")")
-
-;; __index
-(epoch 820)
-(eval "(lua-eval-ast \"local base = {x = 10} local t = setmetatable({}, {__index = base}) return t.x\")")
-(epoch 821)
-(eval "(lua-eval-ast \"local base = {x = 10} local t = setmetatable({y = 20}, {__index = base}) return t.x + t.y\")")
-(epoch 822)
-(eval "(lua-eval-ast \"local t = setmetatable({}, {__index = function(tbl, k) return k .. \\\"!\\\" end}) return t.hi\")")
-
-;; __newindex
-(epoch 830)
-(eval "(lua-eval-ast \"local log = {} local t = setmetatable({}, {__newindex = function(tbl, k, v) log[1] = k end}) t.foo = 1 return log[1]\")")
-
-;; Arithmetic metamethods
-(epoch 840)
-(eval "(lua-eval-ast \"local mt = {__add = function(a, b) return 99 end} local x = setmetatable({}, mt) return x + 1\")")
-(epoch 841)
-(eval "(lua-eval-ast \"local mt = {__add = function(a, b) return a.v + b.v end} local x = setmetatable({v = 3}, mt) local y = setmetatable({v = 4}, mt) return x + y\")")
-(epoch 842)
-(eval "(lua-eval-ast \"local mt = {__sub = function(a, b) return 7 end, __mul = function(a, b) return 11 end} local t = setmetatable({}, mt) return t - t + (t * t)\")")
-(epoch 843)
-(eval "(lua-eval-ast \"local mt = {__unm = function(a) return 42 end} local t = setmetatable({}, mt) return -t\")")
-(epoch 844)
-(eval "(lua-eval-ast \"local mt = {__concat = function(a, b) return \\\"cat\\\" end} local t = setmetatable({}, mt) return t .. \\\"x\\\"\")")
-
-;; Comparison metamethods
-(epoch 850)
-(eval "(lua-eval-ast \"local mt = {__eq = function(a, b) return true end} local x = setmetatable({}, mt) local y = setmetatable({}, mt) if x == y then return 1 else return 0 end\")")
-(epoch 851)
-(eval "(lua-eval-ast \"local mt = {__lt = function(a, b) return true end} local x = setmetatable({}, mt) local y = setmetatable({}, mt) if x < y then return 1 else return 0 end\")")
-(epoch 852)
-(eval "(lua-eval-ast \"local mt = {__le = function(a, b) return true end} local x = setmetatable({}, mt) local y = setmetatable({}, mt) if x <= y then return 1 else return 0 end\")")
-
-;; __call
-(epoch 860)
-(eval "(lua-eval-ast \"local mt = {__call = function(t, x) return x + 100 end} local obj = setmetatable({}, mt) return obj(5)\")")
-
-;; __len
-(epoch 870)
-(eval "(lua-eval-ast \"local mt = {__len = function(t) return 99 end} local t = setmetatable({}, mt) return #t\")")
-
-;; Classic OO pattern
-(epoch 880)
-(eval "(lua-eval-ast \"local Animal = {} Animal.__index = Animal function Animal:new(name) local o = setmetatable({name = name}, self) return o end function Animal:getName() return self.name end local a = Animal:new(\\\"Rex\\\") return a:getName()\")")
-
-;; ── Phase 4: pcall / xpcall / error ────────────────────────────
-(epoch 900)
-(eval "(lua-eval-ast \"local ok, err = pcall(function() error(\\\"boom\\\") end) if ok then return 0 else return err end\")")
-(epoch 901)
-(eval "(lua-eval-ast \"local ok, v = pcall(function() return 42 end) if ok then return v else return -1 end\")")
-(epoch 902)
-(eval "(lua-eval-ast \"local ok, a, b = pcall(function() return 1, 2 end) return (ok and a + b) or 0\")")
-(epoch 903)
-(eval "(lua-eval-ast \"local function div(a, b) if b == 0 then error(\\\"div by zero\\\") end return a / b end local ok, r = pcall(div, 10, 2) if ok then return r else return -1 end\")")
-(epoch 904)
-(eval "(lua-eval-ast \"local function div(a, b) if b == 0 then error(\\\"div by zero\\\") end return a / b end local ok, e = pcall(div, 10, 0) if ok then return \\\"no\\\" else return e end\")")
-(epoch 905)
-(eval "(lua-eval-ast \"local function f() error({code = 42}) end local ok, err = pcall(f) return err.code\")")
-(epoch 906)
-(eval "(lua-eval-ast \"local ok1, e1 = pcall(function() local ok2, e2 = pcall(function() error(\\\"inner\\\") end) if not ok2 then error(\\\"outer:\\\" .. e2) end end) return e1\")")
-
-;; xpcall
-(epoch 910)
-(eval "(lua-eval-ast \"local function f() error(\\\"raw\\\") end local function handler(e) return \\\"H:\\\" .. e end local ok, v = xpcall(f, handler) if ok then return \\\"no\\\" else return v end\")")
-(epoch 911)
-(eval "(lua-eval-ast \"local function f() return 99 end local function handler(e) return e end local ok, v = xpcall(f, handler) return v\")")
-
-;; ── Phase 4: generic `for … in …` ──────────────────────────────
-;; ipairs over array
-(epoch 950)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} local sum = 0 for i, v in ipairs(t) do sum = sum + v end return sum\")")
-(epoch 951)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} local last = 0 for i, v in ipairs(t) do last = i end return last\")")
-(epoch 952)
-(eval "(lua-eval-ast \"local t = {} local count = 0 for i, v in ipairs(t) do count = count + 1 end return count\")")
-(epoch 953)
-(eval "(lua-eval-ast \"local t = {1, 2, nil, 4} local c = 0 for i, v in ipairs(t) do c = c + 1 end return c\")")
-
-;; pairs over hash
-(epoch 960)
-(eval "(lua-eval-ast \"local t = {a = 1, b = 2, c = 3} local sum = 0 for k, v in pairs(t) do sum = sum + v end return sum\")")
-(epoch 961)
-(eval "(lua-eval-ast \"local t = {x = 1, y = 2, z = 3} local n = 0 for k, v in pairs(t) do n = n + 1 end return n\")")
-
-;; custom stateful iterator (if-else-return, works around early-return limit)
-(epoch 970)
-(eval "(lua-eval-ast \"local function range(n) local i = 0 return function() i = i + 1 if i > n then return nil else return i end end end local c = 0 for x in range(5) do c = c + x end return c\")")
-
-;; 3-value iterator form (f, s, var)
-(epoch 971)
-(eval "(lua-eval-ast \"local function step(max, i) if i >= max then return nil else return i + 1, (i + 1) * (i + 1) end end local sum = 0 for i, v in step, 4, 0 do sum = sum + v end return sum\")")
-
-;; pairs ignores __meta key
-(epoch 980)
-(eval "(lua-eval-ast \"local t = setmetatable({x = 1, y = 2}, {}) local n = 0 for k in pairs(t) do n = n + 1 end return n\")")
-
-;; ── Phase 5: coroutines ────────────────────────────────────────
-(epoch 1000)
-(eval "(lua-eval-ast \"local co = coroutine.create(function() end) return coroutine.status(co)\")")
-(epoch 1001)
-(eval "(lua-eval-ast \"local co = coroutine.create(function() return 42 end) coroutine.resume(co) return coroutine.status(co)\")")
-(epoch 1010)
-(eval "(lua-eval-ast \"local co = coroutine.create(function() coroutine.yield(1) coroutine.yield(2) return 3 end) local ok1, v1 = coroutine.resume(co) local ok2, v2 = coroutine.resume(co) local ok3, v3 = coroutine.resume(co) return v1 * 100 + v2 * 10 + v3\")")
-(epoch 1011)
-(eval "(lua-eval-ast \"local co = coroutine.create(function(a, b) return a + b end) local ok, v = coroutine.resume(co, 10, 20) return v\")")
-(epoch 1012)
-(eval "(lua-eval-ast \"local co = coroutine.create(function() local x = coroutine.yield() return x + 100 end) coroutine.resume(co) local ok, v = coroutine.resume(co, 42) return v\")")
-(epoch 1020)
-(eval "(lua-eval-ast \"local co = coroutine.create(function() return 42 end) coroutine.resume(co) local ok, err = coroutine.resume(co) if ok then return \\\"no\\\" else return err end\")")
-(epoch 1030)
-(eval "(lua-eval-ast \"local gen = coroutine.wrap(function() coroutine.yield(1) coroutine.yield(2) coroutine.yield(3) end) return gen() + gen() + gen()\")")
-(epoch 1040)
-(eval "(lua-eval-ast \"local function iter() coroutine.yield(10) coroutine.yield(20) coroutine.yield(30) end local co = coroutine.create(iter) local sum = 0 for i = 1, 3 do local ok, v = coroutine.resume(co) sum = sum + v end return sum\")")
-
-;; ── Phase 6: string library ───────────────────────────────────
-(epoch 1100)
-(eval "(lua-eval-ast \"return string.len(\\\"hello\\\")\")")
-(epoch 1101)
-(eval "(lua-eval-ast \"return string.upper(\\\"hi\\\")\")")
-(epoch 1102)
-(eval "(lua-eval-ast \"return string.lower(\\\"HI\\\")\")")
-(epoch 1103)
-(eval "(lua-eval-ast \"return string.rep(\\\"ab\\\", 3)\")")
-(epoch 1110)
-(eval "(lua-eval-ast \"return string.sub(\\\"hello\\\", 2, 4)\")")
-(epoch 1111)
-(eval "(lua-eval-ast \"return string.sub(\\\"hello\\\", -3)\")")
-(epoch 1112)
-(eval "(lua-eval-ast \"return string.sub(\\\"hello\\\", 1, -2)\")")
-(epoch 1120)
-(eval "(lua-eval-ast \"return string.byte(\\\"A\\\")\")")
-(epoch 1121)
-(eval "(lua-eval-ast \"return string.byte(\\\"ABC\\\", 2)\")")
-(epoch 1130)
-(eval "(lua-eval-ast \"return string.char(72, 105)\")")
-(epoch 1131)
-(eval "(lua-eval-ast \"return string.char(97, 98, 99)\")")
-(epoch 1140)
-(eval "(lua-eval-ast \"local s, e = string.find(\\\"hello world\\\", \\\"wor\\\") return s * 100 + e\")")
-(epoch 1141)
-(eval "(lua-eval-ast \"if string.find(\\\"abc\\\", \\\"z\\\") == nil then return 1 else return 0 end\")")
-(epoch 1150)
-(eval "(lua-eval-ast \"return string.match(\\\"hello\\\", \\\"ell\\\")\")")
-(epoch 1160)
-(eval "(lua-eval-ast \"local r, n = string.gsub(\\\"abcabc\\\", \\\"a\\\", \\\"X\\\") return r .. \\\":\\\" .. n\")")
-(epoch 1161)
-(eval "(lua-eval-ast \"local r, n = string.gsub(\\\"aaaa\\\", \\\"a\\\", \\\"b\\\", 2) return r .. \\\":\\\" .. n\")")
-(epoch 1170)
-(eval "(lua-eval-ast \"local c = 0 for w in string.gmatch(\\\"aa aa aa\\\", \\\"aa\\\") do c = c + 1 end return c\")")
-(epoch 1180)
-(eval "(lua-eval-ast \"return string.format(\\\"%s=%d\\\", \\\"x\\\", 42)\")")
-(epoch 1181)
-(eval "(lua-eval-ast \"return string.format(\\\"%d%%\\\", 50)\")")
-
-;; ── Phase 6: math library ─────────────────────────────────────
-(epoch 1200)
-(eval "(lua-eval-ast \"return math.pi > 3.14 and math.pi < 3.15\")")
-(epoch 1201)
-(eval "(lua-eval-ast \"return math.huge > 1000000\")")
-(epoch 1210)
-(eval "(lua-eval-ast \"return math.abs(-7)\")")
-(epoch 1211)
-(eval "(lua-eval-ast \"return math.sqrt(16)\")")
-(epoch 1212)
-(eval "(lua-eval-ast \"return math.floor(3.7)\")")
-(epoch 1213)
-(eval "(lua-eval-ast \"return math.ceil(3.2)\")")
-(epoch 1220)
-(eval "(lua-eval-ast \"return math.max(3, 7, 1, 4)\")")
-(epoch 1221)
-(eval "(lua-eval-ast \"return math.min(3, 7, 1, 4)\")")
-(epoch 1230)
-(eval "(lua-eval-ast \"return math.pow(2, 8)\")")
-(epoch 1231)
-(eval "(lua-eval-ast \"return math.exp(0)\")")
-(epoch 1232)
-(eval "(lua-eval-ast \"return math.log(1)\")")
-(epoch 1233)
-(eval "(lua-eval-ast \"return math.log10(100)\")")
-(epoch 1240)
-(eval "(lua-eval-ast \"return math.sin(0) + math.cos(0)\")")
-(epoch 1250)
-(eval "(lua-eval-ast \"return math.fmod(10, 3)\")")
-(epoch 1251)
-(eval "(lua-eval-ast \"local i, f = math.modf(3.5) return i\")")
-(epoch 1260)
-(eval "(lua-eval-ast \"local r = math.random(100) return r >= 1 and r <= 100\")")
-(epoch 1261)
-(eval "(lua-eval-ast \"local r = math.random(5, 10) return r >= 5 and r <= 10\")")
-
-;; ── Phase 6: table library ────────────────────────────────────
-(epoch 1300)
-(eval "(lua-eval-ast \"local t = {1, 2, 3} table.insert(t, 4) return #t\")")
-(epoch 1301)
-(eval "(lua-eval-ast \"local t = {1, 2, 3} table.insert(t, 4) return t[4]\")")
-(epoch 1302)
-(eval "(lua-eval-ast \"local t = {10, 30} table.insert(t, 2, 20) return t[2]\")")
-(epoch 1303)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} table.insert(t, 1, 5) return t[1] * 100 + t[2]\")")
-(epoch 1310)
-(eval "(lua-eval-ast \"local t = {1, 2, 3} local v = table.remove(t) return v * 10 + #t\")")
-(epoch 1311)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} table.remove(t, 1) return t[1] * 10 + t[2]\")")
-(epoch 1320)
-(eval "(lua-eval-ast \"local t = {\\\"a\\\", \\\"b\\\", \\\"c\\\"} return table.concat(t)\")")
-(epoch 1321)
-(eval "(lua-eval-ast \"local t = {\\\"a\\\", \\\"b\\\", \\\"c\\\"} return table.concat(t, \\\"-\\\")\")")
-(epoch 1322)
-(eval "(lua-eval-ast \"local t = {1, 2, 3, 4} return table.concat(t, \\\",\\\", 2, 3)\")")
-(epoch 1330)
-(eval "(lua-eval-ast \"local t = {3, 1, 4, 1, 5, 9, 2, 6} table.sort(t) return t[1] * 100 + t[8]\")")
-(epoch 1331)
-(eval "(lua-eval-ast \"local t = {3, 1, 2} table.sort(t, function(a, b) return a > b end) return t[1] * 100 + t[3]\")")
-(epoch 1340)
-(eval "(lua-eval-ast \"local t = {10, 20, 30} local a, b, c = unpack(t) return a + b + c\")")
-(epoch 1341)
-(eval "(lua-eval-ast \"local t = {10, 20, 30, 40} local a, b = table.unpack(t, 2, 3) return a + b\")")
-
-;; ── Phase 6: io stub + print/tostring/tonumber ────────────────
-(epoch 1400)
-(eval "(lua-eval-ast \"io.write(\\\"hello\\\") return io.__buffer()\")")
-(epoch 1401)
-(eval "(lua-eval-ast \"io.write(\\\"a\\\", \\\"b\\\", \\\"c\\\") return io.__buffer()\")")
-(epoch 1402)
-(eval "(lua-eval-ast \"io.write(1, \\\" \\\", 2) return io.__buffer()\")")
-(epoch 1410)
-(eval "(lua-eval-ast \"print(\\\"x\\\", \\\"y\\\") return io.__buffer()\")")
-(epoch 1411)
-(eval "(lua-eval-ast \"print(1, 2, 3) return io.__buffer()\")")
-(epoch 1420)
-(eval "(lua-eval-ast \"return tostring(42)\")")
-(epoch 1421)
-(eval "(lua-eval-ast \"return tostring(nil)\")")
-(epoch 1422)
-(eval "(lua-eval-ast \"return tostring({})\")")
-(epoch 1430)
-(eval "(lua-eval-ast \"return tonumber(\\\"42\\\")\")")
-(epoch 1431)
-(eval "(lua-eval-ast \"if tonumber(\\\"abc\\\") == nil then return 1 else return 0 end\")")
-(epoch 1440)
-(eval "(lua-eval-ast \"if io.read() == nil then return 1 else return 0 end\")")
-(epoch 1441)
-(eval "(lua-eval-ast \"if io.open(\\\"x\\\") == nil then return 1 else return 0 end\")")
-
-;; ── Phase 6: os stub ──────────────────────────────────────────
-(epoch 1500)
-(eval "(lua-eval-ast \"return type(os.time())\")")
-(epoch 1501)
-(eval "(lua-eval-ast \"local t1 = os.time() local t2 = os.time() return t2 > t1\")")
-(epoch 1502)
-(eval "(lua-eval-ast \"return os.difftime(100, 60)\")")
-(epoch 1503)
-(eval "(lua-eval-ast \"return type(os.clock())\")")
-(epoch 1504)
-(eval "(lua-eval-ast \"return type(os.date())\")")
-(epoch 1505)
-(eval "(lua-eval-ast \"local d = os.date(\\\"*t\\\") return d.year\")")
-(epoch 1506)
-(eval "(lua-eval-ast \"if os.getenv(\\\"HOME\\\") == nil then return 1 else return 0 end\")")
-(epoch 1507)
-(eval "(lua-eval-ast \"return type(os.tmpname())\")")
-
-;; ── Phase 7: require / package ────────────────────────────────
-(epoch 1600)
-(eval "(lua-eval-ast \"package.preload.mymath = function() local m = {} m.add = function(a, b) return a + b end return m end local mm = require(\\\"mymath\\\") return mm.add(3, 4)\")")
-(epoch 1601)
-(eval "(lua-eval-ast \"package.preload.counter = function() local n = 0 local m = {} m.inc = function() n = n + 1 return n end return m end local c1 = require(\\\"counter\\\") local c2 = require(\\\"counter\\\") c1.inc() c1.inc() return c2.inc()\")")
-(epoch 1602)
-(eval "(lua-eval-ast \"local ok, err = pcall(require, \\\"nope\\\") if ok then return 0 else return 1 end\")")
-(epoch 1603)
-(eval "(lua-eval-ast \"package.preload.x = function() return {val = 42} end require(\\\"x\\\") return package.loaded.x.val\")")
-(epoch 1604)
-(eval "(lua-eval-ast \"package.preload.noret = function() end local r = require(\\\"noret\\\") return type(r)\")")
-
-;; ── Phase 7: vararg `...` (scoreboard iteration) ──────────────
-(epoch 1700)
-(eval "(lua-eval-ast \"local function f(...) return ... end local a, b, c = f(1, 2, 3) return a + b + c\")")
-(epoch 1701)
-(eval "(lua-eval-ast \"local function f(...) local t = {...} return t[2] end return f(10, 20, 30)\")")
-(epoch 1702)
-(eval "(lua-eval-ast \"local function f(a, ...) return a + select(\\\"#\\\", ...) end return f(10, 1, 2, 3)\")")
-(epoch 1703)
-(eval "(lua-eval-ast \"local function f(...) return select(2, ...) end local a, b = f(10, 20, 30) return a + b\")")
-(epoch 1704)
-(eval "(lua-eval-ast \"local function sum(...) local s = 0 for _, v in ipairs({...}) do s = s + v end return s end return sum(1, 2, 3, 4, 5)\")")
-(epoch 1705)
-(eval "(lua-eval-ast \"local function f(a, b, ...) return a * 100 + b * 10 + select(\\\"#\\\", ...) end return f(7, 8, 1, 2, 3)\")")
-
-;; ── Phase 7: do-block proper scoping ──────────────────────────
-(epoch 1800)
-(eval "(lua-eval-ast \"local i = 10 do local i = 100 end return i\")")
-(epoch 1801)
-(eval "(lua-eval-ast \"do local i = 10 do local i = 100 assert(i == 100) end assert(i == 10) end return \\\"ok\\\"\")")
-
-;; ── if/else/elseif body scoping ──────────────────────────────
-(epoch 1810)
-(eval "(lua-eval-ast \"local x = 10 if true then local x = 99 end return x\")")
-(epoch 1811)
-(eval "(lua-eval-ast \"local x = 10 if false then else local x = 99 end return x\")")
-(epoch 1812)
-(eval "(lua-eval-ast \"local x = 10 if false then elseif true then local x = 99 end return x\")")
-
-;; ── Lua 5.0-style `arg` table in vararg functions ─────────────
-(epoch 1820)
-(eval "(lua-eval-ast \"function f(a, ...) return arg.n end return f({}, 1, 2, 3)\")")
-(epoch 1821)
-(eval "(lua-eval-ast \"function f(a, ...) return arg[1] + arg[2] + arg[3] end return f({}, 10, 20, 30)\")")
-
-;; ── Decimal-escape strings ────────────────────────────────────
-(epoch 1830)
-(eval "(lua-eval-ast \"return \\\"\\\\65\\\"\")")
-(epoch 1831)
-(eval "(lua-eval-ast \"if \\\"\\\\09912\\\" == \\\"c12\\\" then return 1 else return 0 end\")")
-
-;; ── Unary-minus / ^ precedence (Lua spec: ^ tighter than -) ──
-(epoch 1840)
-(eval "(lua-eval-ast \"return -2^2\")")
-(epoch 1841)
-(eval "(lua-eval-ast \"return 2^3^2\")")
-(epoch 1842)
-(eval "(lua-eval-ast \"if -2^2 == -4 then return 1 else return 0 end\")")
-
-;; ── Early-return inside nested block (guard+raise sentinel) ──
-(epoch 1850)
-(eval "(lua-eval-ast \"local function f(n) if n < 0 then return -1 end return n * 2 end return f(-5)\")")
-(epoch 1851)
-(eval "(lua-eval-ast \"local function f(n) if n < 0 then return -1 end return n * 2 end return f(7)\")")
-(epoch 1852)
-(eval "(lua-eval-ast \"function f(i) if type(i) ~= \\\"number\\\" then return i, \\\"jojo\\\" end if i > 0 then return i, f(i-1) end end local a, b = f(3) return a\")")
-
-;; ── break via sentinel (escapes while/for-num/for-in/repeat) ──
-(epoch 1860)
-(eval "(lua-eval-ast \"local i = 0 while true do i = i + 1 if i >= 5 then break end end return i\")")
-(epoch 1861)
-(eval "(lua-eval-ast \"local s = 0 for i = 1, 100 do if i > 10 then break end s = s + i end return s\")")
-(epoch 1862)
-(eval "(lua-eval-ast \"local t = {10, 20, 99, 40} local s = 0 for i, v in ipairs(t) do if v == 99 then break end s = s + v end return s\")")
-(epoch 1863)
-(eval "(lua-eval-ast \"local i = 0 repeat i = i + 1 if i >= 3 then break end until false return i\")")
-
-;; ── Method-call chaining (obj evaluated once) ────────────────
-(epoch 1870)
-(eval "(lua-eval-ast \"local a = {x=0} function a:add(x) self.x = self.x+x return self end return a:add(10):add(20):add(30).x\")")
-
-;; ── Parenthesized expression truncates multi-return ──────────
-(epoch 1880)
-(eval "(lua-eval-ast \"local function f() return 1, 2, 3 end local a, b, c = (f()) return (a == 1 and b == nil and c == nil) and 1 or 0\")")
-(epoch 1881)
-(eval "(lua-eval-ast \"local function f() return 10, 20 end return (f()) + 1\")")
-
-;; ── Lua patterns in match/gmatch/gsub ────────────────────────
-(epoch 1890)
-(eval "(lua-eval-ast \"return string.match(\\\"hello123world\\\", \\\"%d+\\\")\")")
-(epoch 1891)
-(eval "(lua-eval-ast \"return string.match(\\\"name=bob\\\", \\\"%a+\\\")\")")
-(epoch 1892)
-(eval "(lua-eval-ast \"local c = 0 for w in string.gmatch(\\\"a b c d\\\", \\\"%a\\\") do c = c + 1 end return c\")")
-(epoch 1893)
-(eval "(lua-eval-ast \"local r, n = string.gsub(\\\"1 + 2 = 3\\\", \\\"%d\\\", \\\"X\\\") return r .. \\\":\\\" .. n\")")
-(epoch 1894)
-(eval "(lua-eval-ast \"if string.find(\\\"hello\\\", \\\"^hel\\\") then return 1 else return 0 end\")")
-(epoch 1895)
-(eval "(lua-eval-ast \"if string.find(\\\"hello\\\", \\\"^wor\\\") then return 0 else return 1 end\")")
-
-;; ── tonumber with base (Lua 5.1) ──────────────────────────────
-(epoch 1900)
-(eval "(lua-eval-ast \"return tonumber('1010', 2)\")")
-(epoch 1901)
-(eval "(lua-eval-ast \"return tonumber('FF', 16)\")")
-(epoch 1902)
-(eval "(lua-eval-ast \"if tonumber('99', 8) == nil then return 1 else return 0 end\")")
-
-;; ── Pattern character sets [...] ──────────────────────────────
-(epoch 1910)
-(eval "(lua-eval-ast \"return string.match(\\\"hello123\\\", \\\"[a-z]+\\\")\")")
-(epoch 1911)
-(eval "(lua-eval-ast \"return string.match(\\\"hello123\\\", \\\"[0-9]+\\\")\")")
-(epoch 1912)
-(eval "(lua-eval-ast \"return string.match(\\\"abc\\\", \\\"[^a]+\\\")\")")
-
-;; ── string.format width/precision/hex/octal/char ─────────────
-(epoch 1920)
-(eval "(lua-eval-ast \"return string.format('%5d', 42)\")")
-(epoch 1921)
-(eval "(lua-eval-ast \"return string.format('%05d', 42)\")")
-(epoch 1922)
-(eval "(lua-eval-ast \"return string.format('%x', 255)\")")
-(epoch 1923)
-(eval "(lua-eval-ast \"return string.format('%X', 255)\")")
-(epoch 1924)
-(eval "(lua-eval-ast \"return string.format('%c', 65)\")")
-(epoch 1925)
-(eval "(lua-eval-ast \"return string.format('%.3s', 'hello')\")")
-
 EPOCHS
 
 OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
@@ -1127,7 +528,7 @@ check 213 "parse and/or prec"               '(lua-binop "or" (lua-binop "and"'
 check 214 "parse =="                        '(lua-binop "==" (lua-name "a") (lua-name "b"))'
 check 215 "parse .. right-assoc"            '(lua-binop ".." (lua-name "a") (lua-binop ".."'
 check 216 "parse ^ right-assoc"             '(lua-binop "^" (lua-name "a") (lua-binop "^"'
-check 217 "parse paren override"            '(lua-binop "*" (lua-paren (lua-binop "+"'
+check 217 "parse paren override"            '(lua-binop "*" (lua-binop "+"'
 
 check 220 "parse -x"                        '(lua-unop "-" (lua-name "x"))'
 check 221 "parse not x"                     '(lua-unop "not" (lua-name "x"))'
@@ -1232,304 +633,6 @@ check 482 "while i<5 count"                 '5'
 check 483 "repeat until i>=3"               '3'
 check 484 "for 1..100 sum"                  '5050'
 
-# ── Phase 3: functions + closures ─────────────────────────────
-check 500 "anon fn call"                    '6'
-check 501 "anon fn no args"                 '42'
-check 502 "iife"                            '12'
-
-check 510 "local function double"           '14'
-check 511 "local function sum3"             '6'
-check 512 "local function greet"            '"hi"'
-
-check 520 "top-level function decl"         '7'
-check 521 "top-level id string"             '"abc"'
-
-check 530 "closure reads outer"             '10'
-check 531 "closure factory add5(10)"        '15'
-check 532 "closure with mutable counter"    '3'
-check 533 "closure sees later mutation"     '12'
-
-check 540 "recursive local fact(5)"         '120'
-check 541 "recursive top-level fib(10)"     '55'
-
-check 550 "apply(sq,4)"                     '16'
-check 551 "twice(+1, 5)"                    '7'
-
-check 560 "max with if"                     '7'
-check 561 "sum_to(10) with for"             '55'
-
-# ── Phase 3: multi-return + unpack ────────────────────────────
-check 570 "anon-fn returns 2, unpack"       '3'
-check 571 "local fn returns 2, unpack"      '10'
-check 572 "swap via multi-return"           '21'
-check 573 "extra returns discarded"         '12'
-check 574 "missing returns nil-padded"      '3'
-check 575 "tail-return passthrough"         '12'
-check 576 "non-last call truncated to 1st"  '95'
-check 577 "single-assign truncates to 1st"  '5'
-check 578 "empty return → all nil"          '99'
-check 579 "multi-assign (non-local)"        '18'
-
-# ── Phase 3: table constructors ────────────────────────────────
-check 600 "array t[1]"                      '10'
-check 601 "array t[3]"                      '30'
-check 602 "array out-of-range is nil"       '1'
-check 610 "hash t.x+t.y"                    '3'
-check 611 "hash name lookup"                '"bob"'
-check 612 "hash age lookup"                 '30'
-check 620 "computed [k]=v"                  '42'
-check 621 "computed [1+1]"                  '"two"'
-check 622 "computed [concat]"               '99'
-check 623 "boolean key [true]"              '"yes"'
-check 630 "mixed array part"                '2'
-check 631 "mixed hash part"                 '"v"'
-check 640 "trailing comma"                  '3'
-check 641 "semicolon separators"            '2'
-check 642 "mixed separators"                '4'
-check 650 "nested array"                    '3'
-check 651 "nested hash"                     '2'
-check 660 "dynamic pos values"              '14'
-check 661 "function calls as values"        '4'
-check 670 "function-valued field + call"    '10'
-
-# ── Phase 3: raw table access ─────────────────────────────────
-check 700 "t[1]=v then read"                '"a"'
-check 701 "t[1]+t[2] after writes"          '30'
-check 710 "t.x=100 persists"                '100'
-check 711 "t.name=... persists"             '"alice"'
-check 712 "overwrite existing field"        '99'
-check 720 "missing field is nil"            '99'
-check 721 "missing index is nil"            '1'
-check 730 "#t on 5-element array"           '5'
-check 731 "#t on empty"                     '0'
-check 732 "#t after inserts"                '2'
-check 733 "#\"hello\""                      '5'
-check 740 "t.count mutate chain"            '2'
-check 741 "fill via for-num then read"      '9'
-check 742 "#t after 10 inserts"             '10'
-check 750 "chained t.a.b.c read"            '42'
-check 751 "chained t.a.x write"             '7'
-check 760 "t[k]=v reads via t.foo"          '88'
-check 761 "t[concat]=v reads via t.xy"      '7'
-check 770 "reference semantics t=s"         '42'
-
-# ── Phase 4: metatables ───────────────────────────────────────
-check 800 "setmetatable returns t"          '1'
-check 801 "getmetatable roundtrip"          '1'
-check 810 "type(1)"                         '"number"'
-check 811 "type(string)"                    '"string"'
-check 812 "type({})"                        '"table"'
-check 813 "type(nil)"                       '"nil"'
-check 814 "type(true)"                      '"boolean"'
-check 815 "type(function)"                  '"function"'
-check 820 "__index table lookup"            '10'
-check 821 "__index chain + self"            '30'
-check 822 "__index as function"             '"hi!"'
-check 830 "__newindex fires"                '"foo"'
-check 840 "__add table+number"              '99'
-check 841 "__add two tables"                '7'
-check 842 "__sub + __mul chain"             '18'
-check 843 "__unm"                           '42'
-check 844 "__concat"                        '"cat"'
-check 850 "__eq"                            '1'
-check 851 "__lt"                            '1'
-check 852 "__le"                            '1'
-check 860 "__call"                          '105'
-check 870 "__len"                           '99'
-check 880 "OO pattern self:m()"             '"Rex"'
-
-# ── Phase 4: pcall / xpcall / error ───────────────────────────
-check 900 "pcall catches error(msg)"        '"boom"'
-check 901 "pcall ok path single val"        '42'
-check 902 "pcall ok path multi val"         '3'
-check 903 "pcall with args, ok"             '5'
-check 904 "pcall with args, err"            '"div by zero"'
-check 905 "error(table) preserved"          '42'
-check 906 "nested pcall"                    '"outer:inner"'
-check 910 "xpcall invokes handler"          '"H:raw"'
-check 911 "xpcall ok path"                  '99'
-
-# ── Phase 4: generic `for … in …` ─────────────────────────────
-check 950 "ipairs sum"                      '60'
-check 951 "ipairs last index"               '3'
-check 952 "ipairs empty → 0"                '0'
-check 953 "ipairs stops at nil"             '2'
-check 960 "pairs hash sum"                  '6'
-check 961 "pairs hash count"                '3'
-check 970 "stateful closure iter"           '15'
-check 971 "3-value iterator form"           '30'
-check 980 "pairs skips __meta"              '2'
-
-# ── Phase 5: coroutines ────────────────────────────────────────
-check 1000 "coroutine.status initial"       '"suspended"'
-check 1001 "coroutine.status after done"    '"dead"'
-check 1010 "yield/resume × 3 sequence"      '123'
-check 1011 "resume passes args to body"     '30'
-check 1012 "resume passes args via yield"   '142'
-check 1020 "resume dead returns error"      '"cannot resume dead coroutine"'
-check 1030 "coroutine.wrap"                 '6'
-check 1040 "iterator via coroutine"         '60'
-
-# ── Phase 6: string library ───────────────────────────────────
-check 1100 "string.len"                     '5'
-check 1101 "string.upper"                   '"HI"'
-check 1102 "string.lower"                   '"hi"'
-check 1103 "string.rep"                     '"ababab"'
-check 1110 "string.sub(s,i,j)"              '"ell"'
-check 1111 "string.sub(s,-3)"               '"llo"'
-check 1112 "string.sub(s,1,-2)"             '"hell"'
-check 1120 "string.byte"                    '65'
-check 1121 "string.byte(s,i)"               '66'
-check 1130 "string.char(72,105)"            '"Hi"'
-check 1131 "string.char(97,98,99)"          '"abc"'
-check 1140 "string.find literal hit"        '709'
-check 1141 "string.find literal miss"       '1'
-check 1150 "string.match literal"           '"ell"'
-check 1160 "string.gsub replace all"        '"XbcXbc:2"'
-check 1161 "string.gsub with limit"         '"bbaa:2"'
-check 1170 "string.gmatch iterator"         '3'
-check 1180 "string.format %s=%d"            '"x=42"'
-check 1181 "string.format %d%%"             '"50%"'
-
-# ── Phase 6: math library ─────────────────────────────────────
-check 1200 "math.pi in range"               'true'
-check 1201 "math.huge big"                  'true'
-check 1210 "math.abs(-7)"                   '7'
-check 1211 "math.sqrt(16)"                  '4'
-check 1212 "math.floor(3.7)"                '3'
-check 1213 "math.ceil(3.2)"                 '4'
-check 1220 "math.max(3,7,1,4)"              '7'
-check 1221 "math.min(3,7,1,4)"              '1'
-check 1230 "math.pow(2,8)"                  '256'
-check 1231 "math.exp(0)"                    '1'
-check 1232 "math.log(1)"                    '0'
-check 1233 "math.log10(100)"                '2'
-check 1240 "math.sin(0)+math.cos(0)"        '1'
-check 1250 "math.fmod(10,3)"                '1'
-check 1251 "math.modf(3.5) int part"        '3'
-check 1260 "math.random(n) in range"        'true'
-check 1261 "math.random(m,n) in range"      'true'
-
-# ── Phase 6: table library ────────────────────────────────────
-check 1300 "table.insert append → #t"       '4'
-check 1301 "table.insert value"             '4'
-check 1302 "table.insert(t,pos,v) mid"      '20'
-check 1303 "table.insert(t,1,v) prepend"    '510'
-check 1310 "table.remove() last"            '33'
-check 1311 "table.remove(t,1) shift"        '230'
-check 1320 "table.concat no sep"            '"abc"'
-check 1321 "table.concat with sep"          '"a-b-c"'
-check 1322 "table.concat range"             '"2,3"'
-check 1330 "table.sort asc"                 '109'
-check 1331 "table.sort desc via cmp"        '301'
-check 1340 "unpack global"                  '60'
-check 1341 "table.unpack(t,i,j)"            '50'
-
-# ── Phase 6: io stub + print/tostring/tonumber ────────────────
-check 1400 "io.write single"                '"hello"'
-check 1401 "io.write multi strings"         '"abc"'
-check 1402 "io.write numbers + spaces"      '"1 2"'
-check 1410 "print two args tab-sep + NL"    '"x\ty\n"'
-check 1411 "print three ints"               '"1\t2\t3\n"'
-check 1420 "tostring(42)"                   '"42"'
-check 1421 "tostring(nil)"                  '"nil"'
-check 1422 "tostring({})"                   '"table"'
-check 1430 "tonumber(\"42\")"               '42'
-check 1431 "tonumber(\"abc\") → nil"        '1'
-check 1440 "io.read() → nil"                '1'
-check 1441 "io.open(x) → nil"               '1'
-
-# ── Phase 6: os stub ──────────────────────────────────────────
-check 1500 "os.time → number"               '"number"'
-check 1501 "os.time monotonic"              'true'
-check 1502 "os.difftime"                    '40'
-check 1503 "os.clock → number"              '"number"'
-check 1504 "os.date() default"              '"string"'
-check 1505 "os.date(*t).year"               '1970'
-check 1506 "os.getenv → nil"                '1'
-check 1507 "os.tmpname → string"            '"string"'
-
-# ── Phase 7: require / package ────────────────────────────────
-check 1600 "require(preload) + call"        '7'
-check 1601 "require returns cached"         '3'
-check 1602 "require unknown module errors"  '1'
-check 1603 "package.loaded populated"       '42'
-check 1604 "nil return caches as true"      '"boolean"'
-
-# ── Phase 7: vararg `...` (scoreboard iteration) ──────────────
-check 1700 "f(...) return ... unpack"       '6'
-check 1701 "{...} table from vararg"        '20'
-check 1702 "f(a, ...) + select(#,...)"      '13'
-check 1703 "select(2, ...) unpack"          '50'
-check 1704 "sum via ipairs({...})"          '15'
-check 1705 "f(a, b, ...) mixed"             '783'
-
-# ── Phase 7: do-block proper scoping ──────────────────────────
-check 1800 "inner do local shadows"         '10'
-check 1801 "nested do scopes"               '"ok"'
-
-# ── if/else/elseif body scoping ──────────────────────────────
-check 1810 "if then local shadows"          '10'
-check 1811 "else local shadows"             '10'
-check 1812 "elseif local shadows"           '10'
-
-# ── Lua 5.0-style `arg` table in vararg functions ─────────────
-check 1820 "arg.n in vararg fn"             '3'
-check 1821 "arg[i] access"                  '60'
-
-# ── Decimal-escape strings ───────────────────────────────────
-check 1830 "\\65 → A"                        '"A"'
-check 1831 "\\099 + 12 → c12"                '1'
-
-# ── Unary-minus / ^ precedence (Lua: ^ tighter than unary -) ──
-check 1840 "-2^2 = -4"                      '-4'
-check 1841 "2^3^2 = 512 (right-assoc)"      '512'
-check 1842 "-2^2 == -4 true"                '1'
-
-# ── Early-return inside nested block ─────────────────────────
-check 1850 "early return negative path"     '-1'
-check 1851 "non-early return path"          '14'
-check 1852 "nested early-return recursion"  '3'
-
-# ── break via sentinel ───────────────────────────────────────
-check 1860 "break in while"                 '5'
-check 1861 "break in for-num"               '55'
-check 1862 "break in for-in"                '30'
-check 1863 "break in repeat"                '3'
-
-# ── Method-call chaining ─────────────────────────────────────
-check 1870 "a:add():add():add().x chain"    '60'
-
-# ── Parenthesized truncates multi-return ─────────────────────
-check 1880 "(f()) scalar coerce"            '1'
-check 1881 "(f()) + 1 scalar"               '11'
-
-# ── Lua patterns in match/gmatch/gsub ────────────────────────
-check 1890 "match %d+"                      '"123"'
-check 1891 "match %a+"                      '"name"'
-check 1892 "gmatch %a count"                '4'
-check 1893 "gsub %d → X"                    '"X + X = X:3"'
-check 1894 "find ^ anchor hit"              '1'
-check 1895 "find ^ anchor miss"             '1'
-
-# ── tonumber with base ───────────────────────────────────────
-check 1900 "tonumber('1010', 2)"            '10'
-check 1901 "tonumber('FF', 16)"             '255'
-check 1902 "tonumber('99', 8) → nil"        '1'
-
-# ── Pattern character sets [...] ─────────────────────────────
-check 1910 "[a-z]+ on hello123"             '"hello"'
-check 1911 "[0-9]+ on hello123"             '"123"'
-check 1912 "[^a]+ on abc"                   '"bc"'
-
-# ── string.format width/precision/hex/octal/char ────────────
-check 1920 "%5d width"                      '"   42"'
-check 1921 "%05d zero-pad"                  '"00042"'
-check 1922 "%x hex"                         '"ff"'
-check 1923 "%X HEX"                         '"FF"'
-check 1924 "%c char"                        '"A"'
-check 1925 "%.3s precision"                 '"hel"'
-
 TOTAL=$((PASS + FAIL))
 if [ $FAIL -eq 0 ]; then
   echo "ok $PASS/$TOTAL Lua-on-SX tests passed"

lib/lua/tokenizer.sx

@@ -1,14 +1,3 @@
-(define __ascii-tok " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~")
-
-(define lua-byte-to-char
-  (fn (n)
-    (cond
-      ((= n 9) "\t")
-      ((= n 10) "\n")
-      ((= n 13) "\r")
-      ((and (>= n 32) (<= n 126)) (char-at __ascii-tok (- n 32)))
-      (else "?"))))
-
 (define lua-make-token (fn (type value pos) {:pos pos :value value :type type}))
 
 (define lua-digit? (fn (c) (and (not (= c nil)) (>= c "0") (<= c "9"))))
@@ -235,39 +224,14 @@
               (begin
                 (read-decimal-digits!)
                 (when
-                  (and (< pos src-len) (= (cur) "."))
+                  (and
+                    (< pos src-len)
+                    (= (cur) ".")
+                    (< (+ pos 1) src-len)
+                    (lua-digit? (lua-peek 1)))
                   (begin (advance! 1) (read-decimal-digits!)))
                 (read-exp-part!)
                 (parse-number (slice src start pos)))))))
-      (define
-        lua-char-one-tok
-        (fn (n)
-          (cond
-            ((= n 7) (str (list n)))
-            ((= n 8) (str (list n)))
-            ((= n 11) (str (list n)))
-            ((= n 12) (str (list n)))
-            (else (str (list n))))))
-      (define
-        read-decimal-escape!
-        (fn (chars)
-          (let ((d0 (cur)))
-            (begin
-              (advance! 1)
-              (let ((n (- (char-code d0) (char-code "0"))))
-                (begin
-                  (when
-                    (and (< pos src-len) (lua-digit? (cur)))
-                    (begin
-                      (set! n (+ (* n 10) (- (char-code (cur)) (char-code "0"))))
-                      (advance! 1)
-                      (when
-                        (and (< pos src-len) (lua-digit? (cur))
-                             (<= (+ (* n 10) (- (char-code (cur)) (char-code "0"))) 255))
-                        (begin
-                          (set! n (+ (* n 10) (- (char-code (cur)) (char-code "0"))))
-                          (advance! 1)))))
-                  (append! chars (lua-byte-to-char n))))))))
       (define
         read-string
         (fn
@@ -291,18 +255,14 @@
                             ((ch (cur)))
                             (begin
                               (cond
-                                ((= ch "n") (begin (append! chars "\n") (advance! 1)))
+                                ((= ch "n") (append! chars "\n"))
-                                ((= ch "t") (begin (append! chars "\t") (advance! 1)))
+                                ((= ch "t") (append! chars "\t"))
-                                ((= ch "r") (begin (append! chars "\r") (advance! 1)))
+                                ((= ch "r") (append! chars "\r"))
-                                ((= ch "a") (begin (append! chars (lua-char-one-tok 7)) (advance! 1)))
+                                ((= ch "\\") (append! chars "\\"))
-                                ((= ch "b") (begin (append! chars (lua-char-one-tok 8)) (advance! 1)))
+                                ((= ch "'") (append! chars "'"))
-                                ((= ch "f") (begin (append! chars (lua-char-one-tok 12)) (advance! 1)))
+                                ((= ch "\"") (append! chars "\""))
-                                ((= ch "v") (begin (append! chars (lua-char-one-tok 11)) (advance! 1)))
+                                (else (append! chars ch)))
-                                ((= ch "\\") (begin (append! chars "\\") (advance! 1)))
+                              (advance! 1))))
-                                ((= ch "'") (begin (append! chars "'") (advance! 1)))
-                                ((= ch "\"") (begin (append! chars "\"") (advance! 1)))
-                                ((lua-digit? ch) (read-decimal-escape! chars))
-                                (else (begin (append! chars ch) (advance! 1)))))))
                         (loop)))
                     ((= (cur) quote-char) (advance! 1))
                     (else

lib/lua/transpile.sx

@@ -1,14 +1,3 @@
-(define
-  lua-tx-loop-guard
-  (fn (body-sx)
-    (list
-      (make-symbol "guard")
-      (list (make-symbol "e")
-        (list
-          (list (make-symbol "lua-break-sentinel?") (make-symbol "e"))
-          nil))
-      body-sx)))
-
 (define
   lua-tx
   (fn
@@ -29,8 +18,8 @@
       ((= tag (quote lua-true)) true)
       ((= tag (quote lua-false)) false)
       ((= tag (quote lua-name)) (make-symbol (nth node 1)))
-      ((= tag (quote lua-vararg)) (make-symbol "__varargs"))
+      ((= tag (quote lua-vararg))
-      ((= tag (quote lua-paren)) (list (make-symbol "lua-first") (lua-tx (nth node 1))))
+        (error "lua-transpile: ... not yet supported"))
       ((= tag (quote lua-binop)) (lua-tx-binop node))
       ((= tag (quote lua-unop)) (lua-tx-unop node))
       ((= tag (quote lua-call)) (lua-tx-call node))
@@ -46,9 +35,8 @@
       ((= tag (quote lua-while)) (lua-tx-while node))
       ((= tag (quote lua-repeat)) (lua-tx-repeat node))
       ((= tag (quote lua-for-num)) (lua-tx-for-num node))
-      ((= tag (quote lua-for-in)) (lua-tx-for-in node))
       ((= tag (quote lua-do)) (lua-tx-do node))
-      ((= tag (quote lua-break)) (list (make-symbol "raise") (list (make-symbol "list") (list (make-symbol "quote") (make-symbol "lua-brk")))))
+      ((= tag (quote lua-break)) (quote lua-break-marker))
       ((= tag (quote lua-return)) (lua-tx-return node))
       ((= tag (quote lua-call-stmt)) (lua-tx (nth node 1)))
       ((= tag (quote lua-local-function)) (lua-tx-local-function node))
@@ -116,9 +104,7 @@
     (node)
     (let
       ((fn-ast (nth node 1)) (args (nth node 2)))
-      (cons
+      (cons (lua-tx fn-ast) (map lua-tx args)))))
-        (make-symbol "lua-call")
-        (cons (lua-tx fn-ast) (map lua-tx args))))))
 
 (define
   lua-tx-method-call
@@ -128,16 +114,9 @@
       ((obj (lua-tx (nth node 1)))
         (name (nth node 2))
         (args (nth node 3)))
-      (let
-        ((tmp (make-symbol "__obj")))
-        (list
-          (make-symbol "let")
-          (list (list tmp obj))
       (cons
-            (make-symbol "lua-call")
+        (list (make-symbol "lua-get") obj name)
-            (cons
+        (cons obj (map lua-tx args))))))
-              (list (make-symbol "lua-get") tmp name)
-              (cons tmp (map lua-tx args)))))))))
 
 (define
   lua-tx-field
@@ -177,44 +156,6 @@
           (lua-tx (nth f 2))))
       (else (error "lua-transpile: unknown table field")))))
 
-(define
-  lua-tx-function-bindings
-  (fn
-    (params i)
-    (if
-      (>= i (len params))
-      (list)
-      (cons
-        (list
-          (make-symbol (nth params i))
-          (list (make-symbol "lua-arg") (make-symbol "__args") i))
-        (lua-tx-function-bindings params (+ i 1))))))
-
-(define
-  lua-tx-function-varargs-binding
-  (fn (n)
-    (list
-      (make-symbol "__varargs")
-      (list (make-symbol "lua-varargs") (make-symbol "__args") n))))
-
-(define
-  lua-tx-function-arg-binding
-  (fn (n)
-    (list
-      (make-symbol "arg")
-      (list (make-symbol "lua-varargs-arg-table") (make-symbol "__args") n))))
-
-(define
-  lua-tx-function-guard
-  (fn (body-sx)
-    (list
-      (make-symbol "guard")
-      (list (make-symbol "e")
-        (list
-          (list (make-symbol "lua-return-sentinel?") (make-symbol "e"))
-          (list (make-symbol "lua-return-value") (make-symbol "e"))))
-      body-sx)))
-
 (define
   lua-tx-function
   (fn
@@ -223,31 +164,9 @@
       ((params (nth node 1))
         (is-vararg (nth node 2))
         (body (nth node 3)))
-      (cond
-        ((and (= (len params) 0) (not is-vararg))
-          (list
-            (make-symbol "fn")
-            (list (make-symbol "&rest") (make-symbol "__args"))
-            (lua-tx-function-guard (lua-tx body))))
-        (else
       (let
-            ((bindings (lua-tx-function-bindings params 0)))
+        ((sym-params (map make-symbol params)))
-            (let
+        (list (make-symbol "fn") sym-params (lua-tx body))))))
-              ((all-bindings
-                 (if is-vararg
-                     (append bindings
-                       (list
-                         (lua-tx-function-varargs-binding (len params))
-                         (lua-tx-function-arg-binding (len params))))
-                     bindings)))
-              (list
-                (make-symbol "fn")
-                (list (make-symbol "&rest") (make-symbol "__args"))
-                (lua-tx-function-guard
-                  (list
-                    (make-symbol "let")
-                    all-bindings
-                    (lua-tx body)))))))))))
 
 (define
   lua-tx-block
@@ -271,13 +190,9 @@
           (list
             (make-symbol "define")
             (make-symbol (first names))
-            (if
+            (if (> (len exps) 0) (lua-tx (first exps)) nil)))
-              (> (len exps) 0)
+        (else
-              (list (make-symbol "lua-first") (lua-tx (first exps)))
+          (cons (make-symbol "begin") (lua-tx-local-pairs names exps 0)))))))
-              nil)))
-        ((= (len exps) 0)
-          (cons (make-symbol "begin") (lua-tx-local-pairs names exps 0)))
-        (else (lua-tx-multi-local names exps))))))
 
 (define
   lua-tx-local-pairs
@@ -301,12 +216,9 @@
       ((lhss (nth node 1)) (rhss (nth node 2)))
       (cond
         ((= (len lhss) 1)
-          (lua-tx-single-assign
+          (lua-tx-single-assign (first lhss) (lua-tx (first rhss))))
-            (first lhss)
+        (else
-            (list (make-symbol "lua-first") (lua-tx (first rhss)))))
+          (cons (make-symbol "begin") (lua-tx-assign-pairs lhss rhss 0)))))))
-        ((= (len rhss) 0)
-          (cons (make-symbol "begin") (lua-tx-assign-pairs lhss rhss 0)))
-        (else (lua-tx-multi-assign lhss rhss))))))
 
 (define
   lua-tx-assign-pairs
@@ -342,18 +254,13 @@
           rhs))
       (else (error "lua-transpile: bad assignment target")))))
 
-(define
-  lua-tx-if-body
-  (fn (body)
-    (list (make-symbol "let") (list) body)))
-
 (define
   lua-tx-if
   (fn
     (node)
     (let
       ((cnd (lua-tx (nth node 1)))
-        (then-body (lua-tx-if-body (lua-tx (nth node 2))))
+        (then-body (lua-tx (nth node 2)))
         (elseifs (nth node 3))
         (else-body (nth node 4)))
       (if
@@ -377,7 +284,7 @@
           clauses
           (append
             clauses
-            (list (list (make-symbol "else") (lua-tx-if-body (lua-tx else-body))))))))))
+            (list (list (make-symbol "else") (lua-tx else-body)))))))))
 
 (define
   lua-tx-elseif
@@ -385,7 +292,7 @@
     (pair)
     (list
       (list (make-symbol "lua-truthy?") (lua-tx (first pair)))
-      (lua-tx-if-body (lua-tx (nth pair 1))))))
+      (lua-tx (nth pair 1)))))
 
 (define
   lua-tx-while
@@ -409,7 +316,7 @@
                 (make-symbol "begin")
                 body
                 (list (make-symbol "_while_loop"))))))
-        (lua-tx-loop-guard (list (make-symbol "_while_loop")))))))
+        (list (make-symbol "_while_loop"))))))
 
 (define
   lua-tx-repeat
@@ -435,7 +342,7 @@
                   (make-symbol "not")
                   (list (make-symbol "lua-truthy?") cnd))
                 (list (make-symbol "_repeat_loop"))))))
-        (lua-tx-loop-guard (list (make-symbol "_repeat_loop")))))))
+        (list (make-symbol "_repeat_loop"))))))
 
 (define
   lua-tx-for-num
@@ -479,9 +386,9 @@
                       (make-symbol name)
                       (make-symbol "_for_step")))
                   (list (make-symbol "_for_loop"))))))
-          (lua-tx-loop-guard (list (make-symbol "_for_loop"))))))))
+          (list (make-symbol "_for_loop")))))))
 
-(define lua-tx-do (fn (node) (list (make-symbol "let") (list) (lua-tx (nth node 1)))))
+(define lua-tx-do (fn (node) (lua-tx (nth node 1))))
 
 (define
   lua-tx-return
@@ -489,18 +396,10 @@
     (node)
     (let
       ((exps (nth node 1)))
-      (let
-        ((val
       (cond
         ((= (len exps) 0) nil)
         ((= (len exps) 1) (lua-tx (first exps)))
-            (else
+        (else (cons (make-symbol "list") (map lua-tx exps)))))))
-              (list
-                (make-symbol "lua-pack-return")
-                (cons (make-symbol "list") (lua-tx-multi-args exps 0)))))))
-        (list
-          (make-symbol "raise")
-          (list (make-symbol "list") (list (make-symbol "quote") (make-symbol "lua-ret")) val))))))
 
 (define
   lua-tx-local-function
@@ -532,257 +431,6 @@
 
 (define lua-transpile (fn (src) (lua-tx (lua-parse src))))
 
-(define
-  lua-ret-raise?
-  (fn (x)
-    (and (= (type-of x) "list")
-         (= (len x) 2)
-         (= (first x) (make-symbol "raise"))
-         (= (type-of (nth x 1)) "list")
-         (= (len (nth x 1)) 3)
-         (= (first (nth x 1)) (make-symbol "list"))
-         (= (type-of (nth (nth x 1) 1)) "list")
-         (= (first (nth (nth x 1) 1)) (make-symbol "quote"))
-         (= (nth (nth (nth x 1) 1) 1) (make-symbol "lua-ret")))))
-
-(define
-  lua-ret-value
-  (fn (raise-form) (nth (nth raise-form 1) 2)))
-
-(define
-  lua-unwrap-final-return
-  (fn (sx)
-    (cond
-      ((lua-ret-raise? sx) (lua-ret-value sx))
-      ((and (= (type-of sx) "list") (> (len sx) 0) (= (first sx) (make-symbol "begin")))
-        (let ((items (rest sx)))
-          (cond
-            ((= (len items) 0) sx)
-            (else
-              (let ((last-item (nth items (- (len items) 1))))
-                (cond
-                  ((lua-ret-raise? last-item)
-                    (let ((val (lua-ret-value last-item))
-                          (prefix (lua-init-before items 0 (- (len items) 1))))
-                      (cons (make-symbol "begin") (append prefix (list val)))))
-                  (else sx)))))))
-      (else sx))))
-
-(define
-  lua-has-top-return?
-  (fn (node)
-    (cond
-      ((not (= (type-of node) "list")) false)
-      ((= (len node) 0) false)
-      ((= (first node) (quote lua-return)) true)
-      ((or (= (first node) (quote lua-function))
-           (= (first node) (quote lua-local-function))
-           (= (first node) (quote lua-function-decl)))
-        false)
-      (else
-        (lua-has-top-return-children? (rest node) 0)))))
-
-(define
-  lua-has-top-return-children?
-  (fn (children i)
-    (cond
-      ((>= i (len children)) false)
-      ((lua-has-top-return? (nth children i)) true)
-      (else (lua-has-top-return-children? children (+ i 1))))))
-
 (define
   lua-eval-ast
-  (fn (src)
+  (fn (src) (let ((sx (lua-transpile src))) (eval-expr sx))))
-    (let ((parsed (lua-parse src)))
-      (let ((sx (lua-tx parsed)))
-        (let ((sx2 (lua-unwrap-final-return sx)))
-          (cond
-            ((lua-has-top-return? parsed)
-              (eval-expr (lua-tx-function-guard sx2)))
-            (else
-              (eval-expr sx2))))))))
-
-(define
-  lua-tx-multi-args
-  (fn
-    (exps i)
-    (cond
-      ((>= i (len exps)) (list))
-      ((= i (- (len exps) 1))
-        (cons (lua-tx (nth exps i)) (lua-tx-multi-args exps (+ i 1))))
-      (else
-        (cons
-          (list (make-symbol "lua-first") (lua-tx (nth exps i)))
-          (lua-tx-multi-args exps (+ i 1)))))))
-
-(define
-  lua-tx-multi-rhs
-  (fn
-    (exps)
-    (list
-      (make-symbol "lua-pack-return")
-      (cons (make-symbol "list") (lua-tx-multi-args exps 0)))))
-
-(define
-  lua-tx-multi-local
-  (fn
-    (names exps)
-    (let
-      ((tmp (make-symbol "__rets")))
-      (cons
-        (make-symbol "begin")
-        (append
-          (lua-tx-multi-local-decls names 0)
-          (list
-            (list
-              (make-symbol "let")
-              (list (list tmp (lua-tx-multi-rhs exps)))
-              (cons
-                (make-symbol "begin")
-                (lua-tx-multi-local-sets names tmp 0)))))))))
-
-(define
-  lua-tx-multi-local-decls
-  (fn
-    (names i)
-    (if
-      (>= i (len names))
-      (list)
-      (cons
-        (list (make-symbol "define") (make-symbol (nth names i)) nil)
-        (lua-tx-multi-local-decls names (+ i 1))))))
-
-(define
-  lua-tx-multi-local-sets
-  (fn
-    (names tmp i)
-    (if
-      (>= i (len names))
-      (list)
-      (cons
-        (list
-          (make-symbol "set!")
-          (make-symbol (nth names i))
-          (list (make-symbol "lua-nth-ret") tmp i))
-        (lua-tx-multi-local-sets names tmp (+ i 1))))))
-
-(define
-  lua-tx-multi-assign
-  (fn
-    (lhss rhss)
-    (let
-      ((tmp (make-symbol "__rets")))
-      (list
-        (make-symbol "let")
-        (list (list tmp (lua-tx-multi-rhs rhss)))
-        (cons (make-symbol "begin") (lua-tx-multi-assign-pairs lhss tmp 0))))))
-
-(define
-  lua-tx-multi-assign-pairs
-  (fn
-    (lhss tmp i)
-    (if
-      (>= i (len lhss))
-      (list)
-      (cons
-        (lua-tx-single-assign
-          (nth lhss i)
-          (list (make-symbol "lua-nth-ret") tmp i))
-        (lua-tx-multi-assign-pairs lhss tmp (+ i 1))))))
-
-(define
-  lua-tx-for-in-decls
-  (fn
-    (names i)
-    (if
-      (>= i (len names))
-      (list)
-      (cons
-        (list (make-symbol "define") (make-symbol (nth names i)) nil)
-        (lua-tx-for-in-decls names (+ i 1))))))
-
-(define
-  lua-tx-for-in-sets
-  (fn
-    (names rets-sym i)
-    (if
-      (>= i (len names))
-      (list)
-      (cons
-        (list
-          (make-symbol "set!")
-          (make-symbol (nth names i))
-          (list (make-symbol "lua-nth-ret") rets-sym i))
-        (lua-tx-for-in-sets names rets-sym (+ i 1))))))
-
-(define
-  lua-tx-for-in-step-body
-  (fn
-    (names body v-sym loop-sym first-name)
-    (list
-      (make-symbol "when")
-      (list (make-symbol "not") (list (make-symbol "=") first-name nil))
-      (list
-        (make-symbol "begin")
-        (list (make-symbol "set!") v-sym first-name)
-        body
-        (list loop-sym)))))
-
-(define
-  lua-tx-for-in-loop-body
-  (fn
-    (names body f-sym s-sym v-sym rets-sym loop-sym first-name)
-    (list
-      (make-symbol "let")
-      (list
-        (list
-          rets-sym
-          (list
-            (make-symbol "lua-pack-return")
-            (list
-              (make-symbol "list")
-              (list (make-symbol "lua-call") f-sym s-sym v-sym)))))
-      (cons
-        (make-symbol "begin")
-        (append
-          (lua-tx-for-in-sets names rets-sym 0)
-          (list (lua-tx-for-in-step-body names body v-sym loop-sym first-name)))))))
-
-(define
-  lua-tx-for-in
-  (fn
-    (node)
-    (let
-      ((names (nth node 1))
-        (exps (nth node 2))
-        (body (lua-tx (nth node 3))))
-      (let
-        ((pack-sym (make-symbol "__for_pack"))
-          (f-sym (make-symbol "__for_f"))
-          (s-sym (make-symbol "__for_s"))
-          (v-sym (make-symbol "__for_var"))
-          (rets-sym (make-symbol "__for_rets"))
-          (loop-sym (make-symbol "__for_loop"))
-          (first-name (make-symbol (first names))))
-        (list
-          (make-symbol "let")
-          (list (list pack-sym (lua-tx-multi-rhs exps)))
-          (list
-            (make-symbol "let")
-            (list
-              (list f-sym (list (make-symbol "lua-nth-ret") pack-sym 0))
-              (list s-sym (list (make-symbol "lua-nth-ret") pack-sym 1))
-              (list v-sym (list (make-symbol "lua-nth-ret") pack-sym 2)))
-            (cons
-              (make-symbol "begin")
-              (append
-                (lua-tx-for-in-decls names 0)
-                (list
-                  (list
-                    (make-symbol "define")
-                    loop-sym
-                    (list
-                      (make-symbol "fn")
-                      (list)
-                      (lua-tx-for-in-loop-body names body f-sym s-sym v-sym rets-sym loop-sym first-name)))
-                  (lua-tx-loop-guard (list loop-sym)))))))))))

plans/haskell-on-sx.md

@@ -55,27 +55,34 @@ Key mappings:
 
 ### Phase 1 — tokenizer + parser + layout rule
 - [x] Tokenizer: reserved words, qualified names, operators, numbers (int, float, Rational later), chars/strings, comments (`--` and `{-` nested)
-- [ ] Layout algorithm: turn indentation into virtual `{`, `;`, `}` tokens per Haskell 98 §10.3
+- [x] Layout algorithm: turn indentation into virtual `{`, `;`, `}` tokens per Haskell 98 §10.3
-- [ ] Parser: modules, imports (stub), top-level decls, type sigs, function clauses with patterns + guards + where-clauses, expressions with operator precedence, lambdas, `let`, `if`, `case`, `do`, list comp, sections
+- Parser (split into sub-items — implement one per iteration):
-- [ ] AST design modelled on GHC's HsSyn at a surface level
+  - [x] Expressions: atoms, parens, tuples, lists, ranges, application, infix with full Haskell-98 precedence table, unary `-`, backtick operators, lambdas, `if`, `let`
+  - [x] `case … of` and `do`-notation expressions (plus minimal patterns needed for arms/binds: var, wildcard, literal, 0-arity and applied constructor, tuple, list)
+  - [x] Patterns — full: `as` patterns, nested, negative literal, `~` lazy, infix constructor (`:` / consym), extend lambdas/let with non-var patterns
+  - [x] Top-level decls: function clauses (simple — no guards/where yet), pattern bindings, multi-name type signatures, `data` with type vars and recursive constructors, `type` synonyms, `newtype`, fixity (`infix`/`infixl`/`infixr` with optional precedence, comma-separated ops, backtick names). Types: vars / constructors / application / `->` (right-assoc) / tuples / lists. `hk-parse-top` entry.
+  - [x] `where` clauses + guards (on fun-clauses, case alts, and let/do-let bindings — with the let funclause shorthand `let f x = …` now supported)
+  - [x] Module header + imports — `module NAME [exports] where …`, qualified/as/hiding/explicit imports, operator exports, `module Foo` exports, dotted names, headerless-with-imports
+  - [x] List comprehensions + operator sections — `(op)` / `(op e)` / `(e op)` (excluding `-` from right sections), `[e | q1, q2, …]` with `q-gen` / `q-guard` / `q-let` qualifiers
+- [x] AST design modelled on GHC's HsSyn at a surface level — keyword-tagged lists cover modules/imports/decls/types/patterns/expressions; see parser.sx docstrings for the full node catalogue
 - [x] Unit tests in `lib/haskell/tests/parse.sx` (43 tokenizer tests, all green)
 
 ### Phase 2 — desugar + eager-ish eval + ADTs (untyped)
-- [ ] Desugar: guards → nested `if`s; `where` → `let`; list comp → `concatMap`-based; do-notation stays for now (desugared in phase 3)
+- [x] Desugar: guards → nested `if`s; `where` → `let`; list comp → `concatMap`-based; do-notation stays for now (desugared in phase 3)
-- [ ] `data` declarations register constructors in runtime
+- [x] `data` declarations register constructors in runtime
-- [ ] Pattern match (tag-based, value-level): atoms, vars, wildcards, constructor patterns, `as` patterns, nested
+- [x] Pattern match (tag-based, value-level): atoms, vars, wildcards, constructor patterns, `as` patterns, nested
-- [ ] Evaluator (still strict internally — laziness in phase 3): `let`, `lambda`, application, `case`, literals, constructors
+- [x] Evaluator (still strict internally — laziness in phase 3): `let`, `lambda`, application, `case`, literals, constructors
-- [ ] 30+ eval tests in `lib/haskell/tests/eval.sx`
+- [x] 30+ eval tests in `lib/haskell/tests/eval.sx`
 
 ### Phase 3 — laziness + classic programs
-- [ ] Transpile to thunk-wrapped SX: every application arg becomes `(make-thunk (lambda () <arg>))`
+- [x] Transpile to thunk-wrapped SX: every application arg becomes `(make-thunk (lambda () <arg>))`
-- [ ] `force` = SX eval-thunk-to-WHNF primitive
+- [x] `force` = SX eval-thunk-to-WHNF primitive
-- [ ] Pattern match forces scrutinee before matching
+- [x] Pattern match forces scrutinee before matching
-- [ ] Infinite structures: `repeat x`, `iterate f x`, `[1..]`, Fibonacci stream, sieve of Eratosthenes
+- [x] Infinite structures: `repeat x`, `iterate f x`, `[1..]`, Fibonacci stream (sieve deferred — needs lazy `++` and is exercised under `Classic programs`)
-- [ ] `seq`, `deepseq` from Prelude
+- [x] `seq`, `deepseq` from Prelude
-- [ ] Do-notation for a stub `IO` monad (just threading, no real side effects yet)
+- [x] Do-notation for a stub `IO` monad (just threading, no real side effects yet)
 - [ ] Classic programs in `lib/haskell/tests/programs/`:
-  - [ ] `fib.hs` — infinite Fibonacci stream
+  - [x] `fib.hs` — infinite Fibonacci stream
   - [ ] `sieve.hs` — lazy sieve of Eratosthenes
   - [ ] `quicksort.hs` — naive QS
   - [ ] `nqueens.hs`
@@ -107,6 +114,398 @@ Key mappings:
 
 _Newest first._
 
+- **2026-04-25** — First classic program: `fib.hs`. Canonical Haskell
+  source lives at `lib/haskell/tests/programs/fib.hs` (the
+  two-cons-cell self-referential fibs definition plus a hand-rolled
+  `zipPlus`). The runner at `lib/haskell/tests/program-fib.sx`
+  mirrors the source as an SX string (the OCaml server's
+  `read-file` lives in the page-helpers env, not the default load
+  env, so direct file reads from inside `eval` aren't available).
+  Tests: `take 15 myFibs == [0,1,1,2,3,5,8,13,21,34,55,89,144,233,377]`,
+  plus a spot-check that the user-defined `zipPlus` is also
+  reachable. Found and fixed an ordering bug in `hk-bind-decls!`:
+  pass 3 (0-arity body evaluation) iterated `(keys groups)` whose
+  order is implementation-defined, so a top-down program where
+  `result = take 15 myFibs` came after `myFibs = …` could see
+  `myFibs` still bound to its `nil` placeholder. Now group names
+  are tracked in source order via a parallel list and pass 3 walks
+  that. 388/388 green.
+
+- **2026-04-25** — Phase 3 do-notation + stub IO monad. Added a
+  `hk-desugar-do` pass that follows Haskell 98 §3.14 verbatim:
+  `do { e } = e`, `do { e ; ss } = e >> do { ss }`,
+  `do { p <- e ; ss } = e >>= \p -> do { ss }`, and
+  `do { let ds ; ss } = let ds in do { ss }`. The desugarer's
+  `:do` branch now invokes this pass directly so the surface
+  AST forms (`:do-expr`, `:do-bind`, `:do-let`) never reach the
+  evaluator. IO is represented as a tagged value
+  `("IO" payload)` — `return` (lazy builtin) wraps; `>>=` (lazy
+  builtin) forces the action, unwraps, and calls the bound
+  function on the payload; `>>` (lazy builtin) forces the
+  action and returns the second one. All three are non-strict
+  in their action arguments so deeply nested do-blocks don't
+  walk the whole chain at construction time. 14 new tests in
+  `lib/haskell/tests/do-io.sx` cover single-stmt do, single
+  and multi-bind, `>>` sequencing (last action wins), do-let
+  (single, multi, interleaved with bind), bind-to-`Just`,
+  bind-to-tuple, do inside a top-level fun, nested do, and
+  using `(>>=)`/`(>>)` directly as functions. 382/382 green.
+
+- **2026-04-25** — Phase 3 `seq` + `deepseq`. Built-ins were strict
+  in all args by default (every collected thunk forced before
+  invoking the underlying SX fn) — that defeats `seq`'s purpose,
+  which is strict in its first argument and lazy in its second.
+  Added a tiny `lazy` flag on the builtin record (set by a new
+  `hk-mk-lazy-builtin` constructor) and routed `hk-apply-builtin`
+  to skip the auto-force when the flag is true. `seq a b` calls
+  `hk-force a` then returns `b` unchanged so its laziness is
+  preserved; `deepseq` does the same with `hk-deep-force`. 9 new
+  tests in `lib/haskell/tests/seq.sx` cover primitive, computed,
+  and let-bound first args, deepseq on a list / `Just` /
+  tuple, seq inside arithmetic, seq via a fun-clause, and
+  `[seq 1 10, seq 2 20]` to confirm seq composes inside list
+  literals. The lazy-when-unused negative case is also tested:
+  `let x = error "never" in 42 == 42`. 368/368 green.
+
+- **2026-04-24** — Phase 3 infinite structures + Prelude. Two
+  evaluator changes turn the lazy primitives into a working
+  language:
+  1. Op-form `:` is now non-strict in both args — `hk-eval-op`
+     special-cases it before the eager force-and-binop path, so a
+     cons-cell holds two thunks. This is what makes `repeat x =
+     x : repeat x`, `iterate f x = x : iterate f (f x)`, and the
+     classic `fibs = 0 : 1 : zipWith plus fibs (tail fibs)`
+     terminate when only a finite prefix is consumed.
+  2. Operators are now first-class values via a small
+     `hk-make-binop-builtin` helper, so `(+)`, `(*)`, `(==)` etc.
+     can be passed to `zipWith` and `map`.
+  Added range support across parser + evaluator: `[from..to]` and
+  `[from,next..to]` evaluate eagerly via `hk-build-range` (handles
+  step direction); `[from..]` parses to a new `:range-from` node
+  that the evaluator desugars to `iterate (+ 1) from`. New
+  `hk-load-into!` runs the regular pipeline (parse → desugar →
+  register data → bind decls) on a source string, and `hk-init-env`
+  preloads `hk-prelude-src` with the Phase-3 Prelude:
+  `head`, `tail`, `fst`, `snd`, `take`, `drop`, `repeat`, `iterate`,
+  `length`, `map`, `filter`, `zipWith`, plus `fibs` and `plus`.
+  25 new tests in `lib/haskell/tests/infinite.sx`, including
+  `take 10 fibs == [0,1,1,2,3,5,8,13,21,34]`,
+  `head (drop 99 [1..])`, `iterate (\x -> x * 2) 1` powers of two,
+  user-defined `ones = 1 : ones`, `naturalsFrom`, range edge cases,
+  composed `map`/`filter`, and a custom `mySum`. 359/359 green.
+  Sieve of Eratosthenes is deferred — it needs lazy `++` plus a
+  `mod` primitive — and lives under `Classic programs` anyway.
+
+- **2026-04-24** — Phase 3 laziness foundation. Added a thunk type to
+  `lib/haskell/eval.sx` (`hk-mk-thunk` / `hk-is-thunk?`) backed by a
+  one-shot memoizing `hk-force` that evaluates the deferred AST, then
+  flips a `forced` flag and caches the value on the thunk dict; the
+  shared `hk-deep-force` walks the result tree at the test/output
+  boundary. Three single-line wiring changes in the evaluator make
+  every application argument lazy: `:app` now wraps its argument in
+  `hk-mk-thunk` rather than evaluating it. To preserve correctness
+  where values must be inspected, `hk-apply`, `hk-eval-op`,
+  `hk-eval-if`, `hk-eval-case`, and `hk-eval` for `:neg` now force
+  their operand. `hk-apply-builtin` forces every collected arg
+  before invoking the underlying SX fn so built-ins (`error`, `not`,
+  `id`) stay strict. The pattern matcher in `match.sx` now forces
+  the scrutinee just-in-time only for patterns that need to inspect
+  shape — `p-wild`, `p-var`, `p-as`, and `p-lazy` are no-force
+  paths, so the value flows through as a thunk and binding
+  preserves laziness. `hk-match-list-pat` forces at every cons-spine
+  step. 6 new lazy-specific tests in `lib/haskell/tests/eval.sx`
+  verify that `(\x y -> x) 1 (error …)` and `(\x y -> y) (error …) 99`
+  return without diverging, that `case Just (error …) of Just _ -> 7`
+  short-circuits, that `const` drops its second arg, that
+  `myHead (1 : error … : [])` returns 1 without touching the tail,
+  and that `Just (error …)` survives a wildcard-arm `case`. 333/333
+  green, all prior eval tests preserved by deep-forcing the result
+  in `hk-eval-expr-source` and `hk-prog-val`.
+
+- **2026-04-24** — Phase 2 evaluator (`lib/haskell/eval.sx`) — ties
+  the whole pipeline together. Strict semantics throughout (laziness
+  is Phase 3). Function values are tagged dicts: `closure`,
+  `multi`(fun), `con-partial`, `builtin`. `hk-apply` unifies dispatch
+  across all four; closures and multifuns curry one argument at a
+  time, multifuns trying each clause's pat-list in order once arity
+  is reached. Top-level `hk-bind-decls!` is three-pass —
+  collect groups + pre-seed names → install multifuns (so closures
+  observe later names) → eval 0-arity bodies and pat-binds — making
+  forward and mutually recursive references work. `hk-eval-let` does
+  the same trick with a mutable child env. Built-ins:
+  `error`/`not`/`id`, plus `otherwise = True`. Operators wired:
+  arithmetic, comparison (returning Bool conses), `&&`, `||`, `:`,
+  `++`. Sections evaluate the captured operand once and return a
+  closure synthesized via the existing AST. `hk-eval-program`
+  registers data decls then binds, returning the env; `hk-run`
+  fetches `main` if present. Also extended `runtime.sx` to
+  pre-register the standard Prelude conses (`Maybe`, `Either`,
+  `Ordering`) so expression-level eval doesn't need a leading
+  `data` decl. 48 new tests in `lib/haskell/tests/eval.sx` cover
+  literals, arithmetic precedence, comparison/Bool, `if`, `let`
+  (incl. recursive factorial), lambdas (incl. constructor pattern
+  args), constructors, `case` (Just/Nothing/literal/tuple/wildcard),
+  list literals + cons + `++`, tuples, sections, multi-clause
+  top-level (factorial, list length via cons pattern, Maybe handler
+  with default), user-defined `data` with case-style matching, a
+  binary-tree height program, currying, higher-order (`twice`),
+  short-circuit `error` via `if`, and the three built-ins. 329/329
+  green. Phase 2 is now complete; Phase 3 (laziness) is next.
+
+- **2026-04-24** — Phase 2: value-level pattern matcher
+  (`lib/haskell/match.sx`). Core entry `hk-match pat val env` returns
+  an extended env dict on success or `nil` on failure (uses `assoc`
+  rather than `dict-set!` so failed branches never pollute the
+  caller's env). Constructor values are tagged lists with the
+  constructor name as the first element; tuples use the tag `"Tuple"`,
+  lists are chained `(":" h t)` cons cells terminated by `("[]")`.
+  Value builders `hk-mk-con` / `hk-mk-tuple` / `hk-mk-nil` /
+  `hk-mk-cons` / `hk-mk-list` keep tests readable. The matcher
+  handles every pattern node the parser emits:
+  - `:p-wild` (always matches), `:p-var` (binds), `:p-int` /
+    `:p-float` / `:p-string` / `:p-char` (literal equality)
+  - `:p-as` (sub-match then bind whole), `:p-lazy` (eager for now;
+    laziness wired in phase 3)
+  - `:p-con` with arity check + recursive arg matching, including
+    deeply nested patterns and infix `:` cons (uses the same
+    code path as named constructors)
+  - `:p-tuple` against `"Tuple"` values, `:p-list` against an
+    exact-length cons spine.
+  Helper `hk-parse-pat-source` lifts a real Haskell pattern out of
+  `case _ of <pat> -> 0`, letting tests drive against parser output.
+  31 new tests in `lib/haskell/tests/match.sx` cover atomic
+  patterns, success/failure for each con/tuple/list shape, nested
+  `Just (Just x)`, cons-vs-empty, `as` over con / wildcard /
+  failing-sub, `~` lazy, plus four parser-driven cases (`Just x`,
+  `x : xs`, `(a, b)`, `n@(Just x)`). 281/281 green.
+
+- **2026-04-24** — Phase 2: runtime constructor registry
+  (`lib/haskell/runtime.sx`). A mutable dict `hk-constructors` keyed
+  by constructor name, each entry carrying arity and owning type.
+  `hk-register-data!` walks a `:data` AST and registers every
+  `:con-def` with its arity (= number of field types) and the type
+  name; `hk-register-newtype!` does the one-constructor variant;
+  `hk-register-decls!` / `hk-register-program!` filter a decls list
+  (or a `:program` / `:module` AST) and call the appropriate
+  registrar. `hk-load-source!` composes it with `hk-core`
+  (tokenize → layout → parse → desugar → register). Pre-registers
+  five built-ins tied to Haskell syntactic forms: `True` / `False`
+  (Bool), `[]` and `:` (List), `()` (Unit) — everything else comes
+  from user declarations or the eventual Prelude. Query helpers:
+  `hk-is-con?`, `hk-con-arity`, `hk-con-type`, `hk-con-names`. 24
+  new tests in `lib/haskell/tests/runtime.sx` cover each built-in
+  (arity + type), unknown-name probes, registration of `MyBool` /
+  `Maybe` / `Either` / recursive `Tree` / `newtype Age`, multi-data
+  programs, a module-header body, ignoring non-data decls, and
+  last-wins re-registration. 250/250 green.
+
+- **2026-04-24** — Phase 2 kicks off with `lib/haskell/desugar.sx` — a
+  tree-walking rewriter that eliminates the three surface-only forms
+  produced by the parser, leaving a smaller core AST for the evaluator:
+  - `:where BODY DECLS` → `:let DECLS BODY`
+  - `:guarded ((:guard C1 E1) (:guard C2 E2) …)` → right-folded
+    `(:if C1 E1 (:if C2 E2 … (:app (:var "error") (:string "…"))))`
+  - `:list-comp E QUALS` → Haskell 98 §3.11 translation:
+    empty quals → `(:list (E))`, `:q-guard` → `(:if … (:list (E)) (:list ()))`,
+    `:q-gen PAT SRC` → `(concatMap (\PAT -> …) SRC)`, `:q-let BINDS` →
+    `(:let BINDS …)`. Nested generators compile to nested concatMap.
+  Every other expression, decl, pattern, and type node is recursed
+  into and passed through unchanged. Public entries `hk-desugar`,
+  `hk-core` (tokenize → layout → parse → desugar on a module), and
+  `hk-core-expr` (the same for an expression). 15 new tests in
+  `lib/haskell/tests/desugar.sx` cover two- and three-way guards,
+  case-alt guards, single/multi-binding `where`, guards + `where`
+  combined, the four list-comprehension cases (single-gen, gen +
+  filter, gen + let, nested gens), and pass-through for literals,
+  lambdas, simple fun-clauses, `data` decls, and a module header
+  wrapping a guarded function. 226/226 green.
+
+- **2026-04-24** — Phase 1 parser is now complete. This iteration adds
+  operator sections and list comprehensions, the two remaining
+  aexp-level forms, plus ticks the “AST design” item (the keyword-
+  tagged list shape has accumulated a full HsSyn-level surface).
+  Changes:
+  - `hk-parse-infix` now bails on `op )` without consuming the op, so
+    the paren parser can claim it as a left section.
+  - `hk-parse-parens` rewritten to recognise five new forms:
+    `()` (unit), `(op)` → `(:var OP)`, `(op e)` → `(:sect-right OP E)`
+    (excluded for `-` so that `(- 5)` stays `(:neg 5)`), `(e op)` →
+    `(:sect-left OP E)`, plus regular parens and tuples. Works for
+    varsym, consym, reservedop `:`, and backtick-quoted varids.
+  - `hk-section-op-info` inspects the current token and returns a
+    `{:name :len}` dict, so the same logic handles 1-token ops and
+    3-token backtick ops uniformly.
+  - `hk-parse-list-lit` now recognises a `|` after the first element
+    and dispatches to `hk-parse-qual` per qualifier (comma-separated),
+    producing `(:list-comp EXPR QUALS)`. Qualifiers are:
+    `(:q-gen PAT EXPR)` when a paren-balanced lookahead
+    (`hk-comp-qual-is-gen?`) finds `<-` before the next `,`/`]`,
+    `(:q-let BINDS)` for `let …`, and `(:q-guard EXPR)` otherwise.
+  - `hk-parse-comp-let` accepts `]` or `,` as an implicit block close
+    (single-line comprehensions never see layout's vrbrace before the
+    qualifier terminator arrives); explicit `{ }` still closes
+    strictly.
+  22 new tests in `lib/haskell/tests/parser-sect-comp.sx` cover
+  op-references (inc. `(-)`, `(:)`, backtick), right sections (inc.
+  backtick), left sections, the `(- 5)` → `:neg` corner, plain parens
+  and tuples, six comprehension shapes (simple, filter, let,
+  nested-generators, constructor pattern bind, tuple pattern bind,
+  and a three-qualifier mix). 211/211 green.
+
+- **2026-04-24** — Phase 1: module header + imports. Added
+  `hk-parse-module-header`, `hk-parse-import`, plus shared helpers for
+  import/export entity lists (`hk-parse-ent`, `hk-parse-ent-member`,
+  `hk-parse-ent-list`). New AST:
+  - `(:module NAME EXPORTS IMPORTS DECLS)` — NAME `nil` means no header,
+    EXPORTS `nil` means no export list (distinct from empty `()`)
+  - `(:import QUALIFIED NAME AS SPEC)` — QUALIFIED bool, AS alias or nil,
+    SPEC nil / `(:spec-items ENTS)` / `(:spec-hiding ENTS)`
+  - Entity refs: `:ent-var`, `:ent-all` (`Tycon(..)`), `:ent-with`
+    (`Tycon(m1, m2, …)`), `:ent-module` (exports only).
+  `hk-parse-program` now dispatches on the leading token: `module`
+  keyword → full header-plus-body parse (consuming the `where` layout
+  brace around the module body); otherwise collect any leading
+  `import` decls and then remaining decls with the existing logic.
+  The outer shell is `(:module …)` as soon as any header or import is
+  present, and stays as `(:program DECLS)` otherwise — preserving every
+  previous test expectation untouched. Handles operator exports `((+:))`,
+  dotted module names (`Data.Map`), and the Haskell-98 context-sensitive
+  keywords `qualified`/`as`/`hiding` (all lexed as ordinary varids and
+  matched only in import position). 16 new tests in
+  `lib/haskell/tests/parser-module.sx` covering simple/exports/empty
+  headers, dotted names, operator exports, `module Foo` exports,
+  qualified/aliased/items/hiding imports, and a headerless-with-imports
+  file. 189/189 green.
+
+- **2026-04-24** — Phase 1: guards + where clauses. Factored a single
+  `hk-parse-rhs sep` that all body-producing sites now share: it reads
+  a plain `sep expr` body or a chain of `| cond sep expr` guards, then
+  — regardless of which form — looks for an optional `where` block and
+  wraps accordingly. AST additions:
+  - `:guarded GUARDS` where each GUARD is `:guard COND EXPR`
+  - `:where BODY DECLS` where BODY is a plain expr or a `:guarded`
+  Both can nest (guards inside where). `hk-parse-alt` now routes through
+  `hk-parse-rhs "->"`, `hk-parse-fun-clause` and `hk-parse-bind` through
+  `hk-parse-rhs "="`. `hk-parse-where-decls` reuses `hk-parse-decl` so
+  where-blocks accept any decl form (signatures, fixity, nested funs).
+  As a side effect, `hk-parse-bind` now also picks up the Haskell-native
+  `let f x = …` funclause shorthand: a varid followed by one or more
+  apats produces `(:fun-clause NAME APATS BODY)` instead of a
+  `(:bind (:p-var …) …)` — keeping the simple `let x = e` shape
+  unchanged for existing tests. 11 new tests in
+  `lib/haskell/tests/parser-guards-where.sx` cover two- and three-way
+  guards, mixed guarded + equality clauses, single- and multi-binding
+  where blocks, guards plus where, case-alt guards, case-alt where,
+  let with funclause shorthand, let with guards, and a where containing
+  a type signature alongside a fun-clause. 173/173 green.
+
+- **2026-04-24** — Phase 1: top-level decls. Refactored `hk-parse-expr` into a
+  `hk-parser tokens mode` with `:expr` / `:module` dispatch so the big lexical
+  state is shared (peek/advance/pat/expr helpers all reachable); added public
+  wrappers `hk-parse-expr`, `hk-parse-module`, and source-level entry
+  `hk-parse-top`. New type parser (`hk-parse-type` / `hk-parse-btype` /
+  `hk-parse-atype`): type variables (`:t-var`), type constructors (`:t-con`),
+  type application (`:t-app`, left-assoc), right-associative function arrow
+  (`:t-fun`), unit/tuples (`:t-tuple`), and lists (`:t-list`). New decl parser
+  (`hk-parse-decl` / `hk-parse-program`) producing a `(:program DECLS)` shell:
+  - `:type-sig NAMES TYPE` — comma-separated multi-name support
+  - `:fun-clause NAME APATS BODY` — patterns for args, body via existing expr
+  - `:pat-bind PAT BODY` — top-level pattern bindings like `(a, b) = pair`
+  - `:data NAME TVARS CONS` with `:con-def CNAME FIELDS` for nullary and
+    multi-arg constructors, including recursive references
+  - `:type-syn NAME TVARS TYPE`, `:newtype NAME TVARS CNAME FIELD`
+  - `:fixity ASSOC PREC OPS` — assoc one of `"l"`/`"r"`/`"n"`, default prec 9,
+    comma-separated operator names, including backtick-quoted varids.
+  Sig vs fun-clause disambiguated by a paren-balanced top-level scan for
+  `::` before the next `;`/`}` (`hk-has-top-dcolon?`). 24 new tests in
+  `lib/haskell/tests/parser-decls.sx` cover all decl forms, signatures with
+  application / tuples / lists / right-assoc arrows, nullary and recursive
+  data types, multi-clause functions, and a mixed program with data + type-
+  synonym + signature + two function clauses. Not yet: guards, where
+  clauses, module header, imports, deriving, contexts, GADTs. 162/162 green.
+
+- **2026-04-24** — Phase 1: full patterns. Added `as` patterns
+  (`name@apat` → `(:p-as NAME PAT)`), lazy patterns (`~apat` →
+  `(:p-lazy PAT)`), negative literal patterns (`-N` / `-F` resolving
+  eagerly in the parser so downstream passes see a plain `(:p-int -1)`),
+  and infix constructor patterns via a right-associative single-band
+  layer on top of `hk-parse-pat-lhs` for any `consym` or reservedop `:`
+  (so `x : xs` parses as `(:p-con ":" [x, xs])`, `a :+: b` likewise).
+  Extended `hk-apat-start?` with `-` and `~` so the pattern-argument
+  loops in lambdas and constructor applications pick these up.
+  Lambdas now parse apat parameters instead of bare varids — so the
+  `:lambda` AST is `(:lambda APATS BODY)` with apats as pattern nodes.
+  `hk-parse-bind` became a plain `pat = expr` form, so `:bind` now has
+  a pattern LHS throughout (simple `x = 1` → `(:bind (:p-var "x") …)`);
+  this picks up `let (x, y) = pair in …` and `let Just x = m in x`
+  automatically, and flows through `do`-notation lets. Eight existing
+  tests updated to the pattern-flavoured AST. Also fixed a pragmatic
+  layout issue that surfaced in multi-line `let`s: when a layout-indent
+  would emit a spurious `;` just before an `in` token (because the
+  let block had already been closed by dedent), `hk-peek-next-reserved`
+  now lets the layout pass skip that indent and leave closing to the
+  existing `in` handler. 18 new tests in
+  `lib/haskell/tests/parser-patterns.sx` cover every pattern variant,
+  lambda with mixed apats, let pattern-bindings (tuple / constructor /
+  cons), and do-bind with a tuple pattern. 138/138 green.
+
+- **2026-04-24** — Phase 1: `case … of` and `do`-notation parsers. Added `hk-parse-case`
+  / `hk-parse-alt`, `hk-parse-do` / `hk-parse-do-stmt` / `hk-parse-do-let`, plus the
+  minimal pattern language needed to make arms and binds meaningful:
+  `hk-parse-apat` (var, wildcard `_`, int/float/string/char literal, 0-arity
+  conid/qconid, paren+tuple, list) and `hk-parse-pat` (conid applied to
+  apats greedily). AST nodes: `:case SCRUT ALTS`, `:alt PAT BODY`, `:do STMTS`
+  with stmts `:do-expr E` / `:do-bind PAT E` / `:do-let BINDS`, and pattern
+  tags `:p-wild` / `:p-int` / `:p-float` / `:p-string` / `:p-char` / `:p-var`
+  / `:p-con NAME ARGS` / `:p-tuple` / `:p-list`. `do`-stmts disambiguate
+  `pat <- e` vs bare expression with a forward paren/bracket/brace-balanced
+  scan for `<-` before the next `;`/`}` — no backtracking, no AST rewrite.
+  `case` and `do` accept both implicit (`vlbrace`/`vsemi`/`vrbrace`) and
+  explicit braces. Added to `hk-parse-lexp` so they participate fully in
+  operator-precedence expressions. 19 new tests in
+  `lib/haskell/tests/parser-case-do.sx` cover every pattern variant,
+  explicit-brace `case`, expression scrutinees, do with bind/let/expr,
+  multi-binding `let` in `do`, constructor patterns in binds, and
+  `case`/`do` nested inside `let` and lambda. The full pattern item (as
+  patterns, negative literals, `~` lazy, lambda/let pattern extension)
+  remains a separate sub-item. 119/119 green.
+
+- **2026-04-24** — Phase 1: expression parser (`lib/haskell/parser.sx`, ~380 lines).
+  Pratt-style precedence climbing against a Haskell-98-default op table (24
+  operators across precedence 0–9, left/right/non assoc, default infixl 9 for
+  anything unlisted). Supports literals (int/float/string/char), varid/conid
+  (qualified variants folded into `:var` / `:con`), parens / unit / tuples,
+  list literals, ranges `[a..b]` and `[a,b..c]`, left-associative application,
+  unary `-`, backtick operators (`x \`mod\` 3`), lambdas, `if-then-else`, and
+  `let … in` consuming both virtual and explicit braces. AST uses keyword
+  tags (`:var`, `:op`, `:lambda`, `:let`, `:bind`, `:tuple`, `:range`,
+  `:range-step`, `:app`, `:neg`, `:if`, `:list`, `:int`, `:float`, `:string`,
+  `:char`, `:con`). The parser skips a leading `vlbrace` / `lbrace` so it can
+  be called on full post-layout output, and uses a `raise`-based error channel
+  with location-lite messages. 42 new tests in `lib/haskell/tests/parser-expr.sx`
+  cover literals, identifiers, parens/tuple/unit, list + range, app associativity,
+  operator precedence (mul over add, cons right-assoc, function-composition
+  right-assoc, `$` lowest), backtick ops, unary `-`, lambda multi-param,
+  `if` with infix condition, single- and multi-binding `let` (both implicit
+  and explicit braces), plus a few mixed nestings. 100/100 green.
+
+- **2026-04-24** — Phase 1: layout algorithm (`lib/haskell/layout.sx`, ~260 lines)
+  implementing Haskell 98 §10.3. Two-pass design: a pre-pass augments the raw
+  token stream with explicit `layout-open` / `layout-indent` markers (suppressing
+  `<n>` when `{n}` already applies, per note 3), then an L pass consumes the
+  augmented stream against a stack of implicit/explicit layout contexts and
+  emits `vlbrace` / `vsemi` / `vrbrace` tokens; newlines are dropped. Supports
+  the initial module-level implicit open (skipped when the first token is
+  `module` or `{`), the four layout keywords (`let`/`where`/`do`/`of`), explicit
+  braces disabling layout, dedent closing nested implicit blocks while also
+  emitting `vsemi` at the enclosing level, and the pragmatic single-line
+  `let … in` rule (emit `}` when `in` meets an implicit let). 15 new tests
+  in `lib/haskell/tests/layout.sx` cover module-start, do/let/where/case/of,
+  explicit braces, multi-level dedent, line continuation, and EOF close-down.
+  Shared test helpers moved to `lib/haskell/testlib.sx` so both test files
+  can share one `hk-test`. `test.sh` preloads tokenizer + layout + testlib.
+  58/58 green.
+
 - **2026-04-24** — Phase 1: Haskell 98 tokenizer (`lib/haskell/tokenizer.sx`, 490 lines)
   covering idents (lower/upper/qvarid/qconid), 23 reserved words, 11 reserved ops,
   varsym/consym operator chains, integer/hex/octal/float literals incl. exponent

plans/lua-on-sx.md

@@ -51,93 +51,37 @@ Each item: implement → tests → tick box → update progress log.
 - [x] 30+ eval tests in `lib/lua/tests/eval.sx`
 
 ### Phase 3 — tables + functions + first PUC-Rio slice
-- [x] `function` (anon, local, top-level), closures
+- [ ] `function` (anon, local, top-level), closures
-- [x] Multi-return: return as list, unpack at call sites
+- [ ] Multi-return: return as list, unpack at call sites
-- [x] Table constructors (array + hash + computed keys)
+- [ ] Table constructors (array + hash + computed keys)
-- [x] Raw table access `t.k` / `t[k]` (no metatables yet)
+- [ ] Raw table access `t.k` / `t[k]` (no metatables yet)
-- [x] Vendor PUC-Rio 5.1.5 suite to `lib/lua/lua-tests/` (just `.lua` files)
+- [ ] Vendor PUC-Rio 5.1.5 suite to `lib/lua/lua-tests/` (just `.lua` files)
-- [x] `lib/lua/conformance.sh` + Python runner (model on `lib/js/test262-runner.py`)
+- [ ] `lib/lua/conformance.sh` + Python runner (model on `lib/js/test262-runner.py`)
-- [x] `scoreboard.json` + `scoreboard.md` baseline
+- [ ] `scoreboard.json` + `scoreboard.md` baseline
 
 ### Phase 4 — metatables + error handling (next run)
-- [x] Metatable dispatch: `__index`, `__newindex`, `__add`/`__sub`/…, `__eq`, `__lt`, `__call`, `__tostring`, `__len`
+- [ ] Metatable dispatch: `__index`, `__newindex`, `__add`/`__sub`/…, `__eq`, `__lt`, `__call`, `__tostring`, `__len`
-- [x] `pcall`/`xpcall`/`error` via handler-bind
+- [ ] `pcall`/`xpcall`/`error` via handler-bind
-- [x] Generic `for … in …`
+- [ ] Generic `for … in …`
 
 ### Phase 5 — coroutines (the showcase)
-- [x] `coroutine.create`/`.resume`/`.yield`/`.status`/`.wrap` via `perform`/`cek-resume`
+- [ ] `coroutine.create`/`.resume`/`.yield`/`.status`/`.wrap` via `perform`/`cek-resume`
 
 ### Phase 6 — standard library
-- [x] `string` — `format`, `sub`, `find`, `match`, `gmatch`, `gsub`, `len`, `rep`, `upper`, `lower`, `byte`, `char`
+- [ ] `string` — `format`, `sub`, `find`, `match`, `gmatch`, `gsub`, `len`, `rep`, `upper`, `lower`, `byte`, `char`
-- [x] `math` — full surface
+- [ ] `math` — full surface
-- [x] `table` — `insert`, `remove`, `concat`, `sort`, `unpack`
+- [ ] `table` — `insert`, `remove`, `concat`, `sort`, `unpack`
-- [x] `io` — minimal stub (read/write to SX IO surface)
+- [ ] `io` — minimal stub (read/write to SX IO surface)
-- [x] `os` — time/date subset
+- [ ] `os` — time/date subset
 
 ### Phase 7 — modules + full conformance
-- [x] `require` / `package` via SX `define-library`/`import`
+- [ ] `require` / `package` via SX `define-library`/`import`
 - [ ] Drive PUC-Rio scoreboard to 100%
 
 ## Progress log
 
 _Newest first. Agent appends on every commit._
 
-- 2026-04-25: lua: scoreboard iteration — `coroutine.running()` (returns current `__current-co` or nil) and `coroutine.isyieldable()`. 393/393 green.
-- 2026-04-25: lua: scoreboard iteration — `string.byte(s, i, j)` now returns multi-values for ranges (was single byte only). 393/393 green; scoreboard unchanged.
-- 2026-04-25: lua: scoreboard iteration — `math.sinh`/`cosh`/`tanh` (Lua 5.1 hyperbolic). 393/393 green; scoreboard unchanged.
-- 2026-04-25: lua: scoreboard iteration — tried two-phase eval (extract top-level `function f` decls, evaluate them BEFORE the guard so they leak to top-level env, then run the rest inside guard). Broke method-decl tests because `function a:add(...)` requires `a` to exist, and `a = {...}` was in the deferred phase-2. Reverted. Real fix needs `_G` table or AST-level rewriting of top-level returns into chunk-result mutations. 393/393 green.
-- 2026-04-25: lua: scoreboard iteration — `string.dump` stub (returns string-of-fn). Diagnosed calls.lua: file ENDS with `return deep` (line 295), which makes my `lua-has-top-return?` correctly return true, triggering the guard, which scopes user defines and breaks loadstring's lexical capture of `fat`. The fix would require either rewriting top-level returns into a different mechanism (post-processing the AST) or implementing a real `_G` global table for global assignment/lookup. Both larger.
-- 2026-04-25: lua: scoreboard iteration — `math.mod` (Lua 5.0 alias for `fmod`), `math.frexp` (mantissa/exponent split), `math.ldexp` (m·2^e). math.lua moves past line-103 `math.mod` call. Timeouts 6→3, asserts 5→7. 393/393 green.
-- 2026-04-25: lua: scoreboard iteration — `unpack(t, i, j)` now treats explicit nil for `i` or `j` as missing (defaults to 1 and `#t`). vararg.lua-style `unpack(args, 1, args.n)` works when `args.n` is nil. Asserts 4→5, timeouts 8→6 (more tests reach assertions instead of timing out). 393/393 green.
-- 2026-04-25: lua: scoreboard iteration — extended `string.format`. New `%x`/`%X`/`%o` (hex/octal), `%c` (codepoint→char via `lua-char-one`), `%q` (basic quote), width N (`%5d`), zero-pad (`%05d`), left-align (`%-5d`), `%.Ns` precision. Helpers `lua-fmt-pad` and `lua-fmt-int-base`. 393/393 green (+6 format tests).
-- 2026-04-25: lua: scoreboard iteration — `lua-eval-ast` now SKIPS the top-level guard when the parsed chunk has no top-level `return` (recursive AST walk via `lua-has-top-return?` that descends through control-flow but stops at function-body boundaries). Without the guard, top-level user defines leak to the SX top env, and `loadstring`-captured closures can find them. Verified: `function fat(x)...loadstring("return fat(...)")...end; x=fat(5)` works (was undefined). Most PUC-Rio tests still have top-level returns elsewhere, so they still need the guard. Scoreboard unchanged at 1/16 but unblocks future work.
-- 2026-04-25: lua: scoreboard iteration — math fns now error on bad/missing args (was silently returning 0). New `lua-math-num "name" x` validator wraps `abs`/`ceil`/`floor`/`sqrt`/`exp`/`sin`/`cos`/`tan`/`asin`/`acos`/`atan`/`atan2`/`pow`. errors.lua moves past assert #4 (`pcall(math.sin)` now returns false+err as expected).
-- 2026-04-24: lua: scoreboard iteration — **pattern character sets** `[...]` and `[^...]`. New `lua-pat-set-end`/`lua-pat-set-match` helpers handle ranges (`[a-z]`), classes inside sets (`[%d%a]`), negation (`[^abc]`), and `[]...]`/`[^]...]` (literal `]` as first char). Asserts 6→4, but timeouts 3→7 — many tests now reach loop-heavy code. 387/387 green (+3 charset tests).
-- 2026-04-24: lua: scoreboard iteration — `tonumber(s, base)` for bases 2-36. Validates digit ranges per base, supports leading `+`/`-`, trims whitespace. `math.lua` past assert #21. Asserts 8→6, timeouts 3→4. 384/384 green.
-- 2026-04-24: lua: scoreboard iteration — added `lua-unwrap-final-return` (post-processor that rewrites top-level `(raise (list 'lua-ret V))` → `V` so top-level defines leak to SX top and loadstring closures can see them). Tried dropping the function-guard at top level, but too many tests use `if x then return 0 else return err end` at chunk tail, whose returns aren't at the *statement-list* tail — guard still needed. Kept guard + unwrap-as-no-op. Scoreboard unchanged.
-- 2026-04-24: lua: scoreboard iteration — `lua-pat-strip-captures` helper lets patterns with `(...)` capture parens at least match (captures themselves aren't returned yet — match returns whole match). Unblocks common Lua pattern idioms like `(%a+)=(%d+)`. Scoreboard unchanged.
-- 2026-04-24: lua: scoreboard iteration — extended pattern engine to `string.match`/`gmatch`/`gsub`. `gsub` now supports string/function/table replacement modes. 381/381 green (+6 pattern tests).
-- 2026-04-24: lua: scoreboard iteration — **Lua pattern engine (minimal)** for `string.find`. Supports character classes (`%d`/`%a`/`%s`/`%w`/`%p`/`%l`/`%u`/`%c`/`%x` + complements), `.` any, `^`/`$` anchors, quantifiers `*`/`+`/`-`/`?`, literal chars, `%%`. Added `plain` arg pathway. match/gmatch/gsub still literal. Scoreboard unchanged (pattern-using tests still hit other issues downstream).
-- 2026-04-24: lua: scoreboard iteration — `package.cpath`/`config`/`loaders`/`searchers`/`searchpath` stubs. attrib.lua moves from #9 (checking `package.cpath` is a string) to "module 'C' not found" — test requires filesystem-based module loading, not tractable. Most remaining failures need Lua pattern matching (pm.lua/strings.lua), env tracking (locals.lua/events.lua), or filesystem (attrib.lua).
-- 2026-04-24: lua: scoreboard iteration — **parenthesized expressions truncate multi-return** (Lua spec: `(f())` forces single value even if `f` returns multi). Parser wraps `(expr)` in a new `lua-paren` AST node; transpile emits `(lua-first inner)`. Fixes `constructs.lua`@30 (`a,b,c = (f())` expects `a=1, b=nil, c=nil`) and `math.lua`@13. 375/375 green (+2 paren tests). Scoreboard: 8× asserts (was 10).
-- 2026-04-24: lua: scoreboard iteration — stripped `(else (raise e))` from `lua-tx-loop-guard`. SX `guard` with `(else (raise e))` hangs in a loop (re-enters the same guard). Since unmatched sentinels fall through to the enclosing guard naturally, the else is unnecessary. Diagnosed `calls.lua` undefined-`fat`: `function fat(x)` defined at Lua top-level is scoped inside the SX top-level guard's scope; loadstring-captured closures don't see it via lexical env. Fix would require either dropping the top-level guard (breaking top-level `return`) or dynamic env access — deferred.
-- 2026-04-24: lua: scoreboard iteration — **method-call double-evaluation bug**. `lua-tx-method-call` emitted `(lua-call (lua-get OBJ name) OBJ args…)` which evaluated OBJ TWICE, so `a:add(10):add(20):add(30).x` computed `110` instead of `60` (side effects applied twice). Fixed by `(let ((__obj OBJ)) (lua-call (lua-get __obj name) __obj args…))`. 373/373 green (+1 chaining test).
-- 2026-04-24: lua: **🎉 FIRST PASSING PUC-Rio TEST — 1/16 runnable (6.2%)**. `verybig.lua` now passes: needed `io.output`/`io.input`/`io.stdout`/`io.stderr` stubs, made `os.remove` return `true` (test asserts on it), and added `dofile`/`loadfile` stubs. All cumulative fixes (returns/break/scoping/escapes/precedence/vararg/tonumber-trim) combined make this test's full happy path work end-to-end. 372 unit tests. Failure mix: 10× assertion / 4× timeout / 1× call-non-fn.
-- 2026-04-24: lua: scoreboard iteration — **proper `break` via guard+raise sentinel** (`lua-brk`) + auto-first multi-values in arith/concat. Loop break dispatch was previously a no-op (emitted bare `'lua-break-marker` symbol that nothing caught); converted to raise+catch pattern, wrapping the OUTER invocation of `_while_loop`/`_for_loop`/`_repeat_loop`/`__for_loop` in a break-guard (wrapping body doesn't work — break would just be caught and loop keeps recursing). Also `lua-arith`/`lua-concat`/`lua-concat-coerce` now `lua-first` their operands so multi-returns auto-truncate at scalar boundaries. 372/372 green (+4 break tests). Scoreboard: 10×assert / 4×timeout / 2×call-non-fn (no more undef-symbol or compare-incompat).
-- 2026-04-24: lua: scoreboard iteration — **proper early-return via guard+raise sentinel**. Fixes long-logged limitation: `if cond then return X end ...rest` now exits the enclosing function; `rest` is skipped. `lua-tx-return` raises `(list 'lua-ret value)`; every function body and the top-level chunk + loadstring'd chunks wrap in a guard that catches the sentinel and returns its value. Eliminates "compare incompatible types" from constructs.lua (past line 40). 368/368 green (+3 early-return tests).
-- 2026-04-24: lua: scoreboard iteration — **unary-minus / `^` precedence fix**. Per Lua spec, `^` binds tighter than unary `-`, so `-2^2` should parse as `-(2^2) = -4`, not `(-2)^2 = 4`. My parser recursed into `parse-unary` and then let `^` bind to the already-negated operand. Added `parse-pow-chain` helper and changed the `else` branch of `parse-unary` to parse a primary + `^`-chain before returning; unary operators now wrap the full `^`-chain. Fixed `constructs.lua` past assert #3 (moved to compare-incompatible). 365/365 green (+3 precedence tests).
-- 2026-04-24: lua: scoreboard iteration — `lua-byte-to-char` regression fix. My previous change returned 2-char strings (`"\a"` etc.) for bytes that SX string literals can't express (0, 7, 8, 11, 12, 14–31, 127+), breaking `'a\0a'` length from 3 → 4. Now only 9/10/13 and printable 32-126 produce real bytes; others use a single `"?"` placeholder so `string.len` stays correct. literals.lua back to failing at assert #4 (was regressed to #2).
-- 2026-04-24: lua: scoreboard iteration — **decimal string escapes** `\ddd` (1-3 digits). Tokenizer `read-string` previously fell through to literal for digits, so `"\65"` came out as `"65"` not `"A"`. Added `read-decimal-escape!` consuming up to 3 digits while keeping value ≤255, plus `\a`/`\b`/`\f`/`\v` control escapes and `lua-byte-to-char` ASCII lookup. 362 tests (+2 escape tests).
-- 2026-04-24: lua: scoreboard iteration — **`loadstring` error propagation**. When `loadstring(s)()` was implemented as `eval-expr ( (let () compiled))`, SX's `eval-expr` wrapped any propagated `raise` as "Unhandled exception: X" — so `error('hi')` inside a loadstring'd chunk came out as that wrapped string instead of the clean `"hi"` Lua expects. Fix: transpile source once into a lambda AST, `eval-expr` it ONCE to get a callable fn value, return that — subsequent calls propagate raises cleanly. Guarded parse-failure path returns `(nil, err)` per Lua convention. vararg.lua now runs past assert #18; errors.lua past parse stage.
-- 2026-04-24: lua: scoreboard iteration — `table.sort` O(n²) insertion-sort → **quicksort** (Lomuto partition). 1000-element sorts finish in ms; but `sort.lua` uses 30k elements and still times out even at 90s (metamethod-heavy interpreter overhead). Correctness verified on 1000/5000 element random arrays.
-- 2026-04-24: lua: scoreboard iteration — `dostring(s)` alias for `loadstring(s)()` (Lua 5.0 compat used by literals.lua). Diagnosed `locals.lua` call-non-fn at call #18 → `getfenv/setfenv` stub-return pattern fails `assert(getfenv(foo("")) == a)` (need real env tracking, deferred). Tokenizer long-string-leading-NL rule verified correct.
-- 2026-04-24: lua: scoreboard iteration — Lua 5.0-style `arg` auto-binding inside vararg functions (some PUC-Rio tests still rely on it). `lua-varargs-arg-table` builds `{1=v1, 2=v2, …, n=count}`; transpile adds `arg` binding alongside `__varargs` when `is-vararg`. Diagnosis done with assert-counter instrumentation — literals.lua fails at #4 (long-string NL rule), vararg.lua was at #2 (arg table — FIXED), attrib.lua at #9, locals.lua now past asserts into call-non-fn. 360 tests.
-- 2026-04-24: lua: scoreboard iteration — **`loadstring` scoping**. Temporarily instrumented `lua-assert` with a counter, found `locals.lua` fails at assertion #5: `loadstring('local a = {}')() → assert(type(a) ~= 'table')`. The loadstring'd code's `local a` was leaking to outer scope because `lua-eval-ast` ran at top-level. Fixed by transpiling once and wrapping the AST in `(let () …)` before `eval-expr`.
-- 2026-04-24: lua: scoreboard iteration — **`if`/`else`/`elseif` body scoping** (latent bug). `else local x = 99` was leaking to enclosing scope. Wrap all three branches in `(let () …)` via `lua-tx-if-body`. 358 tests.
-- 2026-04-24: lua: scoreboard iteration — **`do`-block proper scoping**. Was transpiling `do ... end` to a raw `lua-tx` pass-through, so `define`s inside leaked to the enclosing scope (`do local i = 100 end` overwrote outer `i`). Now wraps in `(let () body)` for proper lexical isolation. 355 tests, +2 scoping tests.
-- 2026-04-24: lua: scoreboard iteration — `lua-to-number` trims whitespace before `parse-number` (Lua coerces `" 3e0 "` in arithmetic). math.lua moved past the arith-type error to deeper assertion-land. 12× asserts / 3× timeouts / 1× call-non-fn.
-- 2026-04-24: lua: scoreboard iteration — `table.getn`/`setn`/`foreach`/`foreachi` (Lua 5.0-era), `string.reverse`. `sort.lua` unblocked past `getn`-undef; now times out on the 30k-element sort body (insertion sort too slow). 13 fail / 3 timeout / 0 pass.
-- 2026-04-24: lua: scoreboard iteration — parser consumes trailing `;` after `return`; added `collectgarbage`/`setfenv`/`getfenv`/`T` stubs. All parse errors and undefined-symbol failures eliminated — every runnable test now executes deep into the script. Failure mix: **11× assertion failed**, 2× timeout, 2× call-non-fn, 1× arith. Still 0/16 pass but the remaining work is substantive (stdlib fidelity vs the exact PUC-Rio assertions).
-- 2026-04-24: lua: scoreboard iteration — trailing-dot number literals (`5.`), preload stdlibs in `package.loaded` (`string`/`math`/`table`/`io`/`os`/`coroutine`/`package`/`_G`), `arg` stub, `debug` module stub. Assertion-failure count 4→**8**, parse errors 3→**1**, call-non-fn stable, module-not-found gone.
-- 2026-04-24: lua: scoreboard iteration — **vararg `...` transpile**. Parser already emitted `(lua-vararg)`; transpile now: (a) binds `__varargs` in function body when `is-vararg`, (b) emits `__varargs` for `...` uses; `lua-varargs`/`lua-spread-last-multi` runtime helpers spread multi in last call-arg and last table-pos positions. Eliminated all 6× "transpile: unsupported" failures; top-5 now all real asserts. 353 unit tests.
-- 2026-04-24: lua: scoreboard iteration — added `rawget`/`rawset`/`rawequal`/`rawlen`, `loadstring`/`load`, `select`, `assert`, `_G`, `_VERSION`. Failure mix now 6×vararg-transpile / 4×real-assertion / 3×parse / 2×call-non-fn / 1×timeout (was 14 parse + 1 print undef at baseline); tests now reach deep into real assertions. Still 0/16 runnable — next targets: vararg transpile, goto, loadstring-compile depth. 347 unit tests.
-- 2026-04-24: lua: `require`/`package` via preload-only (no filesystem search). `package.loaded` caching, nil-returning modules cache as `true`, unknown modules error. 347 tests.
-- 2026-04-24: lua: `os` stub — time/clock monotonic counter, difftime, date (default string / `*t` dict), getenv/remove/rename/tmpname/execute/exit stubs. Phase 6 complete. 342 tests.
-- 2026-04-24: lua: `io` stub + `print`/`tostring`/`tonumber` globals. io buffers to internal `__io-buffer` (tests drain it via `io.__buffer()`). print: tab-sep + NL. tostring respects `__tostring` metamethod. 334 tests.
-- 2026-04-24: lua: `table` lib — insert (append / at pos, shifts up), remove (last / at pos, shifts down), concat (sep, i, j), sort (insertion sort, optional cmp), unpack + table.unpack, maxn. Caught trap: local helper named `shift` collides with SX's `shift` special form → renamed to `tbl-shift-up`/`tbl-shift-down`. 322 tests.
-- 2026-04-24: lua: `math` lib — pi/huge + abs/ceil/floor/sqrt/exp/log/log10/pow/trig (sin/cos/tan/asin/acos/atan/atan2)/deg/rad/min/max (&rest)/fmod/modf/random (0/1/2 arg)/randomseed. Most ops delegate to SX primitives; log w/ base via change-of-base. 309 tests.
-- 2026-04-24: lua: `string` lib — len/upper/lower/rep/sub (1-idx + neg)/byte/char/find/match/gmatch/gsub/format. Patterns are literal-only (no `%d`/etc.); format is `%s`/`%d`/`%f`/`%%` only. `string.char` uses printable-ASCII lookup + tab/nl/cr. 292 tests.
-- 2026-04-24: lua: phase 5 — coroutines (create/resume/yield/status/wrap) via `call/cc` (perform/cek-resume not exposed to SX userland). Handles multi-yield + final return + arg passthrough. Fix: body's final return must jump via `caller-k` to the **current** resume's caller, not unwind through the stale first-call continuation. 273 tests.
-- 2026-04-24: lua: generic `for … in …` — parser split (`=` → num, else `in`), new `lua-for-in` node, transpile to `let`-bound `f,s,var` + recursive `__for_loop`. Added `ipairs`/`pairs`/`next`/`lua-arg` globals. Lua fns now arity-tolerant (`&rest __args` + indexed bind) — needed because generic for always calls iter with 2 args. Noted early-return-in-nested-block as pre-existing limitation. 265 tests.
-- 2026-04-24: lua: `pcall`/`xpcall`/`error` via SX `guard` + `raise`. Added `lua-apply` (arity-dispatch 0-8, apply fallback) because SX `apply` re-wraps raises as "Unhandled exception". Table payloads preserved (`error({code = 42})`). 256 total tests.
-- 2026-04-24: lua: phase 4 — metatable dispatch (`__index`/`__newindex`/arith/compare/`__call`/`__len`), `setmetatable`/`getmetatable`/`type` globals, OO `self:method` pattern. Transpile routes all calls through `lua-call` (stashed `sx-apply-ref` to dodge user-shadowing of SX `apply`). Skipped `__tostring` (needs `tostring()` builtin). 247 total tests.
-- 2026-04-24: lua: PUC-Rio scoreboard baseline — 0/16 runnable pass (0.0%). Top modes: 14× parse error, 1× `print` undef, 1× vararg transpile. Phase 3 complete.
-- 2026-04-24: lua: conformance runner — `conformance.sh` shim + `conformance.py` (long-lived sx_server, epoch protocol, classify_error, writes scoreboard.{json,md}). 24 files classified in full run: 8 skip / 16 fail / 0 timeout.
-- 2026-04-24: lua: vendored PUC-Rio 5.1 test suite (lua5.1-tests.tar.gz from lua.org) to `lib/lua/lua-tests/` — 22 .lua files, 6304 lines; README kept for context.
-- 2026-04-24: lua: raw table access — fix `lua-set!` to use `dict-set!` (mutating), fix `lua-len` `has?`→`has-key?`, `#t` works, mutation/chained/computed-key writes + reference semantics. 224 total tests.
-- 2026-04-24: lua: phase 3 — table constructors verified (array, hash, computed keys, mixed, nested, dynamic values, fn values, sep variants). 205 total tests.
-- 2026-04-24: lua: multi-return — `lua-multi` tagged value, `lua-first`/`lua-nth-ret`/`lua-pack-return` runtime, tail-position spread in return/local/assign. 185 total tests.
-- 2026-04-24: lua: phase 3 — functions (anon/local/top-level) + closures verified (lexical capture, mutation-through-closure, recursion, HOFs). 175 total tests.
 - 2026-04-24: lua: phase 2 transpile — arithmetic, comparison, short-circuit logical, `..` concat, if/while/repeat/for-num/local/assign. 157 total tests green.
 - 2026-04-24: lua: parser (exprs with precedence, all phase-1 statements, funcbody, table ctors, method/chained calls) — 112 total tokenizer+parser tests
 - 2026-04-24: lua: tokenizer (numbers/strings/long-brackets/keywords/ops/comments) + 56 tests
@@ -147,13 +91,3 @@ _Newest first. Agent appends on every commit._
 _Shared-file issues that need someone else to fix. Minimal repro only._
 
 - _(none yet)_
-
-## Known limitations (own code, not shared)
-
-- **`require` supports `package.preload` only** — no filesystem search (we don't have Lua-file resolution inside sx_server). Users register a loader in `package.preload.name` and `require("name")` calls it with name as arg. Results cached in `package.loaded`; nil return caches as `true` per Lua convention.
-- **`os` library is a stub** — `os.time()` returns a monotonic counter (not Unix epoch), `os.clock()` = counter/1000, `os.date()` returns hardcoded "1970-01-01 00:00:00" or a `*t` table with fixed fields; `os.getenv` returns nil; `os.remove`/`rename` return nil+error. No real clock/filesystem access.
-- **`io` library is a stub** — `io.write`/`print` append to an internal `__io-buffer` (accessible via `io.__buffer()` which returns + clears it) instead of real stdout. `io.read`/`open`/`lines` return nil. Suitable for tests that inspect output; no actual stdio.
-- **`string.find`/`match`/`gmatch`/`gsub` patterns are LITERAL only** — no `%d`/`%a`/`.`/`*`/`+`/etc. Implementing Lua patterns is a separate work item; literal search covers the common case.
-- **`string.format`** supports only `%s`, `%d`, `%f`, `%%`. No width/precision flags (`%.2f`, `%5d`).
-- **`string.char`** supports printable ASCII 32–126 plus `\t`/`\n`/`\r`; other codes error.
-- ~~Early `return` inside nested block~~ — **FIXED 2026-04-24** via guard+raise sentinel (`lua-ret`). All function bodies and the top-level chunk wrap in a guard that catches the return-sentinel; `return` statements raise it.