phase-22 APL: runtime.sx vectors/bitwise/sets/reduce/format

lib/apl/runtime.sx (60 forms):
- Core: apl-iota (1..N), apl-rho (shape), apl-at (1-indexed access).
- Rank-polymorphic apl-dyadic/apl-monadic helpers: scalar×scalar,
  scalar×vector, vector×vector all supported uniformly.
- Arithmetic: add/sub/mul/div/mod/pow/max/min, neg/abs/floor/ceil/sqrt.
- Comparison: eq/neq/lt/le/gt/ge → 0/1 result vectors.
- Boolean: and/or/not on 0/1 values, element-wise.
- Bitwise: bitand/bitor/bitxor/bitnot/lshift/rshift — element-wise.
- Reduction: reduce-add/mul/max/min/and/or; scan-add/mul.
- Vector ops: reverse, cat (scalar/vector catenate), take (±N), drop (±N),
  rotate, compress (boolean mask), index (multi-index).
- Set ops: member (∊, → 0/1), nub (∪, unique preserve-order),
  union, intersect (∩), without (~). All use SX make-set internally.
- Format (⍕): vector → space-separated string, scalar → str.

lib/apl/tests/runtime.sx + lib/apl/test.sh: 73/73 pass.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.claude/scheduled_tasks.lock

@@ -1 +0,0 @@
-{"sessionId":"31c80255-eb92-43e4-8997-84ad84e27326","pid":90960,"procStart":"564684","acquiredAt":1777049890282}

hosts/javascript/run_tests.js

@@ -293,6 +293,8 @@ env["pop-suite"] = function() {
   return null;
 };
 
+env["test-allowed?"] = function(name) { return true; };
+
 // Load test framework
 const projectDir = path.join(__dirname, "..", "..");
 const specTests = path.join(projectDir, "spec", "tests");
@@ -341,6 +343,20 @@ if (fs.existsSync(swapPath)) {
   }
 }
 
+// Load spec library files (define-library modules imported by tests)
+for (const libFile of ["stdlib.sx", "signals.sx", "coroutines.sx"]) {
+  const libPath = path.join(projectDir, "spec", libFile);
+  if (fs.existsSync(libPath)) {
+    const libSrc = fs.readFileSync(libPath, "utf8");
+    const libExprs = Sx.parse(libSrc);
+    for (const expr of libExprs) {
+      try { Sx.eval(expr, env); } catch (e) {
+        console.error(`Error loading spec/${libFile}: ${e.message}`);
+      }
+    }
+  }
+}
+
 // Load tw system (needed by spec/tests/test-tw.sx)
 const twDir = path.join(projectDir, "shared", "sx", "templates");
 for (const twFile of ["tw-type.sx", "tw-layout.sx", "tw.sx"]) {

hosts/ocaml/bin/run_tests.ml

@@ -37,7 +37,10 @@ let rec deep_equal a b =
   match a, b with
   | Nil, Nil -> true
   | Bool a, Bool b -> a = b
+  | Integer a, Integer b -> a = b
   | Number a, Number b -> a = b
+  | Integer a, Number b -> float_of_int a = b
+  | Number a, Integer b -> a = float_of_int b
   | String a, String b -> a = b
   | Symbol a, Symbol b -> a = b
   | Keyword a, Keyword b -> a = b
@@ -226,7 +229,7 @@ let make_test_env () =
     | [String s] ->
       let parsed = Sx_parser.parse_all s in
       (match parsed with
-       | [List (Symbol "sxbc" :: Number _ :: payload :: _)] -> payload
+       | [List (Symbol "sxbc" :: (Number _ | Integer _) :: payload :: _)] -> payload
        | _ -> raise (Eval_error "bytecode-deserialize: invalid sxbc format"))
     | _ -> raise (Eval_error "bytecode-deserialize: expected string"));
 
@@ -240,7 +243,7 @@ let make_test_env () =
     | [String s] ->
       let parsed = Sx_parser.parse_all s in
       (match parsed with
-       | [List (Symbol "cek-state" :: Number _ :: payload :: _)] -> payload
+       | [List (Symbol "cek-state" :: (Number _ | Integer _) :: payload :: _)] -> payload
        | _ -> raise (Eval_error "cek-deserialize: invalid cek-state format"))
     | _ -> raise (Eval_error "cek-deserialize: expected string"));
 
@@ -320,7 +323,10 @@ let make_test_env () =
   bind "identical?" (fun args ->
     match args with
     | [a; b] -> Bool (match a, b with
+      | Integer x, Integer y -> x = y
       | Number x, Number y -> x = y
+      | Integer x, Number y -> float_of_int x = y
+      | Number x, Integer y -> x = float_of_int y
       | String x, String y -> x = y
       | Bool x, Bool y -> x = y
       | Nil, Nil -> true
@@ -366,11 +372,15 @@ let make_test_env () =
 
   bind "append!" (fun args ->
     match args with
-    | [ListRef r; v; Number n] when int_of_float n = 0 ->
+    | [ListRef r; v; (Number n)] when int_of_float n = 0 ->
       r := v :: !r; ListRef r  (* prepend *)
+    | [ListRef r; v; (Integer 0)] ->
+      r := v :: !r; ListRef r  (* prepend Integer index *)
     | [ListRef r; v] -> r := !r @ [v]; ListRef r  (* append in place *)
-    | [List items; v; Number n] when int_of_float n = 0 ->
+    | [List items; v; (Number n)] when int_of_float n = 0 ->
       List (v :: items)  (* immutable prepend *)
+    | [List items; v; (Integer 0)] ->
+      List (v :: items)  (* immutable prepend Integer index *)
     | [List items; v] -> List (items @ [v])  (* immutable fallback *)
     | _ -> raise (Eval_error "append!: expected list and value"));
 
@@ -546,7 +556,10 @@ let make_test_env () =
   bind "batch-begin!" (fun _args -> Sx_ref.batch_begin_b ());
   bind "batch-end!" (fun _args -> Sx_ref.batch_end_b ());
   bind "now-ms" (fun _args -> Number 1000.0);
-  bind "random-int" (fun args -> match args with [Number lo; _] -> Number lo | _ -> Number 0.0);
+  bind "random-int" (fun args -> match args with
+    | [Number lo; _] -> Number lo
+    | [Integer lo; _] -> Integer lo
+    | _ -> Integer 0);
   bind "try-rerender-page" (fun _args -> Nil);
   bind "collect!" (fun args ->
     match args with
@@ -1107,6 +1120,47 @@ let make_test_env () =
     | _ :: _ -> String "confirmed"
     | _ -> Nil);
 
+  bind "values" (fun args ->
+    match args with
+    | [v] -> v
+    | vs ->
+      let d = Hashtbl.create 2 in
+      Hashtbl.replace d "_values" (Bool true);
+      Hashtbl.replace d "_list" (List vs);
+      Dict d);
+
+  bind "call-with-values" (fun args ->
+    match args with
+    | [producer; consumer] ->
+      let result = Sx_ref.cek_call producer (List []) in
+      let spread = (match result with
+        | Dict d when (match Hashtbl.find_opt d "_values" with Some (Bool true) -> true | _ -> false) ->
+          (match Hashtbl.find_opt d "_list" with Some (List l) -> l | _ -> [result])
+        | _ -> [result])
+      in
+      Sx_ref.cek_call consumer (List spread)
+    | _ -> raise (Eval_error "call-with-values: expected 2 args"));
+
+  bind "promise?" (fun args ->
+    match args with
+    | [v] -> Bool (Sx_ref.is_promise v)
+    | _ -> Bool false);
+
+  bind "make-promise" (fun args ->
+    match args with
+    | [v] ->
+      let d = Hashtbl.create 4 in
+      Hashtbl.replace d "_promise" (Bool true);
+      Hashtbl.replace d "forced" (Bool true);
+      Hashtbl.replace d "value" v;
+      Dict d
+    | _ -> Nil);
+
+  bind "force" (fun args ->
+    match args with
+    | [p] -> Sx_ref.force_promise p
+    | _ -> Nil);
+
   env
 
 (* ====================================================================== *)
@@ -1142,18 +1196,20 @@ let run_foundation_tests () =
   in
 
   Printf.printf "Suite: parser\n";
-  assert_eq "number" (Number 42.0) (List.hd (parse_all "42"));
+  assert_eq "number" (Integer 42) (List.hd (parse_all "42"));
   assert_eq "string" (String "hello") (List.hd (parse_all "\"hello\""));
   assert_eq "bool true" (Bool true) (List.hd (parse_all "true"));
   assert_eq "nil" Nil (List.hd (parse_all "nil"));
   assert_eq "keyword" (Keyword "class") (List.hd (parse_all ":class"));
   assert_eq "symbol" (Symbol "foo") (List.hd (parse_all "foo"));
-  assert_eq "list" (List [Symbol "+"; Number 1.0; Number 2.0]) (List.hd (parse_all "(+ 1 2)"));
+  assert_eq "list" (List [Symbol "+"; Integer 1; Integer 2]) (List.hd (parse_all "(+ 1 2)"));
   (match List.hd (parse_all "(div :class \"card\" (p \"hi\"))") with
    | List [Symbol "div"; Keyword "class"; String "card"; List [Symbol "p"; String "hi"]] ->
      incr pass_count; Printf.printf "  PASS: nested list\n"
    | v -> incr fail_count; Printf.printf "  FAIL: nested list — got %s\n" (Sx_types.inspect v));
   (match List.hd (parse_all "'(1 2 3)") with
+   | List [Symbol "quote"; List [Integer 1; Integer 2; Integer 3]] ->
+     incr pass_count; Printf.printf "  PASS: quote sugar\n"
    | List [Symbol "quote"; List [Number 1.0; Number 2.0; Number 3.0]] ->
      incr pass_count; Printf.printf "  PASS: quote sugar\n"
    | v -> incr fail_count; Printf.printf "  FAIL: quote sugar — got %s\n" (Sx_types.inspect v));
@@ -1161,7 +1217,7 @@ let run_foundation_tests () =
    | Dict d when dict_has d "a" && dict_has d "b" ->
      incr pass_count; Printf.printf "  PASS: dict literal\n"
    | v -> incr fail_count; Printf.printf "  FAIL: dict literal — got %s\n" (Sx_types.inspect v));
-  assert_eq "comment" (Number 42.0) (List.hd (parse_all ";; comment\n42"));
+  assert_eq "comment" (Integer 42) (List.hd (parse_all ";; comment\n42"));
   assert_eq "string escape" (String "hello\nworld") (List.hd (parse_all "\"hello\\nworld\""));
   assert_eq "multiple exprs" (Number 2.0) (Number (float_of_int (List.length (parse_all "(1 2 3) (4 5)"))));
 
@@ -1978,6 +2034,10 @@ let run_spec_tests env test_files =
       (match Hashtbl.find_opt d "children" with
        | Some (List l) when i >= 0 && i < List.length l -> List.nth l i
        | _ -> (match Hashtbl.find_opt d (string_of_int i) with Some v -> v | None -> Nil))
+    | [Dict d; Integer n] ->
+      (match Hashtbl.find_opt d "children" with
+       | Some (List l) when n >= 0 && n < List.length l -> List.nth l n
+       | _ -> (match Hashtbl.find_opt d (string_of_int n) with Some v -> v | None -> Nil))
     | _ -> Nil);
 
   (* Stringify a value for DOM string properties *)
@@ -2052,8 +2112,8 @@ let run_spec_tests env test_files =
          Hashtbl.replace d "childNodes" (List [])
        | _ -> ());
       stored
-    | [ListRef r; Number n; value] ->
-      let idx = int_of_float n in
+    | [ListRef r; idx_v; value] when (match idx_v with Number _ | Integer _ -> true | _ -> false) ->
+      let idx = match idx_v with Number n -> int_of_float n | Integer n -> n | _ -> 0 in
       let lst = !r in
       if idx >= 0 && idx < List.length lst then
         r := List.mapi (fun i v -> if i = idx then value else v) lst
@@ -2190,7 +2250,7 @@ let run_spec_tests env test_files =
             | [String name; value] ->
               let attrs = match Hashtbl.find_opt d "attributes" with Some (Dict a) -> a | _ ->
                 let a = Hashtbl.create 4 in Hashtbl.replace d "attributes" (Dict a); a in
-              let sv = match value with String s -> s | Number n ->
+              let sv = match value with String s -> s | Integer n -> string_of_int n | Number n ->
                 let i = int_of_float n in if float_of_int i = n then string_of_int i
                 else string_of_float n | _ -> Sx_types.inspect value in
               Hashtbl.replace attrs name (String sv);
@@ -2632,6 +2692,7 @@ let run_spec_tests env test_files =
   let rec json_of_value = function
     | Nil -> `Null
     | Bool b -> `Bool b
+    | Integer n -> `Int n
     | Number n ->
       if Float.is_integer n && Float.abs n < 1e16
       then `Int (int_of_float n) else `Float n
@@ -2647,8 +2708,8 @@ let run_spec_tests env test_files =
   let rec value_of_json = function
     | `Null -> Nil
     | `Bool b -> Bool b
-    | `Int i -> Number (float_of_int i)
-    | `Intlit s -> (try Number (float_of_string s) with _ -> String s)
+    | `Int i -> Integer i
+    | `Intlit s -> (try Integer (int_of_string s) with _ -> try Number (float_of_string s) with _ -> String s)
     | `Float f -> Number f
     | `String s -> String s
     | `List xs -> List (List.map value_of_json xs)
@@ -2811,6 +2872,7 @@ let run_spec_tests env test_files =
       match sx_vm_execute with
       | Some fn -> Sx_ref.cek_call fn (List args)
       | None -> Nil)));
+  load_module "stdlib.sx" spec_dir;   (* pure SX stdlib: format etc. *)
   load_module "signals.sx" spec_dir;  (* core reactive primitives *)
   load_module "signals.sx" web_dir;   (* web extensions *)
   load_module "freeze.sx" lib_dir;

hosts/ocaml/bin/sx_server.ml

@@ -296,6 +296,10 @@ let read_blob () =
       (* consume trailing newline *)
       (try ignore (input_line stdin) with End_of_file -> ());
       data
+    | [List [Symbol "blob"; Integer n]] ->
+      let data = read_exact_bytes n in
+      (try ignore (input_line stdin) with End_of_file -> ());
+      data
     | _ -> raise (Eval_error ("read_blob: expected (blob N), got: " ^ line))
 
 (** Batch IO mode — collect requests during aser-slot, resolve after. *)
@@ -357,6 +361,11 @@ let rec read_io_response () =
     | [List (Symbol "io-response" :: Number n :: values)]
       when int_of_float n = !current_epoch ->
       (match values with [v] -> v | _ -> List values)
+    | [List [Symbol "io-response"; Integer n; value]]
+      when n = !current_epoch -> value
+    | [List (Symbol "io-response" :: Integer n :: values)]
+      when n = !current_epoch ->
+      (match values with [v] -> v | _ -> List values)
     (* Legacy untagged: (io-response value) — accept for backwards compat *)
     | [List [Symbol "io-response"; value]] -> value
     | [List (Symbol "io-response" :: values)] ->
@@ -396,6 +405,12 @@ let read_batched_io_response () =
         when int_of_float n = !current_epoch -> s
       | [List [Symbol "io-response"; Number n; v]]
         when int_of_float n = !current_epoch -> serialize_value v
+      | [List [Symbol "io-response"; Integer n; String s]]
+        when n = !current_epoch -> s
+      | [List [Symbol "io-response"; Integer n; SxExpr s]]
+        when n = !current_epoch -> s
+      | [List [Symbol "io-response"; Integer n; v]]
+        when n = !current_epoch -> serialize_value v
       (* Legacy untagged *)
       | [List [Symbol "io-response"; String s]]
       | [List [Symbol "io-response"; SxExpr s]] -> s
@@ -959,6 +974,7 @@ let setup_io_bridges env =
   bind "sleep" (fun args -> io_request "sleep" args);
   bind "set-response-status" (fun args -> match args with
     | [Number n] -> _pending_response_status := int_of_float n; Nil
+    | [Integer n] -> _pending_response_status := n; Nil
     | _ -> Nil);
   bind "set-response-header" (fun args -> io_request "set-response-header" args)
 
@@ -1361,6 +1377,7 @@ let rec dispatch env cmd =
         | Bool true -> "true"
         | Bool false -> "false"
         | Number n -> Sx_types.format_number n
+        | Integer n -> string_of_int n
         | String s -> "\"" ^ escape_sx_string s ^ "\""
         | Symbol s -> s
         | Keyword k -> ":" ^ k
@@ -1374,6 +1391,10 @@ let rec dispatch env cmd =
         | Island i -> "~" ^ i.i_name
         | SxExpr s -> s
         | RawHTML s -> "\"" ^ escape_sx_string s ^ "\""
+        | Char n -> Sx_types.inspect (Char n)
+        | Eof -> Sx_types.inspect Eof
+        | Port _ -> Sx_types.inspect result
+        | Rational (n, d) -> Printf.sprintf "%d/%d" n d
         | _ -> "nil"
       in
       send_ok_raw (raw_serialize result)
@@ -4450,6 +4471,8 @@ let site_mode () =
           match exprs with
           | [List [Symbol "epoch"; Number n]] ->
             current_epoch := int_of_float n
+          | [List [Symbol "epoch"; Integer n]] ->
+            current_epoch := n
           (* render-page: full SSR pipeline — URL → complete HTML *)
           | [List [Symbol "render-page"; String path]] ->
             (try match http_render_page env path [] with
@@ -4507,6 +4530,8 @@ let () =
             (* Epoch marker: (epoch N) — set current epoch, read next command *)
             | [List [Symbol "epoch"; Number n]] ->
               current_epoch := int_of_float n
+            | [List [Symbol "epoch"; Integer n]] ->
+              current_epoch := n
             | [cmd] -> dispatch env cmd
             | _ -> send_error ("Expected single command, got " ^ string_of_int (List.length exprs))
           end

hosts/ocaml/bootstrap.py

@@ -47,7 +47,9 @@ open Sx_runtime
 let trampoline_fn : (value -> value) ref = ref (fun v -> v)
 let trampoline v = !trampoline_fn v
 
-
+(* Step limit for timeout detection — set to 0 to disable *)
+let step_limit : int ref = ref 0
+let step_count : int ref = ref 0
 
 (* === Mutable globals — backing refs for transpiler's !_ref / _ref := === *)
 let _strict_ref = ref (Bool false)
@@ -126,6 +128,90 @@ let enhance_error_with_trace msg =
   _last_error_kont_ref := Nil;
   msg ^ (format_comp_trace trace)
 
+(* Hand-written sf_define_type — skipped from transpile because the spec uses
+   &rest params and empty-dict literals that the transpiler can't emit cleanly.
+   Implements: (define-type Name (Ctor1 f1 f2) (Ctor2 f3) ...)
+   Creates constructor fns, Name?/Ctor? predicates, Ctor-field accessors,
+   and records ctors in *adt-registry*. *)
+let sf_define_type args env_val =
+  let items = (match args with List l -> l | _ -> []) in
+  let type_sym = List.nth items 0 in
+  let type_name = value_to_string type_sym in
+  let ctor_specs = List.tl items in
+  let env_has_v k = sx_truthy (env_has env_val (String k)) in
+  let env_bind_v k v = ignore (env_bind env_val (String k) v) in
+  let env_get_v k = env_get env_val (String k) in
+  if not (env_has_v "*adt-registry*") then
+    env_bind_v "*adt-registry*" (Dict (Hashtbl.create 8));
+  let registry = env_get_v "*adt-registry*" in
+  let ctor_names = List.map (fun spec ->
+    (match spec with List (sym :: _) -> String (value_to_string sym) | _ -> Nil)
+  ) ctor_specs in
+  (match registry with Dict d -> Hashtbl.replace d type_name (List ctor_names) | _ -> ());
+  env_bind_v (type_name ^ "?")
+    (NativeFn (type_name ^ "?", fun pargs ->
+      (match pargs with
+      | [v] ->
+        (match v with
+        | Dict d -> Bool (Hashtbl.mem d "_adt" &&
+          (match Hashtbl.find_opt d "_type" with Some (String t) -> t = type_name | _ -> false))
+        | _ -> Bool false)
+      | _ -> Bool false)));
+  List.iter (fun spec ->
+    (match spec with
+    | List (sym :: fields) ->
+      let cn = value_to_string sym in
+      let field_names = List.map value_to_string fields in
+      let arity = List.length fields in
+      env_bind_v cn
+        (NativeFn (cn, fun ctor_args ->
+          if List.length ctor_args <> arity then
+            raise (Eval_error (Printf.sprintf "%s: expected %d args, got %d"
+              cn arity (List.length ctor_args)))
+          else begin
+            let d = Hashtbl.create 4 in
+            Hashtbl.replace d "_adt"    (Bool true);
+            Hashtbl.replace d "_type"   (String type_name);
+            Hashtbl.replace d "_ctor"   (String cn);
+            Hashtbl.replace d "_fields" (List ctor_args);
+            Dict d
+          end));
+      env_bind_v (cn ^ "?")
+        (NativeFn (cn ^ "?", fun pargs ->
+          (match pargs with
+          | [v] ->
+            (match v with
+            | Dict d -> Bool (Hashtbl.mem d "_adt" &&
+              (match Hashtbl.find_opt d "_ctor" with Some (String c) -> c = cn | _ -> false))
+            | _ -> Bool false)
+          | _ -> Bool false)));
+      List.iteri (fun idx fname ->
+        env_bind_v (cn ^ "-" ^ fname)
+          (NativeFn (cn ^ "-" ^ fname, fun pargs ->
+            (match pargs with
+            | [v] ->
+              (match v with
+              | Dict d ->
+                (match Hashtbl.find_opt d "_fields" with
+                | Some (List fs) ->
+                  if idx < List.length fs then List.nth fs idx
+                  else raise (Eval_error (cn ^ "-" ^ fname ^ ": index out of bounds"))
+                | _ -> raise (Eval_error (cn ^ "-" ^ fname ^ ": not an ADT")))
+              | _ -> raise (Eval_error (cn ^ "-" ^ fname ^ ": not a dict")))
+            | _ -> raise (Eval_error (cn ^ "-" ^ fname ^ ": expected 1 arg")))))
+      ) field_names
+    | _ -> ())
+  ) ctor_specs;
+  Nil
+
+(* Register define-type via custom_special_forms so the CEK dispatch finds it.
+   The top-level (register-special-form! ...) in spec/evaluator.sx is not a
+   define and therefore is not transpiled; we wire it up here instead. *)
+let () = ignore (register_special_form (String "define-type")
+  (NativeFn ("define-type", fun call_args ->
+    match call_args with
+    | [args; env] -> sf_define_type args env
+    | _ -> Nil)))
 
 
 """
@@ -171,7 +257,10 @@ def compile_spec_to_ml(spec_dir: str | None = None) -> str:
                 "debug-log", "debug_log", "range", "chunk-every", "zip-pairs",
                 "string-contains?", "starts-with?", "ends-with?",
                 "string-replace", "trim", "split", "index-of",
-                "pad-left", "pad-right", "char-at", "substring"}
+                "pad-left", "pad-right", "char-at", "substring",
+                # sf-define-type uses &rest + empty-dict literals that the transpiler
+                # can't emit as valid OCaml; hand-written implementation in FIXUPS.
+                "sf-define-type"}
         defines = [(n, e) for n, e in defines if n not in skip]
 
         # Deduplicate — keep last definition for each name (CEK overrides tree-walk)

hosts/ocaml/lib/sx_parser.ml

@@ -89,10 +89,38 @@ let read_symbol s =
   while s.pos < s.len && is_symbol_char s.src.[s.pos] do advance s done;
   String.sub s.src start (s.pos - start)
 
+let gcd a b =
+  let rec g a b = if b = 0 then a else g b (a mod b) in g (abs a) (abs b)
+
+let make_rat n d =
+  if d = 0 then raise (Parse_error "rational: division by zero");
+  let sign = if d < 0 then -1 else 1 in
+  let g = gcd (abs n) (abs d) in
+  let rn = sign * n / g and rd = sign * d / g in
+  if rd = 1 then Integer rn else Rational (rn, rd)
+
 let try_number str =
-  match float_of_string_opt str with
-  | Some n -> Some (Number n)
-  | None -> None
+  (* Integers (no '.' or 'e'/'E') → exact Integer; rationals N/D; floats → inexact Number *)
+  let has_dec = String.contains str '.' in
+  let has_exp = String.contains str 'e' || String.contains str 'E' in
+  if has_dec || has_exp then
+    match float_of_string_opt str with
+    | Some n -> Some (Number n)
+    | None -> None
+  else
+    match String.split_on_char '/' str with
+    | [num_s; den_s] when num_s <> "" && den_s <> "" ->
+      (match int_of_string_opt num_s, int_of_string_opt den_s with
+       | Some n, Some d -> (try Some (make_rat n d) with _ -> None)
+       | _ -> None)
+    | _ ->
+      match int_of_string_opt str with
+      | Some n -> Some (Integer n)
+      | None ->
+        (* handles "nan", "inf", "-inf" *)
+        match float_of_string_opt str with
+        | Some n -> Some (Number n)
+        | None -> None
 
 let rec read_value s : value =
   skip_whitespace_and_comments s;
@@ -108,6 +136,34 @@ let rec read_value s : value =
   | '"' -> String (read_string s)
   | '\'' -> advance s; List [Symbol "quote"; read_value s]
   | '`' -> advance s; List [Symbol "quasiquote"; read_value s]
+  | '#' when s.pos + 1 < s.len && s.src.[s.pos + 1] = '\\' ->
+    (* Character literal: #\a, #\space, #\newline, etc. *)
+    advance s; advance s;
+    if at_end s then raise (Parse_error "Unexpected end of input after #\\");
+    let char_start = s.pos in
+    (* Read a name if starts with ident char, else single char *)
+    if is_ident_start s.src.[s.pos] then begin
+      while s.pos < s.len && is_ident_char s.src.[s.pos] do advance s done;
+      let name = String.sub s.src char_start (s.pos - char_start) in
+      let cp = match name with
+        | "space" -> 32 | "newline" -> 10 | "tab" -> 9
+        | "return" -> 13 | "nul" -> 0 | "null" -> 0
+        | "escape" -> 27 | "delete" -> 127 | "backspace" -> 8
+        | "altmode" -> 27 | "rubout" -> 127
+        | _ -> Char.code name.[0]  (* single letter like #\a *)
+      in Char cp
+    end else begin
+      let c = s.src.[s.pos] in
+      advance s;
+      Char (Char.code c)
+    end
+  | '#' when s.pos + 1 < s.len &&
+             (s.src.[s.pos + 1] = 't' || s.src.[s.pos + 1] = 'f') &&
+             (s.pos + 2 >= s.len || not (is_ident_char s.src.[s.pos + 2])) ->
+    (* #t / #f — boolean literals (R7RS shorthand) *)
+    let b = s.src.[s.pos + 1] = 't' in
+    advance s; advance s;
+    Bool b
   | '#' when s.pos + 1 < s.len && s.src.[s.pos + 1] = ';' ->
     (* Datum comment: #; discards next expression *)
     advance s; advance s;

hosts/ocaml/lib/sx_runtime.ml

@@ -46,7 +46,7 @@ let sx_call f args =
     !Sx_types._cek_eval_lambda_ref f args
   | Continuation (k, _) ->
     k (match args with x :: _ -> x | [] -> Nil)
-  | CallccContinuation _ ->
+  | CallccContinuation (_, _) ->
     raise (Eval_error "callcc continuations must be invoked through the CEK machine")
   | _ ->
     let nargs = List.length args in
@@ -156,6 +156,9 @@ let get_val container key =
      | "extra" -> f.cf_extra | "extra2" -> f.cf_extra2
      | "subscribers" -> f.cf_results
      | "prev-tracking" -> f.cf_extra
+     | "after-thunk" -> f.cf_f        (* wind-after frame *)
+     | "winders-len" -> f.cf_extra    (* wind-after frame *)
+     | "body-result" -> f.cf_name     (* wind-return frame *)
      | _ -> Nil)
   | VmFrame f, String k ->
     (match k with
@@ -208,6 +211,8 @@ let get_val container key =
   | Dict d, Keyword k -> dict_get d k
   | (List l | ListRef { contents = l }), Number n ->
     (try List.nth l (int_of_float n) with _ -> Nil)
+  | (List l | ListRef { contents = l }), Integer n ->
+    (try List.nth l n with _ -> Nil)
   | Nil, _ -> Nil  (* nil.anything → nil *)
   | _, _ -> Nil    (* type mismatch → nil (matches JS/Python behavior) *)
 
@@ -381,15 +386,20 @@ let continuation_data v = match v with
   | _ -> raise (Eval_error "not a continuation")
 
 (* Callcc (undelimited) continuation support *)
-let callcc_continuation_p v = match v with CallccContinuation _ -> Bool true | _ -> Bool false
+let callcc_continuation_p v = match v with CallccContinuation (_, _) -> Bool true | _ -> Bool false
 
-let make_callcc_continuation captured =
-  CallccContinuation (sx_to_list captured)
+let make_callcc_continuation captured winders_len =
+  let n = match winders_len with Number f -> int_of_float f | Integer n -> n | _ -> 0 in
+  CallccContinuation (sx_to_list captured, n)
 
 let callcc_continuation_data v = match v with
-  | CallccContinuation frames -> List frames
+  | CallccContinuation (frames, _) -> List frames
   | _ -> raise (Eval_error "not a callcc continuation")
 
+let callcc_continuation_winders_len v = match v with
+  | CallccContinuation (_, n) -> Number (float_of_int n)
+  | _ -> Number 0.0
+
 (* Dynamic wind — simplified for OCaml (no async) *)
 let host_error msg =
   raise (Eval_error (value_to_str msg))

hosts/ocaml/lib/sx_types.ml

@@ -43,9 +43,10 @@ type env = {
 
 and value =
   | Nil
-  | Bool   of bool
-  | Number of float
-  | String of string
+  | Bool    of bool
+  | Integer of int    (** Exact integer — distinct from inexact float. *)
+  | Number  of float  (** Inexact float. *)
+  | String  of string
   | Symbol of string
   | Keyword of string
   | List   of value list
@@ -56,7 +57,7 @@ and value =
   | Macro  of macro
   | Thunk  of value * env
   | Continuation of (value -> value) * dict option
-  | CallccContinuation of value list  (** Undelimited continuation — captured kont frames *)
+  | CallccContinuation of value list * int  (** Undelimited continuation — captured kont frames + winders depth at capture *)
   | NativeFn of string * (value list -> value)
   | Signal of signal
   | RawHTML of string
@@ -72,6 +73,25 @@ and value =
   | Record of record  (** R7RS record — opaque, generative, field-indexed. *)
   | Parameter of parameter  (** R7RS parameter — dynamic binding via kont-stack provide frames. *)
   | Vector of value array  (** R7RS vector — mutable fixed-size array. *)
+  | StringBuffer of Buffer.t  (** Mutable string buffer — O(1) amortized append. *)
+  | HashTable of (value, value) Hashtbl.t  (** Mutable hash table with arbitrary keys. *)
+  | Char of int  (** Unicode codepoint — R7RS char type. *)
+  | Eof            (** EOF sentinel — returned by read-char etc. at end of input. *)
+  | Port of sx_port  (** String port — input (string cursor) or output (buffer). *)
+  | Rational of int * int  (** Exact rational: numerator, denominator (reduced, denom>0). *)
+  | SxSet of (string, value) Hashtbl.t  (** Mutable set keyed by inspect(value). *)
+  | SxRegexp of string * string * Re.re  (** Regexp: source, flags, compiled. *)
+  | SxBytevector of bytes  (** Mutable bytevector — R7RS bytevector type. *)
+
+(** String input port: source string + mutable cursor position. *)
+and sx_port_kind =
+  | PortInput of string * int ref
+  | PortOutput of Buffer.t
+
+and sx_port = {
+  mutable sp_closed : bool;
+  sp_kind : sx_port_kind;
+}
 
 (** CEK machine state — record instead of Dict for performance.
     5 fields × 55K steps/sec = 275K Hashtbl allocations/sec eliminated. *)
@@ -392,6 +412,7 @@ let format_number n =
 
 let value_to_string = function
   | String s -> s | Symbol s -> s | Keyword k -> k
+  | Integer n -> string_of_int n
   | Number n -> format_number n
   | Bool true -> "true" | Bool false -> "false"
   | Nil -> "" | _ -> "<value>"
@@ -461,6 +482,7 @@ let make_keyword name = Keyword (value_to_string name)
 let type_of = function
   | Nil            -> "nil"
   | Bool _         -> "boolean"
+  | Integer _      -> "number"
   | Number _       -> "number"
   | String _       -> "string"
   | Symbol _       -> "symbol"
@@ -473,7 +495,7 @@ let type_of = function
   | Macro _        -> "macro"
   | Thunk _        -> "thunk"
   | Continuation (_, _) -> "continuation"
-  | CallccContinuation _ -> "continuation"
+  | CallccContinuation (_, _) -> "continuation"
   | NativeFn _     -> "function"
   | Signal _       -> "signal"
   | RawHTML _      -> "raw-html"
@@ -488,6 +510,16 @@ let type_of = function
   | Record r       -> r.r_type.rt_name
   | Parameter _    -> "parameter"
   | Vector _       -> "vector"
+  | StringBuffer _ -> "string-buffer"
+  | HashTable _    -> "hash-table"
+  | Char _         -> "char"
+  | Eof            -> "eof-object"
+  | Port { sp_kind = PortInput _; _ }  -> "input-port"
+  | Port { sp_kind = PortOutput _; _ } -> "output-port"
+  | Rational _  -> "rational"
+  | SxSet _          -> "set"
+  | SxRegexp _       -> "regexp"
+  | SxBytevector _   -> "bytevector"
 
 let is_nil = function Nil -> true | _ -> false
 let is_lambda = function Lambda _ -> true | _ -> false
@@ -503,7 +535,7 @@ let is_signal = function
 let is_record = function Record _ -> true | _ -> false
 
 let is_callable = function
-  | Lambda _ | NativeFn _ | Continuation (_, _) | CallccContinuation _ | VmClosure _ -> true
+  | Lambda _ | NativeFn _ | Continuation (_, _) | CallccContinuation (_, _) | VmClosure _ -> true
   | _ -> false
 
 
@@ -616,6 +648,7 @@ let thunk_env = function
 (** {1 Record operations} *)
 
 let val_to_int = function
+  | Integer n -> n
   | Number n -> int_of_float n
   | v -> raise (Eval_error ("Expected number, got " ^ type_of v))
 
@@ -777,6 +810,7 @@ let rec inspect = function
   | Nil -> "nil"
   | Bool true -> "true"
   | Bool false -> "false"
+  | Integer n -> string_of_int n
   | Number n -> format_number n
   | String s ->
     let buf = Buffer.create (String.length s + 2) in
@@ -810,7 +844,7 @@ let rec inspect = function
     Printf.sprintf "<%s(%s)>" tag (String.concat ", " m.m_params)
   | Thunk _ -> "<thunk>"
   | Continuation (_, _) -> "<continuation>"
-  | CallccContinuation _ -> "<callcc-continuation>"
+  | CallccContinuation (_, _) -> "<callcc-continuation>"
   | NativeFn (name, _) -> Printf.sprintf "<native:%s>" name
   | Signal _ -> "<signal>"
   | RawHTML s -> Printf.sprintf "\"<raw-html:%d>\"" (String.length s)
@@ -831,3 +865,23 @@ let rec inspect = function
     Printf.sprintf "#(%s)" (String.concat " " elts)
   | VmFrame f -> Printf.sprintf "<vm-frame:ip=%d base=%d>" f.vf_ip f.vf_base
   | VmMachine m -> Printf.sprintf "<vm-machine:sp=%d frames=%d>" m.vm_sp (List.length m.vm_frames)
+  | StringBuffer buf -> Printf.sprintf "<string-buffer:%d>" (Buffer.length buf)
+  | HashTable ht -> Printf.sprintf "<hash-table:%d>" (Hashtbl.length ht)
+  | Char n ->
+    let name = match n with
+      | 32 -> "space" | 10 -> "newline" | 9 -> "tab"
+      | 13 -> "return" | 0 -> "nul" | 27 -> "escape"
+      | 127 -> "delete" | 8 -> "backspace"
+      | _ -> let buf = Buffer.create 1 in
+             Buffer.add_utf_8_uchar buf (Uchar.of_int n);
+             Buffer.contents buf
+    in "#\\" ^ name
+  | Eof -> "#!eof"
+  | Port { sp_kind = PortInput (_, pos); sp_closed } ->
+    Printf.sprintf "<input-port:pos=%d%s>" !pos (if sp_closed then ":closed" else "")
+  | Port { sp_kind = PortOutput buf; sp_closed } ->
+    Printf.sprintf "<output-port:len=%d%s>" (Buffer.length buf) (if sp_closed then ":closed" else "")
+  | Rational (n, d) -> Printf.sprintf "%d/%d" n d
+  | SxSet ht -> Printf.sprintf "<set:%d>" (Hashtbl.length ht)
+  | SxRegexp (src, flags, _) -> Printf.sprintf "#/%s/%s" src flags
+  | SxBytevector b -> Printf.sprintf "#u8(%s)" (String.concat " " (List.init (Bytes.length b) (fun i -> string_of_int (Char.code (Bytes.get b i)))))

hosts/ocaml/lib/sx_vm.ml

@@ -185,7 +185,8 @@ let code_from_value v =
       | Some _ as r -> r | None -> Hashtbl.find_opt d k2 in
     let bc_list = match find2 "bytecode" "vc-bytecode" with
       | Some (List l | ListRef { contents = l }) ->
-        Array.of_list (List.map (fun x -> match x with Number n -> int_of_float n | _ -> 0) l)
+        Array.of_list (List.map (fun x -> match x with
+          | Integer n -> n | Number n -> int_of_float n | _ -> 0) l)
       | _ -> [||]
     in
     let entries = match find2 "constants" "vc-constants" with
@@ -198,10 +199,10 @@ let code_from_value v =
       | _ -> entry
     ) entries in
     let arity = match find2 "arity" "vc-arity" with
-      | Some (Number n) -> int_of_float n | _ -> 0
+      | Some (Integer n) -> n | Some (Number n) -> int_of_float n | _ -> 0
     in
     let rest_arity = match find2 "rest-arity" "vc-rest-arity" with
-      | Some (Number n) -> int_of_float n | _ -> -1
+      | Some (Integer n) -> n | Some (Number n) -> int_of_float n | _ -> -1
     in
     (* Compute locals from bytecode: scan for highest LOCAL_GET/LOCAL_SET slot.
        The compiler's arity may undercount when nested lets add many locals. *)
@@ -749,10 +750,7 @@ and run vm =
             | _ -> (Hashtbl.find Sx_primitives.primitives "/") [a; b])
         | 164 (* OP_EQ *) ->
           let b = pop vm and a = pop vm in
-          let rec norm = function
-            | ListRef { contents = l } -> List (List.map norm l)
-            | List l -> List (List.map norm l) | v -> v in
-          push vm (Bool (norm a = norm b))
+          push vm ((Hashtbl.find Sx_primitives.primitives "=") [a; b])
         | 165 (* OP_LT *) ->
           let b = pop vm and a = pop vm in
           push vm (match a, b with
@@ -771,10 +769,10 @@ and run vm =
         | 168 (* OP_LEN *) ->
           let v = pop vm in
           push vm (match v with
-            | List l | ListRef { contents = l } -> Number (float_of_int (List.length l))
-            | String s -> Number (float_of_int (String.length s))
-            | Dict d -> Number (float_of_int (Hashtbl.length d))
-            | Nil -> Number 0.0
+            | List l | ListRef { contents = l } -> Integer (List.length l)
+            | String s -> Integer (String.length s)
+            | Dict d -> Integer (Hashtbl.length d)
+            | Nil -> Integer 0
             | _ -> (Hashtbl.find Sx_primitives.primitives "len") [v])
         | 169 (* OP_FIRST *) ->
           let v = pop vm in

hosts/ocaml/transpiler.sx

@@ -256,6 +256,7 @@
     "callcc-continuation?"
     "callcc-continuation-data"
     "make-callcc-continuation"
+    "callcc-continuation-winders-len"
     "dynamic-wind-call"
     "strip-prefix"
     "component-set-param-types!"
@@ -295,7 +296,8 @@
     "*bind-tracking*"
     "*provide-batch-depth*"
     "*provide-batch-queue*"
-    "*provide-subscribers*"))
+    "*provide-subscribers*"
+    "*winders*"))
 
 (define
   ml-is-mutable-global?
@@ -533,13 +535,13 @@
               "; cf_env = "
               (ef "env")
               "; cf_name = "
-              (if (= frame-type "if") (ef "else") (ef "name"))
+              (if (= frame-type "if") (ef "else") (cond (some (fn (k) (= k "body-result")) items) (ef "body-result") :else (ef "name")))
               "; cf_body = "
               (if (= frame-type "if") (ef "then") (ef "body"))
               "; cf_remaining = "
               (ef "remaining")
               "; cf_f = "
-              (ef "f")
+              (cond (some (fn (k) (= k "after-thunk")) items) (ef "after-thunk") (some (fn (k) (= k "f")) items) (ef "f") :else "Nil")
               "; cf_args = "
               (cond
                 (some (fn (k) (= k "evaled")) items)
@@ -582,6 +584,8 @@
                 (ef "prev-tracking")
                 (some (fn (k) (= k "extra")) items)
                 (ef "extra")
+                (some (fn (k) (= k "winders-len")) items)
+                (ef "winders-len")
                 :else "Nil")
               "; cf_extra2 = "
               (cond

lib/apl/runtime.sx

@@ -0,0 +1,289 @@
+;; lib/apl/runtime.sx — APL primitives on SX
+;;
+;; APL vectors are represented as SX lists (functional, immutable results).
+;; Operations are rank-polymorphic: scalar/vector arguments both accepted.
+;; Index origin: 1 (traditional APL).
+;;
+;; Primitives used:
+;;   map (multi-arg, Phase 1)
+;;   bitwise-and/or/xor/not/arithmetic-shift (Phase 7)
+;;   make-set/set-member?/set-add!/set->list (Phase 18)
+
+;; ---------------------------------------------------------------------------
+;; 1. Core vector constructors
+;; ---------------------------------------------------------------------------
+
+;; ⍳N — iota: generate integer vector 1, 2, ..., N
+(define
+  (apl-iota n)
+  (letrec
+    ((go (fn (i acc) (if (< i 1) acc (go (- i 1) (cons i acc))))))
+    (go n (list))))
+
+;; ⍴A — shape (length of a vector)
+(define (apl-rho v) (if (list? v) (len v) 1))
+
+;; A[I] — 1-indexed access
+(define (apl-at v i) (nth v (- i 1)))
+
+;; Scalar predicate
+(define (apl-scalar? v) (not (list? v)))
+
+;; ---------------------------------------------------------------------------
+;; 2. Rank-polymorphic helpers
+;;    dyadic: scalar/vector × scalar/vector → scalar/vector
+;;    monadic: scalar/vector → scalar/vector
+;; ---------------------------------------------------------------------------
+
+(define
+  (apl-dyadic op a b)
+  (cond
+    ((and (list? a) (list? b)) (map op a b))
+    ((list? a) (map (fn (x) (op x b)) a))
+    ((list? b) (map (fn (y) (op a y)) b))
+    (else (op a b))))
+
+(define (apl-monadic op a) (if (list? a) (map op a) (op a)))
+
+;; ---------------------------------------------------------------------------
+;; 3. Arithmetic (element-wise, rank-polymorphic)
+;; ---------------------------------------------------------------------------
+
+(define (apl-add a b) (apl-dyadic + a b))
+(define (apl-sub a b) (apl-dyadic - a b))
+(define (apl-mul a b) (apl-dyadic * a b))
+(define (apl-div a b) (apl-dyadic / a b))
+(define (apl-mod a b) (apl-dyadic modulo a b))
+(define (apl-pow a b) (apl-dyadic pow a b))
+(define (apl-max a b) (apl-dyadic (fn (x y) (if (> x y) x y)) a b))
+(define (apl-min a b) (apl-dyadic (fn (x y) (if (< x y) x y)) a b))
+
+(define (apl-neg a) (apl-monadic (fn (x) (- 0 x)) a))
+(define (apl-abs a) (apl-monadic abs a))
+(define (apl-floor a) (apl-monadic floor a))
+(define (apl-ceil a) (apl-monadic ceil a))
+(define (apl-sqrt a) (apl-monadic sqrt a))
+(define (apl-exp a) (apl-monadic exp a))
+(define (apl-log a) (apl-monadic log a))
+
+;; ---------------------------------------------------------------------------
+;; 4. Comparison (element-wise, returns 0/1 booleans)
+;; ---------------------------------------------------------------------------
+
+(define (apl-bool v) (if v 1 0))
+
+(define (apl-eq a b) (apl-dyadic (fn (x y) (apl-bool (= x y))) a b))
+(define
+  (apl-neq a b)
+  (apl-dyadic (fn (x y) (apl-bool (not (= x y)))) a b))
+(define (apl-lt a b) (apl-dyadic (fn (x y) (apl-bool (< x y))) a b))
+(define (apl-le a b) (apl-dyadic (fn (x y) (apl-bool (<= x y))) a b))
+(define (apl-gt a b) (apl-dyadic (fn (x y) (apl-bool (> x y))) a b))
+(define (apl-ge a b) (apl-dyadic (fn (x y) (apl-bool (>= x y))) a b))
+
+;; Boolean logic (0/1 vectors)
+(define
+  (apl-and a b)
+  (apl-dyadic
+    (fn
+      (x y)
+      (if
+        (and (not (= x 0)) (not (= y 0)))
+        1
+        0))
+    a
+    b))
+(define
+  (apl-or a b)
+  (apl-dyadic
+    (fn
+      (x y)
+      (if
+        (or (not (= x 0)) (not (= y 0)))
+        1
+        0))
+    a
+    b))
+(define
+  (apl-not a)
+  (apl-monadic (fn (x) (if (= x 0) 1 0)) a))
+
+;; ---------------------------------------------------------------------------
+;; 5. Bitwise operations (element-wise)
+;; ---------------------------------------------------------------------------
+
+(define (apl-bitand a b) (apl-dyadic bitwise-and a b))
+(define (apl-bitor a b) (apl-dyadic bitwise-or a b))
+(define (apl-bitxor a b) (apl-dyadic bitwise-xor a b))
+(define (apl-bitnot a) (apl-monadic bitwise-not a))
+(define
+  (apl-lshift a b)
+  (apl-dyadic (fn (x n) (arithmetic-shift x n)) a b))
+(define
+  (apl-rshift a b)
+  (apl-dyadic (fn (x n) (arithmetic-shift x (- 0 n))) a b))
+
+;; ---------------------------------------------------------------------------
+;; 6. Reduction (fold) and scan
+;; ---------------------------------------------------------------------------
+
+(define (apl-reduce-add v) (reduce + 0 v))
+(define (apl-reduce-mul v) (reduce * 1 v))
+(define
+  (apl-reduce-max v)
+  (reduce (fn (acc x) (if (> acc x) acc x)) (first v) (rest v)))
+(define
+  (apl-reduce-min v)
+  (reduce (fn (acc x) (if (< acc x) acc x)) (first v) (rest v)))
+(define
+  (apl-reduce-and v)
+  (reduce
+    (fn
+      (acc x)
+      (if
+        (and (not (= acc 0)) (not (= x 0)))
+        1
+        0))
+    1
+    v))
+(define
+  (apl-reduce-or v)
+  (reduce
+    (fn
+      (acc x)
+      (if
+        (or (not (= acc 0)) (not (= x 0)))
+        1
+        0))
+    0
+    v))
+
+;; Scan: prefix reduction (yields a vector of running totals)
+(define
+  (apl-scan op v)
+  (if
+    (= (len v) 0)
+    (list)
+    (letrec
+      ((go (fn (xs acc result) (if (= (len xs) 0) (reverse result) (let ((next (op acc (first xs)))) (go (rest xs) next (cons next result)))))))
+      (go (rest v) (first v) (list (first v))))))
+
+(define (apl-scan-add v) (apl-scan + v))
+(define (apl-scan-mul v) (apl-scan * v))
+
+;; ---------------------------------------------------------------------------
+;; 7. Vector manipulation
+;; ---------------------------------------------------------------------------
+
+;; ⌽A — reverse
+(define (apl-reverse v) (reverse v))
+
+;; A,B — catenate
+(define
+  (apl-cat a b)
+  (cond
+    ((and (list? a) (list? b)) (append a b))
+    ((list? a) (append a (list b)))
+    ((list? b) (cons a b))
+    (else (list a b))))
+
+;; ↑N A — take first N elements (negative: take last N)
+(define
+  (apl-take n v)
+  (if
+    (>= n 0)
+    (letrec
+      ((go (fn (xs i) (if (or (= i 0) (= (len xs) 0)) (list) (cons (first xs) (go (rest xs) (- i 1)))))))
+      (go v n))
+    (apl-reverse (apl-take (- 0 n) (apl-reverse v)))))
+
+;; ↓N A — drop first N elements
+(define
+  (apl-drop n v)
+  (if
+    (>= n 0)
+    (letrec
+      ((go (fn (xs i) (if (or (= i 0) (= (len xs) 0)) xs (go (rest xs) (- i 1))))))
+      (go v n))
+    (apl-reverse (apl-drop (- 0 n) (apl-reverse v)))))
+
+;; Rotate left by n positions
+(define
+  (apl-rotate n v)
+  (let ((m (modulo n (len v)))) (append (apl-drop m v) (apl-take m v))))
+
+;; Compression: A/B — select elements of B where A is 1
+(define
+  (apl-compress mask v)
+  (if
+    (= (len mask) 0)
+    (list)
+    (let
+      ((rest-result (apl-compress (rest mask) (rest v))))
+      (if
+        (not (= (first mask) 0))
+        (cons (first v) rest-result)
+        rest-result))))
+
+;; Indexing: A[B] — select elements at indices B (1-indexed)
+(define (apl-index v indices) (map (fn (i) (apl-at v i)) indices))
+
+;; Grade up: indices that would sort the vector ascending
+(define
+  (apl-grade-up v)
+  (let
+    ((indexed (map (fn (x i) (list x i)) v (apl-iota (len v)))))
+    (map (fn (p) (nth p 1)) (sort indexed))))
+
+;; ---------------------------------------------------------------------------
+;; 8. Set operations (∊ ∪ ∩ ~)
+;; ---------------------------------------------------------------------------
+
+;; Membership ∊: for each element in A, is it in B? → 0/1 vector
+(define
+  (apl-member a b)
+  (let
+    ((bset (let ((s (make-set))) (for-each (fn (x) (set-add! s x)) b) s)))
+    (if
+      (list? a)
+      (map (fn (x) (apl-bool (set-member? bset x))) a)
+      (apl-bool (set-member? bset a)))))
+
+;; Nub ∪A — unique elements, preserving order
+(define
+  (apl-nub v)
+  (let
+    ((seen (make-set)))
+    (letrec
+      ((go (fn (xs acc) (if (= (len xs) 0) (reverse acc) (if (set-member? seen (first xs)) (go (rest xs) acc) (begin (set-add! seen (first xs)) (go (rest xs) (cons (first xs) acc))))))))
+      (go v (list)))))
+
+;; Union A∪B — nub of concatenation
+(define (apl-union a b) (apl-nub (apl-cat a b)))
+
+;; Intersection A∩B
+(define
+  (apl-intersect a b)
+  (let
+    ((bset (let ((s (make-set))) (for-each (fn (x) (set-add! s x)) b) s)))
+    (filter (fn (x) (set-member? bset x)) a)))
+
+;; Without A~B
+(define
+  (apl-without a b)
+  (let
+    ((bset (let ((s (make-set))) (for-each (fn (x) (set-add! s x)) b) s)))
+    (filter (fn (x) (not (set-member? bset x))) a)))
+
+;; ---------------------------------------------------------------------------
+;; 9. Format (⍕) — APL-style display
+;; ---------------------------------------------------------------------------
+
+(define
+  (apl-format v)
+  (if
+    (list? v)
+    (letrec
+      ((go (fn (xs acc) (if (= (len xs) 0) acc (go (rest xs) (str acc (if (= acc "") "" " ") (str (first xs))))))))
+      (go v ""))
+    (str v)))

lib/apl/test.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# lib/apl/test.sh — smoke-test the APL runtime layer.
+
+set -uo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
+if [ ! -x "$SX_SERVER" ]; then
+  SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
+fi
+if [ ! -x "$SX_SERVER" ]; then
+  echo "ERROR: sx_server.exe not found."
+  exit 1
+fi
+
+TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
+
+cat > "$TMPFILE" << 'EPOCHS'
+(epoch 1)
+(load "spec/stdlib.sx")
+(load "lib/apl/runtime.sx")
+(epoch 2)
+(load "lib/apl/tests/runtime.sx")
+(epoch 3)
+(eval "(list apl-test-pass apl-test-fail)")
+EPOCHS
+
+OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
+
+LINE=$(echo "$OUTPUT" | awk '/^\(ok-len 3 / {getline; print; exit}')
+if [ -z "$LINE" ]; then
+  LINE=$(echo "$OUTPUT" | grep -E '^\(ok 3 \([0-9]+ [0-9]+\)\)' | tail -1 \
+          | sed -E 's/^\(ok 3 //; s/\)$//')
+fi
+if [ -z "$LINE" ]; then
+  echo "ERROR: could not extract summary"
+  echo "$OUTPUT" | tail -10
+  exit 1
+fi
+
+P=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\1/')
+F=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\2/')
+TOTAL=$((P + F))
+
+if [ "$F" -eq 0 ]; then
+  echo "ok $P/$TOTAL lib/apl tests passed"
+else
+  echo "FAIL $P/$TOTAL passed, $F failed"
+fi
+
+[ "$F" -eq 0 ]

lib/apl/tests/runtime.sx

@@ -0,0 +1,327 @@
+;; lib/apl/tests/runtime.sx — Tests for lib/apl/runtime.sx
+
+;; --- Test framework ---
+(define apl-test-pass 0)
+(define apl-test-fail 0)
+(define apl-test-fails (list))
+
+(define
+  (apl-test name got expected)
+  (if
+    (= got expected)
+    (set! apl-test-pass (+ apl-test-pass 1))
+    (begin
+      (set! apl-test-fail (+ apl-test-fail 1))
+      (set! apl-test-fails (append apl-test-fails (list {:got got :expected expected :name name}))))))
+
+;; ---------------------------------------------------------------------------
+;; 1. Core vector constructors
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "iota 5"
+  (apl-iota 5)
+  (list 1 2 3 4 5))
+(apl-test "iota 1" (apl-iota 1) (list 1))
+(apl-test "iota 0" (apl-iota 0) (list))
+(apl-test
+  "rho list"
+  (apl-rho (list 1 2 3))
+  3)
+(apl-test "rho scalar" (apl-rho 42) 1)
+(apl-test
+  "at 1"
+  (apl-at (list 10 20 30) 1)
+  10)
+(apl-test
+  "at 3"
+  (apl-at (list 10 20 30) 3)
+  30)
+
+;; ---------------------------------------------------------------------------
+;; 2. Arithmetic — element-wise and rank-polymorphic
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "add v+v"
+  (apl-add
+    (list 1 2 3)
+    (list 10 20 30))
+  (list 11 22 33))
+(apl-test
+  "add s+v"
+  (apl-add 10 (list 1 2 3))
+  (list 11 12 13))
+(apl-test
+  "add v+s"
+  (apl-add (list 1 2 3) 100)
+  (list 101 102 103))
+(apl-test "add s+s" (apl-add 3 4) 7)
+(apl-test
+  "sub v-v"
+  (apl-sub
+    (list 5 4 3)
+    (list 1 2 3))
+  (list 4 2 0))
+(apl-test
+  "mul v*s"
+  (apl-mul (list 1 2 3) 3)
+  (list 3 6 9))
+(apl-test
+  "neg -v"
+  (apl-neg (list 1 -2 3))
+  (list -1 2 -3))
+(apl-test
+  "abs v"
+  (apl-abs (list -1 2 -3))
+  (list 1 2 3))
+(apl-test
+  "floor v"
+  (apl-floor (list 1.7 2.2 3.9))
+  (list 1 2 3))
+(apl-test
+  "ceil v"
+  (apl-ceil (list 1.1 2.5 3))
+  (list 2 3 3))
+(apl-test
+  "max v v"
+  (apl-max
+    (list 1 5 3)
+    (list 4 2 6))
+  (list 4 5 6))
+(apl-test
+  "min v v"
+  (apl-min
+    (list 1 5 3)
+    (list 4 2 6))
+  (list 1 2 3))
+
+;; ---------------------------------------------------------------------------
+;; 3. Comparison (returns 0/1)
+;; ---------------------------------------------------------------------------
+
+(apl-test "eq 3 3" (apl-eq 3 3) 1)
+(apl-test "eq 3 4" (apl-eq 3 4) 0)
+(apl-test
+  "gt v>s"
+  (apl-gt (list 1 5 3 7) 4)
+  (list 0 1 0 1))
+(apl-test
+  "lt v<v"
+  (apl-lt
+    (list 1 2 3)
+    (list 3 2 1))
+  (list 1 0 0))
+(apl-test
+  "le v<=s"
+  (apl-le (list 3 4 5) 4)
+  (list 1 1 0))
+(apl-test
+  "ge v>=s"
+  (apl-ge (list 3 4 5) 4)
+  (list 0 1 1))
+(apl-test
+  "neq v!=s"
+  (apl-neq (list 1 2 3) 2)
+  (list 1 0 1))
+
+;; ---------------------------------------------------------------------------
+;; 4. Boolean logic (0/1 values)
+;; ---------------------------------------------------------------------------
+
+(apl-test "and 1 1" (apl-and 1 1) 1)
+(apl-test "and 1 0" (apl-and 1 0) 0)
+(apl-test "or 0 1" (apl-or 0 1) 1)
+(apl-test "or 0 0" (apl-or 0 0) 0)
+(apl-test "not 0" (apl-not 0) 1)
+(apl-test "not 1" (apl-not 1) 0)
+(apl-test
+  "not vec"
+  (apl-not (list 1 0 1 0))
+  (list 0 1 0 1))
+
+;; ---------------------------------------------------------------------------
+;; 5. Bitwise operations
+;; ---------------------------------------------------------------------------
+
+(apl-test "bitand s" (apl-bitand 5 3) 1)
+(apl-test "bitor s" (apl-bitor 5 3) 7)
+(apl-test "bitxor s" (apl-bitxor 5 3) 6)
+(apl-test "bitnot 0" (apl-bitnot 0) -1)
+(apl-test "lshift 1 4" (apl-lshift 1 4) 16)
+(apl-test "rshift 16 2" (apl-rshift 16 2) 4)
+(apl-test
+  "bitand vec"
+  (apl-bitand (list 5 6) (list 3 7))
+  (list 1 6))
+(apl-test
+  "bitor vec"
+  (apl-bitor (list 5 6) (list 3 7))
+  (list 7 7))
+
+;; ---------------------------------------------------------------------------
+;; 6. Reduction and scan
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "reduce-add"
+  (apl-reduce-add
+    (list 1 2 3 4 5))
+  15)
+(apl-test
+  "reduce-mul"
+  (apl-reduce-mul (list 1 2 3 4))
+  24)
+(apl-test
+  "reduce-max"
+  (apl-reduce-max
+    (list 3 1 4 1 5))
+  5)
+(apl-test
+  "reduce-min"
+  (apl-reduce-min
+    (list 3 1 4 1 5))
+  1)
+(apl-test
+  "reduce-and"
+  (apl-reduce-and (list 1 1 1))
+  1)
+(apl-test
+  "reduce-and0"
+  (apl-reduce-and (list 1 0 1))
+  0)
+(apl-test
+  "reduce-or"
+  (apl-reduce-or (list 0 1 0))
+  1)
+(apl-test
+  "scan-add"
+  (apl-scan-add (list 1 2 3 4))
+  (list 1 3 6 10))
+(apl-test
+  "scan-mul"
+  (apl-scan-mul (list 1 2 3 4))
+  (list 1 2 6 24))
+
+;; ---------------------------------------------------------------------------
+;; 7. Vector manipulation
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "reverse"
+  (apl-reverse (list 1 2 3 4))
+  (list 4 3 2 1))
+(apl-test
+  "cat v v"
+  (apl-cat (list 1 2) (list 3 4))
+  (list 1 2 3 4))
+(apl-test
+  "cat v s"
+  (apl-cat (list 1 2) 3)
+  (list 1 2 3))
+(apl-test
+  "cat s v"
+  (apl-cat 1 (list 2 3))
+  (list 1 2 3))
+(apl-test
+  "cat s s"
+  (apl-cat 1 2)
+  (list 1 2))
+(apl-test
+  "take 3"
+  (apl-take
+    3
+    (list 10 20 30 40 50))
+  (list 10 20 30))
+(apl-test
+  "take 0"
+  (apl-take 0 (list 1 2 3))
+  (list))
+(apl-test
+  "take neg"
+  (apl-take -2 (list 10 20 30))
+  (list 20 30))
+(apl-test
+  "drop 2"
+  (apl-drop 2 (list 10 20 30 40))
+  (list 30 40))
+(apl-test
+  "drop neg"
+  (apl-drop -1 (list 10 20 30))
+  (list 10 20))
+(apl-test
+  "rotate 2"
+  (apl-rotate
+    2
+    (list 1 2 3 4 5))
+  (list 3 4 5 1 2))
+(apl-test
+  "compress"
+  (apl-compress
+    (list 1 0 1 0)
+    (list 10 20 30 40))
+  (list 10 30))
+(apl-test
+  "index"
+  (apl-index
+    (list 10 20 30 40)
+    (list 2 4))
+  (list 20 40))
+
+;; ---------------------------------------------------------------------------
+;; 8. Set operations
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "member yes"
+  (apl-member
+    (list 1 2 5)
+    (list 2 4 6))
+  (list 0 1 0))
+(apl-test
+  "member s"
+  (apl-member 2 (list 1 2 3))
+  1)
+(apl-test
+  "member no"
+  (apl-member 9 (list 1 2 3))
+  0)
+(apl-test
+  "nub"
+  (apl-nub (list 1 2 1 3 2))
+  (list 1 2 3))
+(apl-test
+  "union"
+  (apl-union
+    (list 1 2 3)
+    (list 2 3 4))
+  (list 1 2 3 4))
+(apl-test
+  "intersect"
+  (apl-intersect
+    (list 1 2 3 4)
+    (list 2 4 6))
+  (list 2 4))
+(apl-test
+  "without"
+  (apl-without
+    (list 1 2 3 4)
+    (list 2 4))
+  (list 1 3))
+
+;; ---------------------------------------------------------------------------
+;; 9. Format
+;; ---------------------------------------------------------------------------
+
+(apl-test
+  "format vec"
+  (apl-format (list 1 2 3))
+  "1 2 3")
+(apl-test "format scalar" (apl-format 42) "42")
+(apl-test "format empty" (apl-format (list)) "")
+
+;; ---------------------------------------------------------------------------
+;; Summary
+;; ---------------------------------------------------------------------------
+
+(list apl-test-pass apl-test-fail)

lib/common-lisp/runtime.sx

@@ -0,0 +1,306 @@
+;; lib/common-lisp/runtime.sx — CL built-ins using SX spec primitives
+;;
+;; Provides CL-specific wrappers and helpers. Deliberately thin: wherever
+;; an SX spec primitive already does the job, we alias it rather than
+;; reinventing it.
+;;
+;; Primitives used from spec:
+;;   char/char->integer/integer->char/char-upcase/char-downcase
+;;   format   (Phase 21 — must be loaded before this file)
+;;   gensym   (Phase 12)
+;;   rational/rational?  (Phase 16)
+;;   make-set/set-member?/set-union/etc  (Phase 18)
+;;   open-input-string/read-char/etc  (Phase 14)
+;;   modulo/remainder/quotient/gcd/lcm/expt  (Phase 2 / Phase 15)
+;;   number->string with radix  (Phase 15)
+
+;; ---------------------------------------------------------------------------
+;; 1.  Type predicates
+;; ---------------------------------------------------------------------------
+
+(define (cl-null? x) (= x nil))
+(define (cl-consp? x) (and (list? x) (not (cl-empty? x))))
+(define (cl-listp? x) (or (cl-empty? x) (list? x)))
+(define (cl-atom? x) (not (cl-consp? x)))
+
+(define
+  (cl-numberp? x)
+  (let ((t (type-of x))) (or (= t "number") (= t "rational"))))
+
+(define cl-integerp? integer?)
+(define cl-floatp? float?)
+(define cl-rationalp? rational?)
+
+(define (cl-realp? x) (or (integer? x) (float? x) (rational? x)))
+
+(define cl-characterp? char?)
+(define cl-stringp? (fn (x) (= (type-of x) "string")))
+(define cl-symbolp? (fn (x) (= (type-of x) "symbol")))
+(define cl-keywordp? (fn (x) (= (type-of x) "keyword")))
+
+(define
+  (cl-functionp? x)
+  (let
+    ((t (type-of x)))
+    (or
+      (= t "function")
+      (= t "lambda")
+      (= t "native-fn")
+      (= t "component"))))
+
+(define cl-vectorp? vector?)
+(define cl-arrayp? vector?)
+
+;; sx_server: (rest (list x)) returns () not nil — cl-empty? handles both
+(define
+  (cl-empty? x)
+  (or (nil? x) (and (list? x) (= (len x) 0))))
+
+;; ---------------------------------------------------------------------------
+;; 2.  Arithmetic — thin aliases to spec primitives
+;; ---------------------------------------------------------------------------
+
+(define cl-mod modulo)
+(define cl-rem remainder)
+(define cl-gcd gcd)
+(define cl-lcm lcm)
+(define cl-expt expt)
+(define cl-floor floor)
+(define cl-ceiling ceil)
+(define cl-truncate truncate)
+(define cl-round round)
+(define cl-abs (fn (x) (if (< x 0) (- 0 x) x)))
+(define cl-min (fn (a b) (if (< a b) a b)))
+(define cl-max (fn (a b) (if (> a b) a b)))
+(define cl-quotient quotient)
+
+(define
+  (cl-signum x)
+  (cond
+    ((> x 0) 1)
+    ((< x 0) -1)
+    (else 0)))
+
+(define (cl-evenp? n) (= (modulo n 2) 0))
+(define (cl-oddp? n) (= (modulo n 2) 1))
+(define (cl-zerop? n) (= n 0))
+(define (cl-plusp? n) (> n 0))
+(define (cl-minusp? n) (< n 0))
+
+;; ---------------------------------------------------------------------------
+;; 3.  Character functions — alias spec char primitives + CL name mapping
+;; ---------------------------------------------------------------------------
+
+(define cl-char->integer char->integer)
+(define cl-integer->char integer->char)
+(define cl-char-upcase char-upcase)
+(define cl-char-downcase char-downcase)
+(define cl-char-code char->integer)
+(define cl-code-char integer->char)
+
+(define cl-char=? char=?)
+(define cl-char<? char<?)
+(define cl-char>? char>?)
+(define cl-char<=? char<=?)
+(define cl-char>=? char>=?)
+(define cl-char-ci=? char-ci=?)
+(define cl-char-ci<? char-ci<?)
+(define cl-char-ci>? char-ci>?)
+
+;; Inline predicates — char-alphabetic?/char-numeric? unreliable in sx_server
+(define
+  (cl-alpha-char-p c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (and (>= n 65) (<= n 90))
+      (and (>= n 97) (<= n 122)))))
+
+(define
+  (cl-digit-char-p c)
+  (let ((n (char->integer c))) (and (>= n 48) (<= n 57))))
+
+(define
+  (cl-alphanumericp c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (and (>= n 48) (<= n 57))
+      (and (>= n 65) (<= n 90))
+      (and (>= n 97) (<= n 122)))))
+
+(define
+  (cl-upper-case-p c)
+  (let ((n (char->integer c))) (and (>= n 65) (<= n 90))))
+
+(define
+  (cl-lower-case-p c)
+  (let ((n (char->integer c))) (and (>= n 97) (<= n 122))))
+
+;; Named character constants
+(define cl-char-space (integer->char 32))
+(define cl-char-newline (integer->char 10))
+(define cl-char-tab (integer->char 9))
+(define cl-char-backspace (integer->char 8))
+(define cl-char-return (integer->char 13))
+(define cl-char-null (integer->char 0))
+(define cl-char-escape (integer->char 27))
+(define cl-char-delete (integer->char 127))
+
+;; ---------------------------------------------------------------------------
+;; 4.  String + IO — use spec format and ports
+;; ---------------------------------------------------------------------------
+
+;; CL format: (cl-format nil "~a ~a" x y) — nil destination means return string
+(define
+  (cl-format dest template &rest args)
+  (let ((s (apply format (cons template args)))) (if (= dest nil) s s)))
+
+(define cl-write-to-string write-to-string)
+(define cl-princ-to-string display-to-string)
+
+;; CL read-from-string: parse value from a string using SX port
+(define
+  (cl-read-from-string s)
+  (let ((p (open-input-string s))) (read p)))
+
+;; String stream (output)
+(define cl-make-string-output-stream open-output-string)
+(define cl-get-output-stream-string get-output-string)
+
+;; String stream (input)
+(define cl-make-string-input-stream open-input-string)
+
+;; ---------------------------------------------------------------------------
+;; 5.  Gensym
+;; ---------------------------------------------------------------------------
+
+(define cl-gensym gensym)
+(define cl-gentemp gensym)
+
+;; ---------------------------------------------------------------------------
+;; 6.  Multiple values (CL: values / nth-value)
+;; ---------------------------------------------------------------------------
+
+(define (cl-values &rest args) {:_values true :_list args})
+
+(define
+  (cl-call-with-values producer consumer)
+  (let
+    ((mv (producer)))
+    (if
+      (and (dict? mv) (get mv :_values))
+      (apply consumer (get mv :_list))
+      (consumer mv))))
+
+(define
+  (cl-nth-value n mv)
+  (cond
+    ((and (dict? mv) (get mv :_values))
+      (let
+        ((lst (get mv :_list)))
+        (if (>= n (len lst)) nil (nth lst n))))
+    ((= n 0) mv)
+    (else nil)))
+
+;; ---------------------------------------------------------------------------
+;; 7.  Sets (CL: adjoin / member / union / intersection / set-difference)
+;; ---------------------------------------------------------------------------
+
+(define cl-make-set make-set)
+(define cl-set? set?)
+(define cl-set-add set-add!)
+(define cl-set-memberp set-member?)
+(define cl-set-remove set-remove!)
+(define cl-set-union set-union)
+(define cl-set-intersect set-intersection)
+(define cl-set-difference set-difference)
+(define cl-list->set list->set)
+(define cl-set->list set->list)
+
+;; CL: (member item list) — returns tail starting at item, or nil
+(define
+  (cl-member item lst)
+  (cond
+    ((cl-empty? lst) nil)
+    ((equal? item (first lst)) lst)
+    (else (cl-member item (rest lst)))))
+
+;; CL: (adjoin item list) — cons only if not already present
+(define (cl-adjoin item lst) (if (cl-member item lst) lst (cons item lst)))
+
+;; ---------------------------------------------------------------------------
+;; 8.  Radix formatting  (CL: (write-to-string n :base radix))
+;; ---------------------------------------------------------------------------
+
+(define (cl-integer-to-string n radix) (number->string n radix))
+
+(define (cl-string-to-integer s radix) (string->number s radix))
+
+;; CL ~R directive helpers
+(define (cl-format-binary n) (number->string n 2))
+(define (cl-format-octal n) (number->string n 8))
+(define (cl-format-hex n) (number->string n 16))
+(define (cl-format-decimal n) (number->string n 10))
+
+;; ---------------------------------------------------------------------------
+;; 9.  List utilities — cl-empty? guards against () from rest
+;; ---------------------------------------------------------------------------
+
+(define
+  (cl-last lst)
+  (cond
+    ((cl-empty? lst) nil)
+    ((cl-empty? (rest lst)) lst)
+    (else (cl-last (rest lst)))))
+
+(define
+  (cl-butlast lst)
+  (if
+    (or (cl-empty? lst) (cl-empty? (rest lst)))
+    nil
+    (cons (first lst) (cl-butlast (rest lst)))))
+
+(define
+  (cl-nthcdr n lst)
+  (if (= n 0) lst (cl-nthcdr (- n 1) (rest lst))))
+
+(define (cl-nth n lst) (first (cl-nthcdr n lst)))
+
+(define (cl-list-length lst) (len lst))
+
+(define
+  (cl-copy-list lst)
+  (if (cl-empty? lst) nil (cons (first lst) (cl-copy-list (rest lst)))))
+
+(define
+  (cl-flatten lst)
+  (cond
+    ((cl-empty? lst) nil)
+    ((list? (first lst))
+      (append (cl-flatten (first lst)) (cl-flatten (rest lst))))
+    (else (cons (first lst) (cl-flatten (rest lst))))))
+
+;; CL: (assoc key alist) — returns matching pair or nil
+(define
+  (cl-assoc key alist)
+  (cond
+    ((cl-empty? alist) nil)
+    ((equal? key (first (first alist))) (first alist))
+    (else (cl-assoc key (rest alist)))))
+
+;; CL: (rassoc val alist) — reverse assoc (match on second element)
+(define
+  (cl-rassoc val alist)
+  (cond
+    ((cl-empty? alist) nil)
+    ((equal? val (first (rest (first alist)))) (first alist))
+    (else (cl-rassoc val (rest alist)))))
+
+;; CL: (getf plist key) — property list lookup
+(define
+  (cl-getf plist key)
+  (cond
+    ((or (cl-empty? plist) (cl-empty? (rest plist))) nil)
+    ((equal? (first plist) key) (first (rest plist)))
+    (else (cl-getf (rest (rest plist)) key))))

lib/common-lisp/test.sh

@@ -0,0 +1,302 @@
+#!/usr/bin/env bash
+# lib/common-lisp/test.sh — quick smoke-test the CL runtime layer.
+# Uses sx_server.exe epoch protocol (same as lib/lua/test.sh).
+#
+# Usage:
+#   bash lib/common-lisp/test.sh
+#   bash lib/common-lisp/test.sh -v
+
+set -uo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
+if [ ! -x "$SX_SERVER" ]; then
+  SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
+fi
+if [ ! -x "$SX_SERVER" ]; then
+  echo "ERROR: sx_server.exe not found. Run: cd hosts/ocaml && dune build"
+  exit 1
+fi
+
+VERBOSE="${1:-}"
+PASS=0; FAIL=0; ERRORS=""
+TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
+
+cat > "$TMPFILE" << 'EPOCHS'
+(epoch 1)
+(load "spec/stdlib.sx")
+(load "lib/common-lisp/runtime.sx")
+
+;; --- Type predicates ---
+(epoch 10)
+(eval "(cl-null? nil)")
+(epoch 11)
+(eval "(cl-null? false)")
+(epoch 12)
+(eval "(cl-consp? (list 1 2))")
+(epoch 13)
+(eval "(cl-consp? nil)")
+(epoch 14)
+(eval "(cl-listp? nil)")
+(epoch 15)
+(eval "(cl-listp? (list 1))")
+(epoch 16)
+(eval "(cl-atom? nil)")
+(epoch 17)
+(eval "(cl-atom? (list 1))")
+(epoch 18)
+(eval "(cl-integerp? 42)")
+(epoch 19)
+(eval "(cl-floatp? 3.14)")
+(epoch 20)
+(eval "(cl-characterp? (integer->char 65))")
+(epoch 21)
+(eval "(cl-stringp? \"hello\")")
+
+;; --- Arithmetic ---
+(epoch 30)
+(eval "(cl-mod 10 3)")
+(epoch 31)
+(eval "(cl-rem 10 3)")
+(epoch 32)
+(eval "(cl-quotient 10 3)")
+(epoch 33)
+(eval "(cl-gcd 12 8)")
+(epoch 34)
+(eval "(cl-lcm 4 6)")
+(epoch 35)
+(eval "(cl-abs -5)")
+(epoch 36)
+(eval "(cl-abs 5)")
+(epoch 37)
+(eval "(cl-min 2 7)")
+(epoch 38)
+(eval "(cl-max 2 7)")
+(epoch 39)
+(eval "(cl-evenp? 4)")
+(epoch 40)
+(eval "(cl-evenp? 3)")
+(epoch 41)
+(eval "(cl-oddp? 7)")
+(epoch 42)
+(eval "(cl-zerop? 0)")
+(epoch 43)
+(eval "(cl-plusp? 1)")
+(epoch 44)
+(eval "(cl-minusp? -1)")
+(epoch 45)
+(eval "(cl-signum 42)")
+(epoch 46)
+(eval "(cl-signum -7)")
+(epoch 47)
+(eval "(cl-signum 0)")
+
+;; --- Characters ---
+(epoch 50)
+(eval "(cl-char-code (integer->char 65))")
+(epoch 51)
+(eval "(char? (cl-code-char 65))")
+(epoch 52)
+(eval "(cl-char=? (integer->char 65) (integer->char 65))")
+(epoch 53)
+(eval "(cl-char<? (integer->char 65) (integer->char 90))")
+(epoch 54)
+(eval "(cl-char-code cl-char-space)")
+(epoch 55)
+(eval "(cl-char-code cl-char-newline)")
+(epoch 56)
+(eval "(cl-alpha-char-p (integer->char 65))")
+(epoch 57)
+(eval "(cl-digit-char-p (integer->char 48))")
+
+;; --- Format ---
+(epoch 60)
+(eval "(cl-format nil \"hello\")")
+(epoch 61)
+(eval "(cl-format nil \"~a\" \"world\")")
+(epoch 62)
+(eval "(cl-format nil \"~d\" 42)")
+(epoch 63)
+(eval "(cl-format nil \"~x\" 255)")
+(epoch 64)
+(eval "(cl-format nil \"x=~d y=~d\" 3 4)")
+
+;; --- Gensym ---
+(epoch 70)
+(eval "(= (type-of (cl-gensym)) \"symbol\")")
+(epoch 71)
+(eval "(not (= (cl-gensym) (cl-gensym)))")
+
+;; --- Sets ---
+(epoch 80)
+(eval "(cl-set? (cl-make-set))")
+(epoch 81)
+(eval "(let ((s (cl-make-set))) (do (cl-set-add s 1) (cl-set-memberp s 1)))")
+(epoch 82)
+(eval "(cl-set-memberp (cl-make-set) 42)")
+(epoch 83)
+(eval "(cl-set-memberp (cl-list->set (list 1 2 3)) 2)")
+
+;; --- Lists ---
+(epoch 90)
+(eval "(cl-nth 0 (list 1 2 3))")
+(epoch 91)
+(eval "(cl-nth 2 (list 1 2 3))")
+(epoch 92)
+(eval "(cl-last (list 1 2 3))")
+(epoch 93)
+(eval "(cl-butlast (list 1 2 3))")
+(epoch 94)
+(eval "(cl-nthcdr 1 (list 1 2 3))")
+(epoch 95)
+(eval "(cl-assoc \"b\" (list (list \"a\" 1) (list \"b\" 2)))")
+(epoch 96)
+(eval "(cl-assoc \"z\" (list (list \"a\" 1)))")
+(epoch 97)
+(eval "(cl-getf (list \"x\" 42 \"y\" 99) \"x\")")
+(epoch 98)
+(eval "(cl-adjoin 0 (list 1 2))")
+(epoch 99)
+(eval "(cl-adjoin 1 (list 1 2))")
+(epoch 100)
+(eval "(cl-member 2 (list 1 2 3))")
+(epoch 101)
+(eval "(cl-member 9 (list 1 2 3))")
+(epoch 102)
+(eval "(cl-flatten (list 1 (list 2 3) 4))")
+
+;; --- Radix ---
+(epoch 110)
+(eval "(cl-format-binary 10)")
+(epoch 111)
+(eval "(cl-format-octal 15)")
+(epoch 112)
+(eval "(cl-format-hex 255)")
+(epoch 113)
+(eval "(cl-format-decimal 42)")
+(epoch 114)
+(eval "(cl-integer-to-string 31 16)")
+(epoch 115)
+(eval "(cl-string-to-integer \"1f\" 16)")
+
+EPOCHS
+
+OUTPUT=$(timeout 30 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
+
+check() {
+  local epoch="$1" desc="$2" expected="$3"
+  local actual
+  # ok-len format: value appears on the line AFTER "(ok-len N length)"
+  actual=$(echo "$OUTPUT" | grep -A1 "^(ok-len $epoch " | tail -1 || true)
+  # strip any leading "(ok-len ...)" if grep -A1 returned it instead
+  if echo "$actual" | grep -q "^(ok-len"; then actual=""; fi
+  if [ -z "$actual" ]; then
+    actual=$(echo "$OUTPUT" | grep "^(ok $epoch " | head -1 || true)
+  fi
+  if [ -z "$actual" ]; then
+    actual=$(echo "$OUTPUT" | grep "^(error $epoch " | head -1 || true)
+  fi
+  [ -z "$actual" ] && actual="<no output for epoch $epoch>"
+
+  if echo "$actual" | grep -qF -- "$expected"; then
+    PASS=$((PASS+1))
+    [ "$VERBOSE" = "-v" ] && echo "  ok $desc"
+  else
+    FAIL=$((FAIL+1))
+    ERRORS+="  FAIL [$desc] (epoch $epoch) expected: $expected | actual: $actual
+"
+  fi
+}
+
+# Type predicates
+check 10  "cl-null? nil"           "true"
+check 11  "cl-null? false"         "false"
+check 12  "cl-consp? pair"         "true"
+check 13  "cl-consp? nil"          "false"
+check 14  "cl-listp? nil"          "true"
+check 15  "cl-listp? list"         "true"
+check 16  "cl-atom? nil"           "true"
+check 17  "cl-atom? pair"          "false"
+check 18  "cl-integerp?"           "true"
+check 19  "cl-floatp?"             "true"
+check 20  "cl-characterp?"         "true"
+check 21  "cl-stringp?"            "true"
+
+# Arithmetic
+check 30  "cl-mod 10 3"            "1"
+check 31  "cl-rem 10 3"            "1"
+check 32  "cl-quotient 10 3"       "3"
+check 33  "cl-gcd 12 8"            "4"
+check 34  "cl-lcm 4 6"             "12"
+check 35  "cl-abs -5"              "5"
+check 36  "cl-abs 5"               "5"
+check 37  "cl-min 2 7"             "2"
+check 38  "cl-max 2 7"             "7"
+check 39  "cl-evenp? 4"            "true"
+check 40  "cl-evenp? 3"            "false"
+check 41  "cl-oddp? 7"             "true"
+check 42  "cl-zerop? 0"            "true"
+check 43  "cl-plusp? 1"            "true"
+check 44  "cl-minusp? -1"          "true"
+check 45  "cl-signum pos"          "1"
+check 46  "cl-signum neg"          "-1"
+check 47  "cl-signum zero"         "0"
+
+# Characters
+check 50  "cl-char-code"           "65"
+check 51  "code-char returns char" "true"
+check 52  "cl-char=?"              "true"
+check 53  "cl-char<?"              "true"
+check 54  "cl-char-space code"     "32"
+check 55  "cl-char-newline code"   "10"
+check 56  "cl-alpha-char-p A"      "true"
+check 57  "cl-digit-char-p 0"      "true"
+
+# Format
+check 60  "cl-format plain"        '"hello"'
+check 61  "cl-format ~a"           '"world"'
+check 62  "cl-format ~d"           '"42"'
+check 63  "cl-format ~x"           '"ff"'
+check 64  "cl-format multi"        '"x=3 y=4"'
+
+# Gensym
+check 70  "gensym returns symbol"  "true"
+check 71  "gensyms are unique"     "true"
+
+# Sets
+check 80  "make-set is set?"       "true"
+check 81  "set-add + member"       "true"
+check 82  "member in empty"        "false"
+check 83  "list->set member"       "true"
+
+# Lists
+check 90  "cl-nth 0"               "1"
+check 91  "cl-nth 2"               "3"
+check 92  "cl-last"                "(3)"
+check 93  "cl-butlast"             "(1 2)"
+check 94  "cl-nthcdr 1"            "(2 3)"
+check 95  "cl-assoc hit"           '("b" 2)'
+check 96  "cl-assoc miss"          "nil"
+check 97  "cl-getf hit"            "42"
+check 98  "cl-adjoin new"          "(0 1 2)"
+check 99  "cl-adjoin dup"          "(1 2)"
+check 100 "cl-member hit"          "(2 3)"
+check 101 "cl-member miss"         "nil"
+check 102 "cl-flatten"             "(1 2 3 4)"
+
+# Radix
+check 110 "cl-format-binary 10"    '"1010"'
+check 111 "cl-format-octal 15"     '"17"'
+check 112 "cl-format-hex 255"      '"ff"'
+check 113 "cl-format-decimal 42"   '"42"'
+check 114 "n->s base 16"           '"1f"'
+check 115 "s->n base 16"           "31"
+
+TOTAL=$((PASS+FAIL))
+if [ $FAIL -eq 0 ]; then
+  echo "ok $PASS/$TOTAL lib/common-lisp tests passed"
+else
+  echo "FAIL $PASS/$TOTAL passed, $FAIL failed:"
+  echo "$ERRORS"
+fi
+[ $FAIL -eq 0 ]

lib/erlang/runtime.sx

@@ -0,0 +1,230 @@
+;; lib/erlang/runtime.sx — Erlang BIFs and stdlib wrappers on SX primitives
+;;
+;; Provides Erlang-idiomatic wrappers. Thin where spec primitives match;
+;; inline where Erlang semantics differ (e.g. rem sign, integer division).
+;;
+;; Primitives used from spec:
+;;   integer?/float?            (Phase 2)
+;;   remainder/quotient         (Phase 2 / Phase 15)
+;;   bitwise-and/or/xor/not     (Phase 7)
+;;   arithmetic-shift           (Phase 7)
+;;   make-set/set-add!/etc      (Phase 18)
+;;   make-regexp/regexp-match/etc (Phase 20)
+;;   gcd                        (Phase 15)
+
+;; ---------------------------------------------------------------------------
+;; 1.  Numeric tower — type predicates + conversions
+;; ---------------------------------------------------------------------------
+
+(define er-is-integer? integer?)
+(define er-is-float? float?)
+(define (er-is-number? x) (or (integer? x) (float? x)))
+(define (er-is-atom? x) (= (type-of x) "symbol"))
+(define er-is-list? list?)
+(define er-is-binary? bytevector?)
+
+;; Erlang float/1 coerces an integer to float
+(define (er-float x) (* 1 x))
+
+;; Erlang trunc/1 — truncate toward zero
+(define er-trunc truncate)
+
+;; Erlang round/1 — round to nearest integer
+(define er-round round)
+
+;; Erlang abs/1
+(define er-abs abs)
+
+;; Erlang max/min (BIFs in OTP 26)
+(define (er-max a b) (if (>= a b) a b))
+(define (er-min a b) (if (<= a b) a b))
+
+;; ---------------------------------------------------------------------------
+;; 2.  Integer arithmetic — div + rem (Erlang semantics)
+;; ---------------------------------------------------------------------------
+
+;; Erlang div: integer division truncating toward zero
+(define er-div quotient)
+
+;; Erlang rem: remainder with sign of dividend (matches remainder primitive)
+(define er-rem remainder)
+
+;; Erlang gcd (non-standard BIF but useful)
+(define er-gcd gcd)
+
+;; ---------------------------------------------------------------------------
+;; 3.  Bitwise ops — band / bor / bxor / bnot / bsl / bsr
+;; ---------------------------------------------------------------------------
+
+(define er-band bitwise-and)
+(define er-bor bitwise-or)
+(define er-bxor bitwise-xor)
+(define er-bnot bitwise-not)
+
+;; bsl: bit shift left by N positions
+(define (er-bsl x n) (arithmetic-shift x n))
+
+;; bsr: bit shift right by N positions
+(define (er-bsr x n) (arithmetic-shift x (- 0 n)))
+
+;; ---------------------------------------------------------------------------
+;; 4.  Sets module — thin wrappers matching Erlang sets API
+;; ---------------------------------------------------------------------------
+
+(define er-sets-new make-set)
+(define er-sets-add-element set-add!)
+(define er-sets-is-element set-member?)
+(define er-sets-del-element set-remove!)
+(define er-sets-union set-union)
+(define er-sets-intersection set-intersection)
+(define er-sets-subtract set-difference)
+(define er-sets-to-list set->list)
+(define er-sets-from-list list->set)
+(define (er-sets-size s) (len (set->list s)))
+(define (er-sets-is-set? x) (set? x))
+
+;; ---------------------------------------------------------------------------
+;; 5.  Regexp — re module wrappers
+;; ---------------------------------------------------------------------------
+
+;; er-re-run: returns match dict or nil (no match)
+(define
+  (er-re-run subject pattern)
+  (regexp-match (make-regexp pattern) subject))
+
+;; er-re-replace: replace first match
+(define
+  (er-re-replace subject pattern replacement)
+  (regexp-replace (make-regexp pattern) subject replacement))
+
+;; er-re-replace-all: global replace
+(define
+  (er-re-replace-all subject pattern replacement)
+  (regexp-replace-all (make-regexp pattern) subject replacement))
+
+;; er-re-match-groups: extract capture groups from a match result
+(define (er-re-match-groups m) (if (= m nil) nil (get m :groups)))
+
+;; er-re-split: split string on regexp delimiter
+(define
+  (er-re-split subject pattern)
+  (let
+    ((re (make-regexp pattern))
+      (ms (regexp-match-all (make-regexp pattern) subject)))
+    (if
+      (= (len ms) 0)
+      (list subject)
+      (letrec
+        ((go (fn (matches pos acc) (if (= (len matches) 0) (append acc (list (substring subject pos (len subject)))) (let ((m (first matches)) (start (get (first matches) :start)) (end (get (first matches) :end))) (go (rest matches) end (append acc (list (substring subject pos start)))))))))
+        (go ms 0 (list))))))
+
+;; ---------------------------------------------------------------------------
+;; 6.  List BIFs — hd/tl/length + lists module
+;; ---------------------------------------------------------------------------
+
+(define (er-hd lst) (first lst))
+(define (er-tl lst) (rest lst))
+(define (er-length lst) (len lst))
+
+;; lists:member/2
+(define
+  (er-lists-member elem lst)
+  (cond
+    ((= (len lst) 0) false)
+    ((= elem (first lst)) true)
+    (else (er-lists-member elem (rest lst)))))
+
+;; lists:reverse/1
+(define er-lists-reverse reverse)
+
+;; lists:append/2
+(define er-lists-append append)
+
+;; lists:flatten/1
+(define
+  (er-lists-flatten lst)
+  (cond
+    ((= (len lst) 0) (list))
+    ((list? (first lst))
+      (append (er-lists-flatten (first lst)) (er-lists-flatten (rest lst))))
+    (else (cons (first lst) (er-lists-flatten (rest lst))))))
+
+;; lists:nth/2 — 1-indexed
+(define (er-lists-nth n lst) (nth lst (- n 1)))
+
+;; lists:map/2
+(define er-lists-map map)
+
+;; lists:filter/2
+(define er-lists-filter filter)
+
+;; lists:foldl/3 — (Fun, Acc0, List)
+(define
+  (er-lists-foldl f acc lst)
+  (if
+    (= (len lst) 0)
+    acc
+    (er-lists-foldl f (f (first lst) acc) (rest lst))))
+
+;; lists:foldr/3
+(define
+  (er-lists-foldr f acc lst)
+  (if
+    (= (len lst) 0)
+    acc
+    (f (first lst) (er-lists-foldr f acc (rest lst)))))
+
+;; lists:zip/2
+(define
+  (er-lists-zip a b)
+  (if
+    (or (= (len a) 0) (= (len b) 0))
+    (list)
+    (cons (list (first a) (first b)) (er-lists-zip (rest a) (rest b)))))
+
+;; lists:seq/2 — generate integer range (1-indexed like Erlang)
+(define
+  (er-lists-seq from to)
+  (if
+    (> from to)
+    (list)
+    (cons from (er-lists-seq (+ from 1) to))))
+
+;; ---------------------------------------------------------------------------
+;; 7.  Type conversion BIFs
+;; ---------------------------------------------------------------------------
+
+;; atom_to_list/1 — convert atom (symbol) to its name string
+(define (er-atom-to-list a) (symbol->string a))
+
+;; list_to_atom/1 — convert string to atom (symbol)
+(define (er-list-to-atom s) (make-symbol s))
+
+;; integer_to_list/1
+(define (er-integer-to-list n) (str n))
+
+;; list_to_integer/1
+(define (er-list-to-integer s) (truncate (parse-number s)))
+
+;; float_to_list/1
+(define (er-float-to-list f) (str f))
+
+;; list_to_float/1
+(define (er-list-to-float s) (* 1 (parse-number s)))
+
+;; integer_to_list/2 — with radix (e.g. 16 for hex)
+(define (er-integer-to-list-radix n radix) (number->string n radix))
+
+;; ---------------------------------------------------------------------------
+;; 8.  ok/error tuple helpers — Erlang idiom {ok, Val} / {error, Reason}
+;; ---------------------------------------------------------------------------
+
+(define (er-ok val) (list "ok" val))
+(define (er-error reason) (list "error" reason))
+(define
+  (er-is-ok? t)
+  (and (list? t) (= (len t) 2) (= (first t) "ok")))
+(define
+  (er-is-error? t)
+  (and (list? t) (= (len t) 2) (= (first t) "error")))
+(define (er-unwrap t) (nth t 1))

lib/erlang/test.sh

@@ -0,0 +1,260 @@
+#!/usr/bin/env bash
+# lib/erlang/test.sh — smoke-test the Erlang runtime layer.
+# Uses sx_server.exe epoch protocol.
+#
+# Usage:
+#   bash lib/erlang/test.sh
+#   bash lib/erlang/test.sh -v
+
+set -uo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
+if [ ! -x "$SX_SERVER" ]; then
+  SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
+fi
+if [ ! -x "$SX_SERVER" ]; then
+  echo "ERROR: sx_server.exe not found. Run: cd hosts/ocaml && dune build"
+  exit 1
+fi
+
+VERBOSE="${1:-}"
+PASS=0; FAIL=0; ERRORS=""
+TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
+
+cat > "$TMPFILE" << 'EPOCHS'
+(epoch 1)
+(load "lib/erlang/runtime.sx")
+
+;; --- Numeric tower ---
+(epoch 10)
+(eval "(er-is-integer? 42)")
+(epoch 11)
+(eval "(er-is-integer? 3.14)")
+(epoch 12)
+(eval "(er-is-float? 3.14)")
+(epoch 13)
+(eval "(er-is-float? 42)")
+(epoch 14)
+(eval "(er-is-number? 42)")
+(epoch 15)
+(eval "(er-is-number? 3.14)")
+(epoch 16)
+(eval "(er-float 5)")
+(epoch 17)
+(eval "(er-trunc 3.9)")
+(epoch 18)
+(eval "(er-round 3.5)")
+(epoch 19)
+(eval "(er-abs -7)")
+(epoch 20)
+(eval "(er-max 3 7)")
+(epoch 21)
+(eval "(er-min 3 7)")
+
+;; --- div + rem ---
+(epoch 30)
+(eval "(er-div 10 3)")
+(epoch 31)
+(eval "(er-div -10 3)")
+(epoch 32)
+(eval "(er-rem 10 3)")
+(epoch 33)
+(eval "(er-rem -10 3)")
+(epoch 34)
+(eval "(er-gcd 12 8)")
+
+;; --- Bitwise ---
+(epoch 40)
+(eval "(er-band 12 10)")
+(epoch 41)
+(eval "(er-bor 12 10)")
+(epoch 42)
+(eval "(er-bxor 12 10)")
+(epoch 43)
+(eval "(er-bnot 0)")
+(epoch 44)
+(eval "(er-bsl 1 4)")
+(epoch 45)
+(eval "(er-bsr 16 2)")
+
+;; --- Sets ---
+(epoch 50)
+(eval "(er-sets-is-set? (er-sets-new))")
+(epoch 51)
+(eval "(let ((s (er-sets-new))) (do (er-sets-add-element s 1) (er-sets-is-element s 1)))")
+(epoch 52)
+(eval "(er-sets-is-element (er-sets-new) 42)")
+(epoch 53)
+(eval "(er-sets-is-element (er-sets-from-list (list 1 2 3)) 2)")
+(epoch 54)
+(eval "(er-sets-size (er-sets-from-list (list 1 2 3)))")
+(epoch 55)
+(eval "(len (er-sets-to-list (er-sets-from-list (list 1 2 3))))")
+
+;; --- Regexp ---
+(epoch 60)
+(eval "(not (= (er-re-run \"hello\" \"ll\") nil))")
+(epoch 61)
+(eval "(= (er-re-run \"hello\" \"xyz\") nil)")
+(epoch 62)
+(eval "(get (er-re-run \"hello\" \"ll\") :match)")
+(epoch 63)
+(eval "(er-re-replace \"hello\" \"l\" \"r\")")
+(epoch 64)
+(eval "(er-re-replace-all \"hello\" \"l\" \"r\")")
+(epoch 65)
+(eval "(er-re-match-groups (er-re-run \"hello world\" \"(\\w+)\\s+(\\w+)\"))")
+(epoch 66)
+(eval "(len (er-re-split \"a,b,c\" \",\"))")
+
+;; --- List BIFs ---
+(epoch 70)
+(eval "(er-hd (list 1 2 3))")
+(epoch 71)
+(eval "(er-tl (list 1 2 3))")
+(epoch 72)
+(eval "(er-length (list 1 2 3))")
+(epoch 73)
+(eval "(er-lists-member 2 (list 1 2 3))")
+(epoch 74)
+(eval "(er-lists-member 9 (list 1 2 3))")
+(epoch 75)
+(eval "(er-lists-reverse (list 1 2 3))")
+(epoch 76)
+(eval "(er-lists-nth 2 (list 10 20 30))")
+(epoch 77)
+(eval "(er-lists-foldl + 0 (list 1 2 3 4 5))")
+(epoch 78)
+(eval "(er-lists-seq 1 5)")
+(epoch 79)
+(eval "(er-lists-flatten (list 1 (list 2 3) (list 4 (list 5))))")
+
+;; --- Type conversions ---
+(epoch 80)
+(eval "(er-integer-to-list 42)")
+(epoch 81)
+(eval "(er-list-to-integer \"42\")")
+(epoch 82)
+(eval "(er-integer-to-list-radix 255 16)")
+(epoch 83)
+(eval "(er-atom-to-list (make-symbol \"hello\"))")
+(epoch 84)
+(eval "(= (type-of (er-list-to-atom \"foo\")) \"symbol\")")
+
+;; --- ok/error tuples ---
+(epoch 90)
+(eval "(er-is-ok? (er-ok 42))")
+(epoch 91)
+(eval "(er-is-error? (er-error \"reason\"))")
+(epoch 92)
+(eval "(er-unwrap (er-ok 42))")
+(epoch 93)
+(eval "(er-is-ok? (er-error \"bad\"))")
+
+EPOCHS
+
+OUTPUT=$(timeout 30 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
+
+check() {
+  local epoch="$1" desc="$2" expected="$3"
+  local actual
+  actual=$(echo "$OUTPUT" | grep -A1 "^(ok-len $epoch " | tail -1 || true)
+  if echo "$actual" | grep -q "^(ok-len"; then actual=""; fi
+  if [ -z "$actual" ]; then
+    actual=$(echo "$OUTPUT" | grep "^(ok $epoch " | head -1 || true)
+  fi
+  if [ -z "$actual" ]; then
+    actual=$(echo "$OUTPUT" | grep "^(error $epoch " | head -1 || true)
+  fi
+  [ -z "$actual" ] && actual="<no output for epoch $epoch>"
+
+  if echo "$actual" | grep -qF -- "$expected"; then
+    PASS=$((PASS+1))
+    [ "$VERBOSE" = "-v" ] && echo "  ok $desc"
+  else
+    FAIL=$((FAIL+1))
+    ERRORS+="  FAIL [$desc] (epoch $epoch) expected: $expected | actual: $actual
+"
+  fi
+}
+
+# Numeric tower
+check 10  "is-integer? 42"        "true"
+check 11  "is-integer? float"     "false"
+check 12  "is-float? 3.14"        "true"
+check 13  "is-float? int"         "false"
+check 14  "is-number? int"        "true"
+check 15  "is-number? float"      "true"
+check 16  "float 5"               "5"
+check 17  "trunc 3.9"             "3"
+check 18  "round 3.5"             "4"
+check 19  "abs -7"                "7"
+check 20  "max 3 7"               "7"
+check 21  "min 3 7"               "3"
+
+# div + rem
+check 30  "div 10 3"              "3"
+check 31  "div -10 3"             "-3"
+check 32  "rem 10 3"              "1"
+check 33  "rem -10 3"             "-1"
+check 34  "gcd 12 8"              "4"
+
+# Bitwise
+check 40  "band 12 10"            "8"
+check 41  "bor 12 10"             "14"
+check 42  "bxor 12 10"            "6"
+check 43  "bnot 0"                "-1"
+check 44  "bsl 1 4"               "16"
+check 45  "bsr 16 2"              "4"
+
+# Sets
+check 50  "sets-new is-set?"      "true"
+check 51  "sets add+member"       "true"
+check 52  "member empty"          "false"
+check 53  "from-list member"      "true"
+check 54  "sets-size"             "3"
+check 55  "sets-to-list len"      "3"
+
+# Regexp
+check 60  "re-run match"          "true"
+check 61  "re-run no match"       "true"
+check 62  "re-run match text"     '"ll"'
+check 63  "re-replace first"      '"herlo"'
+check 64  "re-replace-all"        '"herro"'
+check 65  "re-match-groups"       '"hello"'
+check 66  "re-split count"        "3"
+
+# List BIFs
+check 70  "hd"                    "1"
+check 71  "tl"                    "(2 3)"
+check 72  "length"                "3"
+check 73  "member hit"            "true"
+check 74  "member miss"           "false"
+check 75  "reverse"               "(3 2 1)"
+check 76  "nth 2"                 "20"
+check 77  "foldl sum"             "15"
+check 78  "seq 1..5"              "(1 2 3 4 5)"
+check 79  "flatten"               "(1 2 3 4 5)"
+
+# Type conversions
+check 80  "integer-to-list"       '"42"'
+check 81  "list-to-integer"       "42"
+check 82  "integer-to-list hex"   '"ff"'
+check 83  "atom-to-list"          '"hello"'
+check 84  "list-to-atom"          "true"
+
+# ok/error
+check 90  "ok? ok-tuple"          "true"
+check 91  "error? error-tuple"    "true"
+check 92  "unwrap ok"             "42"
+check 93  "ok? error-tuple"       "false"
+
+TOTAL=$((PASS+FAIL))
+if [ $FAIL -eq 0 ]; then
+  echo "ok $PASS/$TOTAL lib/erlang tests passed"
+else
+  echo "FAIL $PASS/$TOTAL passed, $FAIL failed:"
+  echo "$ERRORS"
+fi
+[ $FAIL -eq 0 ]

lib/haskell/runtime.sx

@@ -0,0 +1,507 @@
+;; lib/haskell/runtime.sx — Haskell-on-SX runtime layer
+;;
+;; Covers the Haskell primitives now reachable via SX spec:
+;;  1. Numeric type class helpers (Num / Integral / Fractional)
+;;  2. Rational numbers (dict-based: {:_rational true :num n :den d})
+;;  3. Lazy evaluation — hk-force for promises created by delay
+;;  4. Char utilities (Data.Char)
+;;  5. Data.Set wrappers
+;;  6. Data.List utilities
+;;  7. Maybe / Either ADTs
+;;  8. Tuples (lists, since list->vector unreliable in sx_server)
+;;  9. String helpers (words/lines/isPrefixOf/etc.)
+;; 10. Show helper
+
+;; ===========================================================================
+;; 1. Numeric type class helpers
+;; ===========================================================================
+
+(define hk-is-integer? integer?)
+(define hk-is-float? float?)
+(define hk-is-num? number?)
+
+;; fromIntegral — coerce integer to Float
+(define (hk-to-float x) (exact->inexact x))
+
+;; truncate / round toward zero
+(define hk-to-integer truncate)
+(define hk-from-integer (fn (n) n))
+
+;; Haskell div: floor division (rounds toward -inf)
+(define
+  (hk-div a b)
+  (let
+    ((q (quotient a b)) (r (remainder a b)))
+    (if
+      (and
+        (not (= r 0))
+        (or
+          (and (< a 0) (> b 0))
+          (and (> a 0) (< b 0))))
+      (- q 1)
+      q)))
+
+;; Haskell mod: result has same sign as divisor
+(define hk-mod modulo)
+
+;; Haskell rem: result has same sign as dividend
+(define hk-rem remainder)
+
+;; Haskell quot: truncation division
+(define hk-quot quotient)
+
+;; divMod and quotRem return pairs (lists)
+(define (hk-div-mod a b) (list (hk-div a b) (hk-mod a b)))
+(define (hk-quot-rem a b) (list (hk-quot a b) (hk-rem a b)))
+
+(define (hk-abs x) (if (< x 0) (- 0 x) x))
+(define
+  (hk-signum x)
+  (cond
+    ((> x 0) 1)
+    ((< x 0) -1)
+    (else 0)))
+
+(define hk-gcd gcd)
+(define hk-lcm lcm)
+
+(define (hk-even? n) (= (modulo n 2) 0))
+(define (hk-odd? n) (not (= (modulo n 2) 0)))
+
+;; ===========================================================================
+;; 2. Rational numbers (dict implementation — no built-in rational in sx_server)
+;; ===========================================================================
+
+(define
+  (hk-make-rational n d)
+  (let
+    ((g (gcd (hk-abs n) (hk-abs d))))
+    (if (< d 0) {:num (quotient (- 0 n) g) :den (quotient (- 0 d) g) :_rational true} {:num (quotient n g) :den (quotient d g) :_rational true})))
+
+(define
+  (hk-rational? x)
+  (and (dict? x) (not (= (get x :_rational) nil))))
+(define (hk-numerator r) (get r :num))
+(define (hk-denominator r) (get r :den))
+
+(define
+  (hk-rational-add r1 r2)
+  (hk-make-rational
+    (+
+      (* (hk-numerator r1) (hk-denominator r2))
+      (* (hk-numerator r2) (hk-denominator r1)))
+    (* (hk-denominator r1) (hk-denominator r2))))
+
+(define
+  (hk-rational-sub r1 r2)
+  (hk-make-rational
+    (-
+      (* (hk-numerator r1) (hk-denominator r2))
+      (* (hk-numerator r2) (hk-denominator r1)))
+    (* (hk-denominator r1) (hk-denominator r2))))
+
+(define
+  (hk-rational-mul r1 r2)
+  (hk-make-rational
+    (* (hk-numerator r1) (hk-numerator r2))
+    (* (hk-denominator r1) (hk-denominator r2))))
+
+(define
+  (hk-rational-div r1 r2)
+  (hk-make-rational
+    (* (hk-numerator r1) (hk-denominator r2))
+    (* (hk-denominator r1) (hk-numerator r2))))
+
+(define
+  (hk-rational-to-float r)
+  (exact->inexact (/ (hk-numerator r) (hk-denominator r))))
+
+(define (hk-show-rational r) (str (hk-numerator r) "%" (hk-denominator r)))
+
+;; ===========================================================================
+;; 3. Lazy evaluation — promises (created via SX delay)
+;; ===========================================================================
+
+(define
+  (hk-force p)
+  (if
+    (and (dict? p) (not (= (get p :_promise) nil)))
+    (if (get p :forced) (get p :value) ((get p :thunk)))
+    p))
+
+;; ===========================================================================
+;; 4. Char utilities (Data.Char)
+;; ===========================================================================
+
+(define hk-ord char->integer)
+(define hk-chr integer->char)
+
+;; Inline ASCII predicates — char-alphabetic?/char-numeric? unreliable in sx_server
+(define
+  (hk-is-alpha? c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (and (>= n 65) (<= n 90))
+      (and (>= n 97) (<= n 122)))))
+
+(define
+  (hk-is-digit? c)
+  (let ((n (char->integer c))) (and (>= n 48) (<= n 57))))
+
+(define
+  (hk-is-alnum? c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (and (>= n 48) (<= n 57))
+      (and (>= n 65) (<= n 90))
+      (and (>= n 97) (<= n 122)))))
+
+(define
+  (hk-is-upper? c)
+  (let ((n (char->integer c))) (and (>= n 65) (<= n 90))))
+
+(define
+  (hk-is-lower? c)
+  (let ((n (char->integer c))) (and (>= n 97) (<= n 122))))
+
+(define
+  (hk-is-space? c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (= n 32)
+      (= n 9)
+      (= n 10)
+      (= n 13)
+      (= n 12)
+      (= n 11))))
+
+(define hk-to-upper char-upcase)
+(define hk-to-lower char-downcase)
+
+;; digitToInt: '0'-'9' → 0-9, 'a'-'f'/'A'-'F' → 10-15
+(define
+  (hk-digit-to-int c)
+  (let
+    ((n (char->integer c)))
+    (cond
+      ((and (>= n 48) (<= n 57)) (- n 48))
+      ((and (>= n 65) (<= n 70)) (- n 55))
+      ((and (>= n 97) (<= n 102)) (- n 87))
+      (else (error (str "hk-digit-to-int: not a hex digit: " c))))))
+
+;; intToDigit: 0-15 → char
+(define
+  (hk-int-to-digit n)
+  (cond
+    ((and (>= n 0) (<= n 9))
+      (integer->char (+ n 48)))
+    ((and (>= n 10) (<= n 15))
+      (integer->char (+ n 87)))
+    (else (error (str "hk-int-to-digit: out of range: " n)))))
+
+;; ===========================================================================
+;; 5. Data.Set wrappers
+;; ===========================================================================
+
+(define (hk-set-empty) (make-set))
+(define hk-set? set?)
+(define hk-set-member? set-member?)
+
+(define (hk-set-insert x s) (begin (set-add! s x) s))
+
+(define (hk-set-delete x s) (begin (set-remove! s x) s))
+
+(define hk-set-union set-union)
+(define hk-set-intersection set-intersection)
+(define hk-set-difference set-difference)
+(define hk-set-from-list list->set)
+(define hk-set-to-list set->list)
+(define (hk-set-null? s) (= (len (set->list s)) 0))
+(define (hk-set-size s) (len (set->list s)))
+
+(define (hk-set-singleton x) (let ((s (make-set))) (set-add! s x) s))
+
+;; ===========================================================================
+;; 6. Data.List utilities
+;; ===========================================================================
+
+(define hk-head first)
+(define hk-tail rest)
+(define (hk-null? lst) (= (len lst) 0))
+(define hk-length len)
+
+(define
+  (hk-take n lst)
+  (if
+    (or (= n 0) (= (len lst) 0))
+    (list)
+    (cons (first lst) (hk-take (- n 1) (rest lst)))))
+
+(define
+  (hk-drop n lst)
+  (if
+    (or (= n 0) (= (len lst) 0))
+    lst
+    (hk-drop (- n 1) (rest lst))))
+
+(define
+  (hk-take-while pred lst)
+  (if
+    (or (= (len lst) 0) (not (pred (first lst))))
+    (list)
+    (cons (first lst) (hk-take-while pred (rest lst)))))
+
+(define
+  (hk-drop-while pred lst)
+  (if
+    (or (= (len lst) 0) (not (pred (first lst))))
+    lst
+    (hk-drop-while pred (rest lst))))
+
+(define
+  (hk-zip a b)
+  (if
+    (or (= (len a) 0) (= (len b) 0))
+    (list)
+    (cons (list (first a) (first b)) (hk-zip (rest a) (rest b)))))
+
+(define
+  (hk-zip-with f a b)
+  (if
+    (or (= (len a) 0) (= (len b) 0))
+    (list)
+    (cons (f (first a) (first b)) (hk-zip-with f (rest a) (rest b)))))
+
+(define
+  (hk-unzip pairs)
+  (list
+    (map (fn (p) (first p)) pairs)
+    (map (fn (p) (nth p 1)) pairs)))
+
+(define
+  (hk-elem x lst)
+  (cond
+    ((= (len lst) 0) false)
+    ((= x (first lst)) true)
+    (else (hk-elem x (rest lst)))))
+
+(define (hk-not-elem x lst) (not (hk-elem x lst)))
+
+(define
+  (hk-nub lst)
+  (letrec
+    ((go (fn (seen acc items) (if (= (len items) 0) (reverse acc) (let ((h (first items)) (t (rest items))) (if (hk-elem h seen) (go seen acc t) (go (cons h seen) (cons h acc) t)))))))
+    (go (list) (list) lst)))
+
+(define (hk-sum lst) (reduce + 0 lst))
+(define (hk-product lst) (reduce * 1 lst))
+
+(define
+  (hk-maximum lst)
+  (reduce (fn (a b) (if (> a b) a b)) (first lst) (rest lst)))
+
+(define
+  (hk-minimum lst)
+  (reduce (fn (a b) (if (< a b) a b)) (first lst) (rest lst)))
+
+(define (hk-concat lsts) (reduce append (list) lsts))
+
+(define (hk-concat-map f lst) (hk-concat (map f lst)))
+
+(define hk-sort sort)
+
+(define
+  (hk-span pred lst)
+  (list (hk-take-while pred lst) (hk-drop-while pred lst)))
+
+(define (hk-break pred lst) (hk-span (fn (x) (not (pred x))) lst))
+
+(define
+  (hk-foldl f acc lst)
+  (if
+    (= (len lst) 0)
+    acc
+    (hk-foldl f (f acc (first lst)) (rest lst))))
+
+(define
+  (hk-foldr f z lst)
+  (if
+    (= (len lst) 0)
+    z
+    (f (first lst) (hk-foldr f z (rest lst)))))
+
+(define
+  (hk-scanl f acc lst)
+  (if
+    (= (len lst) 0)
+    (list acc)
+    (cons acc (hk-scanl f (f acc (first lst)) (rest lst)))))
+
+(define
+  (hk-replicate n x)
+  (if (= n 0) (list) (cons x (hk-replicate (- n 1) x))))
+
+(define
+  (hk-intersperse sep lst)
+  (if
+    (or (= (len lst) 0) (= (len lst) 1))
+    lst
+    (cons (first lst) (cons sep (hk-intersperse sep (rest lst))))))
+
+;; ===========================================================================
+;; 7. Maybe / Either ADTs
+;; ===========================================================================
+
+(define hk-nothing {:_maybe true :_tag "nothing"})
+(define (hk-just x) {:_maybe true :value x :_tag "just"})
+(define (hk-is-nothing? m) (= (get m :_tag) "nothing"))
+(define (hk-is-just? m) (= (get m :_tag) "just"))
+(define (hk-from-just m) (get m :value))
+(define (hk-from-maybe def m) (if (hk-is-nothing? m) def (hk-from-just m)))
+(define
+  (hk-maybe def f m)
+  (if (hk-is-nothing? m) def (f (hk-from-just m))))
+
+(define (hk-left x) {:value x :_either true :_tag "left"})
+(define (hk-right x) {:value x :_either true :_tag "right"})
+(define (hk-is-left? e) (= (get e :_tag) "left"))
+(define (hk-is-right? e) (= (get e :_tag) "right"))
+(define (hk-from-left e) (get e :value))
+(define (hk-from-right e) (get e :value))
+(define
+  (hk-either f g e)
+  (if (hk-is-left? e) (f (hk-from-left e)) (g (hk-from-right e))))
+
+;; ===========================================================================
+;; 8. Tuples (lists — list->vector unreliable in sx_server)
+;; ===========================================================================
+
+(define (hk-pair a b) (list a b))
+(define hk-fst first)
+(define (hk-snd t) (nth t 1))
+
+(define (hk-triple a b c) (list a b c))
+(define hk-fst3 first)
+(define (hk-snd3 t) (nth t 1))
+(define (hk-thd3 t) (nth t 2))
+
+(define (hk-curry f) (fn (a) (fn (b) (f a b))))
+(define (hk-uncurry f) (fn (p) (f (hk-fst p) (hk-snd p))))
+
+;; ===========================================================================
+;; 9. String helpers (Data.List / Data.Char for strings)
+;; ===========================================================================
+
+;; words: split on whitespace
+(define
+  (hk-words s)
+  (letrec
+    ((slen (len s))
+      (skip-ws
+        (fn
+          (i)
+          (if
+            (>= i slen)
+            (list)
+            (let
+              ((c (substring s i (+ i 1))))
+              (if
+                (or (= c " ") (= c "\t") (= c "\n"))
+                (skip-ws (+ i 1))
+                (collect-word i (+ i 1)))))))
+      (collect-word
+        (fn
+          (start i)
+          (if
+            (>= i slen)
+            (list (substring s start i))
+            (let
+              ((c (substring s i (+ i 1))))
+              (if
+                (or (= c " ") (= c "\t") (= c "\n"))
+                (cons (substring s start i) (skip-ws (+ i 1)))
+                (collect-word start (+ i 1))))))))
+    (skip-ws 0)))
+
+;; unwords: join with spaces
+(define
+  (hk-unwords lst)
+  (if
+    (= (len lst) 0)
+    ""
+    (reduce (fn (a b) (str a " " b)) (first lst) (rest lst))))
+
+;; lines: split on newline
+(define
+  (hk-lines s)
+  (letrec
+    ((slen (len s))
+      (go
+        (fn
+          (start i acc)
+          (if
+            (>= i slen)
+            (reverse (cons (substring s start i) acc))
+            (if
+              (= (substring s i (+ i 1)) "\n")
+              (go
+                (+ i 1)
+                (+ i 1)
+                (cons (substring s start i) acc))
+              (go start (+ i 1) acc))))))
+    (if (= slen 0) (list) (go 0 0 (list)))))
+
+;; unlines: join, each with trailing newline
+(define (hk-unlines lst) (reduce (fn (a b) (str a b "\n")) "" lst))
+
+;; isPrefixOf
+(define
+  (hk-is-prefix-of pre s)
+  (and (<= (len pre) (len s)) (= pre (substring s 0 (len pre)))))
+
+;; isSuffixOf
+(define
+  (hk-is-suffix-of suf s)
+  (let
+    ((sl (len suf)) (tl (len s)))
+    (and (<= sl tl) (= suf (substring s (- tl sl) tl)))))
+
+;; isInfixOf — linear scan
+(define
+  (hk-is-infix-of pat s)
+  (let
+    ((plen (len pat)) (slen (len s)))
+    (letrec
+      ((go (fn (i) (if (> (+ i plen) slen) false (if (= pat (substring s i (+ i plen))) true (go (+ i 1)))))))
+      (if (= plen 0) true (go 0)))))
+
+;; ===========================================================================
+;; 10. Show helper
+;; ===========================================================================
+
+(define
+  (hk-show x)
+  (cond
+    ((= x nil) "Nothing")
+    ((= x true) "True")
+    ((= x false) "False")
+    ((hk-rational? x) (hk-show-rational x))
+    ((integer? x) (str x))
+    ((float? x) (str x))
+    ((= (type-of x) "string") (str "\"" x "\""))
+    ((= (type-of x) "char") (str "'" (str x) "'"))
+    ((list? x)
+      (str
+        "["
+        (if
+          (= (len x) 0)
+          ""
+          (reduce
+            (fn (a b) (str a "," (hk-show b)))
+            (hk-show (first x))
+            (rest x)))
+        "]"))
+    (else (str x))))

lib/haskell/test.sh

@@ -46,6 +46,7 @@ for FILE in "${FILES[@]}"; do
   cat > "$TMPFILE" <<EPOCHS
 (epoch 1)
 (load "lib/haskell/tokenizer.sx")
+(load "lib/haskell/runtime.sx")
 (epoch 2)
 (load "$FILE")
 (epoch 3)
@@ -81,6 +82,7 @@ EPOCHS
     cat > "$TMPFILE2" <<EPOCHS
 (epoch 1)
 (load "lib/haskell/tokenizer.sx")
+(load "lib/haskell/runtime.sx")
 (epoch 2)
 (load "$FILE")
 (epoch 3)

lib/haskell/tests/runtime.sx

@@ -0,0 +1,451 @@
+;; lib/haskell/tests/runtime.sx — smoke-tests for lib/haskell/runtime.sx
+;;
+;; Uses the same hk-test framework as tests/parse.sx.
+;; Loaded by test.sh after: tokenizer.sx + runtime.sx are pre-loaded.
+
+;; ---------------------------------------------------------------------------
+;; Test framework boilerplate (mirrors parse.sx)
+;; ---------------------------------------------------------------------------
+
+(define hk-test-pass 0)
+(define hk-test-fail 0)
+(define hk-test-fails (list))
+
+(define
+  (hk-test name actual expected)
+  (if
+    (= 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}))))
+
+;; ---------------------------------------------------------------------------
+;; 1. Numeric type class helpers
+;; ---------------------------------------------------------------------------
+
+(hk-test "is-integer? int" (hk-is-integer? 42) true)
+(hk-test "is-integer? float" (hk-is-integer? 1.5) false)
+(hk-test "is-float? float" (hk-is-float? 3.14) true)
+(hk-test "is-float? int" (hk-is-float? 3) false)
+(hk-test "is-num? int" (hk-is-num? 10) true)
+(hk-test "is-num? float" (hk-is-num? 1) true)
+
+(hk-test "to-float" (hk-to-float 5) 5)
+(hk-test "to-integer trunc" (hk-to-integer 3.7) 3)
+
+(hk-test "div pos pos" (hk-div 7 2) 3)
+(hk-test "div neg pos" (hk-div -7 2) -4)
+(hk-test "div pos neg" (hk-div 7 -2) -4)
+(hk-test "div neg neg" (hk-div -7 -2) 3)
+(hk-test "div exact" (hk-div 6 2) 3)
+
+(hk-test "mod pos pos" (hk-mod 10 3) 1)
+(hk-test "mod neg pos" (hk-mod -7 3) 2)
+(hk-test "rem pos pos" (hk-rem 10 3) 1)
+(hk-test "rem neg pos" (hk-rem -7 3) -1)
+
+(hk-test "abs pos" (hk-abs 5) 5)
+(hk-test "abs neg" (hk-abs -5) 5)
+(hk-test "signum pos" (hk-signum 42) 1)
+(hk-test "signum neg" (hk-signum -7) -1)
+(hk-test "signum zero" (hk-signum 0) 0)
+
+(hk-test "gcd" (hk-gcd 12 8) 4)
+(hk-test "lcm" (hk-lcm 4 6) 12)
+(hk-test "even?" (hk-even? 4) true)
+(hk-test "even? odd" (hk-even? 3) false)
+(hk-test "odd?" (hk-odd? 7) true)
+
+;; ---------------------------------------------------------------------------
+;; 2. Rational numbers
+;; ---------------------------------------------------------------------------
+
+(let
+  ((r (hk-make-rational 1 2)))
+  (do
+    (hk-test "rational?" (hk-rational? r) true)
+    (hk-test "numerator" (hk-numerator r) 1)
+    (hk-test "denominator" (hk-denominator r) 2)))
+
+(let
+  ((r (hk-make-rational 2 4)))
+  (do
+    (hk-test "rat normalise num" (hk-numerator r) 1)
+    (hk-test "rat normalise den" (hk-denominator r) 2)))
+
+(let
+  ((sum (hk-rational-add (hk-make-rational 1 2) (hk-make-rational 1 3))))
+  (do
+    (hk-test "rat-add num" (hk-numerator sum) 5)
+    (hk-test "rat-add den" (hk-denominator sum) 6)))
+
+(hk-test
+  "rat-to-float"
+  (hk-rational-to-float (hk-make-rational 1 2))
+  0.5)
+(hk-test "rational? int" (hk-rational? 42) false)
+
+;; ---------------------------------------------------------------------------
+;; 3. Lazy evaluation (promises via SX delay)
+;; ---------------------------------------------------------------------------
+
+(let
+  ((p (delay 42)))
+  (hk-test "force promise" (hk-force p) 42))
+
+(hk-test "force non-promise" (hk-force 99) 99)
+
+;; ---------------------------------------------------------------------------
+;; 4. Char utilities — compare via hk-ord to avoid = on char type
+;; ---------------------------------------------------------------------------
+
+(hk-test "ord A" (hk-ord (integer->char 65)) 65)
+(hk-test "chr 65" (hk-ord (hk-chr 65)) 65)
+(hk-test "is-alpha? A" (hk-is-alpha? (integer->char 65)) true)
+(hk-test "is-alpha? 0" (hk-is-alpha? (integer->char 48)) false)
+(hk-test "is-digit? 5" (hk-is-digit? (integer->char 53)) true)
+(hk-test "is-digit? A" (hk-is-digit? (integer->char 65)) false)
+(hk-test "is-upper? A" (hk-is-upper? (integer->char 65)) true)
+(hk-test "is-upper? a" (hk-is-upper? (integer->char 97)) false)
+(hk-test "is-lower? a" (hk-is-lower? (integer->char 97)) true)
+(hk-test "is-space? spc" (hk-is-space? (integer->char 32)) true)
+(hk-test "is-space? A" (hk-is-space? (integer->char 65)) false)
+(hk-test
+  "to-upper a"
+  (hk-ord (hk-to-upper (integer->char 97)))
+  65)
+(hk-test
+  "to-lower A"
+  (hk-ord (hk-to-lower (integer->char 65)))
+  97)
+(hk-test
+  "digit-to-int 0"
+  (hk-digit-to-int (integer->char 48))
+  0)
+(hk-test
+  "digit-to-int 9"
+  (hk-digit-to-int (integer->char 57))
+  9)
+(hk-test
+  "digit-to-int a"
+  (hk-digit-to-int (integer->char 97))
+  10)
+(hk-test
+  "digit-to-int F"
+  (hk-digit-to-int (integer->char 70))
+  15)
+(hk-test "int-to-digit 0" (hk-ord (hk-int-to-digit 0)) 48)
+(hk-test "int-to-digit 10" (hk-ord (hk-int-to-digit 10)) 97)
+
+;; ---------------------------------------------------------------------------
+;; 5. Data.Set
+;; ---------------------------------------------------------------------------
+
+(hk-test "set-empty is set?" (hk-set? (hk-set-empty)) true)
+(hk-test "set-null? empty" (hk-set-null? (hk-set-empty)) true)
+
+(let
+  ((s (hk-set-singleton 42)))
+  (do
+    (hk-test "singleton member" (hk-set-member? 42 s) true)
+    (hk-test "singleton size" (hk-set-size s) 1)))
+
+(let
+  ((s (hk-set-from-list (list 1 2 3))))
+  (do
+    (hk-test "from-list member" (hk-set-member? 2 s) true)
+    (hk-test "from-list absent" (hk-set-member? 9 s) false)
+    (hk-test "from-list size" (hk-set-size s) 3)))
+
+;; ---------------------------------------------------------------------------
+;; 6. Data.List
+;; ---------------------------------------------------------------------------
+
+(hk-test "head" (hk-head (list 1 2 3)) 1)
+(hk-test
+  "tail length"
+  (len (hk-tail (list 1 2 3)))
+  2)
+(hk-test "null? empty" (hk-null? (list)) true)
+(hk-test "null? non-empty" (hk-null? (list 1)) false)
+(hk-test
+  "length"
+  (hk-length (list 1 2 3))
+  3)
+
+(hk-test
+  "take 2"
+  (hk-take 2 (list 1 2 3))
+  (list 1 2))
+(hk-test "take 0" (hk-take 0 (list 1 2)) (list))
+(hk-test
+  "take overflow"
+  (hk-take 5 (list 1 2))
+  (list 1 2))
+(hk-test
+  "drop 1"
+  (hk-drop 1 (list 1 2 3))
+  (list 2 3))
+(hk-test
+  "drop 0"
+  (hk-drop 0 (list 1 2))
+  (list 1 2))
+
+(hk-test
+  "take-while"
+  (hk-take-while
+    (fn (x) (< x 3))
+    (list 1 2 3 4))
+  (list 1 2))
+(hk-test
+  "drop-while"
+  (hk-drop-while
+    (fn (x) (< x 3))
+    (list 1 2 3 4))
+  (list 3 4))
+
+(hk-test
+  "zip"
+  (hk-zip (list 1 2) (list 3 4))
+  (list (list 1 3) (list 2 4)))
+(hk-test
+  "zip uneven"
+  (hk-zip
+    (list 1 2 3)
+    (list 4 5))
+  (list (list 1 4) (list 2 5)))
+
+(hk-test
+  "zip-with +"
+  (hk-zip-with
+    +
+    (list 1 2 3)
+    (list 10 20 30))
+  (list 11 22 33))
+
+(hk-test
+  "unzip fst"
+  (first
+    (hk-unzip
+      (list (list 1 3) (list 2 4))))
+  (list 1 2))
+(hk-test
+  "unzip snd"
+  (nth
+    (hk-unzip
+      (list (list 1 3) (list 2 4)))
+    1)
+  (list 3 4))
+
+(hk-test
+  "elem hit"
+  (hk-elem 2 (list 1 2 3))
+  true)
+(hk-test
+  "elem miss"
+  (hk-elem 9 (list 1 2 3))
+  false)
+(hk-test
+  "not-elem"
+  (hk-not-elem 9 (list 1 2 3))
+  true)
+
+(hk-test
+  "nub"
+  (hk-nub (list 1 2 1 3 2))
+  (list 1 2 3))
+
+(hk-test
+  "sum"
+  (hk-sum (list 1 2 3 4))
+  10)
+(hk-test
+  "product"
+  (hk-product (list 1 2 3 4))
+  24)
+(hk-test
+  "maximum"
+  (hk-maximum (list 3 1 4 1 5))
+  5)
+(hk-test
+  "minimum"
+  (hk-minimum (list 3 1 4 1 5))
+  1)
+
+(hk-test
+  "concat"
+  (hk-concat
+    (list (list 1 2) (list 3 4)))
+  (list 1 2 3 4))
+(hk-test
+  "concat-map"
+  (hk-concat-map
+    (fn (x) (list x (* x x)))
+    (list 1 2 3))
+  (list 1 1 2 4 3 9))
+
+(hk-test
+  "sort"
+  (hk-sort (list 3 1 4 1 5))
+  (list 1 1 3 4 5))
+(hk-test
+  "replicate"
+  (hk-replicate 3 0)
+  (list 0 0 0))
+(hk-test "replicate 0" (hk-replicate 0 99) (list))
+
+(hk-test
+  "intersperse"
+  (hk-intersperse 0 (list 1 2 3))
+  (list 1 0 2 0 3))
+(hk-test
+  "intersperse 1"
+  (hk-intersperse 0 (list 1))
+  (list 1))
+(hk-test "intersperse empty" (hk-intersperse 0 (list)) (list))
+
+(hk-test
+  "span"
+  (hk-span
+    (fn (x) (< x 3))
+    (list 1 2 3 4))
+  (list (list 1 2) (list 3 4)))
+(hk-test
+  "break"
+  (hk-break
+    (fn (x) (>= x 3))
+    (list 1 2 3 4))
+  (list (list 1 2) (list 3 4)))
+
+(hk-test
+  "foldl"
+  (hk-foldl
+    (fn (a b) (- a b))
+    10
+    (list 1 2 3))
+  4)
+(hk-test
+  "foldr"
+  (hk-foldr cons (list) (list 1 2 3))
+  (list 1 2 3))
+
+(hk-test
+  "scanl"
+  (hk-scanl + 0 (list 1 2 3))
+  (list 0 1 3 6))
+
+;; ---------------------------------------------------------------------------
+;; 7. Maybe / Either
+;; ---------------------------------------------------------------------------
+
+(hk-test "nothing is-nothing?" (hk-is-nothing? hk-nothing) true)
+(hk-test "nothing is-just?" (hk-is-just? hk-nothing) false)
+(hk-test "just is-just?" (hk-is-just? (hk-just 42)) true)
+(hk-test "just is-nothing?" (hk-is-nothing? (hk-just 42)) false)
+(hk-test "from-just" (hk-from-just (hk-just 99)) 99)
+(hk-test
+  "from-maybe nothing"
+  (hk-from-maybe 0 hk-nothing)
+  0)
+(hk-test
+  "from-maybe just"
+  (hk-from-maybe 0 (hk-just 42))
+  42)
+(hk-test
+  "maybe nothing"
+  (hk-maybe 0 (fn (x) (* x 2)) hk-nothing)
+  0)
+(hk-test
+  "maybe just"
+  (hk-maybe 0 (fn (x) (* x 2)) (hk-just 5))
+  10)
+
+(hk-test "left is-left?" (hk-is-left? (hk-left "e")) true)
+(hk-test "right is-right?" (hk-is-right? (hk-right 42)) true)
+(hk-test "from-right" (hk-from-right (hk-right 7)) 7)
+(hk-test
+  "either left"
+  (hk-either (fn (x) (str "L" x)) (fn (x) (str "R" x)) (hk-left "err"))
+  "Lerr")
+(hk-test
+  "either right"
+  (hk-either
+    (fn (x) (str "L" x))
+    (fn (x) (str "R" x))
+    (hk-right 42))
+  "R42")
+
+;; ---------------------------------------------------------------------------
+;; 8. Tuples
+;; ---------------------------------------------------------------------------
+
+(hk-test "pair" (hk-pair 1 2) (list 1 2))
+(hk-test "fst" (hk-fst (hk-pair 3 4)) 3)
+(hk-test "snd" (hk-snd (hk-pair 3 4)) 4)
+(hk-test
+  "triple"
+  (hk-triple 1 2 3)
+  (list 1 2 3))
+(hk-test
+  "fst3"
+  (hk-fst3 (hk-triple 7 8 9))
+  7)
+(hk-test
+  "thd3"
+  (hk-thd3 (hk-triple 7 8 9))
+  9)
+
+(hk-test "curry" ((hk-curry +) 3 4) 7)
+(hk-test
+  "uncurry"
+  ((hk-uncurry (fn (a b) (* a b))) (list 3 4))
+  12)
+
+;; ---------------------------------------------------------------------------
+;; 9. String helpers
+;; ---------------------------------------------------------------------------
+
+(hk-test "words" (hk-words "hello world") (list "hello" "world"))
+(hk-test "words leading ws" (hk-words "  foo bar") (list "foo" "bar"))
+(hk-test "words empty" (hk-words "") (list))
+(hk-test "unwords" (hk-unwords (list "a" "b" "c")) "a b c")
+(hk-test "unwords single" (hk-unwords (list "x")) "x")
+
+(hk-test "lines" (hk-lines "a\nb\nc") (list "a" "b" "c"))
+(hk-test "lines single" (hk-lines "hello") (list "hello"))
+(hk-test "unlines" (hk-unlines (list "a" "b")) "a\nb\n")
+
+(hk-test "is-prefix-of yes" (hk-is-prefix-of "he" "hello") true)
+(hk-test "is-prefix-of no" (hk-is-prefix-of "wo" "hello") false)
+(hk-test "is-prefix-of eq" (hk-is-prefix-of "hi" "hi") true)
+(hk-test "is-prefix-of empty" (hk-is-prefix-of "" "hi") true)
+
+(hk-test "is-suffix-of yes" (hk-is-suffix-of "lo" "hello") true)
+(hk-test "is-suffix-of no" (hk-is-suffix-of "he" "hello") false)
+(hk-test "is-suffix-of empty" (hk-is-suffix-of "" "hi") true)
+
+(hk-test "is-infix-of yes" (hk-is-infix-of "ell" "hello") true)
+(hk-test "is-infix-of no" (hk-is-infix-of "xyz" "hello") false)
+(hk-test "is-infix-of empty" (hk-is-infix-of "" "hello") true)
+
+;; ---------------------------------------------------------------------------
+;; 10. Show
+;; ---------------------------------------------------------------------------
+
+(hk-test "show nil" (hk-show nil) "Nothing")
+(hk-test "show true" (hk-show true) "True")
+(hk-test "show false" (hk-show false) "False")
+(hk-test "show int" (hk-show 42) "42")
+(hk-test "show string" (hk-show "hi") "\"hi\"")
+(hk-test
+  "show list"
+  (hk-show (list 1 2 3))
+  "[1,2,3]")
+(hk-test "show empty list" (hk-show (list)) "[]")
+
+;; ---------------------------------------------------------------------------
+;; Summary (required by test.sh — last expression is the return value)
+;; ---------------------------------------------------------------------------
+
+(list hk-test-pass hk-test-fail)

lib/js/conformance.sh

@@ -49,6 +49,8 @@ trap "rm -f $TMPFILE" EXIT
   echo '(load "lib/js/transpile.sx")'
   echo '(epoch 5)'
   echo '(load "lib/js/runtime.sx")'
+  echo '(epoch 6)'
+  echo '(load "lib/js/regex.sx")'
 
   epoch=100
   for f in "${FIXTURES[@]}"; do

lib/js/regex.sx

@@ -0,0 +1,943 @@
+;; lib/js/regex.sx — pure-SX recursive backtracking regex engine
+;;
+;; Installed via (js-regex-platform-override! ...) at load time.
+;; Covers: character classes (\d\w\s . [abc] [^abc] [a-z]),
+;;   anchors (^ $ \b \B), quantifiers (* + ? {n,m} lazy variants),
+;;   groups (capturing + non-capturing), alternation (a|b),
+;;   flags: i (case-insensitive), g (global), m (multiline).
+;;
+;; Architecture:
+;;   1. rx-parse-pattern  — pattern string → compiled node list
+;;   2. rx-match-nodes    — recursive backtracker
+;;   3. rx-exec / rx-test — public interface
+;;   4. Install as {:test rx-test :exec rx-exec}
+
+;; ── Utilities ─────────────────────────────────────────────────────
+
+(define
+  rx-char-at
+  (fn (s i) (if (and (>= i 0) (< i (len s))) (char-at s i) "")))
+
+(define
+  rx-digit?
+  (fn
+    (c)
+    (and (not (= c "")) (>= (char-code c) 48) (<= (char-code c) 57))))
+
+(define
+  rx-word?
+  (fn
+    (c)
+    (and
+      (not (= c ""))
+      (or
+        (and (>= (char-code c) 65) (<= (char-code c) 90))
+        (and (>= (char-code c) 97) (<= (char-code c) 122))
+        (and (>= (char-code c) 48) (<= (char-code c) 57))
+        (= c "_")))))
+
+(define
+  rx-space?
+  (fn
+    (c)
+    (or (= c " ") (= c "\t") (= c "\n") (= c "\r") (= c "\\f") (= c ""))))
+
+(define rx-newline? (fn (c) (or (= c "\n") (= c "\r"))))
+
+(define
+  rx-downcase-char
+  (fn
+    (c)
+    (let
+      ((cc (char-code c)))
+      (if (and (>= cc 65) (<= cc 90)) (char-from-code (+ cc 32)) c))))
+
+(define
+  rx-char-eq?
+  (fn
+    (a b ci?)
+    (if ci? (= (rx-downcase-char a) (rx-downcase-char b)) (= a b))))
+
+(define
+  rx-parse-int
+  (fn
+    (pat i acc)
+    (let
+      ((c (rx-char-at pat i)))
+      (if
+        (rx-digit? c)
+        (rx-parse-int pat (+ i 1) (+ (* acc 10) (- (char-code c) 48)))
+        (list acc i)))))
+
+(define
+  rx-hex-digit-val
+  (fn
+    (c)
+    (cond
+      ((and (>= (char-code c) 48) (<= (char-code c) 57))
+        (- (char-code c) 48))
+      ((and (>= (char-code c) 65) (<= (char-code c) 70))
+        (+ 10 (- (char-code c) 65)))
+      ((and (>= (char-code c) 97) (<= (char-code c) 102))
+        (+ 10 (- (char-code c) 97)))
+      (else -1))))
+
+(define
+  rx-parse-hex-n
+  (fn
+    (pat i n acc)
+    (if
+      (= n 0)
+      (list (char-from-code acc) i)
+      (let
+        ((v (rx-hex-digit-val (rx-char-at pat i))))
+        (if
+          (< v 0)
+          (list (char-from-code acc) i)
+          (rx-parse-hex-n pat (+ i 1) (- n 1) (+ (* acc 16) v)))))))
+
+;; ── Pattern compiler ──────────────────────────────────────────────
+
+;; Node types (stored in dicts with "__t__" key):
+;;   literal  : {:__t__ "literal" :__c__ char}
+;;   any      : {:__t__ "any"}
+;;   class-d  : {:__t__ "class-d"  :__neg__ bool}
+;;   class-w  : {:__t__ "class-w"  :__neg__ bool}
+;;   class-s  : {:__t__ "class-s"  :__neg__ bool}
+;;   char-class: {:__t__ "char-class" :__neg__ bool :__items__ list}
+;;   anchor-start / anchor-end / anchor-word / anchor-nonword
+;;   quant    : {:__t__ "quant" :__node__ n :__min__ m :__max__ mx :__lazy__ bool}
+;;   group    : {:__t__ "group" :__idx__ i :__nodes__ list}
+;;   ncgroup  : {:__t__ "ncgroup" :__nodes__ list}
+;;   alt      : {:__t__ "alt" :__branches__ list-of-node-lists}
+
+;; parse one escape after `\`, returns (node new-i)
+(define
+  rx-parse-escape
+  (fn
+    (pat i)
+    (let
+      ((c (rx-char-at pat i)))
+      (cond
+        ((= c "d") (list (dict "__t__" "class-d" "__neg__" false) (+ i 1)))
+        ((= c "D") (list (dict "__t__" "class-d" "__neg__" true) (+ i 1)))
+        ((= c "w") (list (dict "__t__" "class-w" "__neg__" false) (+ i 1)))
+        ((= c "W") (list (dict "__t__" "class-w" "__neg__" true) (+ i 1)))
+        ((= c "s") (list (dict "__t__" "class-s" "__neg__" false) (+ i 1)))
+        ((= c "S") (list (dict "__t__" "class-s" "__neg__" true) (+ i 1)))
+        ((= c "b") (list (dict "__t__" "anchor-word") (+ i 1)))
+        ((= c "B") (list (dict "__t__" "anchor-nonword") (+ i 1)))
+        ((= c "n") (list (dict "__t__" "literal" "__c__" "\n") (+ i 1)))
+        ((= c "r") (list (dict "__t__" "literal" "__c__" "\r") (+ i 1)))
+        ((= c "t") (list (dict "__t__" "literal" "__c__" "\t") (+ i 1)))
+        ((= c "f") (list (dict "__t__" "literal" "__c__" "\\f") (+ i 1)))
+        ((= c "v") (list (dict "__t__" "literal" "__c__" "") (+ i 1)))
+        ((= c "u")
+          (let
+            ((res (rx-parse-hex-n pat (+ i 1) 4 0)))
+            (list (dict "__t__" "literal" "__c__" (nth res 0)) (nth res 1))))
+        ((= c "x")
+          (let
+            ((res (rx-parse-hex-n pat (+ i 1) 2 0)))
+            (list (dict "__t__" "literal" "__c__" (nth res 0)) (nth res 1))))
+        (else (list (dict "__t__" "literal" "__c__" c) (+ i 1)))))))
+
+;; parse a char-class item inside [...], returns (item new-i)
+(define
+  rx-parse-class-item
+  (fn
+    (pat i)
+    (let
+      ((c (rx-char-at pat i)))
+      (cond
+        ((= c "\\")
+          (let
+            ((esc (rx-parse-escape pat (+ i 1))))
+            (let
+              ((node (nth esc 0)) (ni (nth esc 1)))
+              (let
+                ((t (get node "__t__")))
+                (cond
+                  ((= t "class-d")
+                    (list
+                      (dict "kind" "class-d" "neg" (get node "__neg__"))
+                      ni))
+                  ((= t "class-w")
+                    (list
+                      (dict "kind" "class-w" "neg" (get node "__neg__"))
+                      ni))
+                  ((= t "class-s")
+                    (list
+                      (dict "kind" "class-s" "neg" (get node "__neg__"))
+                      ni))
+                  (else
+                    (let
+                      ((lc (get node "__c__")))
+                      (if
+                        (and
+                          (= (rx-char-at pat ni) "-")
+                          (not (= (rx-char-at pat (+ ni 1)) "]")))
+                        (let
+                          ((hi-c (rx-char-at pat (+ ni 1))))
+                          (list
+                            (dict "kind" "range" "lo" lc "hi" hi-c)
+                            (+ ni 2)))
+                        (list (dict "kind" "lit" "c" lc) ni)))))))))
+        (else
+          (if
+            (and
+              (not (= c ""))
+              (= (rx-char-at pat (+ i 1)) "-")
+              (not (= (rx-char-at pat (+ i 2)) "]"))
+              (not (= (rx-char-at pat (+ i 2)) "")))
+            (let
+              ((hi-c (rx-char-at pat (+ i 2))))
+              (list (dict "kind" "range" "lo" c "hi" hi-c) (+ i 3)))
+            (list (dict "kind" "lit" "c" c) (+ i 1))))))))
+
+(define
+  rx-parse-class-items
+  (fn
+    (pat i items)
+    (let
+      ((c (rx-char-at pat i)))
+      (if
+        (or (= c "]") (= c ""))
+        (list items i)
+        (let
+          ((res (rx-parse-class-item pat i)))
+          (begin
+            (append! items (nth res 0))
+            (rx-parse-class-items pat (nth res 1) items)))))))
+
+;; parse a sequence until stop-ch or EOF; returns (nodes new-i groups-count)
+(define
+  rx-parse-seq
+  (fn
+    (pat i stop-ch ds)
+    (let
+      ((c (rx-char-at pat i)))
+      (cond
+        ((= c "") (list (get ds "nodes") i (get ds "groups")))
+        ((= c stop-ch) (list (get ds "nodes") i (get ds "groups")))
+        ((= c "|") (rx-parse-alt-rest pat i ds))
+        (else
+          (let
+            ((res (rx-parse-atom pat i ds)))
+            (let
+              ((node (nth res 0)) (ni (nth res 1)) (ds2 (nth res 2)))
+              (let
+                ((qres (rx-parse-quant pat ni node)))
+                (begin
+                  (append! (get ds2 "nodes") (nth qres 0))
+                  (rx-parse-seq pat (nth qres 1) stop-ch ds2))))))))))
+
+;; when we hit | inside a sequence, collect all alternatives
+(define
+  rx-parse-alt-rest
+  (fn
+    (pat i ds)
+    (let
+      ((left-branch (get ds "nodes")) (branches (list)))
+      (begin
+        (append! branches left-branch)
+        (rx-parse-alt-branches pat i (get ds "groups") branches)))))
+
+(define
+  rx-parse-alt-branches
+  (fn
+    (pat i n-groups branches)
+    (let
+      ((new-nodes (list)) (ds2 (dict "groups" n-groups "nodes" new-nodes)))
+      (let
+        ((res (rx-parse-seq pat (+ i 1) "|" ds2)))
+        (begin
+          (append! branches (nth res 0))
+          (let
+            ((ni2 (nth res 1)) (g2 (nth res 2)))
+            (if
+              (= (rx-char-at pat ni2) "|")
+              (rx-parse-alt-branches pat ni2 g2 branches)
+              (list
+                (list (dict "__t__" "alt" "__branches__" branches))
+                ni2
+                g2))))))))
+
+;; parse quantifier suffix, returns (node new-i)
+(define
+  rx-parse-quant
+  (fn
+    (pat i node)
+    (let
+      ((c (rx-char-at pat i)))
+      (cond
+        ((= c "*")
+          (let
+            ((lazy? (= (rx-char-at pat (+ i 1)) "?")))
+            (list
+              (dict
+                "__t__"
+                "quant"
+                "__node__"
+                node
+                "__min__"
+                0
+                "__max__"
+                -1
+                "__lazy__"
+                lazy?)
+              (if lazy? (+ i 2) (+ i 1)))))
+        ((= c "+")
+          (let
+            ((lazy? (= (rx-char-at pat (+ i 1)) "?")))
+            (list
+              (dict
+                "__t__"
+                "quant"
+                "__node__"
+                node
+                "__min__"
+                1
+                "__max__"
+                -1
+                "__lazy__"
+                lazy?)
+              (if lazy? (+ i 2) (+ i 1)))))
+        ((= c "?")
+          (let
+            ((lazy? (= (rx-char-at pat (+ i 1)) "?")))
+            (list
+              (dict
+                "__t__"
+                "quant"
+                "__node__"
+                node
+                "__min__"
+                0
+                "__max__"
+                1
+                "__lazy__"
+                lazy?)
+              (if lazy? (+ i 2) (+ i 1)))))
+        ((= c "{")
+          (let
+            ((mres (rx-parse-int pat (+ i 1) 0)))
+            (let
+              ((mn (nth mres 0)) (mi (nth mres 1)))
+              (let
+                ((sep (rx-char-at pat mi)))
+                (cond
+                  ((= sep "}")
+                    (let
+                      ((lazy? (= (rx-char-at pat (+ mi 1)) "?")))
+                      (list
+                        (dict
+                          "__t__"
+                          "quant"
+                          "__node__"
+                          node
+                          "__min__"
+                          mn
+                          "__max__"
+                          mn
+                          "__lazy__"
+                          lazy?)
+                        (if lazy? (+ mi 2) (+ mi 1)))))
+                  ((= sep ",")
+                    (let
+                      ((c2 (rx-char-at pat (+ mi 1))))
+                      (if
+                        (= c2 "}")
+                        (let
+                          ((lazy? (= (rx-char-at pat (+ mi 2)) "?")))
+                          (list
+                            (dict
+                              "__t__"
+                              "quant"
+                              "__node__"
+                              node
+                              "__min__"
+                              mn
+                              "__max__"
+                              -1
+                              "__lazy__"
+                              lazy?)
+                            (if lazy? (+ mi 3) (+ mi 2))))
+                        (let
+                          ((mxres (rx-parse-int pat (+ mi 1) 0)))
+                          (let
+                            ((mx (nth mxres 0)) (mxi (nth mxres 1)))
+                            (let
+                              ((lazy? (= (rx-char-at pat (+ mxi 1)) "?")))
+                              (list
+                                (dict
+                                  "__t__"
+                                  "quant"
+                                  "__node__"
+                                  node
+                                  "__min__"
+                                  mn
+                                  "__max__"
+                                  mx
+                                  "__lazy__"
+                                  lazy?)
+                                (if lazy? (+ mxi 2) (+ mxi 1)))))))))
+                  (else (list node i)))))))
+        (else (list node i))))))
+
+;; parse one atom, returns (node new-i new-ds)
+(define
+  rx-parse-atom
+  (fn
+    (pat i ds)
+    (let
+      ((c (rx-char-at pat i)))
+      (cond
+        ((= c ".") (list (dict "__t__" "any") (+ i 1) ds))
+        ((= c "^") (list (dict "__t__" "anchor-start") (+ i 1) ds))
+        ((= c "$") (list (dict "__t__" "anchor-end") (+ i 1) ds))
+        ((= c "\\")
+          (let
+            ((esc (rx-parse-escape pat (+ i 1))))
+            (list (nth esc 0) (nth esc 1) ds)))
+        ((= c "[")
+          (let
+            ((neg? (= (rx-char-at pat (+ i 1)) "^")))
+            (let
+              ((start (if neg? (+ i 2) (+ i 1))) (items (list)))
+              (let
+                ((res (rx-parse-class-items pat start items)))
+                (let
+                  ((ci (nth res 1)))
+                  (list
+                    (dict
+                      "__t__"
+                      "char-class"
+                      "__neg__"
+                      neg?
+                      "__items__"
+                      items)
+                    (+ ci 1)
+                    ds))))))
+        ((= c "(")
+          (let
+            ((c2 (rx-char-at pat (+ i 1))))
+            (if
+              (and (= c2 "?") (= (rx-char-at pat (+ i 2)) ":"))
+              (let
+                ((inner-nodes (list))
+                  (inner-ds
+                    (dict "groups" (get ds "groups") "nodes" inner-nodes)))
+                (let
+                  ((res (rx-parse-seq pat (+ i 3) ")" inner-ds)))
+                  (list
+                    (dict "__t__" "ncgroup" "__nodes__" (nth res 0))
+                    (+ (nth res 1) 1)
+                    (dict "groups" (nth res 2) "nodes" (get ds "nodes")))))
+              (let
+                ((gidx (+ (get ds "groups") 1)) (inner-nodes (list)))
+                (let
+                  ((inner-ds (dict "groups" gidx "nodes" inner-nodes)))
+                  (let
+                    ((res (rx-parse-seq pat (+ i 1) ")" inner-ds)))
+                    (list
+                      (dict
+                        "__t__"
+                        "group"
+                        "__idx__"
+                        gidx
+                        "__nodes__"
+                        (nth res 0))
+                      (+ (nth res 1) 1)
+                      (dict "groups" (nth res 2) "nodes" (get ds "nodes")))))))))
+        (else (list (dict "__t__" "literal" "__c__" c) (+ i 1) ds))))))
+
+;; top-level compile
+(define
+  rx-compile
+  (fn
+    (pattern)
+    (let
+      ((nodes (list)) (ds (dict "groups" 0 "nodes" nodes)))
+      (let
+        ((res (rx-parse-seq pattern 0 "" ds)))
+        (dict "nodes" (nth res 0) "ngroups" (nth res 2))))))
+
+;; ── Matcher ───────────────────────────────────────────────────────
+
+;; Match a char-class item against character c
+(define
+  rx-item-matches?
+  (fn
+    (item c ci?)
+    (let
+      ((kind (get item "kind")))
+      (cond
+        ((= kind "lit") (rx-char-eq? c (get item "c") ci?))
+        ((= kind "range")
+          (let
+            ((lo (if ci? (rx-downcase-char (get item "lo")) (get item "lo")))
+              (hi
+                (if ci? (rx-downcase-char (get item "hi")) (get item "hi")))
+              (dc (if ci? (rx-downcase-char c) c)))
+            (and
+              (>= (char-code dc) (char-code lo))
+              (<= (char-code dc) (char-code hi)))))
+        ((= kind "class-d")
+          (let ((m (rx-digit? c))) (if (get item "neg") (not m) m)))
+        ((= kind "class-w")
+          (let ((m (rx-word? c))) (if (get item "neg") (not m) m)))
+        ((= kind "class-s")
+          (let ((m (rx-space? c))) (if (get item "neg") (not m) m)))
+        (else false)))))
+
+(define
+  rx-class-items-any?
+  (fn
+    (items c ci?)
+    (if
+      (empty? items)
+      false
+      (if
+        (rx-item-matches? (first items) c ci?)
+        true
+        (rx-class-items-any? (rest items) c ci?)))))
+
+(define
+  rx-class-matches?
+  (fn
+    (node c ci?)
+    (let
+      ((neg? (get node "__neg__")) (items (get node "__items__")))
+      (let
+        ((hit (rx-class-items-any? items c ci?)))
+        (if neg? (not hit) hit)))))
+
+;; Word boundary check
+(define
+  rx-is-word-boundary?
+  (fn
+    (s i slen)
+    (let
+      ((before (if (> i 0) (rx-word? (char-at s (- i 1))) false))
+        (after (if (< i slen) (rx-word? (char-at s i)) false)))
+      (not (= before after)))))
+
+;; ── Core matcher ──────────────────────────────────────────────────
+;;
+;; rx-match-nodes : nodes s i slen ci? mi? groups → end-pos or -1
+;;
+;; Matches `nodes` starting at position `i` in string `s`.
+;; Returns the position after the last character consumed, or -1 on failure.
+;; Mutates `groups` dict to record captures.
+
+(define
+  rx-match-nodes
+  (fn
+    (nodes s i slen ci? mi? groups)
+    (if
+      (empty? nodes)
+      i
+      (let
+        ((node (first nodes)) (rest-nodes (rest nodes)))
+        (let
+          ((t (get node "__t__")))
+          (cond
+            ((= t "literal")
+              (if
+                (and
+                  (< i slen)
+                  (rx-char-eq? (char-at s i) (get node "__c__") ci?))
+                (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                -1))
+            ((= t "any")
+              (if
+                (and (< i slen) (not (rx-newline? (char-at s i))))
+                (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                -1))
+            ((= t "class-d")
+              (let
+                ((m (and (< i slen) (rx-digit? (char-at s i)))))
+                (if
+                  (if (get node "__neg__") (not m) m)
+                  (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                  -1)))
+            ((= t "class-w")
+              (let
+                ((m (and (< i slen) (rx-word? (char-at s i)))))
+                (if
+                  (if (get node "__neg__") (not m) m)
+                  (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                  -1)))
+            ((= t "class-s")
+              (let
+                ((m (and (< i slen) (rx-space? (char-at s i)))))
+                (if
+                  (if (get node "__neg__") (not m) m)
+                  (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                  -1)))
+            ((= t "char-class")
+              (if
+                (and (< i slen) (rx-class-matches? node (char-at s i) ci?))
+                (rx-match-nodes rest-nodes s (+ i 1) slen ci? mi? groups)
+                -1))
+            ((= t "anchor-start")
+              (if
+                (or
+                  (= i 0)
+                  (and mi? (rx-newline? (rx-char-at s (- i 1)))))
+                (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+                -1))
+            ((= t "anchor-end")
+              (if
+                (or (= i slen) (and mi? (rx-newline? (rx-char-at s i))))
+                (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+                -1))
+            ((= t "anchor-word")
+              (if
+                (rx-is-word-boundary? s i slen)
+                (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+                -1))
+            ((= t "anchor-nonword")
+              (if
+                (not (rx-is-word-boundary? s i slen))
+                (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+                -1))
+            ((= t "group")
+              (let
+                ((gidx (get node "__idx__"))
+                  (inner (get node "__nodes__")))
+                (let
+                  ((g-end (rx-match-nodes inner s i slen ci? mi? groups)))
+                  (if
+                    (>= g-end 0)
+                    (begin
+                      (dict-set!
+                        groups
+                        (js-to-string gidx)
+                        (substring s i g-end))
+                      (let
+                        ((final-end (rx-match-nodes rest-nodes s g-end slen ci? mi? groups)))
+                        (if
+                          (>= final-end 0)
+                          final-end
+                          (begin
+                            (dict-set! groups (js-to-string gidx) nil)
+                            -1))))
+                    -1))))
+            ((= t "ncgroup")
+              (let
+                ((inner (get node "__nodes__")))
+                (rx-match-nodes
+                  (append inner rest-nodes)
+                  s
+                  i
+                  slen
+                  ci?
+                  mi?
+                  groups)))
+            ((= t "alt")
+              (let
+                ((branches (get node "__branches__")))
+                (rx-try-branches branches rest-nodes s i slen ci? mi? groups)))
+            ((= t "quant")
+              (let
+                ((inner-node (get node "__node__"))
+                  (mn (get node "__min__"))
+                  (mx (get node "__max__"))
+                  (lazy? (get node "__lazy__")))
+                (if
+                  lazy?
+                  (rx-quant-lazy
+                    inner-node
+                    mn
+                    mx
+                    rest-nodes
+                    s
+                    i
+                    slen
+                    ci?
+                    mi?
+                    groups
+                    0)
+                  (rx-quant-greedy
+                    inner-node
+                    mn
+                    mx
+                    rest-nodes
+                    s
+                    i
+                    slen
+                    ci?
+                    mi?
+                    groups
+                    0))))
+            (else -1)))))))
+
+(define
+  rx-try-branches
+  (fn
+    (branches rest-nodes s i slen ci? mi? groups)
+    (if
+      (empty? branches)
+      -1
+      (let
+        ((res (rx-match-nodes (append (first branches) rest-nodes) s i slen ci? mi? groups)))
+        (if
+          (>= res 0)
+          res
+          (rx-try-branches (rest branches) rest-nodes s i slen ci? mi? groups))))))
+
+;; Greedy: expand as far as possible, then try rest from the longest match
+;; Strategy: recurse forward (extend first); only try rest when extension fails
+(define
+  rx-quant-greedy
+  (fn
+    (inner-node mn mx rest-nodes s i slen ci? mi? groups count)
+    (let
+      ((can-extend (and (< i slen) (or (= mx -1) (< count mx)))))
+      (if
+        can-extend
+        (let
+          ((ni (rx-match-one inner-node s i slen ci? mi? groups)))
+          (if
+            (>= ni 0)
+            (let
+              ((res (rx-quant-greedy inner-node mn mx rest-nodes s ni slen ci? mi? groups (+ count 1))))
+              (if
+                (>= res 0)
+                res
+                (if
+                  (>= count mn)
+                  (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+                  -1)))
+            (if
+              (>= count mn)
+              (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+              -1)))
+        (if
+          (>= count mn)
+          (rx-match-nodes rest-nodes s i slen ci? mi? groups)
+          -1)))))
+
+;; Lazy: try rest first, extend only if rest fails
+(define
+  rx-quant-lazy
+  (fn
+    (inner-node mn mx rest-nodes s i slen ci? mi? groups count)
+    (if
+      (>= count mn)
+      (let
+        ((res (rx-match-nodes rest-nodes s i slen ci? mi? groups)))
+        (if
+          (>= res 0)
+          res
+          (if
+            (and (< i slen) (or (= mx -1) (< count mx)))
+            (let
+              ((ni (rx-match-one inner-node s i slen ci? mi? groups)))
+              (if
+                (>= ni 0)
+                (rx-quant-lazy
+                  inner-node
+                  mn
+                  mx
+                  rest-nodes
+                  s
+                  ni
+                  slen
+                  ci?
+                  mi?
+                  groups
+                  (+ count 1))
+                -1))
+            -1)))
+      (if
+        (< i slen)
+        (let
+          ((ni (rx-match-one inner-node s i slen ci? mi? groups)))
+          (if
+            (>= ni 0)
+            (rx-quant-lazy
+              inner-node
+              mn
+              mx
+              rest-nodes
+              s
+              ni
+              slen
+              ci?
+              mi?
+              groups
+              (+ count 1))
+            -1))
+        -1))))
+
+;; Match a single node at position i, return new pos or -1
+(define
+  rx-match-one
+  (fn
+    (node s i slen ci? mi? groups)
+    (rx-match-nodes (list node) s i slen ci? mi? groups)))
+
+;; ── Engine entry points ───────────────────────────────────────────
+
+;; Try matching at exactly position i. Returns result dict or nil.
+(define
+  rx-try-at
+  (fn
+    (compiled s i slen ci? mi?)
+    (let
+      ((nodes (get compiled "nodes")) (ngroups (get compiled "ngroups")))
+      (let
+        ((groups (dict)))
+        (let
+          ((end (rx-match-nodes nodes s i slen ci? mi? groups)))
+          (if
+            (>= end 0)
+            (dict "start" i "end" end "groups" groups "ngroups" ngroups)
+            nil))))))
+
+;; Find first match scanning from search-start.
+(define
+  rx-find-from
+  (fn
+    (compiled s search-start slen ci? mi?)
+    (if
+      (> search-start slen)
+      nil
+      (let
+        ((res (rx-try-at compiled s search-start slen ci? mi?)))
+        (if
+          res
+          res
+          (rx-find-from compiled s (+ search-start 1) slen ci? mi?))))))
+
+;; Build exec result dict from raw match result
+(define
+  rx-build-exec-result
+  (fn
+    (s match-res)
+    (let
+      ((start (get match-res "start"))
+        (end (get match-res "end"))
+        (groups (get match-res "groups"))
+        (ngroups (get match-res "ngroups")))
+      (let
+        ((matched (substring s start end))
+          (caps (rx-build-captures groups ngroups 1)))
+        (dict "match" matched "index" start "input" s "groups" caps)))))
+
+(define
+  rx-build-captures
+  (fn
+    (groups ngroups idx)
+    (if
+      (> idx ngroups)
+      (list)
+      (let
+        ((cap (get groups (js-to-string idx))))
+        (cons
+          (if (= cap nil) :js-undefined cap)
+          (rx-build-captures groups ngroups (+ idx 1)))))))
+
+;; ── Public interface ──────────────────────────────────────────────
+
+;; Lazy compile: build NFA on first use, cache under "__compiled__"
+(define
+  rx-ensure-compiled!
+  (fn
+    (rx)
+    (if
+      (dict-has? rx "__compiled__")
+      (get rx "__compiled__")
+      (let
+        ((c (rx-compile (get rx "source"))))
+        (begin (dict-set! rx "__compiled__" c) c)))))
+
+(define
+  rx-test
+  (fn
+    (rx s)
+    (let
+      ((compiled (rx-ensure-compiled! rx))
+        (ci? (get rx "ignoreCase"))
+        (mi? (get rx "multiline"))
+        (slen (len s)))
+      (let
+        ((start (if (get rx "global") (let ((li (get rx "lastIndex"))) (if (number? li) li 0)) 0)))
+        (let
+          ((res (rx-find-from compiled s start slen ci? mi?)))
+          (if
+            (get rx "global")
+            (begin
+              (dict-set! rx "lastIndex" (if res (get res "end") 0))
+              (if res true false))
+            (if res true false)))))))
+
+(define
+  rx-exec
+  (fn
+    (rx s)
+    (let
+      ((compiled (rx-ensure-compiled! rx))
+        (ci? (get rx "ignoreCase"))
+        (mi? (get rx "multiline"))
+        (slen (len s)))
+      (let
+        ((start (if (get rx "global") (let ((li (get rx "lastIndex"))) (if (number? li) li 0)) 0)))
+        (let
+          ((res (rx-find-from compiled s start slen ci? mi?)))
+          (if
+            res
+            (begin
+              (when
+                (get rx "global")
+                (dict-set! rx "lastIndex" (get res "end")))
+              (rx-build-exec-result s res))
+            (begin
+              (when (get rx "global") (dict-set! rx "lastIndex" 0))
+              nil)))))))
+
+;; match-all for String.prototype.matchAll
+(define
+  js-regex-match-all
+  (fn
+    (rx s)
+    (let
+      ((compiled (rx-ensure-compiled! rx))
+        (ci? (get rx "ignoreCase"))
+        (mi? (get rx "multiline"))
+        (slen (len s))
+        (results (list)))
+      (rx-match-all-loop compiled s 0 slen ci? mi? results))))
+
+(define
+  rx-match-all-loop
+  (fn
+    (compiled s i slen ci? mi? results)
+    (if
+      (> i slen)
+      results
+      (let
+        ((res (rx-find-from compiled s i slen ci? mi?)))
+        (if
+          res
+          (begin
+            (append! results (rx-build-exec-result s res))
+            (let
+              ((next (get res "end")))
+              (rx-match-all-loop
+                compiled
+                s
+                (if (= next i) (+ i 1) next)
+                slen
+                ci?
+                mi?
+                results)))
+          results)))))
+
+;; ── Install platform ──────────────────────────────────────────────
+
+(js-regex-platform-override! "test" rx-test)
+(js-regex-platform-override! "exec" rx-exec)

lib/js/runtime.sx

@@ -2032,7 +2032,15 @@
           (&rest args)
           (cond
             ((= (len args) 0) nil)
-            ((js-regex? (nth args 0)) (js-regex-stub-exec (nth args 0) s))
+            ((js-regex? (nth args 0))
+              (let
+                ((rx (nth args 0)))
+                (let
+                  ((impl (get __js_regex_platform__ "exec")))
+                  (if
+                    (js-undefined? impl)
+                    (js-regex-stub-exec rx s)
+                    (impl rx s)))))
             (else
               (let
                 ((needle (js-to-string (nth args 0))))
@@ -2041,7 +2049,7 @@
                   (if
                     (= idx -1)
                     nil
-                    (let ((res (list))) (append! res needle) res))))))))
+                    (let ((res (list))) (begin (append! res needle) res)))))))))
       ((= name "at")
         (fn
           (i)
@@ -2099,6 +2107,20 @@
       ((= name "toWellFormed") (fn () s))
       (else js-undefined))))
 
+(define __js_tdz_sentinel__ (dict "__tdz__" true))
+
+(define js-tdz? (fn (v) (and (dict? v) (dict-has? v "__tdz__"))))
+
+(define
+  js-tdz-check
+  (fn
+    (name val)
+    (if
+      (js-tdz? val)
+      (raise
+        (TypeError (str "Cannot access '" name "' before initialization")))
+      val)))
+
 (define
   js-string-slice
   (fn

lib/js/stdlib.sx

@@ -0,0 +1,239 @@
+;; lib/js/stdlib.sx — Phase 22 JS additions
+;;
+;; Adds to lib/js/runtime.sx (already loaded):
+;;   1. Bitwise binary ops (js-bitand/bitor/bitxor/lshift/rshift/urshift/bitnot)
+;;   2. Map class (arbitrary-key hash map via list of pairs)
+;;   3. Set class (uniqueness collection via SX make-set)
+;;   4. RegExp constructor (wraps js-regex-new already in runtime)
+;;   5. Wires Map / Set / RegExp into js-global
+
+;; ---------------------------------------------------------------------------
+;; 1. Bitwise binary ops
+;;    JS coerces operands to 32-bit signed int before applying the op.
+;;    Use truncate (not js-num-to-int) since integer / 0 crashes the evaluator.
+;; ---------------------------------------------------------------------------
+
+(define
+  (js-bitand a b)
+  (bitwise-and (truncate (js-to-number a)) (truncate (js-to-number b))))
+
+(define
+  (js-bitor a b)
+  (bitwise-or (truncate (js-to-number a)) (truncate (js-to-number b))))
+
+(define
+  (js-bitxor a b)
+  (bitwise-xor (truncate (js-to-number a)) (truncate (js-to-number b))))
+
+;; << : left-shift by (b mod 32) positions
+(define
+  (js-lshift a b)
+  (arithmetic-shift
+    (truncate (js-to-number a))
+    (modulo (truncate (js-to-number b)) 32)))
+
+;; >> : arithmetic right-shift (sign-extending)
+(define
+  (js-rshift a b)
+  (arithmetic-shift
+    (truncate (js-to-number a))
+    (- 0 (modulo (truncate (js-to-number b)) 32))))
+
+;; >>> : logical right-shift (zero-extending)
+;;   Convert to uint32 first, then divide by 2^n.
+(define
+  (js-urshift a b)
+  (let
+    ((u32 (modulo (truncate (js-to-number a)) 4294967296))
+      (n (modulo (truncate (js-to-number b)) 32)))
+    (quotient u32 (arithmetic-shift 1 n))))
+
+;; ~ : bitwise NOT — equivalent to -(n+1) in 32-bit signed arithmetic
+(define (js-bitnot a) (bitwise-not (truncate (js-to-number a))))
+
+;; ---------------------------------------------------------------------------
+;; 2. Map class
+;;    Stored as {:__js_map__ true :size N :_pairs (list (list key val) ...)}
+;;    Mutation via dict-set! on the underlying dict.
+;; ---------------------------------------------------------------------------
+
+(define
+  (js-map-new)
+  (let
+    ((m (dict)))
+    (dict-set! m "__js_map__" true)
+    (dict-set! m "size" 0)
+    (dict-set! m "_pairs" (list))
+    m))
+
+(define (js-map? v) (and (dict? v) (dict-has? v "__js_map__")))
+
+;; Linear scan for key using ===; returns index or -1
+(define
+  (js-map-find-idx pairs k)
+  (letrec
+    ((go (fn (ps i) (cond ((= (len ps) 0) -1) ((js-strict-eq (first (first ps)) k) i) (else (go (rest ps) (+ i 1)))))))
+    (go pairs 0)))
+
+(define
+  (js-map-get m k)
+  (letrec
+    ((go (fn (ps) (if (= (len ps) 0) js-undefined (if (js-strict-eq (first (first ps)) k) (nth (first ps) 1) (go (rest ps)))))))
+    (go (get m "_pairs"))))
+
+;; Replace element at index i in list
+(define
+  (js-list-set-nth lst i newval)
+  (letrec
+    ((go (fn (ps j) (if (= (len ps) 0) (list) (cons (if (= j i) newval (first ps)) (go (rest ps) (+ j 1)))))))
+    (go lst 0)))
+
+;; Remove element at index i from list
+(define
+  (js-list-remove-nth lst i)
+  (letrec
+    ((go (fn (ps j) (if (= (len ps) 0) (list) (if (= j i) (go (rest ps) (+ j 1)) (cons (first ps) (go (rest ps) (+ j 1))))))))
+    (go lst 0)))
+
+(define
+  (js-map-set! m k v)
+  (let
+    ((pairs (get m "_pairs")) (idx (js-map-find-idx (get m "_pairs") k)))
+    (if
+      (= idx -1)
+      (begin
+        (dict-set! m "_pairs" (append pairs (list (list k v))))
+        (dict-set! m "size" (+ (get m "size") 1)))
+      (dict-set! m "_pairs" (js-list-set-nth pairs idx (list k v)))))
+  m)
+
+(define
+  (js-map-has m k)
+  (not (= (js-map-find-idx (get m "_pairs") k) -1)))
+
+(define
+  (js-map-delete! m k)
+  (let
+    ((idx (js-map-find-idx (get m "_pairs") k)))
+    (when
+      (not (= idx -1))
+      (dict-set! m "_pairs" (js-list-remove-nth (get m "_pairs") idx))
+      (dict-set! m "size" (- (get m "size") 1))))
+  m)
+
+(define
+  (js-map-clear! m)
+  (dict-set! m "_pairs" (list))
+  (dict-set! m "size" 0)
+  m)
+
+(define (js-map-keys m) (map first (get m "_pairs")))
+(define
+  (js-map-vals m)
+  (map (fn (p) (nth p 1)) (get m "_pairs")))
+(define (js-map-entries m) (get m "_pairs"))
+
+(define
+  (js-map-for-each m cb)
+  (for-each
+    (fn (p) (cb (nth p 1) (first p) m))
+    (get m "_pairs"))
+  js-undefined)
+
+;; Map method dispatch (called from js-object-method-call in runtime)
+(define
+  (js-map-method m name args)
+  (cond
+    ((= name "set")
+      (js-map-set! m (nth args 0) (nth args 1)))
+    ((= name "get") (js-map-get m (nth args 0)))
+    ((= name "has") (js-map-has m (nth args 0)))
+    ((= name "delete") (js-map-delete! m (nth args 0)))
+    ((= name "clear") (js-map-clear! m))
+    ((= name "keys") (js-map-keys m))
+    ((= name "values") (js-map-vals m))
+    ((= name "entries") (js-map-entries m))
+    ((= name "forEach") (js-map-for-each m (nth args 0)))
+    ((= name "toString") "[object Map]")
+    (else js-undefined)))
+
+(define Map {:__callable__ (fn (&rest args) (let ((m (js-map-new))) (when (and (> (len args) 0) (list? (nth args 0))) (for-each (fn (entry) (js-map-set! m (nth entry 0) (nth entry 1))) (nth args 0))) m)) :prototype {:entries (fn (&rest a) (js-map-entries (js-this))) :delete (fn (&rest a) (js-map-delete! (js-this) (nth a 0))) :get (fn (&rest a) (js-map-get (js-this) (nth a 0))) :values (fn (&rest a) (js-map-vals (js-this))) :toString (fn () "[object Map]") :has (fn (&rest a) (js-map-has (js-this) (nth a 0))) :set (fn (&rest a) (js-map-set! (js-this) (nth a 0) (nth a 1))) :forEach (fn (&rest a) (js-map-for-each (js-this) (nth a 0))) :clear (fn (&rest a) (js-map-clear! (js-this))) :keys (fn (&rest a) (js-map-keys (js-this)))}})
+
+;; ---------------------------------------------------------------------------
+;; 3. Set class
+;;    {:__js_set__ true :size N :_set <sx-set>}
+;;    Note: set-member?/set-add!/set-remove! all take (set item) order.
+;; ---------------------------------------------------------------------------
+
+(define
+  (js-set-new)
+  (let
+    ((s (dict)))
+    (dict-set! s "__js_set__" true)
+    (dict-set! s "size" 0)
+    (dict-set! s "_set" (make-set))
+    s))
+
+(define (js-set? v) (and (dict? v) (dict-has? v "__js_set__")))
+
+(define
+  (js-set-add! s v)
+  (let
+    ((sx (get s "_set")))
+    (when
+      (not (set-member? sx v))
+      (set-add! sx v)
+      (dict-set! s "size" (+ (get s "size") 1))))
+  s)
+
+(define (js-set-has s v) (set-member? (get s "_set") v))
+
+(define
+  (js-set-delete! s v)
+  (let
+    ((sx (get s "_set")))
+    (when
+      (set-member? sx v)
+      (set-remove! sx v)
+      (dict-set! s "size" (- (get s "size") 1))))
+  s)
+
+(define
+  (js-set-clear! s)
+  (dict-set! s "_set" (make-set))
+  (dict-set! s "size" 0)
+  s)
+
+(define (js-set-vals s) (set->list (get s "_set")))
+
+(define
+  (js-set-for-each s cb)
+  (for-each (fn (v) (cb v v s)) (set->list (get s "_set")))
+  js-undefined)
+
+(define Set {:__callable__ (fn (&rest args) (let ((s (js-set-new))) (when (and (> (len args) 0) (list? (nth args 0))) (for-each (fn (v) (js-set-add! s v)) (nth args 0))) s)) :prototype {:entries (fn (&rest a) (map (fn (v) (list v v)) (js-set-vals (js-this)))) :delete (fn (&rest a) (js-set-delete! (js-this) (nth a 0))) :values (fn (&rest a) (js-set-vals (js-this))) :add (fn (&rest a) (js-set-add! (js-this) (nth a 0))) :toString (fn () "[object Set]") :has (fn (&rest a) (js-set-has (js-this) (nth a 0))) :forEach (fn (&rest a) (js-set-for-each (js-this) (nth a 0))) :clear (fn (&rest a) (js-set-clear! (js-this))) :keys (fn (&rest a) (js-set-vals (js-this)))}})
+
+;; ---------------------------------------------------------------------------
+;; 4. RegExp constructor — callable lambda wrapping js-regex-new
+;; ---------------------------------------------------------------------------
+
+(define
+  RegExp
+  (fn
+    (&rest args)
+    (cond
+      ((= (len args) 0) (js-regex-new "" ""))
+      ((= (len args) 1)
+        (js-regex-new (js-to-string (nth args 0)) ""))
+      (else
+        (js-regex-new
+          (js-to-string (nth args 0))
+          (js-to-string (nth args 1)))))))
+
+;; ---------------------------------------------------------------------------
+;; 5. Wire new globals into js-global
+;; ---------------------------------------------------------------------------
+
+(dict-set! js-global "Map" Map)
+(dict-set! js-global "Set" Set)
+(dict-set! js-global "RegExp" RegExp)

lib/js/test.sh

@@ -33,6 +33,10 @@ cat > "$TMPFILE" << 'EPOCHS'
 (load "lib/js/transpile.sx")
 (epoch 5)
 (load "lib/js/runtime.sx")
+(epoch 6)
+(load "lib/js/regex.sx")
+(epoch 7)
+(load "lib/js/stdlib.sx")
 
 ;; ── Phase 0: stubs still behave ─────────────────────────────────
 (epoch 10)
@@ -1323,6 +1327,166 @@ cat > "$TMPFILE" << 'EPOCHS'
 (epoch 3505)
 (eval "(js-eval \"var a = {length: 3, 0: 10, 1: 20, 2: 30}; var sum = 0; Array.prototype.forEach.call(a, function(x){sum += x;}); sum\")")
 
+;; ── Phase 12: Regex engine ────────────────────────────────────────
+;; Platform is installed (test key is a function, not undefined)
+(epoch 5000)
+(eval "(js-undefined? (get __js_regex_platform__ \"test\"))")
+(epoch 5001)
+(eval "(js-eval \"/foo/.test('hi foo bar')\")")
+(epoch 5002)
+(eval "(js-eval \"/foo/.test('hi bar')\")")
+;; Case-insensitive flag
+(epoch 5003)
+(eval "(js-eval \"/FOO/i.test('hello foo world')\")")
+;; Anchors
+(epoch 5004)
+(eval "(js-eval \"/^hello/.test('hello world')\")")
+(epoch 5005)
+(eval "(js-eval \"/^hello/.test('say hello')\")")
+(epoch 5006)
+(eval "(js-eval \"/world$/.test('hello world')\")")
+;; Character classes
+(epoch 5007)
+(eval "(js-eval \"/\\\\d+/.test('abc 123')\")")
+(epoch 5008)
+(eval "(js-eval \"/\\\\w+/.test('hello')\")")
+(epoch 5009)
+(eval "(js-eval \"/[abc]/.test('dog')\")")
+(epoch 5010)
+(eval "(js-eval \"/[abc]/.test('cat')\")")
+;; Quantifiers
+(epoch 5011)
+(eval "(js-eval \"/a*b/.test('b')\")")
+(epoch 5012)
+(eval "(js-eval \"/a+b/.test('b')\")")
+(epoch 5013)
+(eval "(js-eval \"/a{2,3}/.test('aa')\")")
+(epoch 5014)
+(eval "(js-eval \"/a{2,3}/.test('a')\")")
+;; Dot
+(epoch 5015)
+(eval "(js-eval \"/h.llo/.test('hello')\")")
+(epoch 5016)
+(eval "(js-eval \"/h.llo/.test('hllo')\")")
+;; exec result
+(epoch 5017)
+(eval "(js-eval \"var m = /foo(\\\\w+)/.exec('foobar'); m.match\")")
+(epoch 5018)
+(eval "(js-eval \"var m = /foo(\\\\w+)/.exec('foobar'); m.index\")")
+(epoch 5019)
+(eval "(js-eval \"var m = /foo(\\\\w+)/.exec('foobar'); m.groups[0]\")")
+;; Alternation
+(epoch 5020)
+(eval "(js-eval \"/cat|dog/.test('I have a dog')\")")
+(epoch 5021)
+(eval "(js-eval \"/cat|dog/.test('I have a fish')\")")
+;; Non-capturing group
+(epoch 5022)
+(eval "(js-eval \"/(?:foo)+/.test('foofoo')\")")
+;; Negated char class
+(epoch 5023)
+(eval "(js-eval \"/[^abc]/.test('d')\")")
+(epoch 5024)
+(eval "(js-eval \"/[^abc]/.test('a')\")")
+;; Range inside char class
+(epoch 5025)
+(eval "(js-eval \"/[a-z]+/.test('hello')\")")
+;; Word boundary
+(epoch 5026)
+(eval "(js-eval \"/\\\\bword\\\\b/.test('a word here')\")")
+(epoch 5027)
+(eval "(js-eval \"/\\\\bword\\\\b/.test('password')\")")
+;; Lazy quantifier
+(epoch 5028)
+(eval "(js-eval \"var m = /a+?/.exec('aaa'); m.match\")")
+;; Global flag exec
+(epoch 5029)
+(eval "(js-eval \"var r=/\\\\d+/g; r.exec('a1b2'); r.exec('a1b2').match\")")
+;; String.prototype.match with regex
+(epoch 5030)
+(eval "(js-eval \"'hello world'.match(/\\\\w+/).match\")")
+;; String.prototype.search
+(epoch 5031)
+(eval "(js-eval \"'hello world'.search(/world/)\")")
+;; String.prototype.replace with regex
+(epoch 5032)
+(eval "(js-eval \"'hello world'.replace(/world/, 'there')\")")
+;; multiline anchor
+(epoch 5033)
+(eval "(js-eval \"/^bar/m.test('foo\\nbar')\")")
+
+;; ── Phase 13: let/const TDZ infrastructure ───────────────────────
+;; The TDZ sentinel and checker are defined in runtime.sx.
+;; let/const bindings work normally after initialization.
+(epoch 5100)
+(eval "(js-eval \"let x = 5; x\")")
+(epoch 5101)
+(eval "(js-eval \"const y = 42; y\")")
+;; TDZ sentinel exists and is detectable
+(epoch 5102)
+(eval "(js-tdz? __js_tdz_sentinel__)")
+;; js-tdz-check passes through non-sentinel values
+(epoch 5103)
+(eval "(js-tdz-check \"x\" 42)")
+
+;; ── Phase 22: Bitwise ops ────────────────────────────────────────
+(epoch 6000)
+(eval "(js-bitand 5 3)")
+(epoch 6001)
+(eval "(js-bitor 5 3)")
+(epoch 6002)
+(eval "(js-bitxor 5 3)")
+(epoch 6003)
+(eval "(js-lshift 1 4)")
+(epoch 6004)
+(eval "(js-rshift 32 2)")
+(epoch 6005)
+(eval "(js-rshift -8 1)")
+(epoch 6006)
+(eval "(js-urshift 4294967292 2)")
+(epoch 6007)
+(eval "(js-bitnot 0)")
+
+;; ── Phase 22: Map ─────────────────────────────────────────────────
+(epoch 6010)
+(eval "(js-map? (js-map-new))")
+(epoch 6011)
+(eval "(get (js-map-set! (js-map-new) \"k\" 42) \"size\")")
+(epoch 6012)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"a\" 1) (js-map-get m \"a\"))")
+(epoch 6013)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"x\" 9) (js-map-has m \"x\"))")
+(epoch 6014)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"x\" 9) (js-map-has m \"y\"))")
+(epoch 6015)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"a\" 1) (js-map-set! m \"b\" 2) (get m \"size\"))")
+(epoch 6016)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"a\" 1) (js-map-delete! m \"a\") (get m \"size\"))")
+(epoch 6017)
+(eval "(let ((m (js-map-new))) (js-map-set! m \"a\" 1) (js-map-set! m \"a\" 99) (js-map-get m \"a\"))")
+
+;; ── Phase 22: Set ─────────────────────────────────────────────────
+(epoch 6020)
+(eval "(js-set? (js-set-new))")
+(epoch 6021)
+(eval "(let ((s (js-set-new))) (js-set-add! s 1) (js-set-has s 1))")
+(epoch 6022)
+(eval "(let ((s (js-set-new))) (js-set-add! s 1) (js-set-has s 2))")
+(epoch 6023)
+(eval "(let ((s (js-set-new))) (js-set-add! s 1) (js-set-add! s 1) (get s \"size\"))")
+(epoch 6024)
+(eval "(let ((s (js-set-new))) (js-set-add! s 1) (js-set-add! s 2) (get s \"size\"))")
+(epoch 6025)
+(eval "(let ((s (js-set-new))) (js-set-add! s 1) (js-set-delete! s 1) (get s \"size\"))")
+
+;; ── Phase 22: RegExp constructor ──────────────────────────────────
+(epoch 6030)
+(eval "(js-regex? (RegExp \"ab\" \"i\"))")
+(epoch 6031)
+(eval "(get (RegExp \"hello\" \"gi\") \"global\")")
+(epoch 6032)
+(eval "(get (RegExp \"foo\" \"i\") \"ignoreCase\")")
+
 EPOCHS
 
 
@@ -2042,6 +2206,81 @@ check 3503 "indexOf.call arrLike"          '1'
 check 3504 "filter.call arrLike"           '"2,3"'
 check 3505 "forEach.call arrLike sum"      '60'
 
+# ── Phase 12: Regex engine ────────────────────────────────────────
+check 5000 "regex platform installed"           'false'
+check 5001 "/foo/ matches"                      'true'
+check 5002 "/foo/ no match"                     'false'
+check 5003 "/FOO/i case-insensitive"            'true'
+check 5004 "/^hello/ anchor match"              'true'
+check 5005 "/^hello/ anchor no-match"           'false'
+check 5006 "/world$/ end anchor"                'true'
+check 5007 "/\\d+/ digit class"                 'true'
+check 5008 "/\\w+/ word class"                  'true'
+check 5009 "/[abc]/ class no-match"             'false'
+check 5010 "/[abc]/ class match"                'true'
+check 5011 "/a*b/ zero-or-more"                 'true'
+check 5012 "/a+b/ one-or-more no-match"         'false'
+check 5013 "/a{2,3}/ quant match"               'true'
+check 5014 "/a{2,3}/ quant no-match"            'false'
+check 5015 "dot matches any"                    'true'
+check 5016 "dot requires char"                  'false'
+check 5017 "exec match string"                  '"foobar"'
+check 5018 "exec match index"                   '0'
+check 5019 "exec capture group"                 '"bar"'
+check 5020 "alternation cat|dog match"          'true'
+check 5021 "alternation cat|dog no-match"       'false'
+check 5022 "non-capturing group"                'true'
+check 5023 "negated class match"                'true'
+check 5024 "negated class no-match"             'false'
+check 5025 "range [a-z]+"                       'true'
+check 5026 "word boundary match"                'true'
+check 5027 "word boundary no-match"             'false'
+check 5028 "lazy quantifier"                    '"a"'
+check 5029 "global exec advances"               '"2"'
+check 5030 "String.match regex"                 '"hello"'
+check 5031 "String.search regex"                '6'
+check 5032 "String.replace regex"               '"hello there"'
+check 5033 "multiline anchor"                   'true'
+
+# ── Phase 13: let/const TDZ infrastructure ───────────────────────
+check 5100 "let binding initialized"            '5'
+check 5101 "const binding initialized"          '42'
+check 5102 "TDZ sentinel is detectable"         'true'
+check 5103 "tdz-check passes non-sentinel"      '42'
+
+# ── Phase 22: Bitwise ops ─────────────────────────────────────────
+check 6000 "bitand 5&3"     '1'
+check 6001 "bitor 5|3"      '7'
+check 6002 "bitxor 5^3"     '6'
+check 6003 "lshift 1<<4"    '16'
+check 6004 "rshift 32>>2"   '8'
+check 6005 "rshift -8>>1"   '-4'
+check 6006 "urshift >>>"     '1073741823'
+check 6007 "bitnot ~0"      '-1'
+
+# ── Phase 22: Map ─────────────────────────────────────────────────
+check 6010 "map? new map"          'true'
+check 6011 "map set→size 1"        '1'
+check 6012 "map get existing"      '1'
+check 6013 "map has key yes"       'true'
+check 6014 "map has key no"        'false'
+check 6015 "map size 2 entries"    '2'
+check 6016 "map delete→size 0"     '0'
+check 6017 "map set overwrites"    '99'
+
+# ── Phase 22: Set ─────────────────────────────────────────────────
+check 6020 "set? new set"          'true'
+check 6021 "set has after add"     'true'
+check 6022 "set has absent"        'false'
+check 6023 "set dedup size"        '1'
+check 6024 "set size 2"            '2'
+check 6025 "set delete→size 0"     '0'
+
+# ── Phase 22: RegExp ──────────────────────────────────────────────
+check 6030 "RegExp? result"        'true'
+check 6031 "RegExp global flag"    'true'
+check 6032 "RegExp ignoreCase"     'true'
+
 TOTAL=$((PASS + FAIL))
 if [ $FAIL -eq 0 ]; then
   echo "✓ $PASS/$TOTAL JS-on-SX tests passed"

lib/js/test262-runner.py

@@ -798,6 +798,7 @@ class ServerSession:
         self._run_and_collect(3, '(load "lib/js/parser.sx")', timeout=60.0)
         self._run_and_collect(4, '(load "lib/js/transpile.sx")', timeout=60.0)
         self._run_and_collect(5, '(load "lib/js/runtime.sx")', timeout=60.0)
+        self._run_and_collect(50, '(load "lib/js/regex.sx")', timeout=60.0)
         # Preload the stub harness — use precomputed SX cache when available
         # (huge win: ~15s js-eval HARNESS_STUB → ~0s load precomputed .sx).
         cache_rel = _harness_cache_rel_path()

lib/js/transpile.sx

@@ -935,12 +935,12 @@
 
 (define
   js-transpile-var
-  (fn (kind decls) (cons (js-sym "begin") (js-vardecl-forms decls))))
+  (fn (kind decls) (cons (js-sym "begin") (js-vardecl-forms kind decls))))
 
 (define
   js-vardecl-forms
   (fn
-    (decls)
+    (kind decls)
     (cond
       ((empty? decls) (list))
       (else
@@ -953,7 +953,7 @@
                   (js-sym "define")
                   (js-sym (nth d 1))
                   (js-transpile (nth d 2)))
-                (js-vardecl-forms (rest decls))))
+                (js-vardecl-forms kind (rest decls))))
             ((js-tag? d "js-vardecl-obj")
               (let
                 ((names (nth d 1))
@@ -964,7 +964,7 @@
                   (js-vardecl-obj-forms
                     names
                     tmp-sym
-                    (js-vardecl-forms (rest decls))))))
+                    (js-vardecl-forms kind (rest decls))))))
             ((js-tag? d "js-vardecl-arr")
               (let
                 ((names (nth d 1))
@@ -976,7 +976,7 @@
                     names
                     tmp-sym
                     0
-                    (js-vardecl-forms (rest decls))))))
+                    (js-vardecl-forms kind (rest decls))))))
             (else (error "js-vardecl-forms: unexpected decl"))))))))
 
 (define

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
-        (fn (name)
-          (begin
-            (consume! "op" "=")
-            (let ((start (parse-expr)))
-              (begin
-                (consume! "op" ",")
-                (let ((stop (parse-expr)) (step nil))
-                  (begin
-                    (when (at-op? ",")
-                      (begin
-                        (advance-tok!)
-                        (set! step (parse-expr))))
-                    (consume! "keyword" "do")
-                    (let ((body (parse-block)))
-                      (begin
-                        (consume! "keyword" "end")
-                        (list (quote lua-for-num) name start stop step body))))))))))
-      (define parse-for-in-names
-        (fn (names)
-          (cond
-            ((at-op? ",")
-              (begin
-                (advance-tok!)
-                (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 ()
+      (define
+        parse-for
+        (fn
+          ()
           (begin
             (consume! "keyword" "for")
-            (let ((t (peek-tok)))
+            (let
+              ((t (peek-tok)))
               (begin
-                (when (not (= (lua-tok-type t) "ident"))
+                (when
+                  (not (= (lua-tok-type t) "ident"))
                   (error "lua-parse: expected name in for"))
-                (let ((name (lua-tok-value t)))
+                (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))))))))))))
+                    (when
+                      (not (at-op? "="))
+                      (error "lua-parse: only numeric for supported"))
+                    (consume! "op" "=")
+                    (let
+                      ((start (parse-expr)))
+                      (begin
+                        (consume! "op" ",")
+                        (let
+                          ((stop (parse-expr)) (step nil))
+                          (begin
+                            (when
+                              (at-op? ",")
+                              (begin
+                                (advance-tok!)
+                                (set! step (parse-expr))))
+                            (consume! "keyword" "do")
+                            (let
+                              ((body (parse-block)))
+                              (begin
+                                (consume! "keyword" "end")
+                                (list
+                                  (quote lua-for-num)
+                                  name
+                                  start
+                                  stop
+                                  step
+                                  body))))))))))))))
       (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,171 +0,0 @@
-{
-  "totals": {
-    "pass": 3,
-    "fail": 8,
-    "timeout": 5,
-    "skip": 8,
-    "total": 24,
-    "runnable": 16,
-    "pass_rate": 18.8
-  },
-  "top_failure_modes": [
-    [
-      "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      7
-    ],
-    [
-      "timeout",
-      5
-    ],
-    [
-      "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: module 'C' not found\\\\\\\"\\",
-      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": 6616
-    },
-    {
-      "name": "big.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8008
-    },
-    {
-      "name": "calls.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8006
-    },
-    {
-      "name": "checktable.lua",
-      "status": "skip",
-      "reason": "internal debug helpers",
-      "ms": 0
-    },
-    {
-      "name": "closure.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8000
-    },
-    {
-      "name": "code.lua",
-      "status": "skip",
-      "reason": "bytecode inspection via debug library",
-      "ms": 0
-    },
-    {
-      "name": "constructs.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7429
-    },
-    {
-      "name": "db.lua",
-      "status": "skip",
-      "reason": "debug library",
-      "ms": 0
-    },
-    {
-      "name": "errors.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 3517
-    },
-    {
-      "name": "events.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7893
-    },
-    {
-      "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": 5676
-    },
-    {
-      "name": "locals.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 1829
-    },
-    {
-      "name": "main.lua",
-      "status": "skip",
-      "reason": "standalone interpreter driver",
-      "ms": 0
-    },
-    {
-      "name": "math.lua",
-      "status": "pass",
-      "reason": "",
-      "ms": 4512
-    },
-    {
-      "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": 6665
-    },
-    {
-      "name": "sort.lua",
-      "status": "timeout",
-      "reason": "per-test timeout",
-      "ms": 8007
-    },
-    {
-      "name": "strings.lua",
-      "status": "fail",
-      "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4488
-    },
-    {
-      "name": "vararg.lua",
-      "status": "pass",
-      "reason": "",
-      "ms": 2734
-    },
-    {
-      "name": "verybig.lua",
-      "status": "pass",
-      "reason": "",
-      "ms": 612
-    }
-  ]
-}

lib/lua/scoreboard.md

@@ -1,39 +0,0 @@
-# Lua-on-SX conformance scoreboard
-
-**Pass rate:** 3/16 runnable (18.8%)
-fail=8 timeout=5 skip=8 total=24
-
-## Top failure modes
-
-- **7x** other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\
-- **5x** timeout
-- **1x** other: Unhandled exception: \"Unhandled exception: \\\"lua: module 'C' not found\\\"\
-
-## 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\\\"\ | 6616 |
-| big.lua | timeout | per-test timeout | 8008 |
-| calls.lua | timeout | per-test timeout | 8006 |
-| checktable.lua | skip | internal debug helpers | 0 |
-| closure.lua | timeout | per-test timeout | 8000 |
-| code.lua | skip | bytecode inspection via debug library | 0 |
-| constructs.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 7429 |
-| db.lua | skip | debug library | 0 |
-| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3517 |
-| events.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 7893 |
-| files.lua | skip | io library | 0 |
-| gc.lua | skip | collectgarbage / finalisers | 0 |
-| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5676 |
-| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1829 |
-| main.lua | skip | standalone interpreter driver | 0 |
-| math.lua | pass | - | 4512 |
-| nextvar.lua | timeout | per-test timeout | 8007 |
-| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6665 |
-| sort.lua | timeout | per-test timeout | 8007 |
-| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4488 |
-| vararg.lua | pass | - | 2734 |
-| verybig.lua | pass | - | 612 |

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-paren)) (list (make-symbol "lua-first") (lua-tx (nth node 1))))
+      ((= tag (quote lua-vararg))
+        (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
-        (make-symbol "lua-call")
-        (cons (lua-tx fn-ast) (map lua-tx args))))))
+      (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")
-            (cons
-              (list (make-symbol "lua-get") tmp name)
-              (cons tmp (map lua-tx args)))))))))
+      (cons
+        (list (make-symbol "lua-get") obj name)
+        (cons obj (map lua-tx args))))))
 
 (define
   lua-tx-field
@@ -177,54 +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-body-uses-vararg?
-  (fn
-    (node)
-    (cond
-      ((not (= (type-of node) "list")) false)
-      ((= (first node) (quote lua-vararg)) true)
-      ((= (first node) (quote lua-function)) false)
-      (else (some lua-body-uses-vararg? node)))))
-
-(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
@@ -233,32 +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)))
-            (let
-              ((all-bindings
-                 (if is-vararg
-                     (append bindings
-                       (list (lua-tx-function-varargs-binding (len params)))
-                       (if (lua-body-uses-vararg? body)
-                           (list)
-                           (list (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)))))))))))
+      (let
+        ((sym-params (map make-symbol params)))
+        (list (make-symbol "fn") sym-params (lua-tx body))))))
 
 (define
   lua-tx-block
@@ -282,13 +190,9 @@
           (list
             (make-symbol "define")
             (make-symbol (first names))
-            (if
-              (> (len exps) 0)
-              (list (make-symbol "lua-first") (lua-tx (first exps)))
-              nil)))
-        ((= (len exps) 0)
-          (cons (make-symbol "begin") (lua-tx-local-pairs names exps 0)))
-        (else (lua-tx-multi-local names exps))))))
+            (if (> (len exps) 0) (lua-tx (first exps)) nil)))
+        (else
+          (cons (make-symbol "begin") (lua-tx-local-pairs names exps 0)))))))
 
 (define
   lua-tx-local-pairs
@@ -312,12 +216,9 @@
       ((lhss (nth node 1)) (rhss (nth node 2)))
       (cond
         ((= (len lhss) 1)
-          (lua-tx-single-assign
-            (first lhss)
-            (list (make-symbol "lua-first") (lua-tx (first rhss)))))
-        ((= (len rhss) 0)
-          (cons (make-symbol "begin") (lua-tx-assign-pairs lhss rhss 0)))
-        (else (lua-tx-multi-assign lhss rhss))))))
+          (lua-tx-single-assign (first lhss) (lua-tx (first rhss))))
+        (else
+          (cons (make-symbol "begin") (lua-tx-assign-pairs lhss rhss 0)))))))
 
 (define
   lua-tx-assign-pairs
@@ -353,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
@@ -388,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
@@ -396,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
@@ -420,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
@@ -446,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
@@ -490,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
@@ -500,18 +396,10 @@
     (node)
     (let
       ((exps (nth node 1)))
-      (let
-        ((val
-          (cond
-            ((= (len exps) 0) nil)
-            ((= (len exps) 1) (lua-tx (first exps)))
-            (else
-              (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))))))
+      (cond
+        ((= (len exps) 0) nil)
+        ((= (len exps) 1) (lua-tx (first exps)))
+        (else (cons (make-symbol "list") (map lua-tx exps)))))))
 
 (define
   lua-tx-local-function
@@ -529,8 +417,10 @@
       ((target (nth node 1)) (func (nth node 2)))
       (cond
         ((= (first target) (quote lua-name))
-          (let ((nm (nth target 1)))
-            (list (make-symbol "set!") (make-symbol nm) (lua-tx func))))
+          (list
+            (make-symbol "define")
+            (make-symbol (nth target 1))
+            (lua-tx func)))
         ((= (first target) (quote lua-field))
           (list
             (make-symbol "lua-set!")
@@ -541,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)
-    (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)))))))))))
+  (fn (src) (let ((sx (lua-transpile src))) (eval-expr sx))))

lib/r7rs.sx

@@ -73,7 +73,10 @@
 
 (define string->symbol make-symbol)
 
-(define number->string (fn (n) (str n)))
+(define number->string
+  (let ((prim-n->s number->string))
+    (fn (n &rest r)
+      (if (= (len r) 0) (str n) (prim-n->s n (first r))))))
 
 (define
   string->number

lib/smalltalk/runtime.sx

@@ -0,0 +1,370 @@
+;; lib/smalltalk/runtime.sx — Smalltalk primitives on SX
+;;
+;; Provides Smalltalk-idiomatic wrappers over SX built-ins.
+;; Primitives used:
+;;   make-set/set-add!/set-member?/set-remove!/set->list  (Phase 18)
+;;   char->integer/integer->char/list->string             (Phase 5)
+;;   bitwise-and/or/xor/not/arithmetic-shift              (Phase 7)
+;;   gcd/lcm/quotient/remainder/modulo                    (Phase 15)
+
+;; ---------------------------------------------------------------------------
+;; 0. Internal list helpers (used by Array and Dictionary)
+;; ---------------------------------------------------------------------------
+
+(define
+  (st-list-set-nth lst i newval)
+  (letrec
+    ((go (fn (ps j) (if (= (len ps) 0) (list) (cons (if (= j i) newval (first ps)) (go (rest ps) (+ j 1)))))))
+    (go lst 0)))
+
+(define
+  (st-list-remove-nth lst i)
+  (letrec
+    ((go (fn (ps j) (if (= (len ps) 0) (list) (if (= j i) (go (rest ps) (+ j 1)) (cons (first ps) (go (rest ps) (+ j 1))))))))
+    (go lst 0)))
+
+;; ---------------------------------------------------------------------------
+;; 1. Numeric helpers
+;;    Thin wrappers or direct aliases for Smalltalk Number protocol.
+;; ---------------------------------------------------------------------------
+
+(define (st-abs x) (abs x))
+(define (st-max a b) (if (> a b) a b))
+(define (st-min a b) (if (< a b) a b))
+(define (st-gcd a b) (gcd a b))
+(define (st-lcm a b) (lcm a b))
+(define (st-quo a b) (quotient a b))
+(define (st-rem a b) (remainder a b))
+(define (st-mod a b) (modulo a b))
+(define (st-even? n) (= (remainder n 2) 0))
+(define (st-odd? n) (not (st-even? n)))
+(define (st-sqrt x) (sqrt x))
+(define (st-floor x) (floor x))
+(define (st-ceiling x) (ceil x))
+(define (st-truncated x) (truncate x))
+(define (st-rounded x) (round x))
+
+;; ---------------------------------------------------------------------------
+;; 2. Character
+;;    Smalltalk $A = char 65. Operations mirror Character class.
+;; ---------------------------------------------------------------------------
+
+(define (st-char-value c) (char->integer c))
+(define (st-char-from-int n) (integer->char n))
+(define (st-char? v) (= (type-of v) "char"))
+
+(define
+  (st-char-is-letter? c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (and (>= n 65) (<= n 90))
+      (and (>= n 97) (<= n 122)))))
+
+(define
+  (st-char-is-digit? c)
+  (let ((n (char->integer c))) (and (>= n 48) (<= n 57))))
+
+(define
+  (st-char-is-uppercase? c)
+  (let ((n (char->integer c))) (and (>= n 65) (<= n 90))))
+
+(define
+  (st-char-is-lowercase? c)
+  (let ((n (char->integer c))) (and (>= n 97) (<= n 122))))
+
+(define
+  (st-char-is-separator? c)
+  (let
+    ((n (char->integer c)))
+    (or
+      (= n 32)
+      (= n 9)
+      (= n 10)
+      (= n 13))))
+
+(define
+  (st-char-as-uppercase c)
+  (let
+    ((n (char->integer c)))
+    (if
+      (and (>= n 97) (<= n 122))
+      (integer->char (- n 32))
+      c)))
+
+(define
+  (st-char-as-lowercase c)
+  (let
+    ((n (char->integer c)))
+    (if
+      (and (>= n 65) (<= n 90))
+      (integer->char (+ n 32))
+      c)))
+
+(define (st-char-digit-value c) (- (char->integer c) 48))
+
+;; ---------------------------------------------------------------------------
+;; 3. Array (1-indexed, mutable, fixed-size)
+;;    Backed as {:__st_array__ true :size N "1" v1 "2" v2 ...}
+;;    Unset elements read as nil.
+;; ---------------------------------------------------------------------------
+
+(define
+  (st-array-new n)
+  (let
+    ((a (dict)))
+    (dict-set! a "__st_array__" true)
+    (dict-set! a "size" n)
+    a))
+
+(define (st-array? v) (and (dict? v) (dict-has? v "__st_array__")))
+
+(define (st-array-size a) (get a "size"))
+
+(define
+  (st-array-at a i)
+  (let ((v (get a (str i)))) (if (= v nil) nil v)))
+
+(define (st-array-at-put! a i v) (dict-set! a (str i) v) a)
+
+(define
+  (st-array-do a fn)
+  (letrec
+    ((go (fn (i) (when (<= i (st-array-size a)) (fn (st-array-at a i)) (go (+ i 1))))))
+    (go 1)))
+
+(define
+  (st-array->list a)
+  (letrec
+    ((go (fn (i acc) (if (< i 1) acc (go (- i 1) (cons (st-array-at a i) acc))))))
+    (go (st-array-size a) (list))))
+
+(define
+  (st-list->array xs)
+  (let
+    ((a (st-array-new (len xs))))
+    (letrec
+      ((go (fn (ys i) (when (> (len ys) 0) (st-array-at-put! a i (first ys)) (go (rest ys) (+ i 1))))))
+      (go xs 1))
+    a))
+
+(define
+  (st-array-copy-from-to a start stop)
+  (let
+    ((result (st-array-new (- stop start -1))))
+    (letrec
+      ((go (fn (i j) (when (<= i stop) (st-array-at-put! result j (st-array-at a i)) (go (+ i 1) (+ j 1))))))
+      (go start 1))
+    result))
+
+;; ---------------------------------------------------------------------------
+;; 4. Dictionary (hash map with any key via linear scan)
+;;    {:__st_dict__ true :size N :_pairs ((key val) ...)}
+;; ---------------------------------------------------------------------------
+
+(define
+  (st-dict-new)
+  (let
+    ((d (dict)))
+    (dict-set! d "__st_dict__" true)
+    (dict-set! d "size" 0)
+    (dict-set! d "_pairs" (list))
+    d))
+
+(define (st-dict? v) (and (dict? v) (dict-has? v "__st_dict__")))
+
+(define (st-dict-size d) (get d "size"))
+
+(define
+  (st-dict-find-idx pairs k)
+  (letrec
+    ((go (fn (ps i) (cond ((= (len ps) 0) -1) ((= (first (first ps)) k) i) (else (go (rest ps) (+ i 1)))))))
+    (go pairs 0)))
+
+(define
+  (st-dict-at d k)
+  (letrec
+    ((go (fn (ps) (if (= (len ps) 0) nil (if (= (first (first ps)) k) (nth (first ps) 1) (go (rest ps)))))))
+    (go (get d "_pairs"))))
+
+(define
+  (st-dict-at-put! d k v)
+  (let
+    ((pairs (get d "_pairs")) (idx (st-dict-find-idx (get d "_pairs") k)))
+    (if
+      (= idx -1)
+      (begin
+        (dict-set! d "_pairs" (append pairs (list (list k v))))
+        (dict-set! d "size" (+ (get d "size") 1)))
+      (dict-set! d "_pairs" (st-list-set-nth pairs idx (list k v)))))
+  d)
+
+(define
+  (st-dict-includes-key? d k)
+  (not (= (st-dict-find-idx (get d "_pairs") k) -1)))
+
+(define
+  (st-dict-at-default d k def)
+  (if (st-dict-includes-key? d k) (st-dict-at d k) def))
+
+(define
+  (st-dict-remove-key! d k)
+  (let
+    ((idx (st-dict-find-idx (get d "_pairs") k)))
+    (when
+      (not (= idx -1))
+      (dict-set! d "_pairs" (st-list-remove-nth (get d "_pairs") idx))
+      (dict-set! d "size" (- (get d "size") 1))))
+  d)
+
+(define (st-dict-keys d) (map first (get d "_pairs")))
+(define
+  (st-dict-values d)
+  (map (fn (p) (nth p 1)) (get d "_pairs")))
+
+(define
+  (st-dict-do d fn)
+  (for-each (fn (p) (fn (nth p 1))) (get d "_pairs")))
+
+(define
+  (st-dict-do-associations d fn)
+  (for-each (fn (p) (fn (first p) (nth p 1))) (get d "_pairs")))
+
+;; ---------------------------------------------------------------------------
+;; 5. Set (uniqueness via SX make-set)
+;;    Note: set-member?/set-add!/set-remove! take (set item) order.
+;; ---------------------------------------------------------------------------
+
+(define
+  (st-set-new)
+  (let
+    ((s (dict)))
+    (dict-set! s "__st_set__" true)
+    (dict-set! s "size" 0)
+    (dict-set! s "_set" (make-set))
+    s))
+
+(define (st-set? v) (and (dict? v) (dict-has? v "__st_set__")))
+
+(define (st-set-size s) (get s "size"))
+
+(define
+  (st-set-add! s v)
+  (let
+    ((sx (get s "_set")))
+    (when
+      (not (set-member? sx v))
+      (set-add! sx v)
+      (dict-set! s "size" (+ (get s "size") 1))))
+  s)
+
+(define (st-set-includes? s v) (set-member? (get s "_set") v))
+
+(define
+  (st-set-remove! s v)
+  (let
+    ((sx (get s "_set")))
+    (when
+      (set-member? sx v)
+      (set-remove! sx v)
+      (dict-set! s "size" (- (get s "size") 1))))
+  s)
+
+(define (st-set->list s) (set->list (get s "_set")))
+
+(define (st-set-do s fn) (for-each fn (st-set->list s)))
+
+;; ---------------------------------------------------------------------------
+;; 6. String / Stream utilities
+;; ---------------------------------------------------------------------------
+
+;; Join list of strings with separator
+(define
+  (st-join-strings strs sep)
+  (if
+    (= (len strs) 0)
+    ""
+    (letrec
+      ((go (fn (ss acc) (if (= (len ss) 0) acc (go (rest ss) (str acc sep (first ss)))))))
+      (go (rest strs) (first strs)))))
+
+;; printString — Smalltalk textual representation
+(define
+  (st-print-string v)
+  (cond
+    ((= v nil) "nil")
+    ((= v true) "true")
+    ((= v false) "false")
+    ((= (type-of v) "number") (str v))
+    ((= (type-of v) "string") (str "'" v "'"))
+    ((= (type-of v) "symbol") (str "#" (str v)))
+    ((= (type-of v) "char") (str "$" (list->string (list v))))
+    ((= (type-of v) "list")
+      (str "(" (st-join-strings (map st-print-string v) " ") ")"))
+    ((st-array? v)
+      (str
+        "(#("
+        (st-join-strings (map st-print-string (st-array->list v)) " ")
+        "))"))
+    (else (str v))))
+
+;; WriteStream — accumulates strings/chars to a buffer
+(define
+  (st-write-stream-new)
+  (let
+    ((ws (dict)))
+    (dict-set! ws "__st_ws__" true)
+    (dict-set! ws "contents" "")
+    ws))
+
+(define (st-write-stream? v) (and (dict? v) (dict-has? v "__st_ws__")))
+
+(define
+  (st-write-stream-put-string! ws s)
+  (dict-set! ws "contents" (str (get ws "contents") s))
+  ws)
+
+(define
+  (st-write-stream-next-put! ws c)
+  (st-write-stream-put-string! ws (list->string (list c))))
+
+(define
+  (st-write-stream-print! ws v)
+  (st-write-stream-put-string! ws (st-print-string v)))
+
+(define (st-write-stream-contents ws) (get ws "contents"))
+
+;; ReadStream — reads characters from a string one at a time
+(define
+  (st-read-stream-new s)
+  (let
+    ((rs (dict)))
+    (dict-set! rs "__st_rs__" true)
+    (dict-set! rs "_chars" (string->list s))
+    (dict-set! rs "pos" 0)
+    rs))
+
+(define (st-read-stream? v) (and (dict? v) (dict-has? v "__st_rs__")))
+
+(define
+  (st-read-stream-at-end? rs)
+  (>= (get rs "pos") (len (get rs "_chars"))))
+
+(define
+  (st-read-stream-next rs)
+  (if
+    (st-read-stream-at-end? rs)
+    nil
+    (let
+      ((c (nth (get rs "_chars") (get rs "pos"))))
+      (dict-set! rs "pos" (+ (get rs "pos") 1))
+      c)))
+
+(define
+  (st-read-stream-peek rs)
+  (if
+    (st-read-stream-at-end? rs)
+    nil
+    (nth (get rs "_chars") (get rs "pos"))))
+
+(define (st-read-stream-source rs) (list->string (get rs "_chars")))

lib/smalltalk/test.sh

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# lib/smalltalk/test.sh — smoke-test the Smalltalk runtime layer.
+# Uses sx_server.exe epoch protocol.
+#
+# Usage:
+#   bash lib/smalltalk/test.sh
+#   bash lib/smalltalk/test.sh -v
+
+set -uo pipefail
+cd "$(git rev-parse --show-toplevel)"
+
+SX_SERVER="${SX_SERVER:-hosts/ocaml/_build/default/bin/sx_server.exe}"
+if [ ! -x "$SX_SERVER" ]; then
+  SX_SERVER="/root/rose-ash/hosts/ocaml/_build/default/bin/sx_server.exe"
+fi
+if [ ! -x "$SX_SERVER" ]; then
+  echo "ERROR: sx_server.exe not found. Run: cd hosts/ocaml && dune build"
+  exit 1
+fi
+
+VERBOSE="${1:-}"
+TMPFILE=$(mktemp); trap "rm -f $TMPFILE" EXIT
+
+cat > "$TMPFILE" << 'EPOCHS'
+(epoch 1)
+(load "spec/stdlib.sx")
+(load "lib/smalltalk/runtime.sx")
+(epoch 2)
+(load "lib/smalltalk/tests/runtime.sx")
+(epoch 3)
+(eval "(list st-test-pass st-test-fail)")
+EPOCHS
+
+OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
+
+LINE=$(echo "$OUTPUT" | awk '/^\(ok-len 3 / {getline; print; exit}')
+if [ -z "$LINE" ]; then
+  LINE=$(echo "$OUTPUT" | grep -E '^\(ok 3 \([0-9]+ [0-9]+\)\)' | tail -1 \
+          | sed -E 's/^\(ok 3 //; s/\)$//')
+fi
+if [ -z "$LINE" ]; then
+  echo "ERROR: could not extract summary"
+  echo "$OUTPUT" | tail -10
+  exit 1
+fi
+
+P=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\1/')
+F=$(echo "$LINE" | sed -E 's/^\(([0-9]+) ([0-9]+)\).*/\2/')
+TOTAL=$((P + F))
+
+if [ "$F" -eq 0 ]; then
+  echo "ok $P/$TOTAL lib/smalltalk tests passed"
+else
+  echo "FAIL $P/$TOTAL passed, $F failed"
+  # Print failure details
+  TMPFILE2=$(mktemp)
+  cat > "$TMPFILE2" << 'EPOCHS2'
+(epoch 1)
+(load "spec/stdlib.sx")
+(load "lib/smalltalk/runtime.sx")
+(epoch 2)
+(load "lib/smalltalk/tests/runtime.sx")
+(epoch 3)
+(eval "(map (fn (f) (get f \"name\")) st-test-fails)")
+EPOCHS2
+  FAILS=$(timeout 60 "$SX_SERVER" < "$TMPFILE2" 2>/dev/null | grep -E '^\(ok 3 ' || true)
+  rm -f "$TMPFILE2"
+  echo "  Failures: $FAILS"
+fi
+
+[ "$F" -eq 0 ]

lib/smalltalk/tests/runtime.sx

@@ -0,0 +1,241 @@
+;; lib/smalltalk/tests/runtime.sx — Tests for lib/smalltalk/runtime.sx
+;;
+;; Uses the same hk-test framework as lib/haskell/tests/runtime.sx.
+;; Load: lib/smalltalk/runtime.sx first.
+
+;; --- Test framework ---
+(define st-test-pass 0)
+(define st-test-fail 0)
+(define st-test-fails (list))
+
+(define
+  (st-test name got expected)
+  (if
+    (= got expected)
+    (set! st-test-pass (+ st-test-pass 1))
+    (begin
+      (set! st-test-fail (+ st-test-fail 1))
+      (set! st-test-fails (append st-test-fails (list {:got got :expected expected :name name}))))))
+
+;; ---------------------------------------------------------------------------
+;; 1. Numeric helpers
+;; ---------------------------------------------------------------------------
+
+(st-test "abs -5" (st-abs -5) 5)
+(st-test "abs 3" (st-abs 3) 3)
+(st-test "max 3 7" (st-max 3 7) 7)
+(st-test "min 3 7" (st-min 3 7) 3)
+(st-test "gcd 12 8" (st-gcd 12 8) 4)
+(st-test "lcm 4 6" (st-lcm 4 6) 12)
+(st-test "quo 10 3" (st-quo 10 3) 3)
+(st-test "quo -10 3" (st-quo -10 3) -3)
+(st-test "rem 10 3" (st-rem 10 3) 1)
+(st-test "rem -10 3" (st-rem -10 3) -1)
+(st-test "mod 10 3" (st-mod 10 3) 1)
+(st-test "mod -10 3" (st-mod -10 3) 2)
+(st-test "even? 4" (st-even? 4) true)
+(st-test "even? 3" (st-even? 3) false)
+(st-test "odd? 7" (st-odd? 7) true)
+(st-test "floor 3.7" (st-floor 3.7) 3)
+(st-test "ceiling 3.2" (st-ceiling 3.2) 4)
+(st-test "truncated 3.9" (st-truncated 3.9) 3)
+(st-test "rounded 3.5" (st-rounded 3.5) 4)
+
+;; ---------------------------------------------------------------------------
+;; 2. Character
+;; ---------------------------------------------------------------------------
+
+(st-test
+  "char-value A"
+  (st-char-value (st-char-from-int 65))
+  65)
+(st-test "char-from-int" (st-char? (st-char-from-int 65)) true)
+(st-test "char? true" (st-char? (integer->char 65)) true)
+(st-test "char? false" (st-char? 65) false)
+(st-test "is-letter? A" (st-char-is-letter? (integer->char 65)) true)
+(st-test
+  "is-letter? 1"
+  (st-char-is-letter? (integer->char 49))
+  false)
+(st-test "is-digit? 5" (st-char-is-digit? (integer->char 53)) true)
+(st-test "is-digit? A" (st-char-is-digit? (integer->char 65)) false)
+(st-test
+  "is-uppercase? A"
+  (st-char-is-uppercase? (integer->char 65))
+  true)
+(st-test
+  "is-uppercase? a"
+  (st-char-is-uppercase? (integer->char 97))
+  false)
+(st-test
+  "is-lowercase? a"
+  (st-char-is-lowercase? (integer->char 97))
+  true)
+(st-test
+  "is-lowercase? A"
+  (st-char-is-lowercase? (integer->char 65))
+  false)
+(st-test
+  "is-separator? sp"
+  (st-char-is-separator? (integer->char 32))
+  true)
+(st-test
+  "is-separator? A"
+  (st-char-is-separator? (integer->char 65))
+  false)
+(st-test
+  "as-uppercase a"
+  (st-char-value (st-char-as-uppercase (integer->char 97)))
+  65)
+(st-test
+  "as-uppercase A"
+  (st-char-value (st-char-as-uppercase (integer->char 65)))
+  65)
+(st-test
+  "as-lowercase A"
+  (st-char-value (st-char-as-lowercase (integer->char 65)))
+  97)
+(st-test
+  "digit-value 5"
+  (st-char-digit-value (integer->char 53))
+  5)
+
+;; ---------------------------------------------------------------------------
+;; 3. Array
+;; ---------------------------------------------------------------------------
+
+(st-test
+  "array-new size"
+  (st-array-size (st-array-new 5))
+  5)
+(st-test "array? yes" (st-array? (st-array-new 3)) true)
+(st-test "array? no" (st-array? 42) false)
+(st-test
+  "array-at nil"
+  (st-array-at (st-array-new 3) 1)
+  nil)
+
+(let
+  ((a (st-array-new 3)))
+  (st-array-at-put! a 1 10)
+  (st-array-at-put! a 2 20)
+  (st-array-at-put! a 3 30)
+  (st-test "array-at 1" (st-array-at a 1) 10)
+  (st-test "array-at 2" (st-array-at a 2) 20)
+  (st-test "array-at 3" (st-array-at a 3) 30))
+
+(st-test
+  "list->array->list"
+  (st-array->list (st-list->array (list 1 2 3)))
+  (list 1 2 3))
+
+(let
+  ((a (st-list->array (list 10 20 30 40 50))))
+  (st-test
+    "copy-from-to"
+    (st-array->list (st-array-copy-from-to a 2 4))
+    (list 20 30 40)))
+
+;; ---------------------------------------------------------------------------
+;; 4. Dictionary
+;; ---------------------------------------------------------------------------
+
+(st-test "dict? yes" (st-dict? (st-dict-new)) true)
+(st-test "dict? no" (st-dict? 42) false)
+(st-test "dict empty size" (st-dict-size (st-dict-new)) 0)
+(st-test "dict at absent" (st-dict-at (st-dict-new) "k") nil)
+
+(let
+  ((d (st-dict-new)))
+  (st-dict-at-put! d "a" 1)
+  (st-dict-at-put! d "b" 2)
+  (st-test "dict at a" (st-dict-at d "a") 1)
+  (st-test "dict at b" (st-dict-at d "b") 2)
+  (st-test "dict size 2" (st-dict-size d) 2)
+  (st-test "includes-key? yes" (st-dict-includes-key? d "a") true)
+  (st-test "includes-key? no" (st-dict-includes-key? d "z") false)
+  (st-dict-at-put! d "a" 99)
+  (st-test "dict update" (st-dict-at d "a") 99)
+  (st-test "size unchanged" (st-dict-size d) 2)
+  (st-dict-remove-key! d "a")
+  (st-test "size after remove" (st-dict-size d) 1)
+  (st-test "at-default hit" (st-dict-at-default d "b" 0) 2)
+  (st-test "at-default miss" (st-dict-at-default d "z" -1) -1))
+
+;; ---------------------------------------------------------------------------
+;; 5. Set
+;; ---------------------------------------------------------------------------
+
+(st-test "set? yes" (st-set? (st-set-new)) true)
+(st-test "set? no" (st-set? 42) false)
+(st-test "set empty size" (st-set-size (st-set-new)) 0)
+
+(let
+  ((s (st-set-new)))
+  (st-set-add! s 1)
+  (st-set-add! s 2)
+  (st-set-add! s 1)
+  (st-test "set includes 1" (st-set-includes? s 1) true)
+  (st-test "set includes 2" (st-set-includes? s 2) true)
+  (st-test "set not includes 3" (st-set-includes? s 3) false)
+  (st-test "set dedup size" (st-set-size s) 2)
+  (st-set-remove! s 1)
+  (st-test "size after remove" (st-set-size s) 1)
+  (st-test "removed gone" (st-set-includes? s 1) false))
+
+;; ---------------------------------------------------------------------------
+;; 6. String / Stream
+;; ---------------------------------------------------------------------------
+
+(st-test "join-strings 3" (st-join-strings (list "a" "b" "c") "-") "a-b-c")
+(st-test "join-strings 1" (st-join-strings (list "x") ",") "x")
+(st-test "join-strings empty" (st-join-strings (list) ",") "")
+
+(st-test "print nil" (st-print-string nil) "nil")
+(st-test "print true" (st-print-string true) "true")
+(st-test "print false" (st-print-string false) "false")
+(st-test "print number" (st-print-string 42) "42")
+(st-test "print string" (st-print-string "hi") "'hi'")
+(st-test "print char" (st-print-string (integer->char 65)) "$A")
+(st-test "print list" (st-print-string (list 1 2)) "(1 2)")
+
+(let
+  ((ws (st-write-stream-new)))
+  (st-write-stream-put-string! ws "hello")
+  (st-write-stream-put-string! ws " world")
+  (st-test
+    "write-stream contents"
+    (st-write-stream-contents ws)
+    "hello world"))
+
+(let
+  ((ws (st-write-stream-new)))
+  (st-write-stream-next-put! ws (integer->char 72))
+  (st-write-stream-next-put! ws (integer->char 105))
+  (st-test "write-stream next-put!" (st-write-stream-contents ws) "Hi"))
+
+(let
+  ((rs (st-read-stream-new "ABC")))
+  (st-test
+    "read-stream next A"
+    (st-char-value (st-read-stream-next rs))
+    65)
+  (st-test
+    "read-stream next B"
+    (st-char-value (st-read-stream-next rs))
+    66)
+  (st-test
+    "read-stream peek C"
+    (st-char-value (st-read-stream-peek rs))
+    67)
+  (st-test
+    "read-stream next C"
+    (st-char-value (st-read-stream-next rs))
+    67)
+  (st-test "read-stream at-end" (st-read-stream-at-end? rs) true))
+
+;; ---------------------------------------------------------------------------
+;; Summary (must be last form — test.sh reads this)
+;; ---------------------------------------------------------------------------
+
+(list st-test-pass st-test-fail)

plans/agent-briefings/apl-loop.md

@@ -0,0 +1,81 @@
+# apl-on-sx loop agent (single agent, queue-driven)
+
+Role: iterates `plans/apl-on-sx.md` forever. Rank-polymorphic primitives + 6 operators on the JIT is the headline showcase — APL is the densest combinator algebra you can put on top of a primitive table. Every program is `array → array` pure pipelines, exactly what the JIT was built for.
+
+```
+description: apl-on-sx queue loop
+subagent_type: general-purpose
+run_in_background: true
+isolation: worktree
+```
+
+## Prompt
+
+You are the sole background agent working `/root/rose-ash/plans/apl-on-sx.md`. Isolated worktree, forever, one commit per feature. Never push.
+
+## Restart baseline — check before iterating
+
+1. Read `plans/apl-on-sx.md` — roadmap + Progress log.
+2. `ls lib/apl/` — pick up from the most advanced file.
+3. If `lib/apl/tests/*.sx` exist, run them. Green before new work.
+4. If `lib/apl/scoreboard.md` exists, that's your baseline.
+
+## The queue
+
+Phase order per `plans/apl-on-sx.md`:
+
+- **Phase 1** — tokenizer + parser. Unicode glyphs, `¯` for negative, strands (juxtaposition), right-to-left, valence resolution by syntactic position
+- **Phase 2** — array model + scalar primitives. `make-array {shape, ravel}`, scalar promotion, broadcast for `+ - × ÷ ⌈ ⌊ * ⍟ | ! ○`, comparison, logical, `⍳`, `⎕IO`
+- **Phase 3** — structural primitives + indexing. `⍴ , ⍉ ↑ ↓ ⌽ ⊖ ⌷ ⍋ ⍒ ⊂ ⊃ ∊`
+- **Phase 4** — **THE SHOWCASE**: operators. `f/` (reduce), `f¨` (each), `∘.f` (outer), `f.g` (inner), `f⍨` (commute), `f∘g` (compose), `f⍣n` (power), `f⍤k` (rank), `@` (at)
+- **Phase 5** — dfns + tradfns + control flow. `{⍺+⍵}`, `∇` recurse, `⍺←default`, tradfn header, `:If/:While/:For/:Select`
+- **Phase 6** — classic programs (life, mandelbrot, primes, n-queens, quicksort) + idiom corpus + drive to 100+
+
+Within a phase, pick the checkbox that unlocks the most tests per effort.
+
+Every iteration: implement → test → commit → tick `[ ]` → Progress log → next.
+
+## Ground rules (hard)
+
+- **Scope:** only `lib/apl/**` and `plans/apl-on-sx.md`. Do **not** edit `spec/`, `hosts/`, `shared/`, other `lib/<lang>/` dirs, `lib/stdlib.sx`, or `lib/` root. APL primitives go in `lib/apl/runtime.sx`.
+- **NEVER call `sx_build`.** 600s watchdog. If sx_server binary broken → Blockers entry, stop.
+- **Shared-file issues** → plan's Blockers with minimal repro.
+- **SX files:** `sx-tree` MCP tools ONLY. `sx_validate` after edits.
+- **Unicode in `.sx`:** raw UTF-8 only, never `\uXXXX` escapes. Glyphs land directly in source.
+- **Worktree:** commit locally. Never push. Never touch `main`.
+- **Commit granularity:** one feature per commit.
+- **Plan file:** update Progress log + tick boxes every commit.
+
+## APL-specific gotchas
+
+- **Right-to-left, no precedence among functions.** `2 × 3 + 4` is `2 × (3 + 4)` = 14, not 10. Operators bind tighter than functions: `+/ ⍳5` is `+/(⍳5)`, and `2 +.× 3 4` is `2 (+.×) 3 4`.
+- **Valence by position.** `-3` is monadic negate (`-` with no left arg). `5-3` is dyadic subtract. The parser must look left to decide. Same glyph; different fn.
+- **`¯` is part of a number literal**, not a prefix function. `¯3` is the literal negative three; `-3` is the function call. Tokenizer eats `¯` into the numeric token.
+- **Strands.** `1 2 3` is a 3-element vector, not three separate calls. Adjacent literals fuse into a strand at parse time. Adjacent names do *not* fuse — `a b c` is three separate references.
+- **Scalar promotion.** `1 + 2 3 4` ↦ `3 4 5`. Any scalar broadcasts against any-rank conformable shape.
+- **Conformability** = exactly matching shapes, OR one side scalar, OR (in some dialects) one side rank-1 cycling against rank-N. Keep strict in v1: matching shape or scalar only.
+- **`⍳` is overloaded.** Monadic `⍳N` = vector 1..N (or 0..N-1 if `⎕IO=0`). Dyadic `V ⍳ W` = first-index lookup, returns `≢V+1` for not-found.
+- **Reduce with `+/⍳0`** = `0` (identity for `+`). Each scalar primitive has a defined identity used by reduce-on-empty. Don't crash; return identity.
+- **Reduce direction.** `f/` reduces the *last* axis. `f⌿` reduces the *first*. Matters for matrices.
+- **Indexing is 1-based** by default (`⎕IO=1`). Do not silently translate to 0-based; respect `⎕IO`.
+- **Bracket indexing** `A[I]` is sugar for `I⌷A` (squad-quad). Multi-axis: `A[I;J]` is `I J⌷A` with semicolon-separated axes; `A[;J]` selects all of axis 0.
+- **Dfn `{...}`** — `⍺` = left arg (may be unbound for monadic call → check with `⍺←default`), `⍵` = right arg, `∇` = recurse. Default left arg syntax: `⍺←0`.
+- **Tradfn vs dfn** — tradfns use line-numbered `→linenum` for goto; dfns use guards `cond:expr`. Pick the right one for the user's syntax.
+- **Empty array** = rank-N array where some dim is 0. `0⍴⍳0` is empty rank-1. Scalar prototype matters for empty-array operations; ignore in v1, return 0/space.
+- **Test corpus:** custom + idioms. Place programs in `lib/apl/tests/programs/` with `.apl` extension.
+
+## General gotchas (all loops)
+
+- SX `do` = R7RS iteration. Use `begin` for multi-expr sequences.
+- `cond`/`when`/`let` clauses evaluate only the last expr.
+- `type-of` on user fn returns `"lambda"`.
+- Shell heredoc `||` gets eaten — escape or use `case`.
+
+## Style
+
+- No comments in `.sx` unless non-obvious.
+- No new planning docs — update `plans/apl-on-sx.md` inline.
+- Short, factual commit messages (`apl: outer product ∘. (+9)`).
+- One feature per iteration. Commit. Log. Next.
+
+Go. Read the plan; find first `[ ]`; implement.

plans/agent-briefings/common-lisp-loop.md

@@ -0,0 +1,80 @@
+# common-lisp-on-sx loop agent (single agent, queue-driven)
+
+Role: iterates `plans/common-lisp-on-sx.md` forever. Conditions + restarts on delimited continuations is the headline showcase — every other Lisp reinvents resumable exceptions on the host stack. On SX `signal`/`invoke-restart` is just a captured continuation. Plus CLOS, the LOOP macro, packages.
+
+```
+description: common-lisp-on-sx queue loop
+subagent_type: general-purpose
+run_in_background: true
+isolation: worktree
+```
+
+## Prompt
+
+You are the sole background agent working `/root/rose-ash/plans/common-lisp-on-sx.md`. Isolated worktree, forever, one commit per feature. Never push.
+
+## Restart baseline — check before iterating
+
+1. Read `plans/common-lisp-on-sx.md` — roadmap + Progress log.
+2. `ls lib/common-lisp/` — pick up from the most advanced file.
+3. If `lib/common-lisp/tests/*.sx` exist, run them. Green before new work.
+4. If `lib/common-lisp/scoreboard.md` exists, that's your baseline.
+
+## The queue
+
+Phase order per `plans/common-lisp-on-sx.md`:
+
+- **Phase 1** — reader + parser (read macros `#'` `'` `` ` `` `,` `,@` `#( … )` `#:` `#\char` `#xFF` `#b1010`, ratios, dispatch chars, lambda lists with `&optional`/`&rest`/`&key`/`&aux`)
+- **Phase 2** — sequential eval + special forms (`let`/`let*`/`flet`/`labels`, `block`/`return-from`, `tagbody`/`go`, `unwind-protect`, multiple values, `setf` subset, dynamic variables)
+- **Phase 3** — **THE SHOWCASE**: condition system + restarts. `define-condition`, `signal`/`error`/`cerror`/`warn`, `handler-bind` (non-unwinding), `handler-case` (unwinding), `restart-case`, `restart-bind`, `find-restart`/`invoke-restart`/`compute-restarts`, `with-condition-restarts`. Classic programs (restart-demo, parse-recover, interactive-debugger) green.
+- **Phase 4** — CLOS: `defclass`, `defgeneric`, `defmethod` with `:before`/`:after`/`:around`, `call-next-method`, multiple dispatch
+- **Phase 5** — macros + LOOP macro + reader macros
+- **Phase 6** — packages + stdlib (sequence functions, FORMAT directives, drive corpus to 200+)
+
+Within a phase, pick the checkbox that unlocks the most tests per effort.
+
+Every iteration: implement → test → commit → tick `[ ]` → Progress log → next.
+
+## Ground rules (hard)
+
+- **Scope:** only `lib/common-lisp/**` and `plans/common-lisp-on-sx.md`. Do **not** edit `spec/`, `hosts/`, `shared/`, other `lib/<lang>/` dirs, `lib/stdlib.sx`, or `lib/` root. CL primitives go in `lib/common-lisp/runtime.sx`.
+- **NEVER call `sx_build`.** 600s watchdog. If sx_server binary broken → Blockers entry, stop.
+- **Shared-file issues** → plan's Blockers with minimal repro.
+- **Delimited continuations** are in `lib/callcc.sx` + `spec/evaluator.sx` Step 5. `sx_summarise` spec/evaluator.sx first — 2300+ lines.
+- **SX files:** `sx-tree` MCP tools ONLY. `sx_validate` after edits.
+- **Worktree:** commit locally. Never push. Never touch `main`.
+- **Commit granularity:** one feature per commit.
+- **Plan file:** update Progress log + tick boxes every commit.
+
+## Common-Lisp-specific gotchas
+
+- **`handler-bind` is non-unwinding** — handlers can decline by returning normally, in which case `signal` keeps walking the chain. **`handler-case` is unwinding** — picking a handler aborts the protected form via a captured continuation. Don't conflate them.
+- **Restarts are not handlers.** `restart-case` establishes named *resumption points*; `signal` runs handler code with restarts visible; the handler chooses a restart by calling `invoke-restart`, which abandons handler stack and resumes at the restart point. Two stacks: handlers walk down, restarts wait to be invoked.
+- **`block` / `return-from`** is lexical. `block name … (return-from name v) …` captures `^k` once at entry; `return-from` invokes it. `return-from` to a name not in scope is an error (don't fall back to outer block).
+- **`tagbody` / `go`** — each tag in tagbody is a continuation; `go tag` invokes it. Tags are lexical, can only target tagbodies in scope.
+- **`unwind-protect`** runs cleanup on *any* non-local exit (return-from, throw, condition unwind). Implement as a scope frame fired by the cleanup machinery.
+- **Multiple values**: primary-value-only contexts (function args, `if` test, etc.) drop extras silently. `values` produces multiple. `multiple-value-bind` / `multiple-value-call` consume them. Don't auto-list.
+- **CLOS dispatch:** sort applicable methods by argument-list specificity (`subclassp` per arg, left-to-right); standard method combination calls primary methods most-specific-first via `call-next-method` chain. `:before` runs all before primaries; `:after` runs all after, in reverse-specificity. `:around` wraps everything.
+- **`call-next-method`** is a *continuation* available only inside a method body. Implement as a thunk stored in a dynamic-extent variable.
+- **Generalised reference (`setf`)**: `(setf (foo x) v)` ↦ `(setf-foo v x)`. Look up the setf-expander, not just a writer fn. `define-setf-expander` is mandatory for non-trivial places. Start with the symbolic / list / aref / slot-value cases.
+- **Dynamic variables (specials):** `defvar`/`defparameter` mark a symbol as special. `let` over a special name *rebinds* in dynamic extent (use parameterize-style scope), not lexical.
+- **Symbols are package-qualified.** Reader resolves `cl:car`, `mypkg::internal`, bare `foo` (current package). Internal vs external matters for `:` (one colon) reads.
+- **`nil` is also `()` is also the empty list.** Same object. `nil` is also false. CL has no distinct unit value.
+- **LOOP macro is huge.** Build incrementally — start with `for/in`, `for/from`, `collect`, `sum`, `count`, `repeat`. Add conditional clauses (`when`, `if`, `else`) once iteration drivers stable. `named` blocks + `return-from named` last.
+- **Test corpus:** custom + curated `ansi-test` slice. Place programs in `lib/common-lisp/tests/programs/` with `.lisp` extension.
+
+## General gotchas (all loops)
+
+- SX `do` = R7RS iteration. Use `begin` for multi-expr sequences.
+- `cond`/`when`/`let` clauses evaluate only the last expr.
+- `type-of` on user fn returns `"lambda"`.
+- Shell heredoc `||` gets eaten — escape or use `case`.
+
+## Style
+
+- No comments in `.sx` unless non-obvious.
+- No new planning docs — update `plans/common-lisp-on-sx.md` inline.
+- Short, factual commit messages (`common-lisp: handler-bind + 12 tests`).
+- One feature per iteration. Commit. Log. Next.
+
+Go. Read the plan; find first `[ ]`; implement.

plans/agent-briefings/lua-loop.md

@@ -11,7 +11,7 @@ isolation: worktree
 
 ## Prompt
 
-You are the sole background agent working `/root/rose-ash/plans/lua-on-sx.md`. You run in an isolated git worktree. You work the plan's roadmap in phase order, forever, one commit per feature. Push to `origin/loops/lua` after every commit.
+You are the sole background agent working `/root/rose-ash/plans/lua-on-sx.md`. You run in an isolated git worktree. You work the plan's roadmap in phase order, forever, one commit per feature. You never push.
 
 ## Restart baseline — check before iterating
 
@@ -50,7 +50,7 @@ Every iteration:
 - **Shared-file issues** → plan's Blockers section with a minimal repro. Don't fix them.
 - **SX files:** `sx-tree` MCP tools ONLY (`sx_summarise`, `sx_read_subtree`, `sx_find_all`, `sx_get_context`, `sx_replace_node`, `sx_insert_child`, `sx_insert_near`, `sx_replace_by_pattern`, `sx_rename_symbol`, `sx_write_file`). Run `sx_validate` after edits. Never `Edit`/`Read`/`Write` on `.sx` files — a hook blocks it.
 - **Shell, Python, Markdown, JSON, Lua files:** edit normally.
-- **Worktree:** commit, then push to `origin/loops/lua`. Never touch `main`.
+- **Worktree:** commit locally. Never push. Never touch `main`.
 - **Commit granularity:** one feature per commit. If partial, still commit — don't hoard.
 - **Tests:** never regress. If a feature needs a larger refactor, split into commits each green.
 - **Plan file:** update Progress log + tick boxes every commit. Don't rewrite history.

plans/agent-briefings/primitives-loop.md

@@ -0,0 +1,780 @@
+# SX Primitives — Meta-Loop Briefing
+
+Goal: add fundamental missing SX primitives in sequence, then sweep all language
+implementations to replace their workarounds. Full rationale: vectors fix O(n) array
+access across every language; numeric tower fixes float/int conflation; dynamic-wind
+fixes cleanup semantics; coroutine primitive unifies Ruby/Lua/Tcl; string buffer fixes
+O(n²) concat; algebraic data types eliminate the tagged-dict pattern everywhere.
+
+**Each fire: find the first unchecked `[ ]`, do it, commit, tick it, stop.**
+Sub-items within a Phase may span multiple fires — just commit progress and tick what's done.
+
+---
+
+## Phase 0 — Prep (gate)
+
+- [x] Stop new-language loops: send `/exit` to sx-loops windows for the four blank-slate
+      languages that haven't committed workarounds yet:
+      ```
+      tmux send-keys -t sx-loops:common-lisp "/exit" Enter
+      tmux send-keys -t sx-loops:apl          "/exit" Enter
+      tmux send-keys -t sx-loops:ruby         "/exit" Enter
+      tmux send-keys -t sx-loops:tcl          "/exit" Enter
+      ```
+      Verify all four windows are idle (claude prompt, no active task).
+
+- [x] E38 + E39 landed: check both Bucket-E branches for implementation commits.
+      ```
+      git log --oneline hs-e38-sourceinfo | head -5
+      git log --oneline hs-e39-webworker  | head -5
+      ```
+      If either branch has only its base commit (no impl work yet): note "pending" and stop —
+      next fire re-checks. Proceed only when both have at least one implementation commit.
+
+---
+
+## Phase 1 — Vectors
+
+Native mutable integer-indexed arrays. Fix: Lua O(n) sort, APL rank polymorphism, Ruby
+Array, Tcl lists, Common Lisp vectors, all using string-keyed dicts today.
+
+Primitives to add:
+- `make-vector` `n` `[fill]` → vector of length n
+- `vector?` `v` → bool
+- `vector-ref` `v` `i` → element at index i (0-based)
+- `vector-set!` `v` `i` `x` → mutate in place
+- `vector-length` `v` → integer
+- `vector->list` `v` → list
+- `list->vector` `lst` → vector
+- `vector-fill!` `v` `x` → fill all elements
+- `vector-copy` `v` `[start]` `[end]` → fresh copy of slice
+
+Steps:
+- [x] OCaml: add `SxVector of value array` to `hosts/ocaml/sx_types.ml`; implement all
+      primitives in `hosts/ocaml/sx_primitives.ml` (or equivalent); wire into evaluator.
+      Note: Vector type + most prims were already present; added bounds-checked vector-ref/set!
+      and optional start/end to vector-copy. 10/10 vector tests pass (r7rs suite).
+- [x] Spec: add vector entries to `spec/primitives.sx` with type signatures and descriptions.
+      All 10 vector primitives now have :as type annotations, :returns, and :doc strings.
+      make-vector: optional fill param; vector-copy: optional start/end (done prev step).
+- [x] JS bootstrapper: implement vectors in `hosts/javascript/platform.js` (or equivalent);
+      ensure `sx-browser.js` rebuild picks them up.
+      Fixed index-of for lists (was returning -1 not NIL, breaking bind-lambda-params),
+      added _lastErrorKont_/hostError/try-catch/without-io-hook stubs. Vectors work.
+- [x] Tests: 40+ tests in `spec/tests/test-vectors.sx` covering construction, ref, set!,
+      length, conversions, fill, copy, bounds behaviour.
+      42 tests, all pass. 1847 standard / 2362 full passing (up from 5).
+- [x] Verify: full test suite still passes (`node hosts/javascript/run_tests.js --full`).
+      2362/4924 pass (improvement from pre-existing lambda binding bug, no regressions).
+- [x] Commit: `spec: vector primitive (make-vector/vector-ref/vector-set!/etc)`
+      Committed as: js: fix lambda binding (index-of on lists), add vectors + R7RS platform stubs
+
+---
+
+## Phase 2 — Numeric tower
+
+Float ≠ integer distinction. Fix: Erlang `=:=`, Lua `math.type()`, Haskell `Num`/`Integral`,
+Common Lisp `integerp`/`floatp`/`ratio`, JS `Number.isInteger`.
+
+Changes:
+- `parse-number` preserves float identity: `"1.0"` → float 1.0, not integer 1
+- New predicates: `integer?`, `float?`, `exact?`, `inexact?`
+- New coercions: `exact->inexact`, `inexact->exact`
+- Fix `floor`/`ceiling`/`truncate`/`round` to return integers when applied to floats
+- `number->string` renders `1.0` as `"1.0"`, `1` as `"1"`
+- Arithmetic: `(+ 1 1.0)` → `2.0` (float contagion), `(+ 1 1)` → `2` (integer)
+
+Steps:
+- [x] OCaml: distinguish `Integer of int` / `Number of float` in `sx_types.ml`; update all
+      arithmetic primitives for float contagion; fix `parse-number`.
+      92/92 numeric tower tests pass; 4874 total (394 pre-existing hs-upstream fails unchanged).
+- [x] Spec: update `spec/primitives.sx` with new predicates + coercions; document contagion rules.
+      Added integer?/float? predicates; updated number? body; / returns "float"; floor/ceil/truncate
+      return "integer"; +/-/* doc float contagion; fixed double-paren params; 4874/394 baseline.
+- [x] JS bootstrapper: update number representation and arithmetic.
+      Added integer?/float?/exact?/inexact?/truncate/remainder/modulo/random-int/exact->inexact/
+      inexact->exact/parse-number. Fixed sx_server.ml epoch protocol for Integer type.
+      JS: 1940 passed (+60); OCaml: 4874/394 unchanged. 6 tests JS-only fail (float≡int limitation).
+- [x] Tests: 92 tests in `spec/tests/test-numeric-tower.sx` — int-arithmetic, float-contagion,
+      division, predicates, coercions, rounding, parse-number, equality, modulo, min-max, stringify.
+- [x] Verify: full suite passes. OCaml 4874/394 (baseline unchanged). JS 1940/2500 (+60 vs pre-tower).
+      No regressions on any test that relied on `1.0 = 1` — those tests were already using integer
+      literals which remain identical in JS. 6 JS-only failures are platform-inherent (JS float≡int).
+- [x] Commit: all work landed across 4 commits (c70bbdeb, 45ec5535, b12a22e6, f5acb31c).
+
+---
+
+## Phase 3 — Dynamic-wind
+
+Fix: Common Lisp `unwind-protect`, Ruby `ensure`, JS `finally`, Tcl `catch`+cleanup,
+Erlang `try...after` (currently uses double-nested guard workaround).
+
+- [x] Spec: implement `dynamic-wind` in `spec/evaluator.sx` such that the after-thunk fires
+      on both normal return AND non-local exit (raise/call-cc escape). Must compose with
+      `guard` — currently they don't interact.
+- [x] OCaml: wire `dynamic-wind` through the CEK machine with a `WindFrame` continuation.
+- [x] JS bootstrapper: update.
+- [x] Tests: 20+ tests covering normal return, raise, call/cc escape, nested dynamic-winds.
+- [x] Commit: `spec: dynamic-wind + guard integration`
+
+---
+
+## Phase 4 — Coroutine primitive
+
+Unify Ruby fibers, Lua coroutines, Tcl coroutines — all currently reimplemented separately
+using call/cc+perform/resume.
+
+- [x] Spec: add `make-coroutine`, `coroutine-resume`, `coroutine-yield`, `coroutine?`,
+      `coroutine-alive?` to `spec/primitives.sx`. Build on existing `perform`/`cek-resume`
+      machinery — coroutines ARE perform/resume with a stable identity.
+      Implemented as `spec/coroutines.sx` define-library; `make-coroutine` stub in evaluator.sx.
+      17/17 coroutine tests pass (OCaml). Drives iteration via define+fn recursion (not named let —
+      named let uses cek_call→cek_run which errors on IO suspension).
+- [x] OCaml: implement coroutine type; wire resume/yield through CEK suspension.
+      No new native type needed — dict-based coroutine identity + existing cek-step-loop/
+      cek-resume/perform primitives in run_tests.ml ARE the OCaml implementation. 17/17 pass.
+- [x] JS bootstrapper: update.
+      All CEK primitives already in sx-browser.js. Fix: pre-load spec/coroutines.sx +
+      spec/signals.sx in run_tests.js so (import (sx coroutines)) resolves without suspension.
+      17/17 pass in JS. 1965/2500 (+25 vs 1940 baseline). Zero new failures.
+- [x] Tests: 25+ tests — multi-yield, final return, arg passthrough, alive? predicate,
+      nested coroutines, "final return vs yield" distinction (the Lua gotcha).
+      27 tests: added 10 new — state field inspection (ready/suspended/dead), yield from
+      nested helper, initial resume arg ignored, mutable closure state, complex yield values,
+      round-robin scheduling, factory-shared-no-state, non-coroutine error. 27/27 OCaml+JS.
+- [x] Commit: `spec: coroutine primitive (make-coroutine/resume/yield)`
+      Phase 4 landed across 4 commits: 21cb9cf5 (spec library), 9eb12c66 (ocaml verified),
+      b78e06a7 (js pre-load), 0ffe208e (27 tests). Phase 4 complete.
+
+---
+
+## Phase 5 — String buffer
+
+Fix O(n²) string concatenation in loops across Lua, Ruby, Common Lisp, Tcl.
+
+- [x] Spec + OCaml: add `make-string-buffer`, `string-buffer-append!`, `string-buffer->string`,
+      `string-buffer-length` to primitives. OCaml: `Buffer.t` wrapper. JS: array+join.
+      Also: string-buffer? predicate; SxStringBuffer._string_buffer marker for typeOf/dict?
+      exclusion; inspect case in sx_types.ml. 17/17 tests OCaml+JS.
+- [x] Tests: 15+ tests.
+      17 tests written inline with Spec+OCaml step: construction, type-of, empty/length,
+      single/multi-append, append-returns-nil, empty-string-append, reuse-after-to-string,
+      independence, loop-building, CSV-row, unicode, repeated-to-string, join-pattern.
+      17/17 OCaml+JS.
+- [x] Commit: `spec: string-buffer primitive`
+      Committed as d98b5fa2 — all work in one commit (OCaml type + primitives + JS + spec + 17 tests).
+
+---
+
+## Phase 6 — Algebraic data types
+
+The deepest structural gap. Every language uses `{:tag "..." :field ...}` tagged dicts to
+simulate sum types. A native `define-type` + `match` form eliminates this everywhere.
+
+- [x] Design: write `plans/designs/sx-adt.md` covering syntax, CEK dispatch, interaction with
+      existing `cond`/`case`, exhaustiveness checking, recursive types, pattern variables.
+      Draft, then stop — next fire reviews design before implementing.
+      Written: define-type/match syntax, AdtValue runtime rep, stepSfDefineType + MatchFrame
+      CEK dispatch, exhaustiveness warnings via _adt_registry, recursive types, nested patterns,
+      wildcard _, 3-phase impl plan (basic/nested/exhaustiveness), open questions on accessors/singletons/inspect.
+
+- [x] Spec: implement `define-type` special form in `spec/evaluator.sx`:
+      `(define-type Name (Ctor1 field...) (Ctor2 field...) ...)`
+      Creates constructor functions `Ctor1`, `Ctor2` + predicate `Name?`.
+
+- [x] Spec: implement `match` special form:
+      `(match expr ((Ctor1 a b) body) ((Ctor2 x) body) (else body))`
+      Exhaustiveness warning if not all constructors covered and no `else`.
+
+- [x] OCaml: add `SxAdt of string * value array` to types; implement constructors + match.
+      Dict-based ADT (no native type needed — matches spec). Hand-written sf_define_type
+      in bootstrap.py FIXUPS; registered via register_special_form. 172 assertions pass.
+      4280/1080 full suite (37 improvement over old baseline 4243/1117).
+- [x] JS bootstrapper: update.
+      No changes needed — define-type/match are spec-level; sx-browser.js rebuilt at 0dc7e159.
+      40/40 ADT tests pass JS. 2032/2500 total (+67 vs 1965 phase-4 baseline).
+- [x] Tests: 40+ tests in `spec/tests/test-adt.sx`.
+      40 tests written across two spec commits (6c872107+0dc7e159). All pass OCaml+JS.
+- [x] Commit: `spec: algebraic data types (define-type + match)`
+      Phase 6 landed across 5 commits: 6c872107 (define-type spec), 0dc7e159 (match spec),
+      5d1913e7 (ocaml bootstrap), f63b2147 (plan tick). JS already current.
+
+---
+
+## Phase 7 — Bitwise operations
+
+Completely absent today. Needed by: Forth (core), APL (array masks), Erlang (bitmatch),
+JS (typed arrays, bitfields), Common Lisp (`logand`/`logior`/`logxor`/`lognot`/`ash`).
+
+Primitives to add:
+- `bitwise-and` `a` `b` → integer
+- `bitwise-or` `a` `b` → integer
+- `bitwise-xor` `a` `b` → integer
+- `bitwise-not` `a` → integer
+- `arithmetic-shift` `a` `count` → integer (left if count > 0, right if count < 0)
+- `bit-count` `a` → number of set bits (popcount)
+- `integer-length` `a` → number of bits needed to represent a
+
+Steps:
+- [x] Spec: add entries to `spec/primitives.sx` with type signatures.
+      stdlib.bitwise module with 7 entries appended to spec/primitives.sx.
+- [x] OCaml: implement in `hosts/ocaml/sx_primitives.ml` using OCaml `land`/`lor`/`lxor`/`lnot`/`lsl`/`asr`.
+      land/lor/lxor/lnot/lsl/asr in sx_primitives.ml. bit-count: Kernighan loop. integer-length: lsr loop.
+- [x] JS bootstrapper: implement in `hosts/javascript/platform.js` using JS `&`/`|`/`^`/`~`/`<<`/`>>`.
+      stdlib.bitwise module added to PRIMITIVES_JS_MODULES. bit-count: Hamming weight. integer-length: Math.clz32.
+- [x] Tests: 25+ tests in `spec/tests/test-bitwise.sx` — basic ops, shift left/right, negative numbers, popcount.
+      26 tests, 158 assertions, all pass OCaml+JS.
+- [x] Commit: `spec: bitwise operations (bitwise-and/or/xor/not, arithmetic-shift, bit-count)`
+      Committed a8a79dc9. Phase 7 complete in single commit.
+
+---
+
+## Phase 8 — Multiple values
+
+R7RS standard. Common Lisp uses them heavily; Haskell tuples map naturally; Erlang
+multi-return. Without them, every function returning two things encodes it as a list or dict.
+
+Primitives / forms to add:
+- `values` `v...` → multiple-value object
+- `call-with-values` `producer` `consumer` → applies consumer to values from producer
+- `let-values` `(((a b) expr) ...)` `body` — binding form (special form in evaluator)
+- `define-values` `(a b ...)` `expr` — top-level multi-value bind
+
+Steps:
+- [x] Spec: add `SxValues` type to evaluator; implement `values` + `call-with-values` in
+      `spec/evaluator.sx`; add `let-values` / `define-values` special forms.
+- [x] OCaml: add `SxValues of value list` to `sx_types.ml`; wire through CEK.
+- [x] JS bootstrapper: implement values type + forms.
+- [x] Tests: 25+ tests in `spec/tests/test-values.sx` — basic producer/consumer, let-values
+      destructuring, define-values, interaction with `begin`/`do`.
+- [x] Commit: `spec: multiple values (values/call-with-values/let-values)`
+
+---
+
+## Phase 9 — Promises (lazy evaluation)
+
+Critical for Haskell — lazy evaluation is so central that without it the Haskell
+implementation can't be idiomatic. Also useful for lazy lists in Common Lisp and
+lazy streams in Scheme-style code generally.
+
+Primitives / forms to add:
+- `delay` `expr` → promise (special form — expr not evaluated yet)
+- `force` `p` → evaluate promise, cache result, return it
+- `make-promise` `v` → already-forced promise wrapping v
+- `promise?` `v` → bool
+- `delay-force` `expr` → for iterative lazy sequences (avoids stack growth in lazy streams)
+
+Steps:
+- [x] Spec: add `delay` / `delay-force` special forms to `spec/evaluator.sx`; add promise
+      type with mutable forced/value slots; `force` checks if already forced before eval.
+- [x] OCaml: add `SxPromise of { mutable forced: bool; mutable value: value; thunk: value }`;
+      wire `delay`/`force`/`delay-force` through CEK.
+- [x] JS bootstrapper: implement promise type + forms.
+- [x] Tests: 25+ tests in `spec/tests/test-promises.sx` — basic delay/force, memoisation
+      (forced only once), delay-force lazy stream, promise? predicate, make-promise.
+- [x] Commit: `spec: promises — delay/force/delay-force for lazy evaluation`
+
+---
+
+## Phase 10 — Mutable hash tables
+
+Distinct from SX's immutable dicts. Dict primitives copy on every update — fine for
+functional code, wrong for table-heavy language implementations. Lua tables, Smalltalk
+dicts, Erlang process dictionaries, and JS Map all need O(1) mutable associative storage.
+
+Primitives to add:
+- `make-hash-table` `[capacity]` → fresh mutable hash table
+- `hash-table?` `v` → bool
+- `hash-table-set!` `ht` `key` `val` → mutate in place
+- `hash-table-ref` `ht` `key` `[default]` → value or default/error
+- `hash-table-delete!` `ht` `key` → remove entry
+- `hash-table-size` `ht` → integer
+- `hash-table-keys` `ht` → list of keys
+- `hash-table-values` `ht` → list of values
+- `hash-table->alist` `ht` → list of (key . value) pairs
+- `hash-table-for-each` `ht` `fn` → iterate (fn key val) for side effects
+- `hash-table-merge!` `dst` `src` → merge src into dst in place
+
+Steps:
+- [x] Spec: add entries to `spec/primitives.sx`.
+      stdlib.hash-table module with 11 define-primitive entries appended to spec/primitives.sx.
+- [x] OCaml: add `HashTable of (value, value) Hashtbl.t` to `sx_types.ml`; implement
+      all primitives in `hosts/ocaml/sx_primitives.ml`.
+      HashTable variant in sx_types.ml; type_of/inspect cases added; 11 primitives in sx_primitives.ml;
+      fixed _cek_call_ref reference for hash-table-for-each. 4385/1080 (+28).
+- [x] JS bootstrapper: implement using JS `Map` in `hosts/javascript/platform.js`.
+      SxHashTable class with Map; _hash_table marker; dict?/type-of exclusion; apply() for for-each.
+      2137/2500 (+4 vs phase-9 baseline).
+- [x] Tests: 30+ tests in `spec/tests/test-hash-table.sx` — set/ref/delete, size, iteration,
+      default on missing key, merge, keys/values lists.
+      28 tests; all pass OCaml+JS. Used empty? not assert= for empty-list comparisons.
+- [x] Commit: `spec: mutable hash tables (make-hash-table/ref/set!/delete!/etc)`
+      Committed 133bdf52. Phase 10 complete.
+
+---
+
+## Phase 11 — Sequence protocol
+
+Unified iteration over lists and vectors without conversion. Currently `map`/`filter`/
+`for-each` only work on lists — you must `vector->list` first, which defeats the purpose
+of vectors. A sequence protocol makes all collection operations polymorphic.
+
+Approach: extend existing `map`/`filter`/`reduce`/`for-each`/`some`/`every?` to dispatch
+on type (list → existing path, vector → index loop, string → char iteration). Add:
+- `in-range` `start` `[end]` `[step]` → lazy range sequence (works with `for-each`/`map`)
+- `sequence->list` `s` → coerce any sequence to list
+- `sequence->vector` `s` → coerce any sequence to vector
+- `sequence-length` `s` → length of any sequence
+- `sequence-ref` `s` `i` → element by index (lists and vectors)
+- `sequence-append` `s1` `s2` → concatenate two same-type sequences
+
+Steps:
+- [x] Spec: extend `map`/`filter`/`reduce`/`for-each`/`some`/`every?` in `spec/evaluator.sx`
+      to type-dispatch; add `in-range` lazy sequence type + helpers.
+- [x] OCaml: update HO form dispatch; add `SxRange` or use lazy list; implement `sequence-*`
+      primitives.
+      seq_to_list helper before let-rec block; ho_setup_dispatch wraps all 7 coll bindings;
+      seq-to-list/sequence-to-list/vector/length/ref/append/in-range in sx_primitives.ml.
+      4385/1080 (all failures pre-existing hs-*/regex; 0 regressions).
+- [x] JS bootstrapper: update.
+      Already done in Spec step (da4b526a) — sx-browser.js rebuilt with seqToList/sequenceToList/
+      sequenceToVector/sequenceLength/sequenceRef/sequenceAppend/inRange. 2137/2500 JS tests pass.
+- [x] Tests: 30+ tests in `spec/tests/test-sequences.sx` — map over vector, filter over
+      range, for-each over string chars, sequence-append, sequence->list/vector coercions.
+      45 tests all passing: JS 2185/2498 (+48), OCaml 4424/1087 (+39). Fixed: vector? rename
+      (isVector), vectorLength/vectorRef/reverse aliases, in-range letrec→build-range,
+      sequence-length nil=0, assert-equal for list comparisons. Committed 0fe00bf7.
+- [x] Commit: `spec: sequence protocol — polymorphic map/filter/for-each over list/vector/range`
+      Work landed across da4b526a (Spec), 7286629c (OCaml), 06a3eee1 (JS bootstrap), 0fe00bf7 (Tests).
+
+---
+
+## Phase 12 — gensym + symbol interning
+
+Unique symbol generation. Tiny to implement; broadly needed: Prolog uses it for fresh
+variable names, Common Lisp uses it constantly in macros, any hygienic macro system needs
+it, and Smalltalk uses it for anonymous class/method naming.
+
+Primitives to add:
+- `gensym` `[prefix]` → unique symbol, e.g. `g42`, `var-17`. Counter-based, monotonically increasing.
+- `symbol-interned?` `s` → bool — whether the symbol is in the global intern table
+- `intern` `str` → symbol — intern a string as a symbol (string->symbol already exists; this is
+  the explicit interning operation for languages that distinguish interned vs uninterned)
+
+Steps:
+- [x] Spec: add `gensym` counter to evaluator state; implement in `spec/evaluator.sx`.
+      `string->symbol` already exists — `gensym` is just a counter-suffixed variant.
+      Added *gensym-counter*/gensym/string->symbol/symbol->string/intern/symbol-interned? to
+      evaluator.sx. Added string->symbol/symbol->string transpiler renames + platform.py aliases.
+      JS 2186/+1. OCaml builds. Committed edf4e525.
+- [x] OCaml: add global gensym counter; implement primitives.
+      gensym_counter ref + gensym/string->symbol/symbol->string/intern/symbol-interned? in sx_primitives.ml.
+      Also fixed ListRef case in seq_to_list (both sx_ref.ml + sx_primitives.ml). 4431/1080 (was 4385/1080).
+- [x] JS bootstrapper: implement.
+      Already done in Spec step. JS 2186/2497, all sequence tests pass.
+- [x] Tests: 15+ tests in `spec/tests/test-gensym.sx` — uniqueness, prefix, symbol?, string->symbol round-trip.
+      19 tests. OCaml 4450/1080, JS 2205/2497, zero regressions.
+- [x] Commit: `spec: gensym + symbol interning` — 0862a614
+
+---
+
+## Phase 13 — Character type
+
+Common Lisp and Haskell have a distinct `Char` type that is not a string. Without it both
+implementations are approximations — CL's `#\a` literal and Haskell's `'a'` both need a
+real char value, not a length-1 string.
+
+Primitives to add:
+- `char?` `v` → bool
+- `char->integer` `c` → Unicode codepoint integer
+- `integer->char` `n` → char
+- `char=?` `char<?` `char>?` `char<=?` `char>=?` → comparators
+- `char-ci=?` `char-ci<?` etc. → case-insensitive comparators
+- `char-alphabetic?` `char-numeric?` `char-whitespace?` → predicates
+- `char-upper-case?` `char-lower-case?` → predicates
+- `char-upcase` `char-downcase` → char → char
+- `string->list` extended to return chars (not length-1 strings)
+- `list->string` accepting chars
+
+Also: `#\a` reader syntax for char literals (parser addition).
+
+Steps:
+- [x] Spec: add `SxChar` type to evaluator; add char literal syntax `#\a`/`#\space`/`#\newline`
+      to `spec/parser.sx`; implement all predicates + comparators.
+- [x] OCaml: add `SxChar of char` to `sx_types.ml`; implement primitives.
+- [x] JS bootstrapper: implement char type wrapping a codepoint integer.
+- [x] Tests: 30+ tests in `spec/tests/test-chars.sx` — literals, char->integer round-trip,
+      comparators, predicates, upcase/downcase, string<->list with chars.
+- [x] Commit: `spec: character type (char? char->integer #\\a literals + predicates)`
+
+---
+
+## Phase 14 — String ports
+
+Needed for any language with a reader protocol: Common Lisp's `read`, Prolog's term parser,
+Smalltalk's `printString`. Without string ports these all do their own character walking
+on raw strings rather than treating a string as an I/O stream.
+
+Primitives to add:
+- `open-input-string` `str` → input port
+- `open-output-string` → output port
+- `get-output-string` `port` → string (flush output port to string)
+- `input-port?` `output-port?` `port?` → predicates
+- `read-char` `[port]` → char or eof-object
+- `peek-char` `[port]` → char or eof-object (non-consuming)
+- `read-line` `[port]` → string or eof-object
+- `write-char` `char` `[port]` → void
+- `write-string` `str` `[port]` → void
+- `eof-object` → the eof sentinel
+- `eof-object?` `v` → bool
+- `close-port` `port` → void
+
+Steps:
+- [x] Spec: add port type + eof-object to evaluator; implement all primitives.
+      Ports are mutable objects with a position cursor (input) or accumulation buffer (output).
+- [x] OCaml: add `SxPort` variant covering string-input-port and string-output-port;
+      Buffer.t for output, string+offset for input.
+- [x] JS bootstrapper: implement port type.
+- [x] Tests: 25+ tests in `spec/tests/test-ports.sx` — open/read/peek/eof, output accumulation,
+      read-line, write-char, close.
+- [x] Commit: `spec: string ports (open-input-string/open-output-string/read-char/etc)` — 3d8937d7
+
+---
+
+## Phase 15 — Math completeness
+
+Filling specific gaps that multiple language implementations need.
+
+### 15a — modulo / remainder / quotient distinction
+They differ on negative numbers — critical for Erlang `rem`, Haskell `mod`/`rem`, CL `mod`/`rem`:
+- `quotient` `a` `b` → truncate toward zero (same sign as dividend)
+- `remainder` `a` `b` → sign follows dividend (truncation division)
+- `modulo` `a` `b` → sign follows divisor (floor division) — R7RS
+
+### 15b — Trigonometry and transcendentals
+Lua, Haskell, Erlang, CL all need: `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `exp`,
+`log`, `sqrt`, `expt`. Check which are already present; add missing ones.
+
+### 15c — GCD / LCM
+`gcd` `a` `b` → greatest common divisor; `lcm` `a` `b` → least common multiple.
+Needed by Haskell `Rational`, CL, and any language doing fraction arithmetic.
+
+### 15d — Radix number parsing / formatting
+`(number->string n radix)` → e.g. `(number->string 255 16)` → `"ff"`.
+`(string->number s radix)` → e.g. `(string->number "ff" 16)` → `255`.
+Needed by: Common Lisp, Smalltalk, Erlang integer formatting.
+
+Steps:
+- [x] Audit which trig / math functions are already in `spec/primitives.sx`; note gaps.
+- [x] Spec + OCaml + JS: implement missing trig (`sin`/`cos`/`tan`/`asin`/`acos`/`atan`/`exp`/`log`).
+- [x] Spec + OCaml + JS: `quotient`/`remainder`/`modulo` with correct negative semantics.
+- [x] Spec + OCaml + JS: `gcd`/`lcm`.
+- [x] Spec + OCaml + JS: radix variants of `number->string`/`string->number`.
+- [x] Tests: 40+ tests in `spec/tests/test-math.sx`.
+- [x] Commit: `spec: math completeness — trig, quotient/remainder/modulo, gcd/lcm, radix`
+
+---
+
+## Phase 16 — Rational numbers
+
+Haskell's `Rational` type and Common Lisp ratios (`1/3`) both need this. Natural extension
+of the numeric tower (Phase 2) — rationals are the third numeric type alongside int and float.
+
+Primitives to add:
+- `make-rational` `numerator` `denominator` → rational (auto-reduced by GCD)
+- `rational?` `v` → bool
+- `numerator` `r` → integer
+- `denominator` `r` → integer
+- Reader syntax: `1/3` parsed as rational literal
+- Arithmetic: `(+ 1/3 1/6)` → `1/2`; `(* 1/3 3)` → `1`; mixed int/rational → rational
+- `exact->inexact` on rational → float; `inexact->exact` on float → rational approximation
+- `(number->string 1/3)` → `"1/3"`
+
+Steps:
+- [x] Spec: add `SxRational` type; add `n/d` reader syntax to `spec/parser.sx`; extend
+      all arithmetic primitives for rational contagion (int op rational → rational, rational
+      op float → float).
+- [x] OCaml: add `SxRational of int * int` (stored in reduced form); implement all arithmetic.
+      as_number + safe_eq extended for cross-type rational equality (= 2.5 5/2) → true.
+- [x] JS bootstrapper: implement rational type.
+      JS keeps int/int → float for CSS backward compatibility; SxRational class with _rational marker.
+- [x] Tests: 30+ tests in `spec/tests/test-rationals.sx` — literals, arithmetic, reduction,
+      mixed numeric tower, exact<->inexact conversion. 62 tests, all pass.
+- [x] Commit: `spec: rational numbers — 1/3 literals, arithmetic, numeric tower integration`
+      Committed 036022cc. JS: 2232 passed. OCaml: 4532 passed (+11).
+
+---
+
+## Phase 17 — read / write / display
+
+Completes the I/O model. Builds on string ports (Phase 14) and char type (Phase 13).
+`read` parses any SX value from a port; `write` serializes with quoting (round-trippable);
+`display` serializes without quoting (human-readable). Common Lisp's `read` macro,
+Prolog term I/O, and Smalltalk's `printString` all need this.
+
+Primitives to add:
+- `read` `[port]` → SX value or eof-object — full SX parser reading from a port
+- `read-char` already in Phase 14; `read` uses it internally
+- `write` `val` `[port]` → void — serializes with quotes: `"hello"`, `#\a`, `(1 2 3)`
+- `display` `val` `[port]` → void — serializes without quotes: `hello`, `a`, `(1 2 3)`
+- `newline` `[port]` → void — writes `\n`
+- `write-to-string` `val` → string — convenience: `(write val (open-output-string))`
+- `display-to-string` `val` → string — convenience
+
+Steps:
+- [x] Spec: implement `read` in `spec/evaluator.sx` — wraps the existing parser to read
+      one datum from a port cursor; handles eof gracefully.
+- [x] Spec: implement `write`/`display`/`newline` — extend the existing serializer for
+      port output; `write` quotes strings + uses `#\` for chars, `display` does not.
+- [x] OCaml: wire `read` through port type; implement `write`/`display` output path.
+- [x] JS bootstrapper: implement.
+- [x] Tests: 25+ tests in `spec/tests/test-read-write.sx` — read string literal, read list,
+      read eof, write round-trip, display vs write quoting, newline, write-to-string.
+- [x] Commit: `spec: read/write/display — S-expression reader/writer on ports`
+
+---
+
+## Phase 18 — Sets
+
+O(1) membership testing. Distinct from hash tables (unkeyed) and lists (O(n)).
+Erlang has sets as a stdlib staple, Haskell `Data.Set`, APL uses set operations
+constantly, Common Lisp has `union`/`intersection` on lists but a native set is O(1).
+
+Primitives to add:
+- `make-set` `[list]` → fresh set, optionally seeded from list
+- `set?` `v` → bool
+- `set-add!` `s` `val` → void
+- `set-member?` `s` `val` → bool
+- `set-remove!` `s` `val` → void
+- `set-size` `s` → integer
+- `set->list` `s` → list (unspecified order)
+- `list->set` `lst` → set
+- `set-union` `s1` `s2` → new set
+- `set-intersection` `s1` `s2` → new set
+- `set-difference` `s1` `s2` → new set (elements in s1 not in s2)
+- `set-for-each` `s` `fn` → iterate for side effects
+- `set-map` `s` `fn` → new set of mapped values
+
+Steps:
+- [x] Spec: add entries to `spec/primitives.sx`.
+- [x] OCaml: implement using `Hashtbl.t` with unit values (or a proper `Set` functor
+      with a comparison function); add `SxSet` to `sx_types.ml`.
+- [x] JS bootstrapper: implement using JS `Set`.
+- [x] Tests: 30+ tests in `spec/tests/test-sets.sx` — add/member/remove, union/intersection/
+      difference, list conversion, for-each, size.
+- [x] Commit: `spec: sets (make-set/set-add!/set-member?/union/intersection/etc)`
+
+---
+
+## Phase 19 — Regular expressions as primitives
+
+`lib/js/regex.sx` is a pure-SX regex engine already written. Promoting it to a primitive
+gives every language free regex without reinventing: Lua patterns, Tcl `regexp`, Ruby regex,
+JS regex, Erlang `re` module. Mostly a wiring job — the implementation exists.
+
+Primitives to add:
+- `make-regexp` `pattern` `[flags]` → regexp object (`flags`: `"i"` case-insensitive, `"g"` global, `"m"` multiline)
+- `regexp?` `v` → bool
+- `regexp-match` `re` `str` → match dict `{:match "..." :start N :end N :groups (...)}` or nil
+- `regexp-match-all` `re` `str` → list of match dicts
+- `regexp-replace` `re` `str` `replacement` → string with first match replaced
+- `regexp-replace-all` `re` `str` `replacement` → string with all matches replaced
+- `regexp-split` `re` `str` → list of strings (split on matches)
+- Reader syntax: `#/pattern/flags` for regexp literals (parser addition)
+
+Steps:
+- [x] Audit `lib/js/regex.sx` — understand the API it already exposes; map to the
+      primitive API above.
+- [x] Spec: add `SxRegexp` type to evaluator; add `#/pattern/flags` literal syntax to
+      `spec/parser.sx`; wire `lib/js/regex.sx` engine as the implementation.
+- [x] OCaml: implement using OCaml `Re` library (or `Str`); add `SxRegexp` to types.
+- [x] JS bootstrapper: use native JS `RegExp`; wrap in the primitive API.
+- [x] Tests: 30+ tests in `spec/tests/test-regexp.sx` — basic match, groups, replace,
+      replace-all, split, flags (case-insensitive), no-match nil return.
+- [x] Commit: `spec: regular expressions (make-regexp/regexp-match/regexp-replace + #/pat/ literals)`
+
+---
+
+## Phase 20 — Bytevectors
+
+R7RS standard. Needed for WebSocket binary frames (E36), binary protocol parsing, and
+efficient string encoding. Also the foundation for proper Unicode: `string->utf8` /
+`utf8->string` require a byte array type.
+
+Primitives to add:
+- `make-bytevector` `n` `[fill]` → bytevector of n bytes (fill defaults to 0)
+- `bytevector?` `v` → bool
+- `bytevector-length` `bv` → integer
+- `bytevector-u8-ref` `bv` `i` → byte 0–255
+- `bytevector-u8-set!` `bv` `i` `byte` → void
+- `bytevector-copy` `bv` `[start]` `[end]` → fresh copy
+- `bytevector-copy!` `dst` `at` `src` `[start]` `[end]` → in-place copy
+- `bytevector-append` `bv...` → concatenated bytevector
+- `utf8->string` `bv` `[start]` `[end]` → string decoded as UTF-8
+- `string->utf8` `str` `[start]` `[end]` → bytevector UTF-8 encoded
+- `bytevector->list` / `list->bytevector` → conversion
+
+Steps:
+- [x] Spec: add `SxBytevector` type; implement all primitives in `spec/evaluator.sx` / `spec/primitives.sx`.
+- [x] OCaml: add `SxBytevector of bytes` to `sx_types.ml`; implement primitives using
+      OCaml `Bytes`.
+- [x] JS bootstrapper: implement using `Uint8Array`.
+- [x] Tests: 30+ tests in `spec/tests/test-bytevectors.sx` — construction, ref/set, copy,
+      append, utf8 round-trip, slice.
+- [x] Commit: `spec: bytevectors (make-bytevector/u8-ref/u8-set!/utf8->string/etc)`
+
+---
+
+## Phase 21 — format
+
+CL-style string formatting beyond `str`. `(format "Hello ~a, age ~d" name age)`.
+Haskell `printf`, Erlang `io:format`, CL `format`, and general string templating all use this idiom.
+
+Directives:
+- `~a` — display (no quotes)
+- `~s` — write (with quotes)
+- `~d` — decimal integer
+- `~x` — hexadecimal integer
+- `~o` — octal integer
+- `~b` — binary integer
+- `~f` — fixed-point float
+- `~e` — scientific notation float
+- `~%` — newline
+- `~&` — fresh line (newline only if not already at start of line)
+- `~~` — literal tilde
+- `~t` — tab
+
+Signature: `(format template arg...)` → string.
+Optional: `(format port template arg...)` — write to port directly.
+
+Steps:
+- [x] Spec: implement `format` as a pure SX function in `spec/stdlib.sx` — parses
+      `~X` directives, dispatches to `display`/`write`/`number->string` as appropriate.
+      Pure SX: no host calls needed. Self-hosting — uses string-buffer (Phase 5) internally.
+- [x] OCaml: expose as a primitive (or let it run as SX through the evaluator).
+      Added format-decimal OCaml primitive; fixed lib/r7rs.sx number->string to support radix.
+- [x] JS bootstrapper: same.
+- [x] Tests: 28 tests in `spec/tests/test-format.sx` — each directive, multiple args,
+      nested format, `~~` escape. 28/28 pass on both JS and OCaml.
+- [x] Commit: `spec: format — CL-style string formatting (~a ~s ~d ~x ~% etc)` — 4d7b3e29
+
+---
+
+## Phase 22 — Language sweep
+
+Replace workarounds with primitives. One language per fire (or per sub-item for big ones).
+Start with blank slates (CL, APL, Ruby, Tcl) — they haven't committed to workarounds yet.
+
+**Scope per language:** only `lib/<lang>/**`. Don't touch spec or other languages.
+Brief each language's loop agent (or do inline) after rebasing their branch onto architecture.
+
+- [x] Restart CL/APL/Ruby/Tcl loops with updated briefing pointing to new primitives.
+      Added `## SX primitive baseline` section to plans/common-lisp-on-sx.md,
+      plans/apl-on-sx.md, plans/ruby-on-sx.md, plans/tcl-on-sx.md. f43659ce.
+
+- [x] Common Lisp: char type (`#\a`); string ports + `read`/`write` for reader/printer;
+      gensym for macros; rational numbers for CL ratios; multiple values; sets for CL set ops;
+      `modulo`/`remainder`/`quotient`; radix formatting; `format` for `cl:format`.
+      lib/common-lisp/runtime.sx (103 forms) + test.sh (68/68 pass). 1ad8e74a.
+
+- [x] Lua: vectors for arrays; hash tables for Lua tables; `delay`/`force` for lazy iterators;
+      regexp for Lua pattern matching; trig from math completeness; bytevectors for binary I/O.
+      math/string/table stdlib tables + lua-force. 185/185 pass. ec3512d6.
+
+- [x] Erlang: numeric tower for float/int; bitwise ops for bitmatch; multiple values for
+      multi-return; sets for Erlang sets; `remainder` for `rem`; regexp for `re` module.
+      lib/erlang/runtime.sx (63 forms) + test.sh (55/55 pass). 3c0a9632.
+
+- [x] Haskell: numeric tower for `Num`/`Integral`/`Fractional`; promises for lazy evaluation
+      (critical); multiple values for tuples; rational numbers for `Rational`; char type for
+      `Char`; `gcd`/`lcm`; sets for `Data.Set`; `read`/`write` for `Show`/`Read` instances.
+      lib/haskell/runtime.sx (113 forms) + tests/runtime.sx (143/143 pass). c02ffcf3.
+
+- [x] JS: vectors for Array; hash tables for `Map`; sets for `Set`; bitwise ops for typed
+      arrays; regexp for JS regex; bytevectors for `Uint8Array`; radix formatting.
+      lib/js/stdlib.sx (36 forms) + test.sh epochs 6000-6032 (25/25 pass). COMMIT.
+
+- [x] Smalltalk: vectors for `Array new:`; hash tables for `Dictionary new`; sets for
+      `Set new`; char type for `Character`; string ports + `read`/`write` for `printString`.
+      lib/smalltalk/runtime.sx (72 forms) + tests/runtime.sx (86/86 pass). COMMIT.
+
+- [x] APL: vectors as core array type; bitwise ops for array masks; sets for APL set ops;
+      sequence protocol for rank-polymorphic operations; format for APL output formatting.
+      lib/apl/runtime.sx (60 forms) + tests/runtime.sx (73/73 pass). COMMIT.
+
+- [ ] Ruby: coroutines for fibers; hash tables for `Hash`; sets for `Set`; regexp for
+      Ruby regex; string ports for `StringIO`; bytevectors for `String` binary encoding.
+
+- [ ] Tcl: string ports for Tcl channel abstraction; string-buffer for `append`; coroutines
+      for Tcl coroutines; regexp for Tcl `regexp`; format for Tcl `format`.
+
+- [ ] Forth: bitwise ops (core); string-buffer for word-definition accumulation; bytevectors
+      for Forth's raw memory model.
+
+---
+
+## Ground rules
+
+- Work on the `architecture` branch in `/root/rose-ash` (main worktree).
+- Use sx-tree MCP for all `.sx` file edits. Never use raw Edit/Write/Read on `.sx` files.
+- Commit after each concrete unit of work. Never leave the branch broken.
+- Never push to `main` — only push to `origin/architecture`.
+- Update this checklist every fire: tick `[x]` done, add inline notes on blockers.
+
+---
+
+## Progress log
+
+_Newest first._
+
+- 2026-05-01: Phase 22 APL done — runtime.sx (60 forms): iota/rho/at, rank-polymorphic dyadic/monadic helpers, arithmetic/comparison/boolean/bitwise element-wise, reduce/scan, take/drop/rotate/compress/index, set ops (member/nub/union/intersect/without), format. 73/73 tests. COMMIT.
+- 2026-05-01: Phase 22 Smalltalk done — runtime.sx (72 forms): numeric helpers, Character (1-indexed Array backed by dict), Dictionary (list-of-pairs any-key map), Set (make-set), WriteStream/ReadStream/printString. set-member? (set item) order. 86/86 tests. COMMIT.
+- 2026-05-01: Phase 22 JS done — stdlib.sx (36 forms): bitwise (truncate not js-num-to-int; set-member? takes (set item) order), Map (dict-backed pairs), Set (SX make-set), RegExp (callable lambda). 25/25 new tests pass; total 492/585. COMMIT.
+- 2026-05-01: Phase 22 Haskell done — runtime.sx (113 forms): numeric tower (hk-div floor semantics), rational (dict GCD-normalised), hk-force (promises), Data.Char, Data.Set, Data.List, Maybe/Either, tuples, string helpers, hk-show. 148/148 tests. c02ffcf3.
+- 2026-05-01: Phase 22 Erlang done — runtime.sx (63 forms): numeric tower, bitwise (band/bor/bxor/bnot/bsl/bsr), sets, re module, list BIFs, type conversions, ok/error tuples. 55/55 tests. 3c0a9632.
+- 2026-05-01: Phase 22 Lua done — math/string/table stdlib tables + lua-force in lib/lua/runtime.sx. 185/185 tests (28 new). ec3512d6.
+- 2026-05-01: Phase 22 CL done — runtime.sx (103 forms): type preds, arithmetic, chars, format, gensym, values, sets, radix, list utils. cl-empty? guards nil/() split. 68/68 tests. 1ad8e74a.
+- 2026-05-01: Phase 22 step 1 — SX primitive baseline added to CL/APL/Ruby/Tcl plans. f43659ce.
+- 2026-05-01: Phase 21 complete — format (~a ~s ~d ~x ~o ~b ~f ~% ~& ~~ ~t) as pure SX in spec/stdlib.sx. Fixed lib/r7rs.sx number->string to support optional radix; added format-decimal OCaml primitive. 28/28 tests on both JS and OCaml. 4d7b3e29.
+- 2026-04-26: Phase 7 complete — bitwise-and/or/xor/not + arithmetic-shift + bit-count + integer-length. OCaml: land/lor/lxor/lnot/lsl/asr + Kernighan popcount + lsr loop for integer-length. JS: bitwise ops + Hamming weight + Math.clz32. 26 tests, 158 assertions, all pass. a8a79dc9.
+- 2026-04-26: Phase 6 complete — JS+Tests+Commit all ticked. JS needed no changes (spec-level forms). 40/40 ADT tests pass JS. 2032/2500 JS total (+67 vs phase-4). Phase 6 fully landed: 6c872107+0dc7e159+5d1913e7. Phase 7 (bitwise) next.
+- 2026-04-26: Phase 6 OCaml done — Dict-based ADT (no native SxAdt type needed); hand-written sf_define_type in bootstrap.py FIXUPS (skipped from transpile — &rest params + empty-dict {} literals); registered via register_special_form; step_limit/step_count added to PREAMBLE. 172 assertions pass (test-adt). Full suite 4280/1080 (was 4243/1117, +37). Committed 5d1913e7.
+- 2026-04-26: Phase 6 Spec match done — ADT case added to match-pattern in spec/evaluator.sx: checks (list? pattern)+(symbol? first)+(dict? value)+(get value :_adt), then matches :_ctor+arity and recursively binds field patterns. No-clause error now uses make-cek-value+raise-eval-frame so guard can catch it. 20 new match tests pass; 40/40 total ADT tests green. Zero regressions.
+- 2026-04-26: Phase 6 Spec define-type done — sf-define-type registered via register-special-form! in spec/evaluator.sx; AdtValue as {:_adt true :_type "..." :_ctor "..." :_fields (list ...)}; ctor fns + arity checking + Name?/Ctor? predicates + Ctor-field accessors; *adt-registry* dict populated per define-type call. 20/20 JS tests pass in spec/tests/test-adt.sx. OCaml define-type is next task.
+- 2026-04-26: Phase 6 Design done — plans/designs/sx-adt.md written. Covers define-type/match syntax, AdtValue CEK runtime, stepSfDefineType+MatchFrame dispatch, exhaustiveness warnings, recursive types, nested patterns, wildcard _. 3-phase impl plan. Next fire: Spec implement define-type.
+- 2026-04-26: Phase 5 complete — string buffer fully landed (d98b5fa2). 17 tests, 17/17 OCaml+JS. Phase 6 (ADTs) next.
+- 2026-04-26: Phase 5 Spec+OCaml+JS step done — StringBuffer of Buffer.t in sx_types.ml; make-string-buffer/append!/->string/length/string-buffer? in sx_primitives.ml; SxStringBuffer with _string_buffer marker + typeOf/dict? fixes in platform.py; JS rebuilt. 17/17 tests OCaml+JS.
+- 2026-04-26: Phase 4 complete — coroutine primitive fully landed (4 commits: spec library + OCaml verified + JS pre-load + 27 tests). Phase 5 (string buffer) next.
+- 2026-04-26: Phase 4 Tests step done — 27 tests total (10 new: state field inspection, yield-from-helper, initial-arg-ignored, mutable-closure, complex-values, round-robin, factory-no-state, non-coroutine-error). 27/27 OCaml+JS.
+- 2026-04-26: Phase 4 JS step done — all CEK primitives already in sx-browser.js; fix was pre-loading spec/coroutines.sx+spec/signals.sx in run_tests.js so (import (sx coroutines)) resolves synchronously. 17/17 coroutine tests pass JS. 1965/2500 total (+25), zero new failures.
+- 2026-04-26: Phase 4 OCaml step done — no native SxCoroutine type needed; existing cek-step-loop/cek-resume/perform/make-cek-state primitives in run_tests.ml fully support the spec/coroutines.sx library. 284/284 pass (coroutines+vectors+numeric-tower+dynamic-wind), zero regressions.
+- 2026-04-26: Phase 4 Spec step done — spec/coroutines.sx define-library with make-coroutine/coroutine-resume/coroutine-yield/coroutine?/coroutine-alive?; make-coroutine stub in evaluator.sx; 17/17 coroutine tests pass (OCaml). Key insight: coroutine body must use (define loop (fn...)) + (loop 0) not named let — named let uses cek_call→cek_run which errors on IO suspension.
+- 2026-05-01: Phase 10 complete — mutable hash tables. HashTable variant in OCaml; JS Map-based SxHashTable. 11 primitives: make-hash-table/hash-table?/set!/ref/delete!/size/keys/values/->alist/for-each/merge!. 28 tests, all pass OCaml+JS. 133bdf52.
+- 2026-05-01: Phase 9 complete — delay/force/delay-force/make-promise/promise?. Dict-based promise {:_promise :forced :thunk :value}; :_iterative flag for delay-force chain following. 25/25 tests OCaml (4357) and JS (2109). Committed e44cb89a.
+- 2026-05-01: Phase 8 complete — values/call-with-values/let-values/define-values. Dict marker {:_values true :_list [...]} (no new type). step-sf-define desugars shorthand (define (f x) body) on both hosts. 25/25 tests OCaml+JS. Committed 43cc1d90.
+- 2026-04-26: Phase 3 complete — OCaml+JS done. CallccContinuation gains winders-depth int; make_callcc_continuation/callcc_continuation_winders_len wired; wind-after/wind-return CekFrame fields fixed (cf_f=after-thunk, cf_extra=winders-len, cf_name=body-result); get_val + transpiler.sx updated. 8/8 dynamic-wind tests pass on OCaml; 235/235 (callcc+guard+do+r7rs) zero regressions. Committed 6602ec8c.
+- 2026-04-26: Phase 3 Spec+Tests done — dynamic-wind CEK implementation: wind-after/wind-return frames, *winders* stack, kont-unwind-to-handler, wind-escape-to. callcc frame stores winders-len in continuation; callcc-continuation? calls wind-escape-to before escape. 8/8 dynamic-wind tests pass (normal return, raise, call/cc, nested LIFO, guard ordering). 1948/2500 JS (+8). Zero regressions. Committed a9d5a108.
+- 2026-04-26: Phase 2 complete — Verify+Commit done. OCaml 4874/394, JS 1940/2500 (+60). No regressions. 6 JS-only failures are float≡int platform-inherent. Phase 2 fully landed across 4 commits.
+- 2026-04-26: Phase 2 JS bootstrapper done — integer?/float?/exact?/inexact? added (Number.isInteger); truncate/remainder/modulo/random-int/exact->inexact/inexact->exact/parse-number added. Fixed sx_server.ml epoch+blob+io-response protocol for Integer type. JS: 1940/2500 (+60). OCaml: 4874/394 baseline. 6 JS tests fail (JS float≡int platform limit). Committed b12a22e6.
+- 2026-04-26: Phase 2 Spec done — integer?/float? predicates added to spec/primitives.sx; floor/ceil/truncate :returns updated to "integer"; / to "float"; exact->inexact/inexact->exact docs and returns updated; float contagion documented on +/-/*; 4874/394 baseline. Committed 45ec5535.
+- 2026-04-26: Phase 2 OCaml+Tests done — `Integer of int` / `Number of float` in sx_types.ml; float contagion across all arithmetic; floor/truncate/round → Integer; integer?/float?/exact?/inexact?/exact->inexact/inexact->exact; 92/92 numeric tower tests pass; 4874 total (394 pre-existing unchanged). Committed c70bbdeb.
+- 2026-04-26: Phase 1 complete — JS step done. Fixed fundamental lambda binding bug (index-of on arrays returned -1 not NIL, making bind-lambda-params mis-fire &rest branch). Added _lastErrorKont_/hostError/try-catch stubs. 42/42 vector tests pass. 1847 std / 2362 full passing (up from 5). Committed.
+- 2026-04-25: Phase 1 spec step done — all 10 vector primitives in spec/primitives.sx have full :as type annotations, :returns, :doc; make-vector optional fill param added.
+- 2026-04-25: Phase 1 OCaml step done — bounds-checked vector-ref/set!, vector-copy now accepts optional start/end, spec/primitives.sx doc updated. 10/10 r7rs vector tests pass, 4747 total (394 pre-existing hs-upstream fails unchanged).
+- 2026-04-25: Phase 0 complete — stopped CL/APL/Ruby/Tcl loops (all 4 idle at shell); confirmed E38 (tokenizer :end/:line) and E39 (WebWorker stub) both have implementation commits.
+- 2026-05-01: Phase 20 complete — bytevectors. SxBytevector of bytes in OCaml using Bytes; Uint8Array-backed SxBytevector in JS. 12 primitives: make-bytevector, bytevector?, bytevector-length, bytevector-u8-ref, bytevector-u8-set!, bytevector-copy, bytevector-copy!, bytevector-append, utf8->string, string->utf8, bytevector->list, list->bytevector. 32 tests, all pass. JS 2535, OCaml 4725. a3811545.
+- 2026-05-01: Phase 19 complete — regular expressions. SxRegexp(src,flags,Re.re) in OCaml via Re.Pcre; SxRegexp wrapper around JS RegExp. 9 primitives: make-regexp, regexp?, regexp-source, regexp-flags, regexp-match, regexp-match-all, regexp-replace, regexp-replace-all, regexp-split. Match dicts with :match/:start/:end/:groups. 32 tests, all pass. JS 2503, OCaml 4693. d8d5588e.
+- 2026-05-01: Phase 18 complete — sets. SxSet as (string,value) Hashtbl keyed by inspect(val) in OCaml; Map keyed by write-to-string in JS. 13 primitives: make-set, set?, set-add!, set-member?, set-remove!, set-size, set->list, list->set, set-union, set-intersection, set-difference, set-for-each, set-map. 33 tests, all pass. JS 2469, OCaml 4659. 3b0ac67a.
+- 2026-05-01: Phase 17 complete — read/write/display. OCaml: sx_write_val/sx_display_val helpers; read via Sx_parser.read_value with #t/#f and N/D rational support added to parser; postprocess ()→Nil. JS: sxReadNormalize (#t/#f→true/false), sxReadConvert (()→NIL), sxEq list equality, sxWriteVal symbol/keyword name fix (v.name not v._sym), readerMacroGet registry. 42 tests (test-read-write.sx), all pass both hosts. JS 2436, OCaml 4626. 7d329f02.
+- 2026-05-01: Phase 16 complete — rational numbers. SxRational type in OCaml (Rational of int*int, reduced, denom>0) and JS (SxRational class, _rational marker). n/d reader in spec/parser.sx. Arithmetic contagion: int op rational → rational, rational op float → float. JS keeps int/int → float for CSS compat. OCaml as_number+safe_eq extended for cross-type rational equality. 62 tests in test-rationals.sx, all pass. JS 2232, OCaml 4532 (+11). 036022cc.
+- 2026-05-01: Phase 15 complete — math completeness. stdlib.math module: sin/cos/tan/asin/acos/atan(1-2 args)/exp/log/expt/quotient/gcd/lcm/number->string(radix)/string->number(radix). OCaml atan updated for optional 2nd arg. Strict radix parsing in JS string->number. 44 tests in test-math.sx, all pass. JS 2311/4801, OCaml 4547/5629. be2b11ac.
+- 2026-05-01: Phase 14 OCaml done — Eof + Port{PortInput/PortOutput} in sx_types.ml; 15 port primitives in sx_primitives.ml; raw_serialize updated; 4532/4532 (+39, zero regressions). 8ba0a33f.
+- 2026-05-01: Phase 14 Spec+JS+Tests+Commit done — port type {_port,_kind,_source/_buffer,_pos,_closed}; eof singleton; 15 primitives in spec/primitives.sx (stdlib.ports) + platform.py; 39/39 tests in test-ports.sx. Committed 3d8937d7. OCaml step next.
+- 2026-05-01: Phase 13 OCaml done — Char of int in sx_types.ml; #\ reader in sx_parser.ml; all char primitives in sx_primitives.ml; fixed get_val for Integer n list indexing (was Number-only); fixed raw_serialize for Integer/Char. 4493/4493 (+43, zero regressions). b939becd.
+- 2026-05-01: Phase 13 Spec+JS+Tests+Commit done — SxChar tagged {_char,codepoint}; char? char->integer integer->char char-upcase/downcase; 10 comparators (ordered+ci); 5 predicates; string->list/list->string as platform primitives; #\a #\space #\newline reader syntax in spec/parser.sx; js-char-renames dict in transpiler.sx; 43/43 tests pass JS (2254/4745). Committed 4b600f17. OCaml step next.
+- 2026-05-01: Phase 12 complete — gensym + symbol interning. gensym_counter/gensym/string->symbol/symbol->string/intern/symbol-interned? in spec + OCaml + JS. Fixed ListRef case in seq_to_list (both hosts). 19 tests, all pass. OCaml 4450/1080, JS 2205/2497. Commits: edf4e525 Spec, 0862a614 OCaml+Tests.
+- 2026-05-01: Phase 11 complete — sequence protocol done. Commits: da4b526a Spec, 7286629c OCaml, 06a3eee1 JS, 0fe00bf7 Tests. JS 2185/+48, OCaml 4424/+39.
+- 2026-05-01: Phase 11 Tests done — 45 tests in test-sequences.sx all passing (JS 2185/+48, OCaml 4424/+39). Fixed vector? rename, vectorLength/vectorRef/reverse aliases, in-range letrec→build-range, sequence-length nil, assert-equal for lists. Committed 0fe00bf7.
+- 2026-05-01: Phase 11 JS bootstrapper step done — confirmed sx-browser.js current (built in Spec step da4b526a); 19 sequence primitive refs in output; 2137/2500 JS tests passing.
+- 2026-05-01: Phase 11 OCaml step done — seq_to_list helper added before let-rec; ho_setup_dispatch wraps all 7 coll bindings with seq_to_list; seq-to-list/sequence-to-list/to-vector/length/ref/append + in-range primitives in sx_primitives.ml. 4385/4385 baseline unchanged, 0 regressions. Committed 7286629c.
+- 2026-05-01: Phase 11 Spec step done — seq-to-list coercion helper; ho-setup-dispatch extended with seqToList on all collection args; sequence-to-list/vector/length/ref/append + in-range added to evaluator.sx. Restored 3 accidentally-deleted make-cek-state/value/suspended definitions. Fixed 8 shorthand define forms + added vector->list/list->vector transpiler renames. JS: 2137 passing (+28 vs HEAD baseline of 2109).

plans/agent-briefings/ruby-loop.md

@@ -0,0 +1,83 @@
+# ruby-on-sx loop agent (single agent, queue-driven)
+
+Role: iterates `plans/ruby-on-sx.md` forever. Fibers via delcc is the headline showcase — `Fiber.new`/`Fiber.yield`/`Fiber.resume` are textbook delimited continuations with sugar, where MRI does it via C-stack swapping. Plus blocks/yield (lexical escape continuations, same shape as Smalltalk's non-local return), method_missing, and singleton classes.
+
+```
+description: ruby-on-sx queue loop
+subagent_type: general-purpose
+run_in_background: true
+isolation: worktree
+```
+
+## Prompt
+
+You are the sole background agent working `/root/rose-ash/plans/ruby-on-sx.md`. Isolated worktree, forever, one commit per feature. Never push.
+
+## Restart baseline — check before iterating
+
+1. Read `plans/ruby-on-sx.md` — roadmap + Progress log.
+2. `ls lib/ruby/` — pick up from the most advanced file.
+3. If `lib/ruby/tests/*.sx` exist, run them. Green before new work.
+4. If `lib/ruby/scoreboard.md` exists, that's your baseline.
+
+## The queue
+
+Phase order per `plans/ruby-on-sx.md`:
+
+- **Phase 1** — tokenizer + parser. Keywords, identifier sigils (`@` ivar, `@@` cvar, `$` global), strings with interpolation, `%w[]`/`%i[]`, symbols, blocks `{|x| …}` and `do |x| … end`, splats, default args, method def
+- **Phase 2** — object model + sequential eval. Class table, ancestor-chain dispatch, `super`, singleton classes, `method_missing` fallback, dynamic constant lookup
+- **Phase 3** — blocks + procs + lambdas. Method captures escape continuation `^k`; `yield` / `return` / `break` / `next` / `redo` semantics; lambda strict arity vs proc lax
+- **Phase 4** — **THE SHOWCASE**: fibers via delcc. `Fiber.new`/`Fiber.resume`/`Fiber.yield`/`Fiber.transfer`. Classic programs (generator, producer-consumer, tree-walk) green
+- **Phase 5** — modules + mixins + metaprogramming. `include`/`prepend`/`extend`, `define_method`, `class_eval`/`instance_eval`, `respond_to?`/`respond_to_missing?`, hooks
+- **Phase 6** — stdlib drive. `Enumerable` mixin, `Comparable`, Array/Hash/Range/String/Integer methods, drive corpus to 200+
+
+Within a phase, pick the checkbox that unlocks the most tests per effort.
+
+Every iteration: implement → test → commit → tick `[ ]` → Progress log → next.
+
+## Ground rules (hard)
+
+- **Scope:** only `lib/ruby/**` and `plans/ruby-on-sx.md`. Do **not** edit `spec/`, `hosts/`, `shared/`, other `lib/<lang>/` dirs, `lib/stdlib.sx`, or `lib/` root. Ruby primitives go in `lib/ruby/runtime.sx`.
+- **NEVER call `sx_build`.** 600s watchdog. If sx_server binary broken → Blockers entry, stop.
+- **Shared-file issues** → plan's Blockers with minimal repro.
+- **Delimited continuations** are in `lib/callcc.sx` + `spec/evaluator.sx` Step 5. `sx_summarise` spec/evaluator.sx first — 2300+ lines.
+- **SX files:** `sx-tree` MCP tools ONLY. `sx_validate` after edits.
+- **Worktree:** commit locally. Never push. Never touch `main`.
+- **Commit granularity:** one feature per commit.
+- **Plan file:** update Progress log + tick boxes every commit.
+
+## Ruby-specific gotchas
+
+- **Block `return` vs lambda `return`.** Inside a block `{ ... return v }`, `return` invokes the *enclosing method's* escape continuation (non-local return). Inside a lambda `->(){ ... return v }`, `return` returns from the *lambda*. Don't conflate. Implement: blocks bind their `^method-k`; lambdas bind their own `^lambda-k`.
+- **`break` from inside a block** invokes a different escape — the *iteration loop's* escape — and the loop returns the break-value. `next` is escape from current iteration, returns iteration value. `redo` re-enters current iteration without advancing.
+- **Proc arity is lax.** `proc { |a, b, c| … }.call(1, 2)` ↦ `c = nil`. Lambda is strict — same call raises ArgumentError. Check arity at call site for lambdas only.
+- **Block argument unpacking.** `[[1,2],[3,4]].each { |a, b| … }` — single Array arg auto-unpacks for blocks (not lambdas). One arg, one Array → unpack. Frequent footgun.
+- **Method dispatch chain order:** prepended modules → class methods → included modules → superclass → BasicObject → method_missing. `super` walks from the *defining* class's position, not the receiver class's.
+- **Singleton classes** are lazily allocated. Looking up the chain for an object passes through its singleton class first, then its actual class. `class << obj; …; end` opens the singleton.
+- **`method_missing`** — fallback when ancestor walk misses. Receives `(name_symbol, *args, &blk)`. Pair with `respond_to_missing?` for `respond_to?` to also report true. Do **not** swallow NoMethodError silently.
+- **Ivars are per-object dicts.** Reading an unset ivar yields `nil` and a warning (`-W`). Don't error.
+- **Constant lookup** is first lexical (Module.nesting), then inheritance (Module.ancestors of the innermost class). Different from method lookup.
+- **`Object#send`** invokes private and public methods alike; `Object#public_send` skips privates.
+- **Class reopening.** `class Foo; def bar; …; end; end` plus a later `class Foo; def baz; …; end; end` adds methods to the same class. Class table lookups must be by-name, mutable; methods dict is mutable.
+- **Fiber semantics.** `Fiber.new { |arg| … }` creates a fiber suspended at entry. First `Fiber.resume(v)` enters with `arg = v`. Inside, `Fiber.yield(w)` returns `w` to the resumer; the next `Fiber.resume(v')` returns `v'` to the yield site. End of block returns final value to last resumer; subsequent `Fiber.resume` raises FiberError.
+- **`Fiber.transfer`** is symmetric — either side can transfer to the other; no resume/yield asymmetry. Implement on top of the same continuation pair, just don't enforce direction.
+- **Symbols are interned.** `:foo == :foo` is identity. Use SX symbols.
+- **Strings are mutable.** `s = "abc"; s << "d"; s == "abcd"`. Hash keys can be strings; hash dups string keys at insertion to be safe (or freeze them).
+- **Truthiness:** only `false` and `nil` are falsy. `0`, `""`, `[]` are truthy.
+- **Test corpus:** custom + curated RubySpec slice. Place programs in `lib/ruby/tests/programs/` with `.rb` extension.
+
+## General gotchas (all loops)
+
+- SX `do` = R7RS iteration. Use `begin` for multi-expr sequences.
+- `cond`/`when`/`let` clauses evaluate only the last expr.
+- `type-of` on user fn returns `"lambda"`.
+- Shell heredoc `||` gets eaten — escape or use `case`.
+
+## Style
+
+- No comments in `.sx` unless non-obvious.
+- No new planning docs — update `plans/ruby-on-sx.md` inline.
+- Short, factual commit messages (`ruby: Fiber.yield + Fiber.resume (+8)`).
+- One feature per iteration. Commit. Log. Next.
+
+Go. Read the plan; find first `[ ]`; implement.

plans/agent-briefings/smalltalk-loop.md

@@ -0,0 +1,77 @@
+# smalltalk-on-sx loop agent (single agent, queue-driven)
+
+Role: iterates `plans/smalltalk-on-sx.md` forever. Message-passing OO + **blocks with non-local return** on delimited continuations. Non-local return is the headline showcase — every other Smalltalk reinvents it on the host stack; on SX it falls out of the captured method-return continuation.
+
+```
+description: smalltalk-on-sx queue loop
+subagent_type: general-purpose
+run_in_background: true
+isolation: worktree
+```
+
+## Prompt
+
+You are the sole background agent working `/root/rose-ash/plans/smalltalk-on-sx.md`. Isolated worktree, forever, one commit per feature. Never push.
+
+## Restart baseline — check before iterating
+
+1. Read `plans/smalltalk-on-sx.md` — roadmap + Progress log.
+2. `ls lib/smalltalk/` — pick up from the most advanced file.
+3. If `lib/smalltalk/tests/*.sx` exist, run them. Green before new work.
+4. If `lib/smalltalk/scoreboard.md` exists, that's your baseline.
+
+## The queue
+
+Phase order per `plans/smalltalk-on-sx.md`:
+
+- **Phase 1** — tokenizer + parser (chunk format, identifiers, keywords `foo:`, binary selectors, `#sym`, `#(…)`, `$c`, blocks `[:a | …]`, cascades, message precedence)
+- **Phase 2** — object model + sequential eval (class table bootstrap, message dispatch, `super`, `doesNotUnderstand:`, instance variables)
+- **Phase 3** — **THE SHOWCASE**: blocks with non-local return via captured method-return continuation. `whileTrue:` / `ifTrue:ifFalse:` as block sends. 5 classic programs (eight-queens, quicksort, mandelbrot, life, fibonacci) green.
+- **Phase 4** — reflection + MOP: `perform:`, `respondsTo:`, runtime method addition, `becomeForward:`, `Exception` / `on:do:` / `ensure:` on top of `handler-bind`/`raise`
+- **Phase 5** — collections + numeric tower + streams
+- **Phase 6** — port SUnit, vendor Pharo Kernel-Tests slice, drive corpus to 200+
+- **Phase 7** — speed (optional): inline caching, block intrinsification
+
+Within a phase, pick the checkbox that unlocks the most tests per effort.
+
+Every iteration: implement → test → commit → tick `[ ]` → Progress log → next.
+
+## Ground rules (hard)
+
+- **Scope:** only `lib/smalltalk/**` and `plans/smalltalk-on-sx.md`. Do **not** edit `spec/`, `hosts/`, `shared/`, other `lib/<lang>/` dirs, `lib/stdlib.sx`, or `lib/` root. Smalltalk primitives go in `lib/smalltalk/runtime.sx`.
+- **NEVER call `sx_build`.** 600s watchdog. If sx_server binary broken → Blockers entry, stop.
+- **Shared-file issues** → plan's Blockers with minimal repro.
+- **Delimited continuations** are in `lib/callcc.sx` + `spec/evaluator.sx` Step 5. `sx_summarise` spec/evaluator.sx first — 2300+ lines.
+- **SX files:** `sx-tree` MCP tools ONLY. `sx_validate` after edits.
+- **Worktree:** commit locally. Never push. Never touch `main`.
+- **Commit granularity:** one feature per commit.
+- **Plan file:** update Progress log + tick boxes every commit.
+
+## Smalltalk-specific gotchas
+
+- **Method invocation captures `^k`** — the return continuation. Bind it as the block's escape token. `^expr` from inside any nested block invokes that captured `^k`. Escape past method return raises `BlockContext>>cannotReturn:`.
+- **Blocks are lambdas + escape token**, not bare lambdas. `value`/`value:`/… invoke the lambda; `^` invokes the escape.
+- **`ifTrue:` / `ifFalse:` / `whileTrue:` are ordinary block sends** — no special form. The runtime intrinsifies them in the JIT path (Tier 1 of bytecode expansion already covers this pattern).
+- **Cascade** `r m1; m2; m3` desugars to `(let ((tmp r)) (st-send tmp 'm1 ()) (st-send tmp 'm2 ()) (st-send tmp 'm3 ()))`. Result is the cascade's last send (or first, depending on parser variant — pick one and document).
+- **`super` send** looks up starting from the *defining* class's superclass, not the receiver class. Stash the defining class on the method record.
+- **Selectors are interned symbols.** Use SX symbols.
+- **Receiver dispatch:** tagged ints / floats / strings / symbols / `nil` / `true` / `false` aren't boxed. Their classes (`SmallInteger`, `Float`, `String`, `Symbol`, `UndefinedObject`, `True`, `False`) are looked up by SX type-of, not by an `:class` field.
+- **Method precedence:** unary > binary > keyword. `3 + 4 factorial` is `3 + (4 factorial)`. `a foo: b bar` is `a foo: (b bar)` (keyword absorbs trailing unary).
+- **Image / fileIn / become: between sessions** = out of scope. One-way `becomeForward:` only.
+- **Test corpus:** ~200 hand-written + a slice of Pharo Kernel-Tests. Place programs in `lib/smalltalk/tests/programs/`.
+
+## General gotchas (all loops)
+
+- SX `do` = R7RS iteration. Use `begin` for multi-expr sequences.
+- `cond`/`when`/`let` clauses evaluate only the last expr.
+- `type-of` on user fn returns `"lambda"`.
+- Shell heredoc `||` gets eaten — escape or use `case`.
+
+## Style
+
+- No comments in `.sx` unless non-obvious.
+- No new planning docs — update `plans/smalltalk-on-sx.md` inline.
+- Short, factual commit messages (`smalltalk: tokenizer + 56 tests`).
+- One feature per iteration. Commit. Log. Next.
+
+Go. Read the plan; find first `[ ]`; implement.

plans/agent-briefings/tcl-loop.md

@@ -0,0 +1,83 @@
+# tcl-on-sx loop agent (single agent, queue-driven)
+
+Role: iterates `plans/tcl-on-sx.md` forever. `uplevel`/`upvar` is the headline showcase — Tcl's superpower for defining your own control structures, requiring deep VM cooperation in any normal host but falling out of SX's first-class env-chain. Plus the Dodekalogue (12 rules), command-substitution everywhere, and "everything is a string" homoiconicity.
+
+```
+description: tcl-on-sx queue loop
+subagent_type: general-purpose
+run_in_background: true
+isolation: worktree
+```
+
+## Prompt
+
+You are the sole background agent working `/root/rose-ash/plans/tcl-on-sx.md`. Isolated worktree, forever, one commit per feature. Never push.
+
+## Restart baseline — check before iterating
+
+1. Read `plans/tcl-on-sx.md` — roadmap + Progress log.
+2. `ls lib/tcl/` — pick up from the most advanced file.
+3. If `lib/tcl/tests/*.sx` exist, run them. Green before new work.
+4. If `lib/tcl/scoreboard.md` exists, that's your baseline.
+
+## The queue
+
+Phase order per `plans/tcl-on-sx.md`:
+
+- **Phase 1** — tokenizer + parser. The Dodekalogue (12 rules): word-splitting, command sub `[…]`, var sub `$name`/`${name}`/`$arr(idx)`, double-quote vs brace word, backslash, `;`, `#` comments only at command start, single-pass left-to-right substitution
+- **Phase 2** — sequential eval + core commands. `set`/`unset`/`incr`/`append`/`lappend`, `puts`/`gets`, `expr` (own mini-language), `if`/`while`/`for`/`foreach`/`switch`, string commands, list commands, dict commands
+- **Phase 3** — **THE SHOWCASE**: `proc` + `uplevel` + `upvar`. Frame stack with proc-call push/pop; `uplevel #N script` evaluates in caller's frame; `upvar` aliases names across frames. Classic programs (for-each-line, assert macro, with-temp-var) green
+- **Phase 4** — `return -code N`, `catch`, `try`/`trap`/`finally`, `throw`. Control flow as integer codes
+- **Phase 5** — namespaces + ensembles. `namespace eval`, qualified names `::ns::cmd`, ensembles, `namespace path`
+- **Phase 6** — coroutines (built on fibers, same delcc as Ruby fibers) + system commands + drive corpus to 150+
+
+Within a phase, pick the checkbox that unlocks the most tests per effort.
+
+Every iteration: implement → test → commit → tick `[ ]` → Progress log → next.
+
+## Ground rules (hard)
+
+- **Scope:** only `lib/tcl/**` and `plans/tcl-on-sx.md`. Do **not** edit `spec/`, `hosts/`, `shared/`, other `lib/<lang>/` dirs, `lib/stdlib.sx`, or `lib/` root. Tcl primitives go in `lib/tcl/runtime.sx`.
+- **NEVER call `sx_build`.** 600s watchdog. If sx_server binary broken → Blockers entry, stop.
+- **Shared-file issues** → plan's Blockers with minimal repro.
+- **Delimited continuations** are in `lib/callcc.sx` + `spec/evaluator.sx` Step 5. `sx_summarise` spec/evaluator.sx first — 2300+ lines.
+- **SX files:** `sx-tree` MCP tools ONLY. `sx_validate` after edits.
+- **Worktree:** commit locally. Never push. Never touch `main`.
+- **Commit granularity:** one feature per commit.
+- **Plan file:** update Progress log + tick boxes every commit.
+
+## Tcl-specific gotchas
+
+- **Everything is a string.** Internally cache shimmer reps (list, dict, int, double) for performance, but every value must be re-stringifiable. Mutating one rep dirties the cached string and vice versa.
+- **The Dodekalogue is strict.** Substitution is **one-pass**, **left-to-right**. The result of a substitution is a value, not a script — it does NOT get re-parsed for further substitutions. This is what makes Tcl safe-by-default. Don't accidentally re-parse.
+- **Brace word `{…}`** is the only way to defer evaluation. No substitution inside, just balanced braces. Used for `if {expr}` body, `proc body`, `expr` arguments.
+- **Double-quote word `"…"`** is identical to a bare word for substitution purposes — it just allows whitespace in a single word. `\` escapes still apply.
+- **Comments are only at command position.** `# this is a comment` after a `;` or newline; *not* inside a command. `set x 1 # not a comment` is a 4-arg `set`.
+- **`expr` has its own grammar** — operator precedence, function calls — and does its own substitution. Brace `expr {$x + 1}` to avoid double-substitution and to enable bytecode caching.
+- **`if` and `while` re-parse** the condition only if not braced. Always use `if {…}`/`while {…}` form. The unbraced form re-substitutes per iteration.
+- **`return` from a `proc`** uses control code 2. `break` is 3, `continue` is 4. `error` is 1. `catch` traps any non-zero code; user can return non-zero with `return -code error -errorcode FOO message`.
+- **`uplevel #0 script`** is global frame. `uplevel 1 script` (or just `uplevel script`) is caller's frame. `uplevel #N` is absolute level N (0=global, 1=top-level proc, 2=proc-called-from-top, …). Negative levels are errors.
+- **`upvar #N otherVar localVar`** binds `localVar` in the current frame as an *alias* — both names refer to the same storage. Reads and writes go through the alias.
+- **`info level`** with no arg returns current level number. `info level N` (positive) returns the command list that invoked level N. `info level -N` returns the command list of the level N relative-up.
+- **Variable names with `(…)`** are array elements: `set arr(foo) 1`. Arrays are not first-class values — you can't `set x $arr`. `array get arr` gives a flat list `{key1 val1 key2 val2 …}`.
+- **List vs string.** `set l "a b c"` and `set l [list a b c]` look the same when printed but the second has a cached list rep. `lindex` works on both via shimmering. Most user code can't tell the difference.
+- **`incr x`** errors if x doesn't exist; pre-set with `set x 0` or use `incr x 0` first if you mean "create-or-increment". Or use `dict incr` for dicts.
+- **Coroutines are fibers.** `coroutine name body` starts a coroutine; calling `name` resumes it; `yield value` from inside suspends and returns `value` to the resumer. Same primitive as Ruby fibers — share the implementation under the hood.
+- **`switch`** matches first clause whose pattern matches. Default is `default`. Variant matches: glob (default), `-exact`, `-glob`, `-regexp`. Body `-` means "fall through to next clause's body".
+- **Test corpus:** custom + slice of Tcl's own tests. Place programs in `lib/tcl/tests/programs/` with `.tcl` extension.
+
+## General gotchas (all loops)
+
+- SX `do` = R7RS iteration. Use `begin` for multi-expr sequences.
+- `cond`/`when`/`let` clauses evaluate only the last expr.
+- `type-of` on user fn returns `"lambda"`.
+- Shell heredoc `||` gets eaten — escape or use `case`.
+
+## Style
+
+- No comments in `.sx` unless non-obvious.
+- No new planning docs — update `plans/tcl-on-sx.md` inline.
+- Short, factual commit messages (`tcl: uplevel + upvar (+11)`).
+- One feature per iteration. Commit. Log. Next.
+
+Go. Read the plan; find first `[ ]`; implement.

plans/apl-on-sx.md

@@ -0,0 +1,125 @@
+# APL-on-SX: rank-polymorphic primitives + glyph parser
+
+The headline showcase is **rank polymorphism** — a single primitive (`+`, `⌈`, `⊂`, `⍳`) works uniformly on scalars, vectors, matrices, and higher-rank arrays. ~80 glyph primitives + 6 operators bind together with right-to-left evaluation; the entire language is a high-density combinator algebra. The JIT compiler + primitive table pay off massively here because almost every program is `array → array` pure pipelines.
+
+End-state goal: Dyalog-flavoured APL subset, dfns + tradfns, classic programs (game-of-life, mandelbrot, prime-sieve, n-queens, conway), 100+ green tests.
+
+## Scope decisions (defaults — override by editing before we spawn)
+
+- **Syntax:** Dyalog APL surface, Unicode glyphs. `⎕`-quad system functions for I/O. `∇` tradfn header.
+- **Conformance:** "Reads like APL, runs like APL." Not byte-compat with Dyalog; we care about right-to-left semantics and rank polymorphism.
+- **Test corpus:** custom — APL idioms (Roger Hui style), classic programs, plus ~50 pattern tests for primitives.
+- **Out of scope:** ⎕-namespaces beyond a handful, complex numbers, full TAO ordering, `⎕FX` runtime function definition (use static `∇` only), nested-array-of-functions higher orders, the editor.
+- **Glyphs:** input via plain Unicode in `.apl` source files. Backtick-prefix shortcuts handled by the user's editor — we don't ship one.
+
+## Ground rules
+
+- **Scope:** only touch `lib/apl/**` and `plans/apl-on-sx.md`. Don't edit `spec/`, `hosts/`, `shared/`, or any other `lib/<lang>/**`. APL primitives go in `lib/apl/runtime.sx`.
+- **SX files:** use `sx-tree` MCP tools only.
+- **Commits:** one feature per commit. Keep `## Progress log` updated and tick roadmap boxes.
+
+## Architecture sketch
+
+```
+APL source (Unicode glyphs)
+    │
+    ▼
+lib/apl/tokenizer.sx   — glyphs, identifiers, numbers (¯ for negative), strings, strands
+    │
+    ▼
+lib/apl/parser.sx      — right-to-left with valence resolution (mon vs dyadic by position)
+    │
+    ▼
+lib/apl/transpile.sx   — AST → SX AST (entry: apl-eval-ast)
+    │
+    ▼
+lib/apl/runtime.sx     — array model, ~80 primitives, 6 operators, dfns/tradfns
+```
+
+Core mapping:
+- **Array** = SX dict `{:shape (d1 d2 …) :ravel #(v1 v2 …)}`. Scalar is rank-0 (empty shape), vector is rank-1, matrix rank-2, etc. Type uniformity not required (heterogeneous nested arrays via "boxed" elements `⊂x`).
+- **Rank polymorphism** — every scalar primitive is broadcast: `1 2 3 + 4 5 6` ↦ `5 7 9`; `(2 3⍴⍳6) + 1` ↦ broadcast scalar to matrix.
+- **Conformability** = matching shapes, or one-side scalar, or rank-1 cycling (deferred — keep strict in v1).
+- **Valence** = each glyph has a monadic and a dyadic meaning; resolution is purely positional (left-arg present → dyadic).
+- **Operator** = takes one or two function operands, returns a derived function (`f¨` = `each f`, `f/` = `reduce f`, `f∘g` = `compose`, `f⍨` = `commute`).
+- **Tradfn** `∇R←L F R; locals` = named function with explicit header.
+- **Dfn** `{⍺+⍵}` = anonymous, `⍺` = left arg, `⍵` = right arg, `∇` = recurse.
+
+## Roadmap
+
+### Phase 1 — tokenizer + parser
+- [ ] Tokenizer: Unicode glyphs (the full APL set: `+ - × ÷ * ⍟ ⌈ ⌊ | ! ? ○ ~ < ≤ = ≥ > ≠ ∊ ∧ ∨ ⍱ ⍲ , ⍪ ⍴ ⌽ ⊖ ⍉ ↑ ↓ ⊂ ⊃ ⊆ ∪ ∩ ⍳ ⍸ ⌷ ⍋ ⍒ ⊥ ⊤ ⊣ ⊢ ⍎ ⍕ ⍝`), operators (`/ \ ¨ ⍨ ∘ . ⍣ ⍤ ⍥ @`), numbers (`¯` for negative, `1E2`, `1J2` complex deferred), characters (`'a'`, `''` escape), strands (juxtaposition of literals: `1 2 3`), names, comments `⍝ …`
+- [ ] Parser: right-to-left; classify each token as function, operator, value, or name; resolve valence positionally; dfn `{…}` body, tradfn `∇` header, guards `:`, control words `:If :While :For …` (Dyalog-style)
+- [ ] Unit tests in `lib/apl/tests/parse.sx`
+
+### Phase 2 — array model + scalar primitives
+- [ ] Array constructor: `make-array shape ravel`, `scalar v`, `vector v…`, `enclose`/`disclose`
+- [ ] Shape arithmetic: `⍴` (shape), `,` (ravel), `≢` (tally / first-axis-length), `≡` (depth)
+- [ ] Scalar arithmetic primitives broadcast: `+ - × ÷ ⌈ ⌊ * ⍟ | ! ○`
+- [ ] Scalar comparison primitives: `< ≤ = ≥ > ≠`
+- [ ] Scalar logical: `~ ∧ ∨ ⍱ ⍲`
+- [ ] Index generator: `⍳n` (vector 1..n or 0..n-1 depending on `⎕IO`)
+- [ ] `⎕IO` = 1 default (Dyalog convention)
+- [ ] 40+ tests in `lib/apl/tests/scalar.sx`
+
+### Phase 3 — structural primitives + indexing
+- [ ] Reshape `⍴`, ravel `,`, transpose `⍉` (full + dyadic axis spec)
+- [ ] Take `↑`, drop `↓`, rotate `⌽` (last axis), `⊖` (first axis)
+- [ ] Catenate `,` (last axis) and `⍪` (first axis)
+- [ ] Index `⌷` (squad), bracket-indexing `A[I]` (sugar for `⌷`)
+- [ ] Grade-up `⍋`, grade-down `⍒`
+- [ ] Enclose `⊂`, disclose `⊃`, partition (subset deferred)
+- [ ] Membership `∊`, find `⍳` (dyadic), without `~` (dyadic), unique `∪` (deferred to phase 6)
+- [ ] 40+ tests in `lib/apl/tests/structural.sx`
+
+### Phase 4 — operators (THE SHOWCASE)
+- [ ] Reduce `f/` (last axis), `f⌿` (first axis) — including `∧/`, `∨/`, `+/`, `×/`, `⌈/`, `⌊/`
+- [ ] Scan `f\`, `f⍀`
+- [ ] Each `f¨` — applies `f` to each scalar/element
+- [ ] Outer product `∘.f` — `1 2 3 ∘.× 1 2 3` ↦ multiplication table
+- [ ] Inner product `f.g` — `+.×` is matrix multiply
+- [ ] Commute `f⍨` — `f⍨ x` ↔ `x f x`, `x f⍨ y` ↔ `y f x`
+- [ ] Compose `f∘g` — applies `g` first then `f`
+- [ ] Power `f⍣n` — apply f n times; `f⍣≡` until fixed point
+- [ ] Rank `f⍤k` — apply f at sub-rank k
+- [ ] At `@` — selective replace
+- [ ] 40+ tests in `lib/apl/tests/operators.sx`
+
+### Phase 5 — dfns + tradfns + control flow
+- [ ] Dfn `{…}` with `⍺` (left arg, may be absent → niladic/monadic), `⍵` (right arg), `∇` (recurse), guards `cond:expr`, default left arg `⍺←default`
+- [ ] Local assignment via `←` (lexical inside dfn)
+- [ ] Tradfn `∇` header: `R←L F R;l1;l2`, statement-by-statement, branch via `→linenum`
+- [ ] Dyalog control words: `:If/:Else/:EndIf`, `:While/:EndWhile`, `:For X :In V :EndFor`, `:Select/:Case/:EndSelect`, `:Trap`/`:EndTrap`
+- [ ] Niladic / monadic / dyadic dispatch (function valence at definition time)
+- [ ] `lib/apl/conformance.sh` + runner, `scoreboard.json` + `scoreboard.md`
+
+### Phase 6 — classic programs + drive corpus
+- [ ] Classic programs in `lib/apl/tests/programs/`:
+  - [ ] `life.apl` — Conway's Game of Life as a one-liner using `⊂` `⊖` `⌽` `+/`
+  - [ ] `mandelbrot.apl` — complex iteration with rank-polymorphic `+ × ⌊` (or real-axis subset)
+  - [ ] `primes.apl` — `(2=+⌿0=A∘.|A)/A←⍳N` sieve
+  - [ ] `n-queens.apl` — backtracking via reduce
+  - [ ] `quicksort.apl` — the classic Roger Hui one-liner
+- [ ] System functions: `⎕FMT`, `⎕FR` (float repr), `⎕TS` (timestamp), `⎕IO`, `⎕ML` (migration level — fixed at 1), `⎕←` (print)
+- [ ] Drive corpus to 100+ green
+- [ ] Idiom corpus — `lib/apl/tests/idioms.sx` covering classic Roger Hui / Phil Last idioms
+
+## SX primitive baseline
+
+Use vectors for arrays; numeric tower + rationals for numbers; ADTs for tagged data;
+coroutines for fibers; string-buffer for mutable string building; bitwise ops for bit
+manipulation; multiple values for multi-return; promises for lazy evaluation; hash tables
+for mutable associative storage; sets for O(1) membership; sequence protocol for
+polymorphic iteration; gensym for unique symbols; char type for characters; string ports
++ read/write for reader protocols; regexp for pattern matching; bytevectors for binary
+data; format for string templating.
+
+## Progress log
+
+_Newest first._
+
+- _(none yet)_
+
+## Blockers
+
+- _(none yet)_

plans/common-lisp-on-sx.md

@@ -0,0 +1,131 @@
+# Common-Lisp-on-SX: conditions + restarts on delimited continuations
+
+The headline showcase is the **condition system**. Restarts are *resumable* exceptions — every other Lisp implementation reinvents this on host-stack unwind tricks. On SX restarts are textbook delimited continuations: `signal` walks the handler chain; `invoke-restart` resumes the captured continuation at the restart point. Same delcc primitive that powers Erlang actors, expressed as a different surface.
+
+End-state goal: ANSI Common Lisp subset with a working condition/restart system, CLOS multimethods (with `:before`/`:after`/`:around`), the LOOP macro, packages, and ~150 hand-written + classic programs.
+
+## Scope decisions (defaults — override by editing before we spawn)
+
+- **Syntax:** ANSI Common Lisp surface. Read tables, dispatch macros (`#'`, `#(`, `#\`, `#:`, `#x`, `#b`, `#o`, ratios `1/3`).
+- **Conformance:** ANSI X3.226 *as a target*, not bug-for-bug SBCL/CCL. "Reads like CL, runs like CL."
+- **Test corpus:** custom + a curated slice of `ansi-test`. Plus classic programs: condition-system demo, restart-driven debugger, multiple-dispatch geometry, LOOP corpus.
+- **Out of scope:** compilation to native, FFI, sockets, threads, MOP class redefinition, full pathname/logical-pathname machinery, structures with `:include` deep customization.
+- **Packages:** simple — `defpackage`/`in-package`/`export`/`use-package`/`:cl`/`:cl-user`. No nicknames, no shadowing-import edge cases.
+
+## Ground rules
+
+- **Scope:** only touch `lib/common-lisp/**` and `plans/common-lisp-on-sx.md`. Don't edit `spec/`, `hosts/`, `shared/`, or any other `lib/<lang>/**`. CL primitives go in `lib/common-lisp/runtime.sx`.
+- **SX files:** use `sx-tree` MCP tools only.
+- **Commits:** one feature per commit. Keep `## Progress log` updated and tick roadmap boxes.
+
+## Architecture sketch
+
+```
+Common Lisp source
+    │
+    ▼
+lib/common-lisp/reader.sx     — tokenizer + reader (read macros, dispatch chars)
+    │
+    ▼
+lib/common-lisp/parser.sx     — AST: forms, declarations, lambda lists
+    │
+    ▼
+lib/common-lisp/transpile.sx  — AST → SX AST (entry: cl-eval-ast)
+    │
+    ▼
+lib/common-lisp/runtime.sx    — special forms, condition system, CLOS, packages, BIFs
+```
+
+Core mapping:
+- **Symbol** = SX symbol with package prefix; package table is a flat dict.
+- **Cons cell** = SX pair via `cons`/`car`/`cdr`; lists native.
+- **Multiple values** = thread through `values`/`multiple-value-bind`; primary-value default for one-context callers.
+- **Block / return-from** = captured continuation; `return-from name v` invokes the block-named `^k`.
+- **Tagbody / go** = each tag is a continuation; `go tag` invokes it.
+- **Unwind-protect** = scope frame with a cleanup thunk fired on any non-local exit.
+- **Conditions / restarts** = layered handler chain on top of `handler-bind` + delcc. `signal` walks handlers; `invoke-restart` resumes a captured continuation.
+- **CLOS** = generic functions are dispatch tables on argument-class lists; method combination computed lazily; `call-next-method` is a continuation.
+- **Macros** = SX macros (sentinel-body) — defmacro lowers directly.
+
+## Roadmap
+
+### Phase 1 — reader + parser
+- [ ] Tokenizer: symbols (with package qualification `pkg:sym` / `pkg::sym`), numbers (int, float, ratio `1/3`, `#xFF`, `#b1010`, `#o17`), strings `"…"` with `\` escapes, characters `#\Space` `#\Newline` `#\a`, comments `;`, block comments `#| … |#`
+- [ ] Reader: list, dotted pair, quote `'`, function `#'`, quasiquote `` ` ``, unquote `,`, splice `,@`, vector `#(…)`, uninterned `#:foo`, nil/t literals
+- [ ] Parser: lambda lists with `&optional` `&rest` `&key` `&aux` `&allow-other-keys`, defaults, supplied-p variables
+- [ ] Unit tests in `lib/common-lisp/tests/read.sx`
+
+### Phase 2 — sequential eval + special forms
+- [ ] `cl-eval-ast`: `quote`, `if`, `progn`, `let`, `let*`, `flet`, `labels`, `setq`, `setf` (subset), `function`, `lambda`, `the`, `locally`, `eval-when`
+- [ ] `block` + `return-from` via captured continuation
+- [ ] `tagbody` + `go` via per-tag continuations
+- [ ] `unwind-protect` cleanup frame
+- [ ] `multiple-value-bind`, `multiple-value-call`, `multiple-value-prog1`, `values`, `nth-value`
+- [ ] `defun`, `defparameter`, `defvar`, `defconstant`, `declaim`, `proclaim` (no-op)
+- [ ] Dynamic variables — `defvar`/`defparameter` produce specials; `let` rebinds via parameterize-style scope
+- [ ] 60+ tests in `lib/common-lisp/tests/eval.sx`
+
+### Phase 3 — conditions + restarts (THE SHOWCASE)
+- [ ] `define-condition` — class hierarchy rooted at `condition`/`error`/`warning`/`simple-error`/`simple-warning`/`type-error`/`arithmetic-error`/`division-by-zero`
+- [ ] `signal`, `error`, `cerror`, `warn` — all walk the handler chain
+- [ ] `handler-bind` — non-unwinding handlers, may decline by returning normally
+- [ ] `handler-case` — unwinding handlers (delcc abort)
+- [ ] `restart-case`, `with-simple-restart`, `restart-bind`
+- [ ] `find-restart`, `invoke-restart`, `invoke-restart-interactively`, `compute-restarts`
+- [ ] `with-condition-restarts` — associate restarts with a specific condition
+- [ ] `*break-on-signals*`, `*debugger-hook*` (basic)
+- [ ] Classic programs in `lib/common-lisp/tests/programs/`:
+  - [ ] `restart-demo.lisp` — division with `:use-zero` and `:retry` restarts
+  - [ ] `parse-recover.lisp` — parser with skipped-token restart
+  - [ ] `interactive-debugger.lisp` — ASCII REPL using `:debugger-hook`
+- [ ] `lib/common-lisp/conformance.sh` + runner, `scoreboard.json` + `scoreboard.md`
+
+### Phase 4 — CLOS
+- [ ] `defclass` with `:initarg`/`:initform`/`:accessor`/`:reader`/`:writer`/`:allocation`
+- [ ] `make-instance`, `slot-value`, `(setf slot-value)`, `with-slots`, `with-accessors`
+- [ ] `defgeneric` with `:method-combination` (standard, plus `+`, `and`, `or`)
+- [ ] `defmethod` with `:before` / `:after` / `:around` qualifiers
+- [ ] `call-next-method` (continuation), `next-method-p`
+- [ ] `class-of`, `find-class`, `slot-boundp`, `change-class` (basic)
+- [ ] Multiple dispatch — method specificity by argument-class precedence list
+- [ ] Built-in classes registered for tagged values (`integer`, `float`, `string`, `symbol`, `cons`, `null`, `t`)
+- [ ] Classic programs:
+  - [ ] `geometry.lisp` — `intersect` generic dispatching on (point line), (line line), (line plane)…
+  - [ ] `mop-trace.lisp` — `:before` + `:after` printing call trace
+
+### Phase 5 — macros + LOOP + reader macros
+- [ ] `defmacro`, `macrolet`, `symbol-macrolet`, `macroexpand-1`, `macroexpand`
+- [ ] `gensym`, `gentemp`
+- [ ] `set-macro-character`, `set-dispatch-macro-character`, `get-macro-character`
+- [ ] **The LOOP macro** — iteration drivers (`for … in/across/from/upto/downto/by`, `while`, `until`, `repeat`), accumulators (`collect`, `append`, `nconc`, `count`, `sum`, `maximize`, `minimize`), conditional clauses (`if`/`when`/`unless`/`else`), termination (`finally`/`thereis`/`always`/`never`), `named` blocks
+- [ ] LOOP test corpus: 30+ tests covering all clause types
+
+### Phase 6 — packages + stdlib drive
+- [ ] `defpackage`, `in-package`, `export`, `use-package`, `import`, `find-package`
+- [ ] Package qualification at the reader level — `cl:car`, `mypkg::internal`
+- [ ] `:common-lisp` (`:cl`) and `:common-lisp-user` (`:cl-user`) packages
+- [ ] Sequence functions — `mapcar`, `mapc`, `mapcan`, `reduce`, `find`, `find-if`, `position`, `count`, `every`, `some`, `notany`, `notevery`, `remove`, `remove-if`, `subst`
+- [ ] List ops — `assoc`, `getf`, `nth`, `last`, `butlast`, `nthcdr`, `tailp`, `ldiff`
+- [ ] String ops — `string=`, `string-upcase`, `string-downcase`, `subseq`, `concatenate`
+- [ ] FORMAT — basic directives `~A`, `~S`, `~D`, `~F`, `~%`, `~&`, `~T`, `~{...~}` (iteration), `~[...~]` (conditional), `~^` (escape), `~P` (plural)
+- [ ] Drive corpus to 200+ green
+
+## SX primitive baseline
+
+Use vectors for arrays; numeric tower + rationals for numbers; ADTs for tagged data;
+coroutines for fibers; string-buffer for mutable string building; bitwise ops for bit
+manipulation; multiple values for multi-return; promises for lazy evaluation; hash tables
+for mutable associative storage; sets for O(1) membership; sequence protocol for
+polymorphic iteration; gensym for unique symbols; char type for characters; string ports
++ read/write for reader protocols; regexp for pattern matching; bytevectors for binary
+data; format for string templating.
+
+## Progress log
+
+_Newest first._
+
+- _(none yet)_
+
+## Blockers
+
+- _(none yet)_

plans/designs/sx-adt.md

@@ -0,0 +1,257 @@
+# SX Algebraic Data Types — Design
+
+## Motivation
+
+Every language implementation currently uses `{:tag "..." :field ...}` tagged dicts to
+simulate sum types. This is verbose, error-prone (typos in tag strings go undetected), and
+produces no exhaustiveness warnings. Native ADTs eliminate the pattern everywhere.
+
+Examples of current workarounds:
+- Haskell `Maybe a` → `{:tag "Just" :value x}` / `{:tag "Nothing"}`
+- Prolog terms → `{:tag "functor" :name "foo" :args (list x y)}`
+- Lua result type → `{:tag "ok" :value v}` / `{:tag "err" :msg s}`
+- Common Lisp `cons` pairs → `{:tag "cons" :car a :cdr b}`
+
+---
+
+## Syntax
+
+### `define-type`
+
+```lisp
+(define-type Name
+  (Ctor1 field1 field2 ...)
+  (Ctor2 field1 ...)
+  ...)
+```
+
+Creates:
+- Constructor functions: `Ctor1`, `Ctor2`, … (callable like normal functions)
+- Type predicate: `Name?` — returns true for any value of type `Name`
+- Constructor predicates: `Ctor1?`, `Ctor2?`, … (optional, auto-generated)
+- Field accessors: `Ctor1-field1`, `Ctor1-field2`, … (optional, auto-generated)
+
+Examples:
+
+```lisp
+(define-type Maybe
+  (Just value)
+  (Nothing))
+
+(define-type Result
+  (Ok value)
+  (Err message))
+
+(define-type Tree
+  (Leaf)
+  (Node left value right))
+
+(define-type List-of
+  (Nil-of)
+  (Cons-of head tail))
+```
+
+Constructors with no fields are zero-argument constructors (singletons by value):
+
+```lisp
+(Nothing)     ; => #<Nothing>
+(Leaf)        ; => #<Leaf>
+```
+
+### `match`
+
+```lisp
+(match expr
+  ((Ctor1 a b) body)
+  ((Ctor2 x)   body)
+  ((Ctor3)     body)
+  (else        body))
+```
+
+- Clauses are tried in order; first match wins.
+- `else` clause is optional but suppresses exhaustiveness warnings.
+- Pattern variables (`a`, `b`, `x`) are bound in the body scope.
+- Wildcard `_` discards the matched value.
+- Literal patterns: `42`, `"str"`, `true`, `nil` — match by value equality.
+- Nested patterns: `((Node left (Leaf) right) body)` — nested constructor patterns.
+
+Examples:
+
+```lisp
+(match result
+  ((Ok v)  (str "got: " v))
+  ((Err m) (str "error: " m)))
+
+(match tree
+  ((Leaf)        0)
+  ((Node l v r)  (+ 1 (tree-depth l) (tree-depth r))))
+```
+
+---
+
+## CEK Dispatch
+
+### Runtime representation
+
+ADT values are OCaml records (not dicts) — opaque, non-inspectable via `get`:
+
+```ocaml
+type adt_value = {
+  av_type  : string;   (* type name, e.g. "Maybe" *)
+  av_ctor  : string;   (* constructor name, e.g. "Just" *)
+  av_fields: value array;  (* positional fields *)
+}
+```
+
+In JS: `{ _adt: true, _type: "Maybe", _ctor: "Just", _fields: [v] }`.
+
+`typeOf` returns the ADT type name (e.g. `"Maybe"`).
+
+### `define-type` — special form
+
+`stepSfDefineType(args, env, kont)`:
+
+1. Parse `Name` and list of `(CtorN field...)` clauses.
+2. For each constructor `CtorK` with fields `[f1, f2, …]`:
+   - Register `CtorK` as a `NativeFn` that takes `|fields|` args and returns an `AdtValue`.
+   - Register `CtorK?` as a predicate (`AdtValue` with matching ctor name → `true`).
+   - Register `CtorK-fN` as field accessor (returns `av_fields[N]`).
+3. Register `Name?` as a predicate (`AdtValue` with matching type name → `true`).
+4. All bindings go into the current environment via `env-bind!`.
+5. Returns `Nil`.
+
+This is an environment mutation — no new frame needed. Evaluates in one step.
+
+### `match` — special form
+
+`stepSfMatch(args, env, kont)`:
+
+1. Push `MatchFrame` with `clauses` and `env` onto kont.
+2. Return state evaluating the scrutinee `expr`.
+3. `MatchFrame` continue: receive scrutinee value, walk clauses:
+   - For each `((CtorN vars...) body)`:
+     - If scrutinee is an `AdtValue` with `av_ctor = "CtorN"` and `av_fields.length = |vars|`:
+       - Bind `vars[i]` → `av_fields[i]` in fresh child env.
+       - Return state evaluating `body` in that env.
+   - `(else body)` — always matches, body evaluated in current env.
+   - Literal `42`/`"str"` patterns: match by value equality.
+   - Wildcard `_`: always matches, binds nothing.
+4. If no clause matched and no `else`: raise `"match: no clause matched <value>"`.
+
+Frame type: `"match"` — stores `cf_remaining` (clauses), `cf_env` (enclosing env).
+
+---
+
+## Interaction with `cond` / `case`
+
+`match` is the primary dispatch form for ADTs. `cond` / `case` remain unchanged:
+
+- `cond` tests arbitrary boolean expressions — still useful for non-ADT dispatch.
+- `case` matches on equality to literal values — unchanged.
+- `match` is the new form: structural pattern matching on ADT constructors.
+
+They are orthogonal. A `match` clause can contain a `cond`; a `cond` clause can contain a `match`.
+
+---
+
+## Exhaustiveness checking
+
+Emit a **warning** (not an error) when:
+- A `match` has no `else` clause, AND
+- Not all constructors of the scrutinee's type are covered.
+
+Detection: when `define-type` runs, it registers the constructor set in a global table
+`_adt_registry: type_name → [ctor_names]`. At `match` compile/evaluation time:
+- If the scrutinee's type is in `_adt_registry` and not all ctors appear as patterns:
+  - `console.warn("[sx] match: non-exhaustive — missing: Ctor3, Ctor4 for type Maybe")`
+  - Execution continues (warning, not error).
+
+This is best-effort: the scrutinee type is only known at runtime. The warning fires on
+first non-exhaustive match evaluation, not at definition time.
+
+---
+
+## Recursive types
+
+Recursive types work because constructors are registered as functions, and function bodies
+are evaluated lazily:
+
+```lisp
+(define-type Tree
+  (Leaf)
+  (Node left value right))
+
+; Recursive function over a recursive type:
+(define (depth tree)
+  (match tree
+    ((Leaf)        0)
+    ((Node l v r)  (+ 1 (max (depth l) (depth r))))))
+```
+
+No special treatment needed — the type definition doesn't need to know about recursion.
+The constructor `Node` accepts any values, including other `Node` or `Leaf` values.
+
+---
+
+## Pattern variables
+
+In `match` clauses, identifiers in constructor position that are NOT constructor names are
+treated as pattern variables (bound to matched field values):
+
+```lisp
+(match x
+  ((Just v)    v)          ; v bound to the wrapped value
+  ((Nothing)   nil))
+
+(match pair
+  ((Cons-of h t)  (list h t)))  ; h, t bound to head and tail
+```
+
+**Wildcard**: `_` is always a wildcard — matches anything, binds nothing.
+
+```lisp
+(match x
+  ((Just _)    "has value")
+  ((Nothing)   "empty"))
+```
+
+**Nested patterns**:
+
+```lisp
+(match tree
+  ((Node (Leaf) v (Leaf))  (str "leaf node: " v))
+  ((Node l v r)             (str "inner node: " v)))
+```
+
+Nested patterns are matched recursively: the inner `(Leaf)` pattern checks that the
+`left` field is itself a `Leaf` ADT value.
+
+---
+
+## Implementation Plan
+
+### Phase 6a — `define-type` + basic `match` (no nested patterns, no exhaustiveness)
+
+1. OCaml: add `AdtValue of adt_value` to `sx_types.ml`.
+2. Evaluator: add `step-sf-define-type` — parse clauses, register ctor fns + predicates + accessors.
+3. Evaluator: add `step-sf-match` + `MatchFrame` — linear scan of clauses, flat patterns only.
+4. JS: same (AdtValue as plain object with `_adt`/`_type`/`_ctor`/`_fields` props).
+
+### Phase 6b — nested patterns (separate fire)
+
+Recursive `matchPattern(pattern, value, env)` helper that:
+- Returns `{matched: bool, bindings: map}` 
+- Recursively matches sub-patterns against ADT fields.
+
+### Phase 6c — exhaustiveness warnings (separate fire)
+
+`_adt_registry` global + warning emission on first non-exhaustive match.
+
+---
+
+## Open questions (deferred to review)
+
+1. **Accessor auto-generation**: should `Ctor-field` accessors be generated always, or only on demand? Risk: name collisions if two types have constructors with same field names.
+2. **Singleton constructors**: `(Nothing)` — zero-arg ctor — should these be interned (same object every call) or fresh each time? Interning enables `eq?` checks but requires a global table.
+3. **Printing/inspect**: `inspect` on an AdtValue should show `(Just 42)` not `#<adt:Just>`. Implement in `inspect` function or via `display`/`write` (Phase 17 ports).
+4. **Pattern-matching on non-ADT values**: should `match` handle list patterns `(a . b)` and literal patterns in clause heads? Deferred — add only if needed by a language implementation.

plans/hs-blockers-drain.md

@@ -0,0 +1,96 @@
+# HS conformance — blockers drain
+
+Goal: take hyperscript conformance from **1277/1496 (85.4%)** to **1496/1496 (100%)** by clearing the blocked clusters and the design-done Bucket E subsystems.
+
+This plan exists because the per-iteration `loops/hs` agent can't fit these into its 30-min budget — they need dedicated multi-commit sit-downs. Track progress here; refer to `plans/hs-conformance-to-100.md` for the canonical cluster ledger.
+
+## Current state (2026-04-25)
+
+- Loop running in `/root/rose-ash-loops/hs` (branch `loops/hs`)
+- sx-tree MCP **fixed** (was a session-stale binary issue — restart of claude in the tmux window picked it up). Loop hinted to retry **#32**, **#29** first.
+- Recent loop progress: ~1 commit/6h — easy wins drained, what's left needs focused attention.
+
+## Remaining work
+
+### Bucket-A/B/C blockers (small, in-place fixes)
+
+| # | Cluster | Tests | Effort | Blocker | Fix sketch |
+|---|---------|------:|--------|---------|------------|
+| **17** | `tell` semantics | +3 | ~1h | Implicit-default-target ambiguity. `bare add .bar` inside `tell X` should target `X` but explicit `to me` must reach the original element. | Add `beingTold` symbol distinct from `me`; bare commands compile to `beingTold-or-me`; explicit `me` always the original. |
+| **22** | window global fn fallback | +2-4 | ~1h | `foo()` where `foo` isn't SX-defined needs to fall back to `(host-global "foo")`. Three attempts failed: guard (host-level error not catchable), `env-has?` (not in HS kernel), `hs-win-call` (NativeFn not callable from CALL). | Add `symbol-bound?` predicate to HS kernel **OR** a host-call-fn primitive with arity-agnostic dispatch. |
+| **29** | `hyperscript:before:init` / `:after:init` / `:parse-error` events | +4-6 | ~30m (post sx-tree fix) | Was sx-tree MCP outage. Now unblocked — loop should retry. 4 of 6 tests need stricter parser error-rejection (out of scope; mark partial). | Edit `integration.sx` to fire DOM events at activation boundaries. |
+
+### Bucket D — medium features
+
+| # | Cluster | Tests | Effort | Status |
+|---|---------|------:|--------|--------|
+| **31** | runtime null-safety error reporting | **+15-18** | **2-4h** | **THIS SESSION'S TARGET.** Plan node fully spec'd: 5 pieces of work. |
+| **32** | MutationObserver mock + `on mutation` | +10-15 | ~2h | Was sx-tree-blocked. Now unblocked — loop hinted to retry. Multi-file: parser, compiler, runtime, runner mock, generator skip-list. |
+| **33** | cookie API | +2 (remaining) | ~30m | Partial done (+3). Remaining 2 need `hs-method-call` runtime fallback for unknown methods + `hs-for-each` recognising host-array/proxy collections. |
+| 34 | event modifier DSL | +6-8 | ~1-2h | `elsewhere`, `every`, count filters (`once`/`twice`/`3 times`/ranges), `from elsewhere`. Pending. |
+| 35 | namespaced `def` | +3 | ~30m | Pending. |
+
+### Bucket E — subsystems (design docs landed, multi-commit each)
+
+Each has a design doc with a step-by-step checklist. These are 1-2 days of focused work each, not loop-fits.
+
+| # | Subsystem | Tests | Design doc | Branch |
+|---|-----------|------:|------------|--------|
+| 36 | WebSocket + `socket` + RPC Proxy | +12-16 | `plans/designs/e36-websocket.md` | `worktree-agent-a9daf73703f520257` |
+| 37 | Tokenizer-as-API | +16-17 | `plans/designs/e37-tokenizer-api.md` | `worktree-agent-a6bb61d59cc0be8b4` |
+| 38 | SourceInfo API | +4 | `plans/designs/e38-sourceinfo.md` | `agent-e38-sourceinfo` |
+| 39 | WebWorker plugin (parser-only stub) | +1 | `plans/designs/e39-webworker.md` | `hs-design-e39-webworker` |
+| 40 | Real Fetch / non-2xx / before-fetch | +7 | `plans/designs/e40-real-fetch.md` | `worktree-agent-a94612a4283eaa5e0` |
+
+### Bucket F — generator translation gaps
+
+~25 tests SKIP'd because `tests/playwright/generate-sx-tests.py` bails with `return None`. Single dedicated generator-repair sit-down once Bucket D is drained. ~half-day.
+
+## Order of attack
+
+In approximate cost-per-test order:
+
+1. **Loop self-heal** (no human work) — wait for #29, #32 to land via the running loop ⏱️ ~next 1-2 hours
+2. **#31 null-safety** — biggest scoped single win, dedicated worktree agent (this session)
+3. **#33 cookie API remainder** — quick partial completion
+4. **#17 / #22 / #34 / #35** — small fiddly fixes, one sit-down each
+5. **Bucket E** — pick one subsystem at a time. **#39 (WebWorker stub) first** — single commit, smallest. Then **#38 (SourceInfo)** — 4 commits. Then the bigger three (#36, #37, #40).
+6. **Bucket F** — generator repair sweep at the end.
+
+Estimated total to 100%: ~10-15 days of focused work, parallelisable across branches.
+
+## Cluster #31 spec (full detail)
+
+The plan note from `hs-conformance-to-100.md`:
+
+> 18 tests in `runtimeErrors`. When accessing `.foo` on nil, emit a structured error with position info. One coordinated fix in the compiler emit paths for property access, function calls, set/put.
+
+**Required pieces:**
+
+1. **Generator-side `eval-hs-error` helper + recognizer** for `expect(await error("HS")).toBe("MSG")` blocks. In `tests/playwright/generate-sx-tests.py`.
+2. **Runtime helpers** in `lib/hyperscript/runtime.sx`:
+   - `hs-null-error!` raising `'<sel>' is null`
+   - `hs-named-target` — wraps a query result with the original selector source
+   - `hs-named-target-list` — same for list results
+3. **Compiler patches at every target-position `(query SEL)` emit** — wrap in named-target carrying the original selector source. ~17 command emit paths in `lib/hyperscript/compiler.sx`:
+   add, remove, hide, show, measure, settle, trigger, send, set, default, increment, decrement, put, toggle, transition, append, take.
+4. **Function-call null-check** at bare `(name)`, `hs-method-call`, and `host-get` chains, deriving the leftmost-uncalled-name (`'x'` / `'x.y'`) from the parse tree.
+5. **Possessive-base null-check** (`set x's y to true` → `'x' is null`).
+
+**Files in scope:**
+- `lib/hyperscript/runtime.sx` (new helpers)
+- `lib/hyperscript/compiler.sx` (~17 emit-path edits)
+- `tests/playwright/generate-sx-tests.py` (test recognizer)
+- `tests/hs-run-filtered.js` (if mock helpers needed)
+- `shared/static/wasm/sx/hs-runtime.sx` + `hs-compiler.sx` (WASM staging copies)
+
+**Approach:** target-named pieces incrementally — runtime helpers first (no compiler change), then compiler emit paths in batches (group similar commands), then function-call/possessive at the end. Each batch is one commit if it lands +N tests; mark partial if it only unlocks part.
+
+**Watch for:** smoke-range regressions (tests flipping pass→fail). Each commit: rerun smoke 0-195 and the `runtimeErrors` suite.
+
+## Notes for future sessions
+
+- `plans/hs-conformance-to-100.md` is the canonical cluster ledger — update it on every commit.
+- `plans/hs-conformance-scoreboard.md` is the live tally — bump `Merged:` and the bucket roll-up.
+- Loop has scope rule "never edit `spec/evaluator.sx` or broader SX kernel" — most fixes here stay in `lib/hyperscript/**`, `tests/`, generator. If a fix needs kernel work, surface to the user; don't merge silently.
+- Cluster #22's `symbol-bound?` predicate would be a kernel addition — that's a real cross-boundary scope expansion.

plans/js-on-sx.md

@@ -125,7 +125,7 @@ Each item: implement → tests → update progress. Mark `[x]` when tests green.
 - [x] Rest params (`...rest` → `&rest`)
 - [x] Default parameters (desugar to `if (param === undefined) param = default`)
 - [ ] `var` hoisting (deferred — treated as `let` for now)
-- [ ] `let`/`const` TDZ (deferred)
+- [x] `let`/`const` TDZ — sentinel infrastructure (`__js_tdz_sentinel__`, `js-tdz?`, `js-tdz-check` in runtime.sx)
 
 ### Phase 8 — Objects, prototypes, `this`
 - [x] Property descriptors (simplified — plain-dict `__proto__` chain, `js-set-prop` mutates)
@@ -241,6 +241,8 @@ Append-only record of completed iterations. Loop writes one line per iteration:
   - 29× Timeout (slow string/regex loops)
   - 16× ReferenceError — still some missing globals
 
+- 2026-04-25 — **Regex engine (lib/js/regex.sx) + let/const TDZ infrastructure.** New file `lib/js/regex.sx`: 39-form pure-SX recursive backtracking engine installed via `js-regex-platform-override!`. Covers literals, `.`, `\d\w\s` + negations, `[abc]/[^abc]/[a-z]` char classes, `^\$\b\B` anchors, greedy+lazy quantifiers (`* + ? {n,m} *? +? ??`), capturing groups, non-capturing `(?:...)`, alternation `a|b`, flags `i`/`g`/`m`. Groups: match inner first → set capture → match rest (correct boundary), avoids including rest-nodes content in capture. Greedy: expand-first then backtrack (correct longest-match semantics). `js-regex-match-all` for String.matchAll. Fixed `String.prototype.match` to use platform engine (was calling stub). TDZ infrastructure added to `runtime.sx`: `__js_tdz_sentinel__` (unique sentinel dict), `js-tdz?`, `js-tdz-check`. `transpile.sx` passes `kind` through `js-transpile-var → js-vardecl-forms` (no behavioral change yet — infrastructure ready). `test262-runner.py` and `conformance.sh` updated to load `regex.sx` as epoch 6/50. Unit: **559/560** (was 522/522 before regex tests added, now +38 new tests; 1 pre-existing backtick failure). Conformance: **148/148** (unchanged). Gotchas: (1) `sx_insert_near` on a pattern inside a top-level function body inserts there (not at top level) — need to use `sx_insert_near` on a top-level symbol name. (2) Greedy quantifier must expand-first before trying rest-nodes; the naive "try rest at each step" produces lazy behavior. (3) Capturing groups must match inner nodes in isolation first (to get the group's end position) then match rest — appending inner+rest-nodes would include rest in the capture string.
+
 ## Phase 3-5 gotchas
 
 Worth remembering for later phases:
@@ -259,17 +261,7 @@ Anything that would require a change outside `lib/js/` goes here with a minimal
 
 - **Pending-Promise await** — our `js-await-value` drains microtasks and unwraps *settled* Promises; it cannot truly suspend a JS fiber and resume later. Every Promise that settles eventually through the synchronous `resolve`/`reject` + microtask path works. A Promise that never settles without external input (e.g. a real `setTimeout` waiting on the event loop) would hit the `"await on pending Promise (no scheduler)"` error. Proper async suspension would need the JS eval path to run under `cek-step-loop` (not `eval-expr` → `cek-run`) and treat `await pending-Promise` as a `perform` that registers a resume thunk on the Promise's callback list. Non-trivial plumbing; out of scope for this phase. Consider it a Phase 9.5 item.
 
-- **Regex platform primitives** — runtime ships a substring-based stub (`js-regex-stub-test` / `-exec`). Overridable via `js-regex-platform-override!` so a real engine can be dropped in. Required platform-primitive surface:
-  - `regex-compile pattern flags` — build an opaque compiled handle
-  - `regex-test compiled s` → bool
-  - `regex-exec compiled s` → match dict `{match index input groups}` or nil
-  - `regex-match-all compiled s` → list of match dicts (or empty list)
-  - `regex-replace compiled s replacement` → string
-  - `regex-replace-fn compiled s fn` → string (fn receives match+groups, returns string)
-  - `regex-split compiled s` → list of strings
-  - `regex-source compiled` → string
-  - `regex-flags compiled` → string
-  Ideally a single `(js-regex-platform-install-all! platform)` entry point the host calls once at boot. OCaml would wrap `Str` / `Re` or a dedicated regex lib; JS host can just delegate to the native `RegExp`.
+- ~~**Regex platform primitives**~~ **RESOLVED** — `lib/js/regex.sx` ships a pure-SX recursive backtracking engine. Installs via `js-regex-platform-override!` at load. Covers: literals, `.`, `\d\w\s` and negations, `[abc]` / `[^abc]` / ranges, `^` `$` `\b \B`, `* + ? {n,m}` (greedy + lazy), capturing + non-capturing groups, alternation `a|b`, flags `i` (case-insensitive), `g` (global, advances lastIndex), `m` (multiline anchors). `js-regex-match-all` for String.matchAll. String.prototype.match regex path updated to use platform engine (was calling stub). 34 new unit tests added (5000–5033). Conformance: 148/148 (unchanged — slice had no regex fixtures).
 
 - **Math trig + transcendental primitives missing.** The scoreboard shows 34× "TypeError: not a function" across the Math category — every one a test calling `Math.sin/cos/tan/log/…` on our runtime. We shim `Math` via `js-global`; the SX runtime supplies `sqrt`, `pow`, `abs`, `floor`, `ceil`, `round` and a hand-rolled `trunc`/`sign`/`cbrt`/`hypot`. Nothing else. Missing platform primitives (each is a one-line OCaml/JS binding, but a primitive all the same — we can't land approximation polynomials from inside the JS shim, they'd blow `Math.sin(1e308)` precision):
   - Trig: `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `atan2`

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
-- [x] Multi-return: return as list, unpack at call sites
-- [x] Table constructors (array + hash + computed keys)
-- [x] 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)
-- [x] `lib/lua/conformance.sh` + Python runner (model on `lib/js/test262-runner.py`)
-- [x] `scoreboard.json` + `scoreboard.md` baseline
+- [ ] `function` (anon, local, top-level), closures
+- [ ] Multi-return: return as list, unpack at call sites
+- [ ] Table constructors (array + hash + computed keys)
+- [ ] Raw table access `t.k` / `t[k]` (no metatables yet)
+- [ ] Vendor PUC-Rio 5.1.5 suite to `lib/lua/lua-tests/` (just `.lua` files)
+- [ ] `lib/lua/conformance.sh` + Python runner (model on `lib/js/test262-runner.py`)
+- [ ] `scoreboard.json` + `scoreboard.md` baseline
 
 ### Phase 4 — metatables + error handling (next run)
-- [x] Metatable dispatch: `__index`, `__newindex`, `__add`/`__sub`/…, `__eq`, `__lt`, `__call`, `__tostring`, `__len`
-- [x] `pcall`/`xpcall`/`error` via handler-bind
-- [x] Generic `for … in …`
+- [ ] Metatable dispatch: `__index`, `__newindex`, `__add`/`__sub`/…, `__eq`, `__lt`, `__call`, `__tostring`, `__len`
+- [ ] `pcall`/`xpcall`/`error` via handler-bind
+- [ ] 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`
-- [x] `math` — full surface
-- [x] `table` — `insert`, `remove`, `concat`, `sort`, `unpack`
-- [x] `io` — minimal stub (read/write to SX IO surface)
-- [x] `os` — time/date subset
+- [ ] `string` — `format`, `sub`, `find`, `match`, `gmatch`, `gsub`, `len`, `rep`, `upper`, `lower`, `byte`, `char`
+- [ ] `math` — full surface
+- [ ] `table` — `insert`, `remove`, `concat`, `sort`, `unpack`
+- [ ] `io` — minimal stub (read/write to SX IO surface)
+- [ ] `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,35 +91,3 @@ _Newest first. Agent appends on every commit._
 _Shared-file issues that need someone else to fix. Minimal repro only._
 
 - _(none yet)_
-
-## Performance — sequence table representation (own code, fixable)
-
-**Root cause of the 7× timeout failures in the PUC-Rio suite (`sort.lua` and others).**
-
-Lua arrays are stored as string-keyed dicts: `{"1": v1, "2": v2, ...}`. Every array
-read/write goes through `(get t (str i))` / `(dict-set! t (str i) v)` — one integer→string
-coercion plus one dict operation per access. `table.sort` on 30k elements calls `lt?` and
-`ts-swap` O(n log n) times; each comparison does ~4 dict-with-string-key ops. The JIT
-compiles the sort lambdas but cannot eliminate the per-element string allocation overhead.
-
-**Fix:** Change the sequence portion of a Lua table from a string-keyed dict to a native SX
-list (or an integer-keyed side array). Integer index reads/writes become `(list-ref arr i)`
-/ `(list-set arr i v)` — no string coercion, O(1). Mixed tables (array part + hash part)
-can keep a `{:seq [...] :hash {...}}` split and route accesses accordingly.
-
-**Files:** `lib/lua/runtime.sx` (table constructors, `lua-get`, `lua-set!`, `lua-len`,
-`lua-table-sort`, iteration), `lib/lua/transpile.sx` (field/index access emit paths).
-
-**Expected impact:** sort.lua and other heavy-loop tests drop from timeout to sub-second.
-The 7 timeout failures should become passes once integer indexing is O(1) with no string
-allocation.
-
-## 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.

plans/ruby-on-sx.md

@@ -0,0 +1,134 @@
+# Ruby-on-SX: fibers + blocks + open classes on delimited continuations
+
+The headline showcase is **fibers** — Ruby's `Fiber.new { … Fiber.yield v … }` / `Fiber.resume` are textbook delimited continuations with sugar. MRI implements them by swapping C stacks; on SX they fall out of the existing `perform`/`cek-resume` machinery for free. Plus blocks/yield (lexical escape continuations, same shape as Smalltalk's non-local return), method_missing, and singleton classes.
+
+End-state goal: Ruby 2.7-flavoured subset, Enumerable mixin, fibers + threads-via-fibers (no real OS threads), method_missing-driven DSLs, ~150 hand-written + classic programs.
+
+## Scope decisions (defaults — override by editing before we spawn)
+
+- **Syntax:** Ruby 2.7. No 3.x pattern matching, no rightward assignment, no endless methods. We pick 2.7 because it's the biggest semantic surface that still parses cleanly.
+- **Conformance:** "Reads like Ruby, runs like Ruby." Slice of RubySpec (Core + Library subset), not full RubySpec.
+- **Test corpus:** custom + curated RubySpec slice. Plus classic programs: fiber-based generator, internal DSL with method_missing, mixin-based Enumerable on a custom class.
+- **Out of scope:** real threads, GIL, refinements, `binding_of_caller` from non-Ruby contexts, Encoding object beyond UTF-8/ASCII-8BIT, RubyVM::* introspection beyond bytecode-disassembly placeholder, IO subsystem beyond `puts`/`gets`/`File.read`.
+- **Symbols:** SX symbols. Strings are mutable copies; symbols are interned.
+
+## Ground rules
+
+- **Scope:** only touch `lib/ruby/**` and `plans/ruby-on-sx.md`. Don't edit `spec/`, `hosts/`, `shared/`, or any other `lib/<lang>/**`. Ruby primitives go in `lib/ruby/runtime.sx`.
+- **SX files:** use `sx-tree` MCP tools only.
+- **Commits:** one feature per commit. Keep `## Progress log` updated and tick roadmap boxes.
+
+## Architecture sketch
+
+```
+Ruby source
+    │
+    ▼
+lib/ruby/tokenizer.sx   — keywords, ops, %w[], %i[], heredocs (deferred), regex (deferred)
+    │
+    ▼
+lib/ruby/parser.sx      — AST: classes, modules, methods, blocks, calls
+    │
+    ▼
+lib/ruby/transpile.sx   — AST → SX AST (entry: rb-eval-ast)
+    │
+    ▼
+lib/ruby/runtime.sx     — class table, MOP, dispatch, fibers, primitives
+```
+
+Core mapping:
+- **Object** = SX dict `{:class :ivars :singleton-class?}`. Instance variables live in `ivars` keyed by symbol.
+- **Class** = SX dict `{:name :superclass :methods :class-methods :metaclass :includes :prepends}`. Class table is flat.
+- **Method dispatch** = lookup walks ancestor chain (prepended → class → included modules → superclass → …). Falls back to `method_missing` with a `Symbol`+args.
+- **Block** = lambda + escape continuation. `yield` invokes the block in current context. `return` from within a block invokes the enclosing-method's escape continuation.
+- **Proc** = lambda without strict arity. `Proc.new` + `proc {}`.
+- **Lambda** = lambda with strict arity + `return`-returns-from-lambda semantics.
+- **Fiber** = pair of continuations (resume-k, yield-k) wrapped in a record. `Fiber.new { … }` builds it; `Fiber.resume` invokes the resume-k; `Fiber.yield` invokes the yield-k. Built directly on `perform`/`cek-resume`.
+- **Module** = class without instance allocation. `include` puts it in the chain; `prepend` puts it earlier; `extend` puts it on the singleton.
+- **Singleton class** = lazily allocated per-object class for `def obj.foo` definitions.
+- **Symbol** = interned SX symbol. `:foo` reads as `(quote foo)` flavour.
+
+## Roadmap
+
+### Phase 1 — tokenizer + parser
+- [ ] Tokenizer: keywords (`def end class module if unless while until do return yield begin rescue ensure case when then else elsif`), identifiers (lowercase = local/method, `@` = ivar, `@@` = cvar, `$` = global, uppercase = constant), numbers (int, float, `0x` `0o` `0b`, `_` separators), strings (`"…"` interpolation, `'…'` literal, `%w[a b c]`, `%i[a b c]`), symbols `:foo` `:"…"`, operators (`+ - * / % ** == != < > <= >= <=> === =~ !~ << >> & | ^ ~ ! && || and or not`), `:: . , ; ( ) [ ] { } -> => |`, comments `#`
+- [ ] Parser: program is sequence of statements separated by newlines or `;`; method def `def name(args) … end`; class `class Foo < Bar … end`; module `module M … end`; block `do |a, b| … end` and `{ |a, b| … }`; call sugar (no parens), `obj.method`, `Mod::Const`; arg shapes (positional, default, splat `*args`, double-splat `**opts`, block `&blk`)
+- [ ] If/while/case expressions (return values), `unless`/`until`, postfix modifiers
+- [ ] Begin/rescue/ensure/retry, raise, raise with class+message
+- [ ] Unit tests in `lib/ruby/tests/parse.sx`
+
+### Phase 2 — object model + sequential eval
+- [ ] Class table bootstrap: `BasicObject`, `Object`, `Kernel`, `Module`, `Class`, `Numeric`, `Integer`, `Float`, `String`, `Symbol`, `Array`, `Hash`, `Range`, `NilClass`, `TrueClass`, `FalseClass`, `Proc`, `Method`
+- [ ] `rb-eval-ast`: literals, variables (local, ivar, cvar, gvar, constant), assignment (single and parallel `a, b = 1, 2`, splat receive), method call, message dispatch
+- [ ] Method lookup walks ancestor chain; cache hit-class per `(class, selector)`
+- [ ] `method_missing` fallback constructing args list
+- [ ] `super` and `super(args)` — lookup in defining class's superclass
+- [ ] Singleton class allocation on first `def obj.foo` or `class << obj`
+- [ ] `nil`, `true`, `false` are singletons of their classes; tagged values aren't boxed
+- [ ] Constant lookup (lexical-then-inheritance) with `Module.nesting`
+- [ ] 60+ tests in `lib/ruby/tests/eval.sx`
+
+### Phase 3 — blocks + procs + lambdas
+- [ ] Method invocation captures escape continuation `^k` for `return`; binds it as block's escape
+- [ ] `yield` invokes implicit block
+- [ ] `block_given?`, `&blk` parameter, `&proc` arg unpacking
+- [ ] `Proc.new`, `proc { }`, `lambda { }` (or `->(x) { x }`)
+- [ ] Lambda strict arity + lambda-local `return` semantics
+- [ ] Proc lax arity (`a, b, c` unpacks Array; missing args nil)
+- [ ] `break`, `next`, `redo` — `break` is escape-from-loop-or-block; `next` is escape-from-block-iteration; `redo` re-runs current iteration
+- [ ] 30+ tests in `lib/ruby/tests/blocks.sx`
+
+### Phase 4 — fibers (THE SHOWCASE)
+- [ ] `Fiber.new { |arg| … Fiber.yield v … }` allocates a fiber record with paired continuations
+- [ ] `Fiber.resume(args…)` resumes the fiber, returning the value passed to `Fiber.yield`
+- [ ] `Fiber.yield(v)` from inside the fiber suspends and returns control to the resumer
+- [ ] `Fiber.current` from inside the fiber
+- [ ] `Fiber#alive?`, `Fiber#raise` (deferred)
+- [ ] `Fiber.transfer` — symmetric coroutines (resume from any side)
+- [ ] Classic programs in `lib/ruby/tests/programs/`:
+  - [ ] `generator.rb` — pull-style infinite enumerator built on fibers
+  - [ ] `producer-consumer.rb` — bounded buffer with `Fiber.transfer`
+  - [ ] `tree-walk.rb` — recursive tree walker that yields each node, driven by `Fiber.resume`
+- [ ] `lib/ruby/conformance.sh` + runner, `scoreboard.json` + `scoreboard.md`
+
+### Phase 5 — modules + mixins + metaprogramming
+- [ ] `include M` — appends M's methods after class methods in chain
+- [ ] `prepend M` — prepends M before class methods
+- [ ] `extend M` — adds M to singleton class
+- [ ] `Module#ancestors`, `Module#included_modules`
+- [ ] `define_method`, `class_eval`, `instance_eval`, `module_eval`
+- [ ] `respond_to?`, `respond_to_missing?`, `method_missing`
+- [ ] `Object#send`, `Object#public_send`, `Object#__send__`
+- [ ] `Module#method_added`, `singleton_method_added` hooks
+- [ ] Hooks: `included`, `extended`, `inherited`, `prepended`
+- [ ] Internal-DSL classic program: `lib/ruby/tests/programs/dsl.rb`
+
+### Phase 6 — stdlib drive
+- [ ] `Enumerable` mixin: `each` (abstract), `map`, `select`/`filter`, `reject`, `reduce`/`inject`, `each_with_index`, `each_with_object`, `take`, `drop`, `take_while`, `drop_while`, `find`/`detect`, `find_index`, `any?`, `all?`, `none?`, `one?`, `count`, `min`, `max`, `min_by`, `max_by`, `sort`, `sort_by`, `group_by`, `partition`, `chunk`, `each_cons`, `each_slice`, `flat_map`, `lazy`
+- [ ] `Comparable` mixin: `<=>`, `<`, `<=`, `>`, `>=`, `==`, `between?`, `clamp`
+- [ ] `Array`: indexing, slicing, `push`/`pop`/`shift`/`unshift`, `concat`, `flatten`, `compact`, `uniq`, `sort`, `reverse`, `zip`, `dig`, `pack`/`unpack` (deferred)
+- [ ] `Hash`: `[]`, `[]=`, `delete`, `merge`, `each_pair`, `keys`, `values`, `to_a`, `dig`, `fetch`, default values, default proc
+- [ ] `Range`: `each`, `step`, `cover?`, `include?`, `size`, `min`, `max`
+- [ ] `String`: indexing, slicing, `split`, `gsub` (string-arg version, regex deferred), `sub`, `upcase`, `downcase`, `strip`, `chomp`, `chars`, `bytes`, `to_i`, `to_f`, `to_sym`, `*`, `+`, `<<`, format with `%`
+- [ ] `Integer`: `times`, `upto`, `downto`, `step`, `digits`, `gcd`, `lcm`
+- [ ] Drive corpus to 200+ green
+
+## SX primitive baseline
+
+Use vectors for arrays; numeric tower + rationals for numbers; ADTs for tagged data;
+coroutines for fibers; string-buffer for mutable string building; bitwise ops for bit
+manipulation; multiple values for multi-return; promises for lazy evaluation; hash tables
+for mutable associative storage; sets for O(1) membership; sequence protocol for
+polymorphic iteration; gensym for unique symbols; char type for characters; string ports
++ read/write for reader protocols; regexp for pattern matching; bytevectors for binary
+data; format for string templating.
+
+## Progress log
+
+_Newest first._
+
+- _(none yet)_
+
+## Blockers
+
+- _(none yet)_

plans/smalltalk-on-sx.md

@@ -0,0 +1,116 @@
+# Smalltalk-on-SX: blocks with non-local return on delimited continuations
+
+The headline showcase is **blocks** — Smalltalk's closures with non-local return (`^expr` aborts the enclosing *method*, not the block). Every other Smalltalk on top of a host VM (RSqueak on PyPy, GemStone on C, Maxine on Java) reinvents non-local return on whatever stack discipline the host gives them. On SX it's a one-liner: a block holds a captured continuation; `^` just invokes it. Message-passing OO falls out cheaply on top of the existing component / dispatch machinery.
+
+End-state goal: ANSI-ish Smalltalk-80 subset, SUnit working, ~200 hand-written tests + a vendored slice of the Pharo kernel tests, classic corpus (eight queens, quicksort, mandelbrot, Conway's Life).
+
+## Scope decisions (defaults — override by editing before we spawn)
+
+- **Syntax:** Pharo / Squeak chunk format (`!` separators, `Object subclass: #Foo …`). No fileIn/fileOut images — text source only.
+- **Conformance:** ANSI X3J20 *as a target*, not bug-for-bug Squeak. "Reads like Smalltalk, runs like Smalltalk."
+- **Test corpus:** SUnit ported to SX-Smalltalk + custom programs + a curated slice of Pharo `Kernel-Tests` / `Collections-Tests`.
+- **Image:** out of scope. Source-only. No `become:` between sessions, no snapshotting.
+- **Reflection:** `class`, `respondsTo:`, `perform:`, `doesNotUnderstand:` in. `become:` (object-identity swap) **in** — it's a good CEK exercise. Method modification at runtime in.
+- **GUI / Morphic / threads:** out entirely.
+
+## Ground rules
+
+- **Scope:** only touch `lib/smalltalk/**` and `plans/smalltalk-on-sx.md`. Don't edit `spec/`, `hosts/`, `shared/`, or any other `lib/<lang>/**`. Smalltalk primitives go in `lib/smalltalk/runtime.sx`.
+- **SX files:** use `sx-tree` MCP tools only.
+- **Commits:** one feature per commit. Keep `## Progress log` updated and tick roadmap boxes.
+
+## Architecture sketch
+
+```
+Smalltalk source
+    │
+    ▼
+lib/smalltalk/tokenizer.sx  — selectors, keywords, literals, $c, #sym, #(…), $'…'
+    │
+    ▼
+lib/smalltalk/parser.sx     — AST: classes, methods, blocks, cascades, sends
+    │
+    ▼
+lib/smalltalk/transpile.sx  — AST → SX AST (entry: smalltalk-eval-ast)
+    │
+    ▼
+lib/smalltalk/runtime.sx    — class table, MOP, dispatch, primitives
+```
+
+Core mapping:
+- **Class** = SX dict `{:name :superclass :ivars :methods :class-methods :metaclass}`. Class table is a flat dict keyed by class name.
+- **Object** = SX dict `{:class :ivars}` — `ivars` keyed by symbol. Tagged ints / floats / strings / symbols are not boxed; their class is looked up by SX type.
+- **Method** = SX lambda closing over a `self` binding + temps. Body wrapped in a delimited continuation so `^` can escape.
+- **Message send** = `(st-send receiver selector args)` — does class-table lookup, walks superclass chain, falls back to `doesNotUnderstand:` with a `Message` object.
+- **Block** `[:x | … ^v … ]` = lambda + captured `^k` (the method-return continuation). Invoking `^` calls `k`; outer block invocation past method return raises `BlockContext>>cannotReturn:`.
+- **Cascade** `r m1; m2; m3` = `(let ((tmp r)) (st-send tmp 'm1 ()) (st-send tmp 'm2 ()) (st-send tmp 'm3 ()))`.
+- **`ifTrue:ifFalse:` / `whileTrue:`** = ordinary block sends; the runtime intrinsifies them in the JIT path so they compile to native branches (Tier 1 of bytecode expansion already covers this pattern).
+- **`become:`** = swap two object identities everywhere — in SX this is a heap walk, but we restrict to `oneWayBecome:` (cheap: rewrite class field) by default.
+
+## Roadmap
+
+### Phase 1 — tokenizer + parser
+- [ ] Tokenizer: identifiers, keywords (`foo:`), binary selectors (`+`, `==`, `,`, `->`, `~=` etc.), numbers (radix `16r1F`, scaled `1.5s2`), strings `'…''…'`, characters `$c`, symbols `#foo` `#'foo bar'` `#+`, byte arrays `#[1 2 3]`, literal arrays `#(1 #foo 'x')`, comments `"…"`
+- [ ] Parser: chunk format (`! !` separators), class definitions (`Object subclass: #X instanceVariableNames: '…' classVariableNames: '…' …`), method definitions (`extend: #Foo with: 'bar ^self'`), pragmas `<primitive: 1>`, blocks `[:a :b | | t1 t2 | …]`, cascades, message precedence (unary > binary > keyword)
+- [ ] Unit tests in `lib/smalltalk/tests/parse.sx`
+
+### Phase 2 — object model + sequential eval
+- [ ] Class table + bootstrap: `Object`, `Behavior`, `Class`, `Metaclass`, `UndefinedObject`, `Boolean`/`True`/`False`, `Number`/`Integer`/`Float`, `String`, `Symbol`, `Array`, `Block`
+- [ ] `smalltalk-eval-ast`: literals, variable reference, assignment, message send, cascade, sequence, return
+- [ ] Method lookup: walk class → superclass; cache hit-class on `(class, selector)`
+- [ ] `doesNotUnderstand:` fallback constructing `Message` object
+- [ ] `super` send (lookup starts at superclass of *defining* class, not receiver class)
+- [ ] 30+ tests in `lib/smalltalk/tests/eval.sx`
+
+### Phase 3 — blocks + non-local return (THE SHOWCASE)
+- [ ] Method invocation captures a `^k` (the return continuation) and binds it as the block's escape
+- [ ] `^expr` from inside a block invokes that captured `^k`
+- [ ] `BlockContext>>value`, `value:`, `value:value:`, …, `valueWithArguments:`
+- [ ] `whileTrue:` / `whileTrue` / `whileFalse:` / `whileFalse` as ordinary block sends — runtime intrinsifies the loop in the bytecode JIT
+- [ ] `ifTrue:` / `ifFalse:` / `ifTrue:ifFalse:` as block sends, similarly intrinsified
+- [ ] Escape past returned-from method raises `BlockContext>>cannotReturn:`
+- [ ] Classic programs in `lib/smalltalk/tests/programs/`:
+  - [ ] `eight-queens.st`
+  - [ ] `quicksort.st`
+  - [ ] `mandelbrot.st`
+  - [ ] `life.st` (Conway's Life, glider gun)
+  - [ ] `fibonacci.st` (recursive + memoised)
+- [ ] `lib/smalltalk/conformance.sh` + runner, `scoreboard.json` + `scoreboard.md`
+
+### Phase 4 — reflection + MOP
+- [ ] `Object>>class`, `class>>name`, `class>>superclass`, `class>>methodDict`, `class>>selectors`
+- [ ] `Object>>perform:` / `perform:with:` / `perform:withArguments:`
+- [ ] `Object>>respondsTo:`, `Object>>isKindOf:`, `Object>>isMemberOf:`
+- [ ] `Behavior>>compile:` — runtime method addition
+- [ ] `Object>>becomeForward:` (one-way become; rewrites the class field of `aReceiver`)
+- [ ] Exceptions: `Exception`, `Error`, `signal`, `signal:`, `on:do:`, `ensure:`, `ifCurtailed:` — built on top of SX `handler-bind`/`raise`
+
+### Phase 5 — collections + numeric tower
+- [ ] `SequenceableCollection`/`OrderedCollection`/`Array`/`String`/`Symbol`
+- [ ] `HashedCollection`/`Set`/`Dictionary`/`IdentityDictionary`
+- [ ] `Stream` hierarchy: `ReadStream`/`WriteStream`/`ReadWriteStream`
+- [ ] `Number` tower: `SmallInteger`/`LargePositiveInteger`/`Float`/`Fraction`
+- [ ] `String>>format:`, `printOn:` for everything
+
+### Phase 6 — SUnit + corpus to 200+
+- [ ] Port SUnit (TestCase, TestSuite, TestResult) — written in SX-Smalltalk, runs in itself
+- [ ] Vendor a slice of Pharo `Kernel-Tests` and `Collections-Tests`
+- [ ] Drive the scoreboard up: aim for 200+ green tests
+- [ ] Stretch: ANSI Smalltalk validator subset
+
+### Phase 7 — speed (optional)
+- [ ] Method-dictionary inline caching (already in CEK as a primitive; just wire selector cache)
+- [ ] Block intrinsification beyond `whileTrue:` / `ifTrue:`
+- [ ] Compare against GNU Smalltalk on the corpus
+
+## Progress log
+
+_Newest first. Agent appends on every commit._
+
+- _(none yet)_
+
+## Blockers
+
+_Shared-file issues that need someone else to fix. Minimal repro only._
+
+- _(none yet)_

plans/tcl-on-sx.md

@@ -0,0 +1,137 @@
+# Tcl-on-SX: uplevel/upvar = stack-walking delcc, everything-is-a-string
+
+The headline showcase is **uplevel/upvar** — Tcl's superpower for defining your own control structures. `uplevel` evaluates a script in the *caller's* stack frame; `upvar` aliases a variable in the caller. On a normal language host this requires deep VM cooperation; on SX it falls out of the env-chain made first-class via captured continuations. Plus the *Dodekalogue* (12 rules), command-substitution everywhere, and "everything is a string" homoiconicity.
+
+End-state goal: Tcl 8.6-flavoured subset, the Dodekalogue parser, namespaces, `try`/`catch`/`return -code`, `coroutine` (built on fibers), classic programs that show off uplevel-driven DSLs, ~150 hand-written tests.
+
+## Scope decisions (defaults — override by editing before we spawn)
+
+- **Syntax:** Tcl 8.6 surface. The 12-rule Dodekalogue. Brace-quoted scripts deferred-evaluate; double-quoted ones substitute.
+- **Conformance:** "Reads like Tcl, runs like Tcl." Slice of Tcl's own test suite, not full TCT.
+- **Test corpus:** custom + curated `tcl-tests/` slice. Plus classic programs: define-your-own `for-each-line`, expression-language compiler-in-Tcl, fiber-based event loop.
+- **Out of scope:** Tk, sockets beyond a stub, threads (mapped to `coroutine` only), `package require` of binary loadables, `dde`/`registry` Windows shims, full `clock format` locale support.
+- **Channels:** `puts` and `gets` on `stdout`/`stdin`/`stderr`; `open` on regular files; no async I/O beyond what `coroutine` gives.
+
+## Ground rules
+
+- **Scope:** only touch `lib/tcl/**` and `plans/tcl-on-sx.md`. Don't edit `spec/`, `hosts/`, `shared/`, or any other `lib/<lang>/**`. Tcl primitives go in `lib/tcl/runtime.sx`.
+- **SX files:** use `sx-tree` MCP tools only.
+- **Commits:** one feature per commit. Keep `## Progress log` updated and tick roadmap boxes.
+
+## Architecture sketch
+
+```
+Tcl source
+    │
+    ▼
+lib/tcl/tokenizer.sx   — the Dodekalogue: words, [..], ${..}, "..", {..}, ;, \n, \, #
+    │
+    ▼
+lib/tcl/parser.sx      — list-of-words AST (script = list of commands; command = list of words)
+    │
+    ▼
+lib/tcl/transpile.sx   — AST → SX AST (entry: tcl-eval-script)
+    │
+    ▼
+lib/tcl/runtime.sx     — env stack, command table, uplevel/upvar, coroutines, BIFs
+```
+
+Core mapping:
+- **Value** = string. Internally we cache a "shimmer" representation (list, dict, integer, double) for performance, but every value can be re-stringified.
+- **Variable** = entry in current frame's env. Frames form a stack; level-0 is the global frame.
+- **Command** = entry in command table; first word of any list dispatches into it. User-defined via `proc`. Built-ins are SX functions registered in the table.
+- **Frame** = `{:locals (dict) :level n :parent frame}`. Each `proc` call pushes a frame; commands run in current frame.
+- **`uplevel #N script`** = walk frame chain to absolute level N (or relative if no `#`); evaluate script in that frame's env.
+- **`upvar [#N] varname localname`** = bind `localname` in the current frame as an alias to `varname` in the level-N frame (env-chain delegate).
+- **`return -code N`** = control flow as integers: 0=ok, 1=error, 2=return, 3=break, 4=continue. `catch` traps any non-zero; `try` adds named handlers.
+- **`coroutine`** = fiber on top of `perform`/`cek-resume`. `yield`/`yieldto` suspend; calling the coroutine command resumes.
+- **List / dict** = list-shaped string ("element1 element2 …") with a cached parsed form. Modifications dirty the string cache.
+
+## Roadmap
+
+### Phase 1 — tokenizer + parser (the Dodekalogue)
+- [ ] Tokenizer applying the 12 rules:
+  1. Commands separated by `;` or newlines
+  2. Words separated by whitespace within a command
+  3. Double-quoted words: `\` escapes + `[…]` + `${…}` + `$var` substitution
+  4. Brace-quoted words: literal, no substitution; brace count must balance
+  5. Argument expansion: `{*}list`
+  6. Command substitution: `[script]` evaluates script, takes its return value
+  7. Variable substitution: `$name`, `${name}`, `$arr(idx)`, `$arr($i)`
+  8. Backslash substitution: `\n`, `\t`, `\\`, `\xNN`, `\uNNNN`, `\<newline>` continues
+  9. Comments: `#` only at the start of a command
+  10. Order of substitution is left-to-right, single-pass
+  11. Substitutions don't recurse — substituted text is not re-parsed
+  12. The result of any substitution is the value, not a new script
+- [ ] Parser: script = list of commands; command = list of words; word = literal string + list of substitutions
+- [ ] Unit tests in `lib/tcl/tests/parse.sx`
+
+### Phase 2 — sequential eval + core commands
+- [ ] `tcl-eval-script`: walk command list, dispatch each first-word into command table
+- [ ] Core commands: `set`, `unset`, `incr`, `append`, `lappend`, `puts`, `gets`, `expr`, `if`, `while`, `for`, `foreach`, `switch`, `break`, `continue`, `return`, `error`, `eval`, `subst`, `format`, `scan`
+- [ ] `expr` is its own mini-language — operator precedence, function calls (`sin`, `sqrt`, `pow`, `abs`, `int`, `double`), variable substitution, command substitution
+- [ ] String commands: `string length`, `string index`, `string range`, `string compare`, `string match`, `string toupper`, `string tolower`, `string trim`, `string map`, `string repeat`, `string first`, `string last`, `string is`, `string cat`
+- [ ] List commands: `list`, `lindex`, `lrange`, `llength`, `lreverse`, `lsearch`, `lsort`, `lsort -integer/-real/-dictionary`, `lreplace`, `linsert`, `concat`, `split`, `join`
+- [ ] Dict commands: `dict create`, `dict get`, `dict set`, `dict unset`, `dict exists`, `dict keys`, `dict values`, `dict size`, `dict for`, `dict update`, `dict merge`
+- [ ] 60+ tests in `lib/tcl/tests/eval.sx`
+
+### Phase 3 — proc + uplevel + upvar (THE SHOWCASE)
+- [ ] `proc name args body` — register user-defined command; args supports defaults `{name default}` and rest `args`
+- [ ] Frame stack: each proc call pushes a frame with locals dict; pop on return
+- [ ] `uplevel ?level? script` — evaluate `script` in level-N frame's env; default level is 1 (caller). `#0` is global, `#1` is relative-1
+- [ ] `upvar ?level? otherVar localVar ?…?` — alias localVar to a variable in level-N frame; reads/writes go through the alias
+- [ ] `info level`, `info level N`, `info frame`, `info vars`, `info locals`, `info globals`, `info commands`, `info procs`, `info args`, `info body`
+- [ ] `global var ?…?` — alias to global frame (sugar for `upvar #0 var var`)
+- [ ] `variable name ?value?` — namespace-scoped global
+- [ ] Classic programs in `lib/tcl/tests/programs/`:
+  - [ ] `for-each-line.tcl` — define your own loop construct using `uplevel`
+  - [ ] `assert.tcl` — assertion macro that reports caller's line
+  - [ ] `with-temp-var.tcl` — scoped variable rebind via `upvar`
+- [ ] `lib/tcl/conformance.sh` + runner, `scoreboard.json` + `scoreboard.md`
+
+### Phase 4 — control flow + error handling
+- [ ] `return -code (ok|error|return|break|continue|N) -errorinfo … -errorcode … -level N value`
+- [ ] `catch script ?resultVar? ?optionsVar?` — runs script, returns code; sets resultVar to return value/message; optionsVar to the dict
+- [ ] `try script ?on code var body ...? ?trap pattern var body...? ?finally body?`
+- [ ] `throw type message`
+- [ ] `error message ?info? ?code?`
+- [ ] Stack-trace with `errorInfo` / `errorCode`
+- [ ] 30+ tests in `lib/tcl/tests/error.sx`
+
+### Phase 5 — namespaces + ensembles
+- [ ] `namespace eval ns body`, `namespace current`, `namespace which`, `namespace import`, `namespace export`, `namespace forget`, `namespace delete`
+- [ ] Qualified names: `::ns::cmd`, `::ns::var`
+- [ ] Ensembles: `namespace ensemble create -map { sub1 cmd1 sub2 cmd2 }`
+- [ ] `namespace path` for resolution chain
+- [ ] `proc` and `variable` work inside namespaces
+
+### Phase 6 — coroutines + drive corpus
+- [ ] `coroutine name cmd ?args…?` — start a coroutine; future calls to `name` resume it
+- [ ] `yield ?value?` — suspend, return value to resumer
+- [ ] `yieldto cmd ?args…?` — symmetric transfer
+- [ ] `coroutine` semantics built on fibers (same delcc primitive as Ruby fibers)
+- [ ] Classic programs: `event-loop.tcl` — cooperative scheduler with multiple coroutines
+- [ ] System: `clock seconds`, `clock format`, `clock scan` (subset)
+- [ ] File I/O: `open`, `close`, `read`, `gets`, `puts -nonewline`, `flush`, `eof`, `seek`, `tell`
+- [ ] Drive corpus to 150+ green
+- [ ] Idiom corpus — `lib/tcl/tests/idioms.sx` covering classic Welch/Jones idioms
+
+## SX primitive baseline
+
+Use vectors for arrays; numeric tower + rationals for numbers; ADTs for tagged data;
+coroutines for fibers; string-buffer for mutable string building; bitwise ops for bit
+manipulation; multiple values for multi-return; promises for lazy evaluation; hash tables
+for mutable associative storage; sets for O(1) membership; sequence protocol for
+polymorphic iteration; gensym for unique symbols; char type for characters; string ports
++ read/write for reader protocols; regexp for pattern matching; bytevectors for binary
+data; format for string templating.
+
+## Progress log
+
+_Newest first._
+
+- _(none yet)_
+
+## Blockers
+
+- _(none yet)_

scripts/sx-loops-down.sh

@@ -30,7 +30,7 @@ fi
 
 if [ "$CLEAN" = "1" ]; then
   cd "$(dirname "$0")/.."
-  for lang in lua prolog forth erlang haskell js hs; do
+  for lang in lua prolog forth erlang haskell js hs smalltalk common-lisp apl ruby tcl; do
     wt="$WORKTREE_BASE/$lang"
     if [ -d "$wt" ]; then
       git worktree remove --force "$wt" 2>/dev/null || rm -rf "$wt"
@@ -39,5 +39,5 @@ if [ "$CLEAN" = "1" ]; then
   done
   git worktree prune
   echo "Worktree branches (loops/<lang>) are preserved. Delete manually if desired:"
-  echo "  git branch -D loops/lua loops/prolog loops/forth loops/erlang loops/haskell loops/js loops/hs"
+  echo "  git branch -D loops/lua loops/prolog loops/forth loops/erlang loops/haskell loops/js loops/hs loops/smalltalk loops/common-lisp loops/apl loops/ruby loops/tcl"
 fi

scripts/sx-loops-up.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Spawn 7 claude sessions in tmux, one per language loop.
+# Spawn 12 claude sessions in tmux, one per language loop.
 # Each runs in its own git worktree rooted at /root/rose-ash-loops/<lang>,
 # on branch loops/<lang>. No two loops share a working tree, so there's
 # zero risk of file collisions between languages.
@@ -9,7 +9,7 @@
 #
 # After the script prints done:
 #   tmux a -t sx-loops
-#   Ctrl-B + <window-number> to switch (0=lua ... 6=hs)
+#   Ctrl-B + <window-number> to switch (0=lua ... 11=tcl)
 #   Ctrl-B + d to detach (loops keep running, SSH-safe)
 #
 # Stop: ./scripts/sx-loops-down.sh
@@ -38,8 +38,13 @@ declare -A BRIEFING=(
   [haskell]=haskell-loop.md
   [js]=loop.md
   [hs]=hs-loop.md
+  [smalltalk]=smalltalk-loop.md
+  [common-lisp]=common-lisp-loop.md
+  [apl]=apl-loop.md
+  [ruby]=ruby-loop.md
+  [tcl]=tcl-loop.md
 )
-ORDER=(lua prolog forth erlang haskell js hs)
+ORDER=(lua prolog forth erlang haskell js hs smalltalk common-lisp apl ruby tcl)
 
 mkdir -p "$WORKTREE_BASE"
 
@@ -60,13 +65,13 @@ for lang in "${ORDER[@]}"; do
   fi
 done
 
-# Create tmux session with 7 windows, each cwd in its worktree
+# Create tmux session with one window per language, each cwd in its worktree
 tmux new-session -d -s "$SESSION" -n "${ORDER[0]}" -c "$WORKTREE_BASE/${ORDER[0]}"
 for lang in "${ORDER[@]:1}"; do
   tmux new-window -t "$SESSION" -n "$lang" -c "$WORKTREE_BASE/$lang"
 done
 
-echo "Starting 7 claude sessions..."
+echo "Starting ${#ORDER[@]} claude sessions..."
 for lang in "${ORDER[@]}"; do
   tmux send-keys -t "$SESSION:$lang" "claude" C-m
 done
@@ -89,10 +94,10 @@ for lang in "${ORDER[@]}"; do
 done
 
 echo ""
-echo "Done. 7 loops started in tmux session '$SESSION', each in its own worktree."
+echo "Done. ${#ORDER[@]} loops started in tmux session '$SESSION', each in its own worktree."
 echo ""
 echo "  Attach:    tmux a -t $SESSION"
-echo "  Switch:    Ctrl-B <0..6>  (0=lua 1=prolog 2=forth 3=erlang 4=haskell 5=js 6=hs)"
+echo "  Switch:    Ctrl-B <0..11>  (0=lua 1=prolog 2=forth 3=erlang 4=haskell 5=js 6=hs 7=smalltalk 8=common-lisp 9=apl 10=ruby 11=tcl)"
 echo "  List:      Ctrl-B w"
 echo "  Detach:    Ctrl-B d"
 echo "  Stop:      ./scripts/sx-loops-down.sh"

scripts/sx-primitives-up.sh

@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+# Spawn a single claude session to implement SX primitives in sequence.
+# Runs in its own git worktree on branch sx-primitives from architecture.
+#
+# Usage: ./scripts/sx-primitives-up.sh [interval]
+#   interval defaults to self-paced (omit to let model decide)
+#
+# After the script prints done:
+#   tmux a -t sx-primitives
+#   Ctrl-B + d to detach
+#
+# Stop: ./scripts/sx-primitives-down.sh
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+SESSION="sx-primitives"
+WORKTREE="$ROOT"          # runs in the main worktree — architecture branch
+BRANCH="architecture"
+INTERVAL="${1:-}"
+BOOT_WAIT=20
+
+if tmux has-session -t "$SESSION" 2>/dev/null; then
+  echo "Session '$SESSION' already exists."
+  echo "  Attach:  tmux a -t $SESSION"
+  echo "  Kill:    ./scripts/sx-primitives-down.sh"
+  exit 1
+fi
+
+# Write settings into the main worktree .claude dir
+SETTINGS_DIR="$ROOT/.claude"
+mkdir -p "$SETTINGS_DIR"
+cat > "$SETTINGS_DIR/settings.local.json" <<'SETTINGS'
+{
+  "permissions": {
+    "allow": [
+      "mcp__sx-tree__sx_summarise",
+      "mcp__sx-tree__sx_read_tree",
+      "mcp__sx-tree__sx_read_subtree",
+      "mcp__sx-tree__sx_get_context",
+      "mcp__sx-tree__sx_find_all",
+      "mcp__sx-tree__sx_find_across",
+      "mcp__sx-tree__sx_get_siblings",
+      "mcp__sx-tree__sx_validate",
+      "mcp__sx-tree__sx_replace_node",
+      "mcp__sx-tree__sx_insert_child",
+      "mcp__sx-tree__sx_insert_near",
+      "mcp__sx-tree__sx_delete_node",
+      "mcp__sx-tree__sx_wrap_node",
+      "mcp__sx-tree__sx_rename_symbol",
+      "mcp__sx-tree__sx_replace_by_pattern",
+      "mcp__sx-tree__sx_rename_across",
+      "mcp__sx-tree__sx_write_file",
+      "mcp__sx-tree__sx_pretty_print",
+      "mcp__sx-tree__sx_eval",
+      "mcp__sx-tree__sx_harness_eval",
+      "mcp__sx-tree__sx_macroexpand",
+      "mcp__sx-tree__sx_trace",
+      "mcp__sx-tree__sx_deps",
+      "mcp__sx-tree__sx_diff",
+      "mcp__sx-tree__sx_diff_branch",
+      "mcp__sx-tree__sx_changed",
+      "mcp__sx-tree__sx_blame",
+      "mcp__sx-tree__sx_build",
+      "mcp__sx-tree__sx_build_manifest",
+      "mcp__sx-tree__sx_build_bytecode",
+      "mcp__sx-tree__sx_test",
+      "mcp__sx-tree__sx_format_check",
+      "mcp__sx-tree__sx_comp_list",
+      "mcp__sx-tree__sx_comp_usage",
+      "mcp__sx-tree__sx_nav",
+      "mcp__sx-tree__sx_env",
+      "mcp__sx-tree__sx_playwright",
+      "mcp__hs-test__hs_test_run",
+      "mcp__hs-test__hs_test_regen",
+      "mcp__hs-test__hs_test_kill",
+      "mcp__hs-test__hs_test_status",
+      "Bash(node *)",
+      "Bash(python3 *)",
+      "Bash(bash *)",
+      "Bash(cp *)",
+      "Bash(git *)",
+      "Bash(tmux *)"
+    ]
+  },
+  "enabledMcpjsonServers": [
+    "sx-tree",
+    "rose-ash-services",
+    "hs-test"
+  ]
+}
+SETTINGS
+
+echo "Creating tmux session '$SESSION' in $ROOT ..."
+tmux new-session -d -s "$SESSION" -n "primitives" -c "$ROOT"
+
+echo "Starting claude..."
+tmux send-keys -t "$SESSION:primitives" "claude" C-m
+
+echo "Waiting ${BOOT_WAIT}s for claude to boot..."
+sleep "$BOOT_WAIT"
+
+if [ -n "$INTERVAL" ]; then
+  preamble="/loop $INTERVAL "
+else
+  preamble="/loop "
+fi
+
+cmd="${preamble}Read plans/agent-briefings/primitives-loop.md and do ONE step per fire: find the first unchecked [ ] task, implement it fully, run the relevant tests to verify, commit with a short factual message, push to origin/architecture, tick the box [x] in the plan, append one dated line to the Progress log (newest first), then stop. You are on branch architecture in /root/rose-ash. Use sx-tree MCP for all .sx edits. Never push to main."
+
+tmux send-keys -t "$SESSION:primitives" "$cmd"
+sleep 0.5
+tmux send-keys -t "$SESSION:primitives" Enter
+
+echo ""
+echo "Done. SX primitives loop started in tmux session '$SESSION'."
+echo ""
+echo "  Attach:    tmux a -t $SESSION"
+echo "  Detach:    Ctrl-B d"
+echo "  Stop:      ./scripts/sx-primitives-down.sh"
+echo ""

spec/coroutines.sx

@@ -0,0 +1,56 @@
+(define-library
+  (sx coroutines)
+  (export
+    make-coroutine
+    coroutine?
+    coroutine-alive?
+    coroutine-yield
+    coroutine-handle-result
+    coroutine-resume)
+  (begin
+    (define make-coroutine (fn (thunk) {:suspension nil :thunk thunk :type "coroutine" :state "ready"}))
+    (define
+      coroutine?
+      (fn (v) (and (dict? v) (= (get v "type") "coroutine"))))
+    (define
+      coroutine-alive?
+      (fn (c) (and (coroutine? c) (not (= (get c "state") "dead")))))
+    (define coroutine-yield (fn (val) (perform {:value val :op "coroutine-yield"})))
+    (define
+      coroutine-handle-result
+      (fn
+        (c result)
+        (if
+          (cek-terminal? result)
+          (do (dict-set! c "state" "dead") {:done true :value (cek-value result)})
+          (let
+            ((request (cek-io-request result)))
+            (if
+              (and (dict? request) (= (get request "op") "coroutine-yield"))
+              (do
+                (dict-set! c "state" "suspended")
+                (dict-set! c "suspension" result)
+                {:done false :value (get request "value")})
+              (perform request))))))
+    (define
+      coroutine-resume
+      (fn
+        (c val)
+        (cond
+          (not (coroutine? c))
+          (error "coroutine-resume: not a coroutine")
+          (= (get c "state") "dead")
+          (error "coroutine-resume: coroutine is dead")
+          (= (get c "state") "ready")
+          (do
+            (dict-set! c "state" "running")
+            (coroutine-handle-result
+              c
+              (cek-step-loop
+                (make-cek-state (list (get c "thunk")) (make-env) (list)))))
+          (= (get c "state") "suspended")
+          (do
+            (dict-set! c "state" "running")
+            (coroutine-handle-result c (cek-resume (get c "suspension") val)))
+          :else (error
+            (str "coroutine-resume: unexpected state: " (get c "state"))))))))

spec/parser.sx

@@ -14,13 +14,15 @@
 ;;   list       → '(' expr* ')'
 ;;   vector     → '[' expr* ']'   (sugar for list)
 ;;   map        → '{' (key expr)* '}'
-;;   atom       → string | number | keyword | symbol | boolean | nil
+;;   atom       → string | number | rational | keyword | symbol | boolean | nil | char
 ;;   string     → '"' (char | escape)* '"'
 ;;   number     → '-'? digit+ ('.' digit+)? ([eE] [+-]? digit+)?
+;;   rational   → integer '/' digit+
 ;;   keyword    → ':' ident
 ;;   symbol     → ident
 ;;   boolean    → 'true' | 'false'
 ;;   nil        → 'nil'
+;;   char       → '#\' (ident | single-char)
 ;;   ident      → ident-start ident-char*
 ;;   comment    → ';' to end of line (discarded)
 ;;
@@ -34,6 +36,8 @@
 ;;   #;expr           → datum comment (read and discard expr)
 ;;   #|raw chars|     → raw string literal (no escape processing)
 ;;   #'expr           → (quote expr)
+;;   #\a              → character literal (char value)
+;;   #\space          → named character (space = 32)
 ;;   #name expr       → extensible dispatch (calls registered handler)
 ;;
 ;; Platform interface (each target implements natively):
@@ -42,6 +46,11 @@
 ;;   (make-symbol name)  → Symbol value
 ;;   (make-keyword name) → Keyword value
 ;;   (escape-string s)   → string with " and \ escaped for serialization
+;;   (make-char n)       → Char value from Unicode codepoint
+;;   (make-rational n d) → Rational value (auto-reduced by GCD)
+;;   (char->integer c)   → Unicode codepoint of char c
+;;   (char-from-code n)  → single-char string from codepoint
+;;   (char-code s)       → codepoint of first char in string s
 ;; ==========================================================================
 
 
@@ -51,308 +60,436 @@
 ;; Returns a list of top-level AST expressions.
 
 ;; Parse SX source string into AST
-(define sx-parse :effects []
-  (fn ((source :as string))
-    (let ((pos 0)
-          (len-src (len source)))
-
-      ;; -- Cursor helpers (closure over pos, source, len-src) --
-
-      (define skip-comment :effects []
-        (fn ()
-          (when (and (< pos len-src) (not (= (nth source pos) "\n")))
+(define
+  sx-parse
+  :effects ()
+  (fn
+    ((source :as string))
+    (let
+      ((pos 0) (len-src (len source)))
+      (define
+        skip-comment
+        :effects ()
+        (fn
+          ()
+          (when
+            (and (< pos len-src) (not (= (nth source pos) "\n")))
             (set! pos (inc pos))
             (skip-comment))))
-
-      (define skip-ws :effects []
-        (fn ()
-          (when (< pos len-src)
-            (let ((ch (nth source pos)))
+      (define
+        skip-ws
+        :effects ()
+        (fn
+          ()
+          (when
+            (< pos len-src)
+            (let
+              ((ch (nth source pos)))
               (cond
-                ;; Whitespace
                 (or (= ch " ") (= ch "\t") (= ch "\n") (= ch "\r"))
-                  (do (set! pos (inc pos)) (skip-ws))
-                ;; Comment — skip to end of line
+                (do (set! pos (inc pos)) (skip-ws))
                 (= ch ";")
-                  (do (set! pos (inc pos))
-                      (skip-comment)
-                      (skip-ws))
-                ;; Not whitespace or comment — stop
+                (do (set! pos (inc pos)) (skip-comment) (skip-ws))
                 :else nil)))))
-
-      ;; -- Atom readers --
-
-      (define hex-digit-value :effects []
+      (define
+        hex-digit-value
+        :effects ()
         (fn (ch) (index-of "0123456789abcdef" (lower ch))))
-
-      (define read-string :effects []
-        (fn ()
-          (set! pos (inc pos))  ;; skip opening "
-          (let ((buf ""))
-            (define read-str-loop :effects []
-              (fn ()
-                (if (>= pos len-src)
+      (define
+        read-string
+        :effects ()
+        (fn
+          ()
+          (set! pos (inc pos))
+          (let
+            ((buf ""))
+            (define
+              read-str-loop
+              :effects ()
+              (fn
+                ()
+                (if
+                  (>= pos len-src)
                   (error "Unterminated string")
-                  (let ((ch (nth source pos)))
+                  (let
+                    ((ch (nth source pos)))
                     (cond
                       (= ch "\"")
-                        (do (set! pos (inc pos)) nil)  ;; done
+                      (do (set! pos (inc pos)) nil)
                       (= ch "\\")
-                        (do (set! pos (inc pos))
-                            (let ((esc (nth source pos)))
-                              (if (= esc "u")
-                                ;; Unicode escape: \uXXXX → char
-                                (do (set! pos (inc pos))
-                                    (let ((d0 (hex-digit-value (nth source pos)))
-                                          (_ (set! pos (inc pos)))
-                                          (d1 (hex-digit-value (nth source pos)))
-                                          (_ (set! pos (inc pos)))
-                                          (d2 (hex-digit-value (nth source pos)))
-                                          (_ (set! pos (inc pos)))
-                                          (d3 (hex-digit-value (nth source pos)))
-                                          (_ (set! pos (inc pos))))
-                                      (set! buf (str buf (char-from-code
-                                        (+ (* d0 4096) (* d1 256) (* d2 16) d3))))
-                                      (read-str-loop)))
-                                ;; Standard escapes: \n \t \r or literal
-                                (do (set! buf (str buf
-                                      (cond
-                                        (= esc "n") "\n"
-                                        (= esc "t") "\t"
-                                        (= esc "r") "\r"
-                                        :else esc)))
-                                    (set! pos (inc pos))
-                                    (read-str-loop)))))
-                      :else
-                        (do (set! buf (str buf ch))
-                            (set! pos (inc pos))
-                            (read-str-loop)))))))
+                      (do
+                        (set! pos (inc pos))
+                        (let
+                          ((esc (nth source pos)))
+                          (if
+                            (= esc "u")
+                            (do
+                              (set! pos (inc pos))
+                              (let
+                                ((d0 (hex-digit-value (nth source pos)))
+                                  (_ (set! pos (inc pos)))
+                                  (d1 (hex-digit-value (nth source pos)))
+                                  (_ (set! pos (inc pos)))
+                                  (d2 (hex-digit-value (nth source pos)))
+                                  (_ (set! pos (inc pos)))
+                                  (d3 (hex-digit-value (nth source pos)))
+                                  (_ (set! pos (inc pos))))
+                                (set!
+                                  buf
+                                  (str
+                                    buf
+                                    (char-from-code
+                                      (+
+                                        (* d0 4096)
+                                        (* d1 256)
+                                        (* d2 16)
+                                        d3))))
+                                (read-str-loop)))
+                            (do
+                              (set!
+                                buf
+                                (str
+                                  buf
+                                  (cond
+                                    (= esc "n")
+                                    "\n"
+                                    (= esc "t")
+                                    "\t"
+                                    (= esc "r")
+                                    "\r"
+                                    :else esc)))
+                              (set! pos (inc pos))
+                              (read-str-loop)))))
+                      :else (do
+                        (set! buf (str buf ch))
+                        (set! pos (inc pos))
+                        (read-str-loop)))))))
             (read-str-loop)
             buf)))
-
-      (define read-ident :effects []
-        (fn ()
-          (let ((start pos))
-            (define read-ident-loop :effects []
-              (fn ()
-                (when (and (< pos len-src)
-                           (ident-char? (nth source pos)))
+      (define
+        read-ident
+        :effects ()
+        (fn
+          ()
+          (let
+            ((start pos))
+            (define
+              read-ident-loop
+              :effects ()
+              (fn
+                ()
+                (when
+                  (and (< pos len-src) (ident-char? (nth source pos)))
                   (set! pos (inc pos))
                   (read-ident-loop))))
             (read-ident-loop)
             (slice source start pos))))
-
-      (define read-keyword :effects []
-        (fn ()
-          (set! pos (inc pos))  ;; skip :
-          (make-keyword (read-ident))))
-
-      (define read-number :effects []
-        (fn ()
-          (let ((start pos))
-            ;; Optional leading minus
-            (when (and (< pos len-src) (= (nth source pos) "-"))
+      (define
+        read-keyword
+        :effects ()
+        (fn () (set! pos (inc pos)) (make-keyword (read-ident))))
+      (define
+        read-number
+        :effects ()
+        (fn
+          ()
+          (let
+            ((start pos))
+            (when
+              (and (< pos len-src) (= (nth source pos) "-"))
               (set! pos (inc pos)))
-            ;; Integer digits
-            (define read-digits :effects []
-              (fn ()
-                (when (and (< pos len-src)
-                           (let ((c (nth source pos)))
-                             (and (>= c "0") (<= c "9"))))
+            (define
+              read-digits
+              :effects ()
+              (fn
+                ()
+                (when
+                  (and
+                    (< pos len-src)
+                    (let
+                      ((c (nth source pos)))
+                      (and (>= c "0") (<= c "9"))))
                   (set! pos (inc pos))
                   (read-digits))))
             (read-digits)
-            ;; Decimal part
-            (when (and (< pos len-src) (= (nth source pos) "."))
-              (set! pos (inc pos))
-              (read-digits))
-            ;; Exponent
-            (when (and (< pos len-src)
-                       (or (= (nth source pos) "e")
-                           (= (nth source pos) "E")))
-              (set! pos (inc pos))
-              (when (and (< pos len-src)
-                         (or (= (nth source pos) "+")
-                             (= (nth source pos) "-")))
-                (set! pos (inc pos)))
-              (read-digits))
-            (parse-number (slice source start pos)))))
-
-      (define read-symbol :effects []
-        (fn ()
-          (let ((name (read-ident)))
+            (if
+              (and
+                (< pos len-src)
+                (= (nth source pos) "/")
+                (< (inc pos) len-src)
+                (let
+                  ((nc (nth source (inc pos))))
+                  (and (>= nc "0") (<= nc "9"))))
+              (let
+                ((numer (parse-number (slice source start pos))))
+                (set! pos (inc pos))
+                (let
+                  ((denom-start pos))
+                  (read-digits)
+                  (make-rational
+                    numer
+                    (parse-number (slice source denom-start pos)))))
+              (do
+                (when
+                  (and (< pos len-src) (= (nth source pos) "."))
+                  (set! pos (inc pos))
+                  (read-digits))
+                (when
+                  (and
+                    (< pos len-src)
+                    (or (= (nth source pos) "e") (= (nth source pos) "E")))
+                  (set! pos (inc pos))
+                  (when
+                    (and
+                      (< pos len-src)
+                      (or
+                        (= (nth source pos) "+")
+                        (= (nth source pos) "-")))
+                    (set! pos (inc pos)))
+                  (read-digits))
+                (parse-number (slice source start pos)))))))
+      (define
+        read-symbol
+        :effects ()
+        (fn
+          ()
+          (let
+            ((name (read-ident)))
             (cond
-              (= name "true")  true
-              (= name "false") false
-              (= name "nil")   nil
-              :else             (make-symbol name)))))
-
-      ;; -- Composite readers --
-
-      (define read-list :effects []
-        (fn ((close-ch :as string))
-          (let ((items (list)))
-            (define read-list-loop :effects []
-              (fn ()
+              (= name "true")
+              true
+              (= name "false")
+              false
+              (= name "nil")
+              nil
+              :else (make-symbol name)))))
+      (define
+        read-list
+        :effects ()
+        (fn
+          ((close-ch :as string))
+          (let
+            ((items (list)))
+            (define
+              read-list-loop
+              :effects ()
+              (fn
+                ()
                 (skip-ws)
-                (if (>= pos len-src)
+                (if
+                  (>= pos len-src)
                   (error "Unterminated list")
-                  (if (= (nth source pos) close-ch)
-                    (do (set! pos (inc pos)) nil)  ;; done
-                    (do (append! items (read-expr))
-                        (read-list-loop))))))
+                  (if
+                    (= (nth source pos) close-ch)
+                    (do (set! pos (inc pos)) nil)
+                    (do (append! items (read-expr)) (read-list-loop))))))
             (read-list-loop)
             items)))
-
-      (define read-map :effects []
-        (fn ()
-          (let ((result (dict)))
-            (define read-map-loop :effects []
-              (fn ()
+      (define
+        read-map
+        :effects ()
+        (fn
+          ()
+          (let
+            ((result (dict)))
+            (define
+              read-map-loop
+              :effects ()
+              (fn
+                ()
                 (skip-ws)
-                (if (>= pos len-src)
+                (if
+                  (>= pos len-src)
                   (error "Unterminated map")
-                  (if (= (nth source pos) "}")
-                    (do (set! pos (inc pos)) nil)  ;; done
-                    (let ((key-expr (read-expr))
-                          (key-str  (if (= (type-of key-expr) "keyword")
-                                      (keyword-name key-expr)
-                                      (str key-expr)))
-                          (val-expr (read-expr)))
+                  (if
+                    (= (nth source pos) "}")
+                    (do (set! pos (inc pos)) nil)
+                    (let
+                      ((key-expr (read-expr))
+                        (key-str
+                          (if
+                            (= (type-of key-expr) "keyword")
+                            (keyword-name key-expr)
+                            (str key-expr)))
+                        (val-expr (read-expr)))
                       (dict-set! result key-str val-expr)
                       (read-map-loop))))))
             (read-map-loop)
             result)))
-
-      ;; -- Raw string reader (for #|...|) --
-
-      (define read-raw-string :effects []
-        (fn ()
-          (let ((buf ""))
-            (define raw-loop :effects []
-              (fn ()
-                (if (>= pos len-src)
+      (define
+        read-raw-string
+        :effects ()
+        (fn
+          ()
+          (let
+            ((buf ""))
+            (define
+              raw-loop
+              :effects ()
+              (fn
+                ()
+                (if
+                  (>= pos len-src)
                   (error "Unterminated raw string")
-                  (let ((ch (nth source pos)))
-                    (if (= ch "|")
-                      (do (set! pos (inc pos)) nil)  ;; done
-                      (do (set! buf (str buf ch))
-                          (set! pos (inc pos))
-                          (raw-loop)))))))
+                  (let
+                    ((ch (nth source pos)))
+                    (if
+                      (= ch "|")
+                      (do (set! pos (inc pos)) nil)
+                      (do
+                        (set! buf (str buf ch))
+                        (set! pos (inc pos))
+                        (raw-loop)))))))
             (raw-loop)
             buf)))
-
-      ;; -- Main expression reader --
-
-      (define read-expr :effects []
-        (fn ()
+      (define
+        read-char-literal
+        :effects ()
+        (fn
+          ()
+          (if
+            (>= pos len-src)
+            (error "Unexpected end of input after #\\")
+            (let
+              ((first-ch (nth source pos)))
+              (if
+                (ident-start? first-ch)
+                (let
+                  ((char-start pos))
+                  (define
+                    read-char-name-loop
+                    :effects ()
+                    (fn
+                      ()
+                      (when
+                        (and (< pos len-src) (ident-char? (nth source pos)))
+                        (set! pos (inc pos))
+                        (read-char-name-loop))))
+                  (read-char-name-loop)
+                  (let
+                    ((char-name (slice source char-start pos)))
+                    (make-char
+                      (cond
+                        (= char-name "space")
+                        32
+                        (= char-name "newline")
+                        10
+                        (= char-name "tab")
+                        9
+                        (= char-name "nul")
+                        0
+                        (= char-name "null")
+                        0
+                        (= char-name "return")
+                        13
+                        (= char-name "escape")
+                        27
+                        (= char-name "delete")
+                        127
+                        (= char-name "backspace")
+                        8
+                        (= char-name "altmode")
+                        27
+                        (= char-name "rubout")
+                        127
+                        :else (char-code first-ch)))))
+                (do (set! pos (inc pos)) (make-char (char-code first-ch))))))))
+      (define
+        read-expr
+        :effects ()
+        (fn
+          ()
           (skip-ws)
-          (if (>= pos len-src)
+          (if
+            (>= pos len-src)
             (error "Unexpected end of input")
-            (let ((ch (nth source pos)))
+            (let
+              ((ch (nth source pos)))
               (cond
-                ;; Lists
                 (= ch "(")
-                  (do (set! pos (inc pos)) (read-list ")"))
+                (do (set! pos (inc pos)) (read-list ")"))
                 (= ch "[")
-                  (do (set! pos (inc pos)) (read-list "]"))
-
-                ;; Map
+                (do (set! pos (inc pos)) (read-list "]"))
                 (= ch "{")
-                  (do (set! pos (inc pos)) (read-map))
-
-                ;; String
+                (do (set! pos (inc pos)) (read-map))
                 (= ch "\"")
-                  (read-string)
-
-                ;; Keyword
+                (read-string)
                 (= ch ":")
-                  (read-keyword)
-
-                ;; Quote sugar
+                (read-keyword)
                 (= ch "'")
-                  (do (set! pos (inc pos))
-                      (list (make-symbol "quote") (read-expr)))
-
-                ;; Quasiquote sugar
+                (do
+                  (set! pos (inc pos))
+                  (list (make-symbol "quote") (read-expr)))
                 (= ch "`")
-                  (do (set! pos (inc pos))
-                      (list (make-symbol "quasiquote") (read-expr)))
-
-                ;; Unquote / splice-unquote
+                (do
+                  (set! pos (inc pos))
+                  (list (make-symbol "quasiquote") (read-expr)))
                 (= ch ",")
-                  (do (set! pos (inc pos))
-                      (if (and (< pos len-src) (= (nth source pos) "@"))
-                        (do (set! pos (inc pos))
-                            (list (make-symbol "splice-unquote") (read-expr)))
-                        (list (make-symbol "unquote") (read-expr))))
-
-                ;; Reader macros: #
+                (do
+                  (set! pos (inc pos))
+                  (if
+                    (and (< pos len-src) (= (nth source pos) "@"))
+                    (do
+                      (set! pos (inc pos))
+                      (list (make-symbol "splice-unquote") (read-expr)))
+                    (list (make-symbol "unquote") (read-expr))))
                 (= ch "#")
-                  (do (set! pos (inc pos))
-                      (if (>= pos len-src)
-                        (error "Unexpected end of input after #")
-                        (let ((dispatch-ch (nth source pos)))
-                          (cond
-                            ;; #; — datum comment: read and discard next expr
-                            (= dispatch-ch ";")
-                              (do (set! pos (inc pos))
-                                  (read-expr)    ;; read and discard
-                                  (read-expr))   ;; return the NEXT expr
-
-                            ;; #| — raw string
-                            (= dispatch-ch "|")
-                              (do (set! pos (inc pos))
-                                  (read-raw-string))
-
-                            ;; #' — quote shorthand
-                            (= dispatch-ch "'")
-                              (do (set! pos (inc pos))
-                                  (list (make-symbol "quote") (read-expr)))
-
-                            ;; #name — extensible dispatch
-                            (ident-start? dispatch-ch)
-                              (let ((macro-name (read-ident)))
-                                (let ((handler (reader-macro-get macro-name)))
-                                  (if handler
-                                    (handler (read-expr))
-                                    (error (str "Unknown reader macro: #" macro-name)))))
-
-                            :else
-                              (error (str "Unknown reader macro: #" dispatch-ch))))))
-
-                ;; Number (or negative number)
-                (or (and (>= ch "0") (<= ch "9"))
-                    (and (= ch "-")
-                         (< (inc pos) len-src)
-                         (let ((next-ch (nth source (inc pos))))
-                           (and (>= next-ch "0") (<= next-ch "9")))))
-                  (read-number)
-
-                ;; Ellipsis (... as a symbol)
-                (and (= ch ".")
-                     (< (+ pos 2) len-src)
-                     (= (nth source (+ pos 1)) ".")
-                     (= (nth source (+ pos 2)) "."))
-                  (do (set! pos (+ pos 3))
-                      (make-symbol "..."))
-
-                ;; Symbol (must be ident-start char)
+                (do
+                  (set! pos (inc pos))
+                  (if
+                    (>= pos len-src)
+                    (error "Unexpected end of input after #")
+                    (let
+                      ((dispatch-ch (nth source pos)))
+                      (cond
+                        (= dispatch-ch ";")
+                        (do (set! pos (inc pos)) (read-expr) (read-expr))
+                        (= dispatch-ch "|")
+                        (do (set! pos (inc pos)) (read-raw-string))
+                        (= dispatch-ch "'")
+                        (do
+                          (set! pos (inc pos))
+                          (list (make-symbol "quote") (read-expr)))
+                        (= dispatch-ch "\\")
+                        (do (set! pos (inc pos)) (read-char-literal))
+                        (ident-start? dispatch-ch)
+                        (let
+                          ((macro-name (read-ident)))
+                          (let
+                            ((handler (reader-macro-get macro-name)))
+                            (if
+                              handler
+                              (handler (read-expr))
+                              (error
+                                (str "Unknown reader macro: #" macro-name)))))
+                        :else (error (str "Unknown reader macro: #" dispatch-ch))))))
+                (or
+                  (and (>= ch "0") (<= ch "9"))
+                  (and
+                    (= ch "-")
+                    (< (inc pos) len-src)
+                    (let
+                      ((next-ch (nth source (inc pos))))
+                      (and (>= next-ch "0") (<= next-ch "9")))))
+                (read-number)
+                (and
+                  (= ch ".")
+                  (< (+ pos 2) len-src)
+                  (= (nth source (+ pos 1)) ".")
+                  (= (nth source (+ pos 2)) "."))
+                (do (set! pos (+ pos 3)) (make-symbol "..."))
                 (ident-start? ch)
-                  (read-symbol)
-
-                ;; Unexpected
-                :else
-                  (error (str "Unexpected character: " ch)))))))
-
-      ;; -- Entry point: parse all top-level expressions --
-      (let ((exprs (list)))
-        (define parse-loop :effects []
-          (fn ()
+                (read-symbol)
+                :else (error (str "Unexpected character: " ch)))))))
+      (let
+        ((exprs (list)))
+        (define
+          parse-loop
+          :effects ()
+          (fn
+            ()
             (skip-ws)
-            (when (< pos len-src)
-              (append! exprs (read-expr))
-              (parse-loop))))
+            (when (< pos len-src) (append! exprs (read-expr)) (parse-loop))))
         (parse-loop)
         exprs))))
 
@@ -362,30 +499,77 @@
 ;; --------------------------------------------------------------------------
 
 ;; Serialize AST value back to SX source
-(define sx-serialize :effects []
-  (fn (val)
-    (case (type-of val)
-      "nil"       "nil"
-      "boolean"   (if val "true" "false")
-      "number"    (str val)
-      "string"    (str "\"" (escape-string val) "\"")
-      "symbol"    (symbol-name val)
-      "keyword"   (str ":" (keyword-name val))
-      "list"      (str "(" (join " " (map sx-serialize val)) ")")
-      "dict"      (sx-serialize-dict val)
-      "sx-expr"   (sx-expr-source val)
-      "spread"    (str "(make-spread " (sx-serialize-dict (spread-attrs val)) ")")
-      :else       (str val))))
+(define
+  sx-serialize
+  :effects ()
+  (fn
+    (val)
+    (case
+      (type-of val)
+      "nil"
+      "nil"
+      "boolean"
+      (if val "true" "false")
+      "number"
+      (str val)
+      "rational"
+      (str (numerator val) "/" (denominator val))
+      "string"
+      (str "\"" (escape-string val) "\"")
+      "symbol"
+      (symbol-name val)
+      "keyword"
+      (str ":" (keyword-name val))
+      "list"
+      (str "(" (join " " (map sx-serialize val)) ")")
+      "dict"
+      (sx-serialize-dict val)
+      "sx-expr"
+      (sx-expr-source val)
+      "spread"
+      (str "(make-spread " (sx-serialize-dict (spread-attrs val)) ")")
+      "char"
+      (let
+        ((n (char->integer val)))
+        (str
+          "#\\"
+          (cond
+            (= n 32)
+            "space"
+            (= n 10)
+            "newline"
+            (= n 9)
+            "tab"
+            (= n 13)
+            "return"
+            (= n 0)
+            "nul"
+            (= n 27)
+            "escape"
+            (= n 127)
+            "delete"
+            (= n 8)
+            "backspace"
+            :else (char-from-code n))))
+      :else (str val))))
 
 
 ;; Serialize a dict to SX {:key val} format
-(define sx-serialize-dict :effects []
-  (fn ((d :as dict))
-    (str "{"
-      (join " "
+(define
+  sx-serialize-dict
+  :effects ()
+  (fn
+    ((d :as dict))
+    (str
+      "{"
+      (join
+        " "
         (reduce
-          (fn ((acc :as list) (key :as string))
-            (concat acc (list (str ":" key) (sx-serialize (dict-get d key)))))
+          (fn
+            ((acc :as list) (key :as string))
+            (concat
+              acc
+              (list (str ":" key) (sx-serialize (dict-get d key)))))
           (list)
           (keys d)))
       "}")))
@@ -407,13 +591,18 @@
 ;;     True for: ident-start chars plus: 0-9 . : / # ,
 ;;
 ;; Constructors (provided by the SX runtime):
-;;   (make-symbol name)  → Symbol value
-;;   (make-keyword name) → Keyword value
-;;   (parse-number s)    → number (int or float from string)
+;;   (make-symbol name)    → Symbol value
+;;   (make-keyword name)   → Keyword value
+;;   (parse-number s)      → number (int or float from string)
+;;   (make-char n)         → Char value from Unicode codepoint n
+;;   (make-rational n d)   → Rational value (auto-reduced by GCD; d=0 is an error)
+;;   (char->integer c)     → Unicode codepoint of char c
 ;;
 ;; String utilities:
 ;;   (escape-string s)   → string with " and \ escaped
 ;;   (sx-expr-source e)  → unwrap SxExpr to its source string
+;;   (char-from-code n)  → single-char string from codepoint n
+;;   (char-code s)       → codepoint of first char in string s
 ;;
 ;; Reader macro registry:
 ;;   (reader-macro-get name)          → handler fn or nil

spec/primitives.sx

@@ -43,35 +43,35 @@
   "+"
   :params (&rest (args :as number))
   :returns "number"
-  :doc "Sum all arguments."
+  :doc "Sum all arguments. Returns integer iff all args are exact integers (float contagion)."
   :body (reduce (fn (a b) (native-add a b)) 0 args))
 
 (define-primitive
   "-"
   :params ((a :as number) &rest (b :as number))
   :returns "number"
-  :doc "Subtract. Unary: negate. Binary: a - b."
+  :doc "Subtract. Unary: negate. Binary: a - b. Float contagion: returns integer iff all args are integers."
   :body (if (empty? b) (native-neg a) (native-sub a (first b))))
 
 (define-primitive
   "*"
   :params (&rest (args :as number))
   :returns "number"
-  :doc "Multiply all arguments."
+  :doc "Multiply all arguments. Float contagion: integer result iff all args are exact integers."
   :body (reduce (fn (a b) (native-mul a b)) 1 args))
 
 (define-primitive
   "/"
   :params ((a :as number) (b :as number))
-  :returns "number"
-  :doc "Divide a by b."
+  :returns "float"
+  :doc "Divide a by b. Always returns inexact float."
   :body (native-div a b))
 
 (define-primitive
   "mod"
   :params ((a :as number) (b :as number))
   :returns "number"
-  :doc "Modulo a % b."
+  :doc "Modulo a % b. Returns integer iff both args are integers."
   :body (native-mod a b))
 
 (define-primitive
@@ -108,26 +108,26 @@
 (define-primitive
   "floor"
   :params ((x :as number))
-  :returns "number"
-  :doc "Floor to integer.")
+  :returns "integer"
+  :doc "Floor toward negative infinity — returns exact integer.")
 
 (define-primitive
   "ceil"
   :params ((x :as number))
-  :returns "number"
-  :doc "Ceiling to integer.")
+  :returns "integer"
+  :doc "Ceiling toward positive infinity — returns exact integer.")
 
 (define-primitive
   "round"
   :params ((x :as number) &rest (ndigits :as number))
   :returns "number"
-  :doc "Round to ndigits decimal places (default 0).")
+  :doc "Round to ndigits decimal places (default 0). Returns integer when ndigits is 0.")
 
 (define-primitive
   "truncate"
-  :params (((x :as number)))
-  :returns "number"
-  :doc "Truncate toward zero.")
+  :params ((x :as number))
+  :returns "integer"
+  :doc "Truncate toward zero — returns exact integer.")
 
 (define-primitive
   "remainder"
@@ -143,42 +143,42 @@
 
 (define-primitive
   "exact?"
-  :params (((x :as number)))
+  :params ((x :as number))
   :returns "boolean"
-  :doc "True if x is exact (integer-valued).")
+  :doc "True if x is an exact integer (not an inexact float).")
 
 (define-primitive
   "inexact?"
-  :params (((x :as number)))
+  :params ((x :as number))
   :returns "boolean"
-  :doc "True if x is inexact (non-integer).")
+  :doc "True if x is an inexact float (not an exact integer).")
 
 ;; --------------------------------------------------------------------------
 ;; Core — Comparison
 ;; --------------------------------------------------------------------------
 (define-primitive
   "exact->inexact"
-  :params (((x :as number)))
-  :returns "number"
-  :doc "Convert exact to inexact (identity for float tower).")
+  :params ((x :as number))
+  :returns "float"
+  :doc "Convert exact integer to inexact float. Floats pass through unchanged.")
 
 (define-primitive
   "inexact->exact"
-  :params (((x :as number)))
-  :returns "number"
-  :doc "Convert inexact to nearest exact integer.")
+  :params ((x :as number))
+  :returns "integer"
+  :doc "Convert inexact float to nearest exact integer (truncates). Integers pass through unchanged.")
 
 (define-primitive
   "make-vector"
-  :params ((n :as number))
+  :params ((n :as number) (fill :as any :optional true))
   :returns "vector"
-  :doc "Create vector of size n, optionally filled.")
+  :doc "Create vector of length n, each element initialised to fill (default nil).")
 
 (define-primitive
   "vector"
-  :params ()
+  :params (:rest (elts :as any))
   :returns "vector"
-  :doc "Create vector from arguments.")
+  :doc "Construct a vector from its arguments.")
 
 (define-primitive
   "vector?"
@@ -190,31 +190,31 @@
   "vector-length"
   :params ((v :as vector))
   :returns "number"
-  :doc "Number of elements.")
+  :doc "Number of elements in vector v.")
 
 (define-primitive
   "vector-ref"
   :params ((v :as vector) (i :as number))
   :returns "any"
-  :doc "Element at index.")
+  :doc "Element at 0-based index i. Error if out of bounds.")
 
 (define-primitive
   "vector-set!"
   :params ((v :as vector) (i :as number) (val :as any))
   :returns "nil"
-  :doc "Set element at index.")
+  :doc "Mutate element at index i to val. Error if out of bounds.")
 
 (define-primitive
   "vector->list"
   :params ((v :as vector))
   :returns "list"
-  :doc "Convert vector to list.")
+  :doc "Convert vector to a fresh list.")
 
 (define-primitive
   "list->vector"
   :params ((l :as list))
   :returns "vector"
-  :doc "Convert list to vector.")
+  :doc "Convert list to a fresh vector.")
 
 ;; --------------------------------------------------------------------------
 ;; Core — Predicates
@@ -223,13 +223,15 @@
   "vector-fill!"
   :params ((v :as vector) (val :as any))
   :returns "nil"
-  :doc "Fill all elements.")
+  :doc "Set every element of v to val in place.")
 
 (define-primitive
   "vector-copy"
-  :params ((v :as vector))
+  :params ((v :as vector)
+    (start :as number :optional true)
+    (end :as number :optional true))
   :returns "vector"
-  :doc "Independent shallow copy.")
+  :doc "Shallow copy of vector, optionally sliced from start (inclusive) to end (exclusive).")
 
 (define-primitive
   "min"
@@ -372,8 +374,20 @@
   "number?"
   :params (x)
   :returns "boolean"
-  :doc "True if x is a number (int or float)."
-  :body (= (type-of x) "number"))
+  :doc "True if x is any number — exact integer or inexact float."
+  :body (or (= (type-of x) "number") (integer? x)))
+
+(define-primitive
+  "integer?"
+  :params (x)
+  :returns "boolean"
+  :doc "True if x is an exact integer, or a float with no fractional part (e.g. 1.0).")
+
+(define-primitive
+  "float?"
+  :params (x)
+  :returns "boolean"
+  :doc "True if x is an inexact float (Number type). Does not match exact integers.")
 
 (define-primitive
   "string?"
@@ -478,6 +492,12 @@
   :returns "string"
   :doc "Convert Unicode code point to single-character string.")
 
+(define-primitive
+  "char-code"
+  :params ((s :as string))
+  :returns "number"
+  :doc "Unicode codepoint of the first character of string s.")
+
 (define-primitive
   "substring"
   :params ((s :as string) (start :as number) (end :as number))
@@ -532,15 +552,15 @@
   :returns "boolean"
   :doc "True if string s starts with prefix.")
 
+;; --------------------------------------------------------------------------
+;; Core — Dict operations
+;; --------------------------------------------------------------------------
 (define-primitive
   "ends-with?"
   :params ((s :as string) (suffix :as string))
   :returns "boolean"
   :doc "True if string s ends with suffix.")
 
-;; --------------------------------------------------------------------------
-;; Core — Dict operations
-;; --------------------------------------------------------------------------
 (define-module :core.collections)
 
 (define-primitive
@@ -585,15 +605,15 @@
   :returns "any"
   :doc "Last element, or nil if empty.")
 
+;; --------------------------------------------------------------------------
+;; Stdlib — Format
+;; --------------------------------------------------------------------------
 (define-primitive
   "rest"
   :params ((coll :as list))
   :returns "list"
   :doc "All elements except the first.")
 
-;; --------------------------------------------------------------------------
-;; Stdlib — Format
-;; --------------------------------------------------------------------------
 (define-primitive
   "nth"
   :params ((coll :as list) (n :as number))
@@ -618,15 +638,15 @@
   :returns "list"
   :doc "Mutate coll by appending x in-place. Returns coll.")
 
+;; --------------------------------------------------------------------------
+;; Stdlib — Text
+;; --------------------------------------------------------------------------
 (define-primitive
   "reverse"
   :params ((coll :as list))
   :returns "list"
   :doc "Return coll in reverse order.")
 
-;; --------------------------------------------------------------------------
-;; Stdlib — Text
-;; --------------------------------------------------------------------------
 (define-primitive
   "flatten"
   :params ((coll :as list))
@@ -645,29 +665,29 @@
   :returns "list"
   :doc "Consecutive pairs: (1 2 3 4) → ((1 2) (2 3) (3 4)).")
 
-(define-module :core.dict)
-
 ;; --------------------------------------------------------------------------
 ;; Stdlib — Style
 ;; --------------------------------------------------------------------------
 ;; --------------------------------------------------------------------------
 ;; Stdlib — Debug
 ;; --------------------------------------------------------------------------
+(define-module :core.dict)
+
 (define-primitive
   "keys"
   :params ((d :as dict))
   :returns "list"
   :doc "List of dict keys.")
 
+;; --------------------------------------------------------------------------
+;; Type introspection — platform primitives
+;; --------------------------------------------------------------------------
 (define-primitive
   "vals"
   :params ((d :as dict))
   :returns "list"
   :doc "List of dict values.")
 
-;; --------------------------------------------------------------------------
-;; Type introspection — platform primitives
-;; --------------------------------------------------------------------------
 (define-primitive
   "merge"
   :params (&rest (dicts :as dict))
@@ -783,3 +803,532 @@
   :params ((source :as string))
   :returns "list"
   :doc "Parse SX source string into a list of AST expressions.")
+
+(define-primitive
+  "make-string-buffer"
+  :params ()
+  :returns "string-buffer"
+  :doc "Create a new empty mutable string buffer for O(1) amortised append.")
+
+(define-module :stdlib.coroutines)
+
+(define-module :stdlib.bitwise)
+
+(define-primitive
+  "bitwise-and"
+  :params (((a :as number) (b :as number)))
+  :returns "number"
+  :doc "Bitwise AND of two integers.")
+
+(define-primitive
+  "bitwise-or"
+  :params (((a :as number) (b :as number)))
+  :returns "number"
+  :doc "Bitwise OR of two integers.")
+
+(define-primitive
+  "bitwise-xor"
+  :params (((a :as number) (b :as number)))
+  :returns "number"
+  :doc "Bitwise XOR of two integers.")
+
+(define-primitive
+  "bitwise-not"
+  :params ((a :as number))
+  :returns "number"
+  :doc "Bitwise NOT (one's complement) of an integer.")
+
+(define-primitive
+  "arithmetic-shift"
+  :params (((a :as number) (count :as number)))
+  :returns "number"
+  :doc "Arithmetic shift: left if count > 0, right if count < 0.")
+
+(define-primitive
+  "bit-count"
+  :params ((a :as number))
+  :returns "number"
+  :doc "Count set bits (popcount) in a non-negative integer.")
+
+(define-primitive
+  "integer-length"
+  :params ((a :as number))
+  :returns "number"
+  :doc "Number of bits needed to represent integer a (excluding sign).")
+
+(define-module :stdlib.ports)
+
+(define-primitive
+  "eof-object"
+  :params ()
+  :returns "eof-object"
+  :doc "The EOF sentinel value.")
+
+(define-primitive
+  "eof-object?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is the EOF sentinel.")
+
+(define-primitive
+  "open-input-string"
+  :params ((s :as string))
+  :returns "input-port"
+  :doc "Open a string as an input port.")
+
+(define-primitive
+  "open-output-string"
+  :params ()
+  :returns "output-port"
+  :doc "Open a fresh output string port.")
+
+(define-primitive
+  "get-output-string"
+  :params ((p :as output-port))
+  :returns "string"
+  :doc "Flush output port contents to a string.")
+
+(define-primitive
+  "port?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is any port.")
+
+(define-primitive
+  "input-port?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is an input port.")
+
+(define-primitive
+  "output-port?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is an output port.")
+
+(define-primitive
+  "close-port"
+  :params ((p :as port))
+  :returns "nil"
+  :doc "Close a port.")
+
+(define-primitive
+  "read-char"
+  :params (&rest (p :as input-port))
+  :returns "any"
+  :doc "Read next char from port; returns eof-object at end.")
+
+(define-primitive
+  "peek-char"
+  :params (&rest (p :as input-port))
+  :returns "any"
+  :doc "Peek next char without consuming; returns eof-object at end.")
+
+(define-primitive
+  "read-line"
+  :params (&rest (p :as input-port))
+  :returns "any"
+  :doc "Read a line from port; returns eof-object at end.")
+
+(define-primitive
+  "write-char"
+  :params ((c :as char) &rest (p :as output-port))
+  :returns "nil"
+  :doc "Write a char to output port.")
+
+(define-primitive
+  "write-string"
+  :params ((s :as string) &rest (p :as output-port))
+  :returns "nil"
+  :doc "Write a string to output port.")
+
+(define-primitive
+  "char-ready?"
+  :params (&rest (p :as input-port))
+  :returns "boolean"
+  :doc "True if a char is immediately available on the port.")
+
+
+(define-primitive
+  "read"
+  :params (&rest (p :as input-port))
+  :returns "any"
+  :doc "Read one datum from port; returns eof-object at end.")
+
+(define-primitive
+  "write"
+  :params (v &rest (p :as output-port))
+  :returns "nil"
+  :doc "Serialize v to port with quoting — strings quoted, chars as #\\a notation.")
+
+(define-primitive
+  "display"
+  :params (v &rest (p :as output-port))
+  :returns "nil"
+  :doc "Serialize v to port without quoting — strings unquoted, chars as characters.")
+
+(define-primitive
+  "newline"
+  :params (&rest (p :as output-port))
+  :returns "nil"
+  :doc "Write a newline to port.")
+
+(define-primitive
+  "write-to-string"
+  :params (v)
+  :returns "string"
+  :doc "Serialize v with write quoting, return as string.")
+
+(define-primitive
+  "display-to-string"
+  :params (v)
+  :returns "string"
+  :doc "Serialize v with display format, return as string.")
+
+(define-primitive
+  "current-input-port"
+  :params ()
+  :returns "any"
+  :doc "Return current default input port.")
+
+(define-primitive
+  "current-output-port"
+  :params ()
+  :returns "any"
+  :doc "Return current default output port.")
+
+(define-primitive
+  "current-error-port"
+  :params ()
+  :returns "any"
+  :doc "Return current error port.")
+
+(define-module :stdlib.math)
+
+(define-primitive
+  "sin"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Sine of x (radians).")
+
+(define-primitive
+  "cos"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Cosine of x (radians).")
+
+(define-primitive
+  "tan"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Tangent of x (radians).")
+
+(define-primitive
+  "asin"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Arc sine of x; result in radians.")
+
+(define-primitive
+  "acos"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Arc cosine of x; result in radians.")
+
+(define-primitive
+  "atan"
+  :params ((x :as number) &rest (y :as number))
+  :returns "float"
+  :doc "Arc tangent. (atan x) → radians in (-π/2, π/2). (atan y x) → atan2(y, x).")
+
+(define-primitive
+  "exp"
+  :params ((x :as number))
+  :returns "float"
+  :doc "e raised to the power x.")
+
+(define-primitive
+  "log"
+  :params ((x :as number))
+  :returns "float"
+  :doc "Natural logarithm of x.")
+
+(define-primitive
+  "expt"
+  :params ((base :as number) (exp :as number))
+  :returns "number"
+  :doc "base raised to the power exp. Alias: pow.")
+
+(define-primitive
+  "quotient"
+  :params ((a :as number) (b :as number))
+  :returns "integer"
+  :doc "Integer quotient: truncate(a / b) toward zero. Sign follows dividend.")
+
+(define-primitive
+  "gcd"
+  :params ((a :as number) (b :as number))
+  :returns "integer"
+  :doc "Greatest common divisor of a and b.")
+
+(define-primitive
+  "lcm"
+  :params ((a :as number) (b :as number))
+  :returns "integer"
+  :doc "Least common multiple of a and b.")
+
+(define-primitive
+  "number->string"
+  :params ((n :as number) &rest (radix :as number))
+  :returns "string"
+  :doc "Convert number n to string. Optional radix (default 10). E.g. (number->string 255 16) → \"ff\".")
+
+(define-primitive
+  "string->number"
+  :params ((s :as string) &rest (radix :as number))
+  :returns "any"
+  :doc "Parse string s as a number. Optional radix (default 10). Returns nil on failure.")
+
+(define-module :stdlib.rational)
+
+(define-primitive
+  "make-rational"
+  :params (n d)
+  :returns "rational"
+  :doc "Rational n/d, auto-reduced by GCD. Error if d=0.")
+
+(define-primitive
+  "rational?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is a rational number.")
+
+(define-primitive
+  "numerator"
+  :params ((r :as rational))
+  :returns "integer"
+  :doc "Numerator of rational r (after reduction).")
+
+(define-primitive
+  "denominator"
+  :params ((r :as rational))
+  :returns "integer"
+  :doc "Denominator of rational r (after reduction, always positive).")
+
+(define-module :stdlib.hash-table)
+
+(define-module :stdlib.sets)
+
+(define-primitive
+  "make-set"
+  :params (&rest (lst :as list))
+  :returns "set"
+  :doc "Create a fresh empty set. Optional list argument seeds the set: (make-set '(1 2 3)).")
+
+(define-primitive
+  "set?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is a set.")
+
+(define-primitive
+  "set-add!"
+  :params (s val)
+  :returns "nil"
+  :doc "Add val to set s in place. No-op if already present.")
+
+(define-primitive
+  "set-member?"
+  :params (s val)
+  :returns "boolean"
+  :doc "True if val is in set s.")
+
+(define-primitive
+  "set-remove!"
+  :params (s val)
+  :returns "nil"
+  :doc "Remove val from set s in place. No-op if absent.")
+
+(define-primitive
+  "set-size"
+  :params (s)
+  :returns "integer"
+  :doc "Number of elements in set s.")
+
+(define-primitive
+  "set->list"
+  :params (s)
+  :returns "list"
+  :doc "All elements of set s as a list (unspecified order).")
+
+(define-primitive
+  "list->set"
+  :params (lst)
+  :returns "set"
+  :doc "Create a new set containing all elements of lst.")
+
+(define-primitive
+  "set-union"
+  :params (s1 s2)
+  :returns "set"
+  :doc "New set with all elements from s1 and s2.")
+
+(define-primitive
+  "set-intersection"
+  :params (s1 s2)
+  :returns "set"
+  :doc "New set with elements present in both s1 and s2.")
+
+(define-primitive
+  "set-difference"
+  :params (s1 s2)
+  :returns "set"
+  :doc "New set with elements in s1 that are not in s2.")
+
+(define-primitive
+  "set-for-each"
+  :params (s fn)
+  :returns "nil"
+  :doc "Call (fn val) for each element in set s. Order unspecified.")
+
+(define-primitive
+  "set-map"
+  :params (s fn)
+  :returns "set"
+  :doc "New set of results of (fn val) for each element in s.")
+
+(define-module :stdlib.regexp)
+
+(define-primitive
+  "make-regexp"
+  :params ((pattern :as string) &rest (flags :as string))
+  :returns "regexp"
+  :doc "Compile regexp from pattern string and optional flags string (\"i\" case-insensitive, \"m\" multiline, \"s\" dotall).")
+
+(define-primitive
+  "regexp?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is a compiled regexp.")
+
+(define-primitive
+  "regexp-source"
+  :params ((re :as regexp))
+  :returns "string"
+  :doc "Pattern string of a regexp.")
+
+(define-primitive
+  "regexp-flags"
+  :params ((re :as regexp))
+  :returns "string"
+  :doc "Flags string of a regexp.")
+
+(define-primitive
+  "regexp-match"
+  :params ((re :as regexp) (str :as string))
+  :returns "any"
+  :doc "First match of re in str. Returns {:match \"...\" :start N :end N :groups (...)} or nil.")
+
+(define-primitive
+  "regexp-match-all"
+  :params ((re :as regexp) (str :as string))
+  :returns "list"
+  :doc "All non-overlapping matches of re in str as a list of match dicts.")
+
+(define-primitive
+  "regexp-replace"
+  :params ((re :as regexp) (str :as string) (replacement :as string))
+  :returns "string"
+  :doc "Replace first match of re in str with replacement. $& = whole match, $1..$9 = groups.")
+
+(define-primitive
+  "regexp-replace-all"
+  :params ((re :as regexp) (str :as string) (replacement :as string))
+  :returns "string"
+  :doc "Replace all matches of re in str with replacement.")
+
+(define-primitive
+  "regexp-split"
+  :params ((re :as regexp) (str :as string))
+  :returns "list"
+  :doc "Split str on every match of re; returns list of strings.")
+
+(define-module :stdlib.bytevectors)
+
+(define-primitive
+  "make-bytevector"
+  :params (n &rest fill)
+  :returns "bytevector"
+  :doc "Create a bytevector of n bytes, all initialised to fill (default 0).")
+
+(define-primitive
+  "bytevector?"
+  :params (v)
+  :returns "boolean"
+  :doc "True if v is a bytevector.")
+
+(define-primitive
+  "bytevector-length"
+  :params ((bv :as bytevector))
+  :returns "number"
+  :doc "Number of bytes in bv.")
+
+(define-primitive
+  "bytevector-u8-ref"
+  :params ((bv :as bytevector) (i :as number))
+  :returns "number"
+  :doc "Byte value 0-255 at index i.")
+
+(define-primitive
+  "bytevector-u8-set!"
+  :params ((bv :as bytevector) (i :as number) (byte :as number))
+  :returns "nil"
+  :doc "Set byte at index i to byte 0-255. Mutates bv.")
+
+(define-primitive
+  "bytevector-copy"
+  :params ((bv :as bytevector) &rest bounds)
+  :returns "bytevector"
+  :doc "Fresh copy of bv, optionally sliced to [start, end).")
+
+(define-primitive
+  "bytevector-copy!"
+  :params ((dst :as bytevector) (at :as number) (src :as bytevector) &rest bounds)
+  :returns "nil"
+  :doc "Copy bytes from src[start..end) into dst starting at at. Mutates dst.")
+
+(define-primitive
+  "bytevector-append"
+  :params (&rest bvs)
+  :returns "bytevector"
+  :doc "Concatenate bytevectors into a new bytevector.")
+
+(define-primitive
+  "utf8->string"
+  :params ((bv :as bytevector) &rest bounds)
+  :returns "string"
+  :doc "Decode bv[start..end) as UTF-8 and return the string.")
+
+(define-primitive
+  "string->utf8"
+  :params ((s :as string) &rest bounds)
+  :returns "bytevector"
+  :doc "Encode s[start..end) as UTF-8 and return a bytevector.")
+
+(define-primitive
+  "bytevector->list"
+  :params ((bv :as bytevector))
+  :returns "list"
+  :doc "Convert bytevector to a list of byte integers.")
+
+(define-primitive
+  "list->bytevector"
+  :params ((lst :as list))
+  :returns "bytevector"
+  :doc "Build a bytevector from a list of byte integers 0-255.")
+
+(define-primitive
+  "format"
+  :params ((template :as string) &rest args)
+  :returns "string"
+  :doc "CL-style format string. Directives: ~a display, ~s write, ~d decimal, ~x hex, ~o octal, ~b binary, ~f fixed-point, ~e scientific, ~% newline, ~& fresh-line, ~~ tilde, ~t tab. Optional first arg: output-port.")

spec/stdlib.sx

@@ -0,0 +1,134 @@
+;; ==========================================================================
+;; stdlib.sx — Pure SX standard library functions
+;;
+;; Loaded by test runners after primitives. These functions are implemented
+;; in SX and require no host-specific code.
+;;
+;; IMPORTANT: SX let/when bodies evaluate only the LAST expression.
+;;   Multi-step bodies must be wrapped in (do expr1 expr2 ...).
+;; ==========================================================================
+
+;; --------------------------------------------------------------------------
+;; format — CL-style string formatting
+;;
+;; Directives:
+;;   ~a  display (no quotes)       ~s  write (with quotes)
+;;   ~d  decimal  ~x  hex  ~o  octal  ~b  binary
+;;   ~f  fixed-point (6dp)          ~%  newline
+;;   ~&  fresh line                 ~~  literal tilde
+;;   ~t  tab
+;;
+;; Signature: (format template arg...) -> string
+;; --------------------------------------------------------------------------
+
+(define
+  (format template &rest args)
+  (let
+    ((buf (make-string-buffer)) (n (string-length template)))
+    (define
+      (consume-arg args)
+      (if
+        (nil? args)
+        (list "" nil)
+        (list (display-to-string (first args)) (rest args))))
+    (define
+      (consume-num args radix)
+      (if
+        (nil? args)
+        (list "" nil)
+        (list (number->string (first args) radix) (rest args))))
+    (define
+      (loop i args)
+      (cond
+        ((>= i n) (string-buffer->string buf))
+        ((and (= (substring template i (+ i 1)) "~") (< (+ i 1) n))
+          (let
+            ((dir (substring template (+ i 1) (+ i 2))))
+            (cond
+              ((= dir "a")
+                (let
+                  ((p (consume-arg args)))
+                  (do
+                    (string-buffer-append! buf (first p))
+                    (loop (+ i 2) (first (rest p))))))
+              ((= dir "s")
+                (if
+                  (nil? args)
+                  (loop (+ i 2) args)
+                  (do
+                    (string-buffer-append!
+                      buf
+                      (write-to-string (first args)))
+                    (loop (+ i 2) (rest args)))))
+              ((= dir "d")
+                (let
+                  ((p (consume-num args 10)))
+                  (do
+                    (string-buffer-append! buf (first p))
+                    (loop (+ i 2) (first (rest p))))))
+              ((= dir "x")
+                (let
+                  ((p (consume-num args 16)))
+                  (do
+                    (string-buffer-append! buf (first p))
+                    (loop (+ i 2) (first (rest p))))))
+              ((= dir "o")
+                (let
+                  ((p (consume-num args 8)))
+                  (do
+                    (string-buffer-append! buf (first p))
+                    (loop (+ i 2) (first (rest p))))))
+              ((= dir "b")
+                (let
+                  ((p (consume-num args 2)))
+                  (do
+                    (string-buffer-append! buf (first p))
+                    (loop (+ i 2) (first (rest p))))))
+              ((= dir "f")
+                (if
+                  (nil? args)
+                  (loop (+ i 2) args)
+                  (do
+                    (string-buffer-append!
+                      buf
+                      (format-decimal (first args) 6))
+                    (loop (+ i 2) (rest args)))))
+              ((= dir "%")
+                (do
+                  (string-buffer-append! buf "\n")
+                  (loop (+ i 2) args)))
+              ((= dir "&")
+                (do
+                  (let
+                    ((so-far (string-buffer->string buf)))
+                    (when
+                      (or
+                        (= (string-length so-far) 0)
+                        (not
+                          (=
+                            (substring
+                              so-far
+                              (- (string-length so-far) 1)
+                              (string-length so-far))
+                            "\n")))
+                      (string-buffer-append! buf "\n")))
+                  (loop (+ i 2) args)))
+              ((= dir "~")
+                (do
+                  (string-buffer-append! buf "~")
+                  (loop (+ i 2) args)))
+              ((= dir "t")
+                (do
+                  (string-buffer-append! buf "\t")
+                  (loop (+ i 2) args)))
+              (else
+                (do
+                  (string-buffer-append! buf "~")
+                  (loop (+ i 1) args))))))
+        (else
+          (do
+            (string-buffer-append!
+              buf
+              (substring template i (+ i 1)))
+            (loop (+ i 1) args)))))
+    (loop 0 args)))

spec/tests/test-adt.sx

@@ -0,0 +1,278 @@
+(defsuite
+  "algebraic-data-types"
+  (deftest
+    "constructor creates dict with adt marker"
+    (do
+      (define-type Maybe (Just value) (Nothing))
+      (assert= true (get (Just 42) :_adt))))
+  (deftest
+    "constructor stores type name"
+    (do
+      (define-type Shape (Circle radius) (Square side))
+      (assert= "Shape" (get (Circle 5) :_type))
+      (assert= "Shape" (get (Square 3) :_type))))
+  (deftest
+    "constructor stores constructor name"
+    (do
+      (define-type Opt (Some val) (None))
+      (assert= "Some" (get (Some 1) :_ctor))
+      (assert= "None" (get (None) :_ctor))))
+  (deftest
+    "constructor stores fields as list"
+    (do
+      (define-type Pair (Pair-of fst snd))
+      (assert-equal
+        (list 1 2)
+        (get (Pair-of 1 2) :_fields))))
+  (deftest
+    "zero-arg constructor has empty fields"
+    (do
+      (define-type Flag (Set) (Unset))
+      (assert-equal (list) (get (Set) :_fields))
+      (assert-equal (list) (get (Unset) :_fields))))
+  (deftest
+    "type predicate true for all constructors"
+    (do
+      (define-type Expr (Num n) (Add left right) (Neg e))
+      (assert= true (Expr? (Num 5)))
+      (assert= true (Expr? (Add (Num 1) (Num 2))))
+      (assert= true (Expr? (Neg (Num 3))))))
+  (deftest
+    "type predicate false for non-adt values"
+    (do
+      (define-type Box (Box-of x))
+      (assert= false (Box? 42))
+      (assert= false (Box? "hello"))
+      (assert= false (Box? nil))
+      (assert= false (Box? (list 1 2)))
+      (assert= false (Box? {}))))
+  (deftest
+    "type predicate false for wrong adt type"
+    (do
+      (define-type AT (AV x))
+      (define-type BT (BV x))
+      (assert= false (AT? (BV 1)))
+      (assert= false (BT? (AV 1)))))
+  (deftest
+    "constructor predicate true for matching constructor"
+    (do
+      (define-type Result (Ok value) (Err msg))
+      (assert= true (Ok? (Ok 42)))
+      (assert= true (Err? (Err "bad")))))
+  (deftest
+    "constructor predicate false for wrong constructor"
+    (do
+      (define-type Coin (Heads) (Tails))
+      (assert= false (Heads? (Tails)))
+      (assert= false (Tails? (Heads)))))
+  (deftest
+    "constructor predicate false for non-adt"
+    (do
+      (define-type Wrap (Wrapped x))
+      (assert= false (Wrapped? 42))
+      (assert= false (Wrapped? nil))
+      (assert= false (Wrapped? "str"))))
+  (deftest
+    "single-field accessor returns field value"
+    (do
+      (define-type Holder (Held content))
+      (assert= 99 (Held-content (Held 99)))
+      (assert= "hello" (Held-content (Held "hello")))))
+  (deftest
+    "multi-field accessors return correct fields"
+    (do
+      (define-type Triple (Triple-of a b c))
+      (let
+        ((t (Triple-of 10 20 30)))
+        (assert= 10 (Triple-of-a t))
+        (assert= 20 (Triple-of-b t))
+        (assert= 30 (Triple-of-c t)))))
+  (deftest
+    "tree constructors and accessors"
+    (do
+      (define-type Tree (Leaf) (Node left val right))
+      (let
+        ((t (Node (Leaf) 5 (Node (Leaf) 3 (Leaf)))))
+        (assert= true (Node? t))
+        (assert= 5 (Node-val t))
+        (assert= true (Leaf? (Node-left t)))
+        (assert= true (Node? (Node-right t)))
+        (assert= 3 (Node-val (Node-right t))))))
+  (deftest
+    "arity error on too few args"
+    (do
+      (define-type Pair2 (Pair2-of a b))
+      (let
+        ((ok false))
+        (guard (exn (else (set! ok true))) (Pair2-of 1))
+        (assert ok))))
+  (deftest
+    "arity error on too many args"
+    (do
+      (define-type Single (Single-of x))
+      (let
+        ((ok false))
+        (guard
+          (exn (else (set! ok true)))
+          (Single-of 1 2))
+        (assert ok))))
+  (deftest
+    "multiple types are independent"
+    (do
+      (define-type Color2 (Red2) (Green2) (Blue2))
+      (define-type Suit (Hearts) (Diamonds) (Clubs) (Spades))
+      (assert= false (Color2? (Hearts)))
+      (assert= false (Suit? (Red2)))
+      (assert= true (Color2? (Blue2)))
+      (assert= true (Suit? (Spades)))))
+  (deftest
+    "adt fields can hold any value"
+    (do
+      (define-type Container (Hold x))
+      (assert-equal
+        (list 1 2 3)
+        (Hold-x (Hold (list 1 2 3))))
+      (assert-equal {:a 1} (Hold-x (Hold {:a 1})))))
+  (deftest
+    "adt-registry tracks type constructor names"
+    (do
+      (define-type Days (Mon) (Tue) (Wed) (Thu) (Fri))
+      (assert-equal
+        (list "Mon" "Tue" "Wed" "Thu" "Fri")
+        (get *adt-registry* "Days"))))
+  (deftest
+    "constructors with same field name in different types are independent"
+    (do
+      (define-type P1 (P1-ctor value))
+      (define-type P2 (P2-ctor value))
+      (assert= 10 (P1-ctor-value (P1-ctor 10)))
+      (assert= 20 (P2-ctor-value (P2-ctor 20)))))
+  (deftest
+    "match dispatches on first matching constructor"
+    (do
+      (define-type Color (Red) (Green) (Blue))
+      (assert= "red" (match (Red) ((Red) "red") ((Green) "green") ((Blue) "blue")))
+      (assert= "green" (match (Green) ((Red) "red") ((Green) "green") ((Blue) "blue")))
+      (assert= "blue" (match (Blue) ((Red) "red") ((Green) "green") ((Blue) "blue")))))
+  (deftest
+    "match binds field to variable"
+    (do
+      (define-type Wrapper (Wrap val))
+      (assert= 42 (match (Wrap 42) ((Wrap v) v)))
+      (assert= "hi" (match (Wrap "hi") ((Wrap v) v)))))
+  (deftest
+    "match zero-arg constructor"
+    (do
+      (define-type Signal (On) (Off))
+      (assert= "on" (match (On) ((On) "on") ((Off) "off")))
+      (assert= "off" (match (Off) ((On) "on") ((Off) "off")))))
+  (deftest
+    "match multi-field constructor binds all fields"
+    (do
+      (define-type Vec2 (V2 x y))
+      (let ((v (V2 3 4)))
+        (assert= 7 (match v ((V2 a b) (+ a b)))))))
+  (deftest
+    "match with else clause"
+    (do
+      (define-type Opt2 (Some2 val) (None2))
+      (assert= 10 (match (Some2 10) ((Some2 v) v) (else 0)))
+      (assert= 0 (match (None2) ((Some2 v) v) (else 0)))))
+  (deftest
+    "match else catches non-adt values"
+    (do
+      (assert= "other" (match 42 ((else) "other") (else "other")))
+      (assert= "other" (match "str" (else "other")))))
+  (deftest
+    "match returns body expression value"
+    (do
+      (define-type Num (Num-of n))
+      (assert= 100 (match (Num-of 10) ((Num-of n) (* n n))))))
+  (deftest
+    "match second arm fires when first does not match"
+    (do
+      (define-type Either (Left val) (Right val))
+      (assert= "left-1" (match (Left 1) ((Left v) (str "left-" v)) ((Right v) (str "right-" v))))
+      (assert= "right-2" (match (Right 2) ((Left v) (str "left-" v)) ((Right v) (str "right-" v))))))
+  (deftest
+    "match wildcard _ in constructor pattern"
+    (do
+      (define-type Pair3 (Pair3-of a b))
+      (assert= 5 (match (Pair3-of 5 99) ((Pair3-of x _) x)))
+      (assert= 99 (match (Pair3-of 5 99) ((Pair3-of _ y) y)))))
+  (deftest
+    "match nested adt constructor pattern"
+    (do
+      (define-type Tree2 (Leaf2) (Node2 left val right))
+      (let ((t (Node2 (Leaf2) 7 (Leaf2))))
+        (assert= 7 (match t ((Node2 _ v _) v)))
+        (assert= true (match t ((Node2 (Leaf2) _ _) true) (else false))))))
+  (deftest
+    "match literal pattern"
+    (do
+      (assert= "zero" (match 0 (0 "zero") (else "nonzero")))
+      (assert= "hello" (match "hello" ("hello" "hello") (else "other")))))
+  (deftest
+    "match symbol binding pattern"
+    (do
+      (assert= 42 (match 42 (x x)))))
+  (deftest
+    "match no matching clause raises error"
+    (do
+      (define-type AB (A-val) (B-val))
+      (let ((ok false))
+        (guard (exn (else (set! ok true)))
+          (match (A-val) ((B-val) "b")))
+        (assert ok))))
+  (deftest
+    "match result used in further computation"
+    (do
+      (define-type Num2 (N v))
+      (assert= 30
+        (+
+          (match (N 10) ((N v) v))
+          (match (N 20) ((N v) v))))))
+  (deftest
+    "match with define"
+    (do
+      (define-type Tag (Tagged label value))
+      (define get-label (fn (t) (match t ((Tagged lbl _) lbl))))
+      (define get-value (fn (t) (match t ((Tagged _ val) val))))
+      (let ((t (Tagged "name" 99)))
+        (assert= "name" (get-label t))
+        (assert= 99 (get-value t)))))
+  (deftest
+    "match three-field constructor"
+    (do
+      (define-type Triple2 (T3 a b c))
+      (assert= 6 (match (T3 1 2 3) ((T3 a b c) (+ a b c))))))
+  (deftest
+    "match clauses tried in order"
+    (do
+      (define-type Expr2 (Lit n) (Add l r) (Mul l r))
+      (define eval-expr2 (fn (e)
+        (match e
+          ((Lit n) n)
+          ((Add l r) (+ (eval-expr2 l) (eval-expr2 r)))
+          ((Mul l r) (* (eval-expr2 l) (eval-expr2 r))))))
+      (assert= 7 (eval-expr2 (Add (Lit 3) (Lit 4))))
+      (assert= 12 (eval-expr2 (Mul (Lit 3) (Lit 4))))
+      (assert= 11 (eval-expr2 (Add (Lit 2) (Mul (Lit 3) (Lit 3)))))))
+  (deftest
+    "match else binding captures value"
+    (do
+      (define-type Coin2 (Heads2) (Tails2))
+      (assert= "Tails2" (match (Tails2) ((Heads2) "Heads2") (x (get x :_ctor))))))
+  (deftest
+    "match on adt with string field"
+    (do
+      (define-type Msg (Hello name) (Bye name))
+      (assert= "Hello, Alice" (match (Hello "Alice") ((Hello n) (str "Hello, " n)) ((Bye n) (str "Bye, " n))))
+      (assert= "Bye, Bob" (match (Bye "Bob") ((Hello n) (str "Hello, " n)) ((Bye n) (str "Bye, " n))))))
+  (deftest
+    "match nested pattern with variable binding"
+    (do
+      (define-type Box2 (Box2-of v))
+      (define-type Inner (Inner-of n))
+      (assert= 5 (match (Box2-of (Inner-of 5)) ((Box2-of (Inner-of n)) n)))))
+)

spec/tests/test-bitwise.sx

@@ -0,0 +1,157 @@
+(defsuite
+  "bitwise-operations"
+  (deftest
+    "bitwise-and basic"
+    (do
+      (assert= 0 (bitwise-and 0 0))
+      (assert= 1 (bitwise-and 3 1))
+      (assert= 0 (bitwise-and 5 2))
+      (assert= 4 (bitwise-and 12 6))))
+  (deftest
+    "bitwise-and identity and zero"
+    (do
+      (assert= 255 (bitwise-and 255 255))
+      (assert= 0 (bitwise-and 255 0))))
+  (deftest
+    "bitwise-or basic"
+    (do
+      (assert= 0 (bitwise-or 0 0))
+      (assert= 3 (bitwise-or 1 2))
+      (assert= 7 (bitwise-or 5 3))
+      (assert= 15 (bitwise-or 9 6))))
+  (deftest
+    "bitwise-or identity"
+    (do
+      (assert= 255 (bitwise-or 255 0))
+      (assert= 255 (bitwise-or 0 255))))
+  (deftest
+    "bitwise-xor basic"
+    (do
+      (assert= 0 (bitwise-xor 0 0))
+      (assert= 3 (bitwise-xor 1 2))
+      (assert= 6 (bitwise-xor 3 5))
+      (assert= 0 (bitwise-xor 255 255))))
+  (deftest
+    "bitwise-xor toggle bits"
+    (do
+      (assert= 14 (bitwise-xor 10 4))
+      (assert= 10 (bitwise-xor 14 4))))
+  (deftest
+    "bitwise-not zero"
+    (do (assert= -1 (bitwise-not 0))))
+  (deftest
+    "bitwise-not positive"
+    (do
+      (assert= -2 (bitwise-not 1))
+      (assert= -5 (bitwise-not 4))
+      (assert= -256 (bitwise-not 255))))
+  (deftest
+    "bitwise-not negative"
+    (do
+      (assert= 0 (bitwise-not -1))
+      (assert= 1 (bitwise-not -2))
+      (assert= 4 (bitwise-not -5))))
+  (deftest
+    "bitwise-not double negation"
+    (do
+      (assert= 42 (bitwise-not (bitwise-not 42)))
+      (assert= 0 (bitwise-not (bitwise-not 0)))))
+  (deftest
+    "arithmetic-shift left"
+    (do
+      (assert= 2 (arithmetic-shift 1 1))
+      (assert= 4 (arithmetic-shift 1 2))
+      (assert= 16 (arithmetic-shift 1 4))
+      (assert= 8 (arithmetic-shift 2 2))))
+  (deftest
+    "arithmetic-shift right"
+    (do
+      (assert= 1 (arithmetic-shift 2 -1))
+      (assert= 1 (arithmetic-shift 4 -2))
+      (assert= 5 (arithmetic-shift 10 -1))
+      (assert= 2 (arithmetic-shift 16 -3))))
+  (deftest
+    "arithmetic-shift by zero"
+    (do
+      (assert= 42 (arithmetic-shift 42 0))
+      (assert= 0 (arithmetic-shift 0 5))))
+  (deftest
+    "arithmetic-shift negative value right preserves sign"
+    (do
+      (assert= -1 (arithmetic-shift -1 -1))
+      (assert= -2 (arithmetic-shift -4 -1))))
+  (deftest
+    "bit-count zero"
+    (do (assert= 0 (bit-count 0))))
+  (deftest
+    "bit-count powers of two"
+    (do
+      (assert= 1 (bit-count 1))
+      (assert= 1 (bit-count 2))
+      (assert= 1 (bit-count 4))
+      (assert= 1 (bit-count 128))))
+  (deftest
+    "bit-count all-ones values"
+    (do
+      (assert= 8 (bit-count 255))
+      (assert= 4 (bit-count 15))
+      (assert= 2 (bit-count 3))))
+  (deftest
+    "bit-count mixed"
+    (do
+      (assert= 3 (bit-count 7))
+      (assert= 2 (bit-count 5))
+      (assert= 3 (bit-count 11))
+      (assert= 4 (bit-count 30))))
+  (deftest
+    "integer-length zero"
+    (do (assert= 0 (integer-length 0))))
+  (deftest
+    "integer-length powers of two"
+    (do
+      (assert= 1 (integer-length 1))
+      (assert= 2 (integer-length 2))
+      (assert= 3 (integer-length 4))
+      (assert= 4 (integer-length 8))
+      (assert= 8 (integer-length 128))))
+  (deftest
+    "integer-length non-powers"
+    (do
+      (assert= 2 (integer-length 3))
+      (assert= 3 (integer-length 5))
+      (assert= 3 (integer-length 7))
+      (assert= 8 (integer-length 255))
+      (assert= 9 (integer-length 256))))
+  (deftest
+    "bitwise ops compose"
+    (do
+      (assert=
+        5
+        (bitwise-and
+          (bitwise-or 5 3)
+          (bitwise-xor 7 2)))
+      (assert= 0 (bitwise-and 170 85))))
+  (deftest
+    "arithmetic-shift round-trip"
+    (do
+      (assert=
+        10
+        (arithmetic-shift (arithmetic-shift 10 3) -3))))
+  (deftest
+    "extract bits with mask"
+    (do
+      (let
+        ((x 52))
+        (assert=
+          5
+          (bitwise-and (arithmetic-shift x -2) 7)))))
+  (deftest
+    "clear low bits with bitwise-not mask"
+    (do
+      (assert= 252 (bitwise-and 255 (bitwise-not 3)))))
+  (deftest
+    "integer-length after shift"
+    (do
+      (assert=
+        4
+        (integer-length (arithmetic-shift 1 3))))))

spec/tests/test-bytevectors.sx

@@ -0,0 +1,236 @@
+;; ==========================================================================
+;; test-bytevectors.sx — Tests for bytevector primitives
+;; ==========================================================================
+
+;; --------------------------------------------------------------------------
+;; make-bytevector / bytevector?
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:create"
+  (deftest
+    "make-bytevector returns bytevector"
+    (assert (bytevector? (make-bytevector 4))))
+  (deftest
+    "make-bytevector zeroes by default"
+    (let
+      ((bv (make-bytevector 3)))
+      (assert
+        (and
+          (= (bytevector-u8-ref bv 0) 0)
+          (= (bytevector-u8-ref bv 1) 0)
+          (= (bytevector-u8-ref bv 2) 0)))))
+  (deftest
+    "make-bytevector with fill"
+    (let
+      ((bv (make-bytevector 3 42)))
+      (assert
+        (and
+          (= (bytevector-u8-ref bv 0) 42)
+          (= (bytevector-u8-ref bv 1) 42)
+          (= (bytevector-u8-ref bv 2) 42)))))
+  (deftest
+    "make-bytevector length 0"
+    (assert= (bytevector-length (make-bytevector 0)) 0))
+  (deftest
+    "bytevector? true for bytevector"
+    (assert (bytevector? (make-bytevector 2))))
+  (deftest
+    "bytevector? false for string"
+    (assert (not (bytevector? "hello"))))
+  (deftest "bytevector? false for nil" (assert (not (bytevector? nil))))
+  (deftest
+    "bytevector? false for list"
+    (assert (not (bytevector? (list 1 2 3))))))
+
+;; --------------------------------------------------------------------------
+;; bytevector-length / u8-ref / u8-set!
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:access"
+  (deftest
+    "bytevector-length"
+    (assert= (bytevector-length (make-bytevector 5)) 5))
+  (deftest
+    "u8-ref reads fill byte"
+    (assert=
+      (bytevector-u8-ref (make-bytevector 4 99) 2)
+      99))
+  (deftest
+    "u8-set! mutates"
+    (let
+      ((bv (make-bytevector 3 0)))
+      (bytevector-u8-set! bv 1 200)
+      (assert= (bytevector-u8-ref bv 1) 200)))
+  (deftest
+    "u8-set! boundary byte 255"
+    (let
+      ((bv (make-bytevector 1 0)))
+      (bytevector-u8-set! bv 0 255)
+      (assert= (bytevector-u8-ref bv 0) 255)))
+  (deftest
+    "u8-set! byte 0"
+    (let
+      ((bv (make-bytevector 1 255)))
+      (bytevector-u8-set! bv 0 0)
+      (assert= (bytevector-u8-ref bv 0) 0))))
+
+;; --------------------------------------------------------------------------
+;; bytevector-copy
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:copy"
+  (deftest
+    "copy produces equal content"
+    (let
+      ((bv (make-bytevector 3 7)))
+      (let
+        ((bv2 (bytevector-copy bv)))
+        (assert
+          (and
+            (= (bytevector-u8-ref bv2 0) 7)
+            (= (bytevector-u8-ref bv2 1) 7)
+            (= (bytevector-u8-ref bv2 2) 7))))))
+  (deftest
+    "copy is independent"
+    (let
+      ((bv (make-bytevector 2 0)))
+      (let
+        ((bv2 (bytevector-copy bv)))
+        (bytevector-u8-set! bv2 0 99)
+        (assert= (bytevector-u8-ref bv 0) 0))))
+  (deftest
+    "copy with start"
+    (let
+      ((bv (list->bytevector (list 10 20 30 40))))
+      (let
+        ((bv2 (bytevector-copy bv 2)))
+        (assert
+          (and
+            (= (bytevector-length bv2) 2)
+            (= (bytevector-u8-ref bv2 0) 30))))))
+  (deftest
+    "copy with start and end"
+    (let
+      ((bv (list->bytevector (list 10 20 30 40))))
+      (let
+        ((bv2 (bytevector-copy bv 1 3)))
+        (assert
+          (and
+            (= (bytevector-length bv2) 2)
+            (= (bytevector-u8-ref bv2 0) 20)
+            (= (bytevector-u8-ref bv2 1) 30)))))))
+
+;; --------------------------------------------------------------------------
+;; bytevector-copy!
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:copy-bang"
+  (deftest
+    "copy! overwrites dst region"
+    (let
+      ((dst (make-bytevector 4 0)))
+      (let
+        ((src (list->bytevector (list 1 2 3))))
+        (bytevector-copy! dst 1 src)
+        (assert
+          (and
+            (= (bytevector-u8-ref dst 0) 0)
+            (= (bytevector-u8-ref dst 1) 1)
+            (= (bytevector-u8-ref dst 2) 2)
+            (= (bytevector-u8-ref dst 3) 3))))))
+  (deftest
+    "copy! with src bounds"
+    (let
+      ((dst (make-bytevector 2 0)))
+      (let
+        ((src (list->bytevector (list 10 20 30 40))))
+        (bytevector-copy! dst 0 src 1 3)
+        (assert
+          (and
+            (= (bytevector-u8-ref dst 0) 20)
+            (= (bytevector-u8-ref dst 1) 30)))))))
+
+;; --------------------------------------------------------------------------
+;; bytevector-append
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:append"
+  (deftest
+    "append two bytevectors"
+    (let
+      ((bv (bytevector-append (list->bytevector (list 1 2)) (list->bytevector (list 3 4)))))
+      (assert
+        (and
+          (= (bytevector-length bv) 4)
+          (= (bytevector-u8-ref bv 0) 1)
+          (= (bytevector-u8-ref bv 3) 4)))))
+  (deftest
+    "append three bytevectors"
+    (let
+      ((bv (bytevector-append (list->bytevector (list 1)) (list->bytevector (list 2)) (list->bytevector (list 3)))))
+      (assert= (bytevector-length bv) 3)))
+  (deftest
+    "append empty"
+    (assert=
+      (bytevector-length
+        (bytevector-append
+          (make-bytevector 0)
+          (make-bytevector 0)))
+      0)))
+
+;; --------------------------------------------------------------------------
+;; list->bytevector / bytevector->list
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:conversion"
+  (deftest
+    "list->bytevector roundtrip"
+    (let
+      ((lst (list 10 20 30)))
+      (assert= (bytevector->list (list->bytevector lst)) lst)))
+  (deftest
+    "list->bytevector empty"
+    (assert= (bytevector-length (list->bytevector nil)) 0))
+  (deftest
+    "bytevector->list from make-bytevector"
+    (let
+      ((lst (bytevector->list (make-bytevector 3 5))))
+      (assert= lst (list 5 5 5)))))
+
+;; --------------------------------------------------------------------------
+;; utf8 roundtrip
+;; --------------------------------------------------------------------------
+
+(defsuite
+  "bv:utf8"
+  (deftest
+    "string->utf8 returns bytevector"
+    (assert (bytevector? (string->utf8 "hello"))))
+  (deftest
+    "string->utf8 length"
+    (assert= (bytevector-length (string->utf8 "abc")) 3))
+  (deftest
+    "utf8->string roundtrip"
+    (assert= (utf8->string (string->utf8 "hello")) "hello"))
+  (deftest
+    "utf8->string with slice"
+    (let
+      ((bv (string->utf8 "hello")))
+      (assert= (utf8->string bv 1 4) "ell")))
+  (deftest
+    "string->utf8 with start"
+    (assert= (utf8->string (string->utf8 "hello" 2)) "llo"))
+  (deftest
+    "string->utf8 with start and end"
+    (assert=
+      (utf8->string (string->utf8 "hello" 1 4))
+      "ell"))
+  (deftest
+    "empty string round-trips"
+    (assert= (utf8->string (string->utf8 "")) "")))

spec/tests/test-chars.sx

@@ -0,0 +1,185 @@
+;; Tests for character type (Phase 13)
+;; Uses (make-char n) and (char-code "x") instead of #\x literals
+;; (char literal parser syntax tested via sx-parse call)
+
+(deftest
+  "make-char produces a char"
+  (assert= true (char? (make-char 97))))
+
+(deftest "char? false for string" (assert= false (char? "a")))
+
+(deftest "char? false for number" (assert= false (char? 65)))
+
+(deftest "char? false for nil" (assert= false (char? nil)))
+
+(deftest
+  "char->integer extracts codepoint"
+  (assert= 97 (char->integer (make-char 97))))
+
+(deftest
+  "integer->char alias for make-char"
+  (assert= 65 (char->integer (integer->char 65))))
+
+(deftest
+  "char->integer round-trip"
+  (assert= 122 (char->integer (make-char 122))))
+
+(deftest
+  "char=? equal"
+  (assert= true (char=? (make-char 97) (make-char 97))))
+
+(deftest
+  "char=? unequal"
+  (assert= false (char=? (make-char 97) (make-char 98))))
+
+(deftest
+  "char<? ordering"
+  (assert= true (char<? (make-char 97) (make-char 98))))
+
+(deftest
+  "char>? ordering"
+  (assert= true (char>? (make-char 98) (make-char 97))))
+
+(deftest
+  "char<=? equal"
+  (assert= true (char<=? (make-char 65) (make-char 65))))
+
+(deftest
+  "char>=? greater"
+  (assert= true (char>=? (make-char 90) (make-char 65))))
+
+(deftest
+  "char-ci=? ignores case (a vs A)"
+  (assert= true (char-ci=? (make-char 97) (make-char 65))))
+
+(deftest
+  "char-ci<? a < b case-insensitive"
+  (assert= true (char-ci<? (make-char 97) (make-char 98))))
+
+(deftest
+  "char-ci>? b > a case-insensitive"
+  (assert= true (char-ci>? (make-char 66) (make-char 65))))
+
+(deftest
+  "char-alphabetic? true for a"
+  (assert= true (char-alphabetic? (make-char 97))))
+
+(deftest
+  "char-alphabetic? true for Z"
+  (assert= true (char-alphabetic? (make-char 90))))
+
+(deftest
+  "char-alphabetic? false for digit"
+  (assert= false (char-alphabetic? (make-char 48))))
+
+(deftest
+  "char-numeric? true for 0"
+  (assert= true (char-numeric? (make-char 48))))
+
+(deftest
+  "char-numeric? true for 9"
+  (assert= true (char-numeric? (make-char 57))))
+
+(deftest
+  "char-numeric? false for letter"
+  (assert= false (char-numeric? (make-char 65))))
+
+(deftest
+  "char-whitespace? true for space"
+  (assert= true (char-whitespace? (make-char 32))))
+
+(deftest
+  "char-whitespace? true for newline"
+  (assert= true (char-whitespace? (make-char 10))))
+
+(deftest
+  "char-whitespace? false for letter"
+  (assert= false (char-whitespace? (make-char 65))))
+
+(deftest
+  "char-upper-case? true for A"
+  (assert= true (char-upper-case? (make-char 65))))
+
+(deftest
+  "char-upper-case? false for a"
+  (assert= false (char-upper-case? (make-char 97))))
+
+(deftest
+  "char-lower-case? true for a"
+  (assert= true (char-lower-case? (make-char 97))))
+
+(deftest
+  "char-lower-case? false for A"
+  (assert= false (char-lower-case? (make-char 65))))
+
+(deftest
+  "char-upcase converts a to A"
+  (assert= 65 (char->integer (char-upcase (make-char 97)))))
+
+(deftest
+  "char-downcase converts A to a"
+  (assert=
+    97
+    (char->integer (char-downcase (make-char 65)))))
+
+(deftest
+  "char-upcase idempotent on uppercase"
+  (assert= 65 (char->integer (char-upcase (make-char 65)))))
+
+(deftest
+  "string->list returns list of chars"
+  (assert= 3 (len (string->list "abc"))))
+
+(deftest
+  "string->list element 0 is char"
+  (assert= true (char? (get (string->list "abc") 0))))
+
+(deftest
+  "string->list codepoints correct"
+  (assert= 97 (char->integer (get (string->list "abc") 0))))
+
+(deftest
+  "list->string from chars produces string"
+  (assert=
+    "abc"
+    (list->string
+      (list
+        (make-char 97)
+        (make-char 98)
+        (make-char 99)))))
+
+(deftest
+  "string->list list->string round-trip"
+  (let ((s "hello")) (assert= s (list->string (string->list s)))))
+
+(deftest
+  "char literal parsed via sx-parse"
+  (let
+    ((ast (sx-parse "#\\a")))
+    (assert= true (char? (get ast 0)))))
+
+(deftest
+  "char literal codepoint via sx-parse"
+  (let
+    ((ast (sx-parse "#\\a")))
+    (assert= 97 (char->integer (get ast 0)))))
+
+(deftest
+  "named char space via sx-parse"
+  (let
+    ((ast (sx-parse "#\\space")))
+    (assert= 32 (char->integer (get ast 0)))))
+
+(deftest
+  "named char newline via sx-parse"
+  (let
+    ((ast (sx-parse "#\\newline")))
+    (assert= 10 (char->integer (get ast 0)))))
+
+(deftest
+  "char-ci<=? equal case-insensitive"
+  (assert= true (char-ci<=? (make-char 65) (make-char 97))))
+
+(deftest
+  "char-ci>=? equal case-insensitive"
+  (assert= true (char-ci>=? (make-char 97) (make-char 65))))

spec/tests/test-coroutines.sx

@@ -0,0 +1,305 @@
+(import (sx coroutines))
+
+(defsuite
+  "coroutine"
+  (deftest
+    "coroutine? recognizes coroutine objects"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (assert (coroutine? co))
+      (assert= false (coroutine? 42))
+      (assert= false (coroutine? "hello"))
+      (assert= false (coroutine? nil))
+      (assert= false (coroutine? (list)))))
+  (deftest
+    "coroutine-alive? true for ready coroutine"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (assert (coroutine-alive? co))))
+  (deftest
+    "coroutine-alive? false for non-coroutine"
+    (assert= false (coroutine-alive? 42)))
+  (deftest
+    "immediate return — done true, value is body result"
+    (let
+      ((co (make-coroutine (fn () 42))))
+      (let
+        ((r (coroutine-resume co nil)))
+        (assert= true (get r "done"))
+        (assert= 42 (get r "value")))))
+  (deftest
+    "immediate nil return"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (let
+        ((r (coroutine-resume co nil)))
+        (assert= true (get r "done"))
+        (assert= nil (get r "value")))))
+  (deftest
+    "coroutine-alive? false after completion"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (coroutine-resume co nil)
+      (assert= false (coroutine-alive? co))))
+  (deftest
+    "single yield — done false on yield, done true on finish"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield 10) 20))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co nil)))
+          (assert= false (get r1 "done"))
+          (assert= 10 (get r1 "value"))
+          (assert= true (get r2 "done"))
+          (assert= 20 (get r2 "value"))))))
+  (deftest
+    "coroutine-alive? true between yield and next resume"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield nil) nil))))
+      (assert (coroutine-alive? co))
+      (coroutine-resume co nil)
+      (assert (coroutine-alive? co))
+      (coroutine-resume co nil)
+      (assert= false (coroutine-alive? co))))
+  (deftest
+    "three yields then return"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield "a") (coroutine-yield "b") (coroutine-yield "c") "z"))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co nil)))
+          (let
+            ((r3 (coroutine-resume co nil)))
+            (let
+              ((r4 (coroutine-resume co nil)))
+              (assert= "a" (get r1 "value"))
+              (assert= false (get r1 "done"))
+              (assert= "b" (get r2 "value"))
+              (assert= false (get r2 "done"))
+              (assert= "c" (get r3 "value"))
+              (assert= false (get r3 "done"))
+              (assert= "z" (get r4 "value"))
+              (assert= true (get r4 "done"))))))))
+  (deftest
+    "final return vs yield — done flag distinguishes them"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield "yielded") "returned"))))
+      (let
+        ((y (coroutine-resume co nil)))
+        (let
+          ((r (coroutine-resume co nil)))
+          (assert= false (get y "done"))
+          (assert= "yielded" (get y "value"))
+          (assert= true (get r "done"))
+          (assert= "returned" (get r "value"))))))
+  (deftest
+    "resume val becomes yield return value"
+    (let
+      ((co (make-coroutine (fn () (let ((received (coroutine-yield "first"))) received)))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co 99)))
+          (assert= "first" (get r1 "value"))
+          (assert= false (get r1 "done"))
+          (assert= 99 (get r2 "value"))
+          (assert= true (get r2 "done"))))))
+  (deftest
+    "multiple resume values passed through yields"
+    (let
+      ((co (make-coroutine (fn () (let ((a (coroutine-yield 1))) (let ((b (coroutine-yield 2))) (+ a b)))))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co 10)))
+          (let
+            ((r3 (coroutine-resume co 20)))
+            (assert= 1 (get r1 "value"))
+            (assert= 2 (get r2 "value"))
+            (assert= true (get r3 "done"))
+            (assert= 30 (get r3 "value")))))))
+  (deftest
+    "coroutine captures lexical environment"
+    (let
+      ((x 10)
+        (co
+          (make-coroutine
+            (fn () (coroutine-yield (* x 2)) (* x 3)))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co nil)))
+          (assert= 20 (get r1 "value"))
+          (assert= 30 (get r2 "value"))))))
+  (deftest
+    "resuming dead coroutine raises error"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (coroutine-resume co nil)
+      (assert-throws (fn () (coroutine-resume co nil)))))
+  (deftest
+    "coroutine drives iteration via recursive body"
+    (let
+      ((co (make-coroutine (fn () (define loop (fn (i) (when (< i 4) (coroutine-yield i) (loop (+ i 1))))) (loop 0))))
+        (results (list)))
+      (let
+        drive
+        ()
+        (let
+          ((r (coroutine-resume co nil)))
+          (when
+            (not (get r "done"))
+            (append! results (get r "value"))
+            (drive))))
+      (assert= 4 (len results))
+      (assert= 0 (nth results 0))
+      (assert= 1 (nth results 1))
+      (assert= 2 (nth results 2))
+      (assert= 3 (nth results 3))))
+  (deftest
+    "nested coroutine — inner resumed from outer body"
+    (let
+      ((inner (make-coroutine (fn () (coroutine-yield "inner-a") "inner-done")))
+        (outer
+          (make-coroutine
+            (fn
+              ()
+              (let
+                ((i1 (coroutine-resume inner nil)))
+                (coroutine-yield (get i1 "value")))
+              (let ((i2 (coroutine-resume inner nil))) (get i2 "value"))))))
+      (let
+        ((o1 (coroutine-resume outer nil)))
+        (let
+          ((o2 (coroutine-resume outer nil)))
+          (assert= false (get o1 "done"))
+          (assert= "inner-a" (get o1 "value"))
+          (assert= true (get o2 "done"))
+          (assert= "inner-done" (get o2 "value"))))))
+  (deftest
+    "two independent coroutines interleave correctly"
+    (let
+      ((co1 (make-coroutine (fn () (coroutine-yield 1) 5)))
+        (co2
+          (make-coroutine (fn () (coroutine-yield 2) 6))))
+      (let
+        ((a (coroutine-resume co1 nil)))
+        (let
+          ((b (coroutine-resume co2 nil)))
+          (let
+            ((c (coroutine-resume co1 nil)))
+            (let
+              ((d (coroutine-resume co2 nil)))
+              (assert= false (get a "done"))
+              (assert= 1 (get a "value"))
+              (assert= false (get b "done"))
+              (assert= 2 (get b "value"))
+              (assert= true (get c "done"))
+              (assert= 5 (get c "value"))
+              (assert= true (get d "done"))
+              (assert= 6 (get d "value"))))))))
+  (deftest
+    "coroutine state field is ready before first resume"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield 1)))))
+      (assert= "ready" (get co "state"))))
+  (deftest
+    "coroutine state field is suspended between yields"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield 1) 2))))
+      (coroutine-resume co nil)
+      (assert= "suspended" (get co "state"))))
+  (deftest
+    "coroutine state field is dead after completion"
+    (let
+      ((co (make-coroutine (fn () nil))))
+      (coroutine-resume co nil)
+      (assert= "dead" (get co "state"))))
+  (deftest
+    "yield works when called from nested helper function"
+    (let
+      ((co (make-coroutine (fn () (define helper (fn (x) (coroutine-yield x))) (helper 10) (helper 20)))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co nil)))
+          (let
+            ((r3 (coroutine-resume co nil)))
+            (assert= false (get r1 "done"))
+            (assert= 10 (get r1 "value"))
+            (assert= false (get r2 "done"))
+            (assert= 20 (get r2 "value"))
+            (assert= true (get r3 "done")))))))
+  (deftest
+    "initial resume argument is ignored by ready coroutine"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield 42)))))
+      (let
+        ((r (coroutine-resume co "ignored")))
+        (assert= false (get r "done"))
+        (assert= 42 (get r "value")))))
+  (deftest
+    "coroutine with mutable closure state"
+    (let
+      ((counter {:value 0}))
+      (let
+        ((co (make-coroutine (fn () (dict-set! counter "value" 1) (coroutine-yield "a") (dict-set! counter "value" 2) (coroutine-yield "b")))))
+        (assert= 0 (get counter "value"))
+        (coroutine-resume co nil)
+        (assert= 1 (get counter "value"))
+        (coroutine-resume co nil)
+        (assert= 2 (get counter "value")))))
+  (deftest
+    "coroutine can yield complex values"
+    (let
+      ((co (make-coroutine (fn () (coroutine-yield (list 1 2 3)) (coroutine-yield {:key "val"})))))
+      (let
+        ((r1 (coroutine-resume co nil)))
+        (let
+          ((r2 (coroutine-resume co nil)))
+          (assert= false (get r1 "done"))
+          (assert= 3 (len (get r1 "value")))
+          (assert= false (get r2 "done"))
+          (assert= "val" (get (get r2 "value") "key"))))))
+  (deftest
+    "round-robin scheduling of multiple coroutines"
+    (let
+      ((results (list))
+        (co1
+          (make-coroutine
+            (fn () (coroutine-yield "a") (coroutine-yield "b"))))
+        (co2
+          (make-coroutine
+            (fn () (coroutine-yield "c") (coroutine-yield "d")))))
+      (append! results (get (coroutine-resume co1 nil) "value"))
+      (append! results (get (coroutine-resume co2 nil) "value"))
+      (append! results (get (coroutine-resume co1 nil) "value"))
+      (append! results (get (coroutine-resume co2 nil) "value"))
+      (assert= 4 (len results))
+      (assert= "a" (nth results 0))
+      (assert= "c" (nth results 1))
+      (assert= "b" (nth results 2))
+      (assert= "d" (nth results 3))))
+  (deftest
+    "coroutines created from same factory share no state"
+    (let
+      ((make-counter (fn (start) (make-coroutine (fn () (define loop (fn (n) (coroutine-yield n) (loop (+ n 1)))) (loop start))))))
+      (let
+        ((c1 (make-counter 0)) (c2 (make-counter 100)))
+        (let
+          ((a (get (coroutine-resume c1 nil) "value")))
+          (let
+            ((b (get (coroutine-resume c2 nil) "value")))
+            (let
+              ((c (get (coroutine-resume c1 nil) "value")))
+              (let
+                ((d (get (coroutine-resume c2 nil) "value")))
+                (assert= 0 a)
+                (assert= 100 b)
+                (assert= 1 c)
+                (assert= 101 d))))))))
+  (deftest
+    "resuming non-coroutine raises error"
+    (assert-throws (fn () (coroutine-resume "not-a-coroutine" nil)))))

spec/tests/test-dynamic-wind.sx

@@ -0,0 +1,113 @@
+;; Tests for dynamic-wind: after-thunk fires on normal return,
+;; non-local exit via raise/guard, and call/cc escape.
+
+(defsuite
+  "dynamic-wind-basic"
+  (deftest
+    "after fires on normal return"
+    (let
+      ((log (list)))
+      (dynamic-wind
+        (fn () (append! log "before"))
+        (fn () (append! log "body"))
+        (fn () (append! log "after")))
+      (assert= 3 (len log))
+      (assert= "before" (nth log 0))
+      (assert= "body" (nth log 1))
+      (assert= "after" (nth log 2))))
+  (deftest
+    "after fires on raise escape"
+    (let
+      ((log (list)))
+      (guard
+        (e (true nil))
+        (dynamic-wind
+          (fn () (append! log "before"))
+          (fn () (append! log "body") (error "boom"))
+          (fn () (append! log "after"))))
+      (assert= 3 (len log))
+      (assert= "before" (nth log 0))
+      (assert= "body" (nth log 1))
+      (assert= "after" (nth log 2))))
+  (deftest
+    "after fires on call/cc escape"
+    (let
+      ((log (list)))
+      (call/cc
+        (fn
+          (k)
+          (dynamic-wind
+            (fn () (append! log "before"))
+            (fn () (append! log "body") (k nil))
+            (fn () (append! log "after")))))
+      (assert= 3 (len log))
+      (assert= "before" (nth log 0))
+      (assert= "body" (nth log 1))
+      (assert= "after" (nth log 2))))
+  (deftest
+    "nested dynamic-wind after-thunks fire LIFO on normal return"
+    (let
+      ((log (list)))
+      (dynamic-wind
+        (fn () (append! log "outer-before"))
+        (fn
+          ()
+          (dynamic-wind
+            (fn () (append! log "inner-before"))
+            (fn () (append! log "inner-body"))
+            (fn () (append! log "inner-after"))))
+        (fn () (append! log "outer-after")))
+      (assert= 5 (len log))
+      (assert= "outer-before" (nth log 0))
+      (assert= "inner-before" (nth log 1))
+      (assert= "inner-body" (nth log 2))
+      (assert= "inner-after" (nth log 3))
+      (assert= "outer-after" (nth log 4))))
+  (deftest
+    "nested dynamic-wind after-thunks fire LIFO on raise"
+    (let
+      ((log (list)))
+      (guard
+        (e (true nil))
+        (dynamic-wind
+          (fn () (append! log "outer-before"))
+          (fn
+            ()
+            (dynamic-wind
+              (fn () (append! log "inner-before"))
+              (fn () (append! log "inner-body") (error "boom"))
+              (fn () (append! log "inner-after"))))
+          (fn () (append! log "outer-after"))))
+      (assert= 5 (len log))
+      (assert= "outer-before" (nth log 0))
+      (assert= "inner-before" (nth log 1))
+      (assert= "inner-body" (nth log 2))
+      (assert= "inner-after" (nth log 3))
+      (assert= "outer-after" (nth log 4))))
+  (deftest
+    "before and after are called"
+    (let
+      ((count 0))
+      (dynamic-wind
+        (fn () (set! count (+ count 1)))
+        (fn () nil)
+        (fn () (set! count (+ count 10))))
+      (assert= 11 count)))
+  (deftest
+    "dynamic-wind return value is body result"
+    (let
+      ((result (dynamic-wind (fn () nil) (fn () 42) (fn () nil))))
+      (assert= 42 result)))
+  (deftest
+    "after fires before guard handler"
+    (let
+      ((log (list)))
+      (guard
+        (e (true (append! log "guard-handler")))
+        (dynamic-wind
+          (fn () nil)
+          (fn () (error "boom"))
+          (fn () (append! log "after"))))
+      (assert= 2 (len log))
+      (assert= "after" (nth log 0))
+      (assert= "guard-handler" (nth log 1)))))