From 57516ce18eaed90ae0edc02ac517e35d648c0d74 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@rose-ash.com>
Date: Fri, 24 Apr 2026 20:53:36 +0000
Subject: [PATCH] lua: dostring alias + diagnosis notes; keep grinding
 scoreboard

---
 lib/lua/runtime.sx      |  2 ++
 lib/lua/scoreboard.json | 28 ++++++++++++++--------------
 lib/lua/scoreboard.md   | 28 ++++++++++++++--------------
 plans/lua-on-sx.md      |  1 +
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/lib/lua/runtime.sx b/lib/lua/runtime.sx
index 090415d3..473fa9ee 100644
--- a/lib/lua/runtime.sx
+++ b/lib/lua/runtime.sx
@@ -1491,6 +1491,8 @@
 (define loadstring lua-loadstring)
 (define load lua-loadstring)
 
+(define dostring (fn (s) (let ((f (lua-loadstring s))) (f))))
+
 ;; select(n, ...) — Lua 5.1 built-in. select("#", ...) is arg count; select(i, ...) returns args from i on.
 (define
   lua-select
diff --git a/lib/lua/scoreboard.json b/lib/lua/scoreboard.json
index 314ffd65..29fe8d84 100644
--- a/lib/lua/scoreboard.json
+++ b/lib/lua/scoreboard.json
@@ -39,7 +39,7 @@
       "name": "attrib.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7512
+      "ms": 5843
     },
     {
       "name": "big.lua",
@@ -51,7 +51,7 @@
       "name": "calls.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 5982
+      "ms": 4830
     },
     {
       "name": "checktable.lua",
@@ -63,7 +63,7 @@
       "name": "closure.lua",
       "status": "timeout",
       "reason": "per-test timeout",
-      "ms": 8007
+      "ms": 8000
     },
     {
       "name": "code.lua",
@@ -75,7 +75,7 @@
       "name": "constructs.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 5319
+      "ms": 4113
     },
     {
       "name": "db.lua",
@@ -87,13 +87,13 @@
       "name": "errors.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 3803
+      "ms": 3084
     },
     {
       "name": "events.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7620
+      "ms": 6860
     },
     {
       "name": "files.lua",
@@ -111,13 +111,13 @@
       "name": "literals.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 1927
+      "ms": 1770
     },
     {
       "name": "locals.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      "ms": 1702
+      "ms": 1646
     },
     {
       "name": "main.lua",
@@ -129,19 +129,19 @@
       "name": "math.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4183
+      "ms": 3867
     },
     {
       "name": "nextvar.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 7853
+      "ms": 6771
     },
     {
       "name": "pm.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 6268
+      "ms": 5769
     },
     {
       "name": "sort.lua",
@@ -153,19 +153,19 @@
       "name": "strings.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4020
+      "ms": 3909
     },
     {
       "name": "vararg.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 2349
+      "ms": 2074
     },
     {
       "name": "verybig.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      "ms": 579
+      "ms": 567
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/lua/scoreboard.md b/lib/lua/scoreboard.md
index db21961e..dfba923f 100644
--- a/lib/lua/scoreboard.md
+++ b/lib/lua/scoreboard.md
@@ -15,25 +15,25 @@ fail=13 timeout=3 skip=8 total=24
 |---|---|---|---:|
 | 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: \\\"assertion failed!\\\"\ | 7512 |
+| attrib.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5843 |
 | big.lua | timeout | per-test timeout | 8007 |
-| calls.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5982 |
+| calls.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4830 |
 | checktable.lua | skip | internal debug helpers | 0 |
-| closure.lua | timeout | per-test timeout | 8007 |
+| 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!\\\"\ | 5319 |
+| constructs.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4113 |
 | db.lua | skip | debug library | 0 |
-| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3803 |
-| events.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 7620 |
+| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3084 |
+| events.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6860 |
 | files.lua | skip | io library | 0 |
 | gc.lua | skip | collectgarbage / finalisers | 0 |
-| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1927 |
-| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 1702 |
+| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1770 |
+| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 1646 |
 | main.lua | skip | standalone interpreter driver | 0 |
-| math.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4183 |
-| nextvar.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 7853 |
-| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6268 |
+| math.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3867 |
+| nextvar.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6771 |
+| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5769 |
 | sort.lua | timeout | per-test timeout | 8007 |
-| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4020 |
-| vararg.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2349 |
-| verybig.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 579 |
+| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3909 |
+| vararg.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2074 |
+| verybig.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 567 |
diff --git a/plans/lua-on-sx.md b/plans/lua-on-sx.md
index d4886605..a96c30b4 100644
--- a/plans/lua-on-sx.md
+++ b/plans/lua-on-sx.md
@@ -82,6 +82,7 @@ Each item: implement → tests → tick box → update progress log.
 
 _Newest first. Agent appends on every commit._
 
+- 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.