From 54d7fcf43657de468f2cd4999253b5459e325c2e Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@rose-ash.com>
Date: Fri, 24 Apr 2026 20:19:01 +0000
Subject: [PATCH] =?UTF-8?q?lua:=20do-block=20proper=20lexical=20scoping=20?=
 =?UTF-8?q?(wrap=20in=20(let=20()=20=E2=80=A6))=20+2=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/lua/scoreboard.json | 30 +++++++++++++++---------------
 lib/lua/scoreboard.md   | 30 +++++++++++++++---------------
 lib/lua/test.sh         | 10 ++++++++++
 lib/lua/transpile.sx    |  2 +-
 plans/lua-on-sx.md      |  1 +
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/lib/lua/scoreboard.json b/lib/lua/scoreboard.json
index 950e55f6..0d187207 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": 5513
+      "ms": 5565
     },
     {
       "name": "big.lua",
@@ -51,7 +51,7 @@
       "name": "calls.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4561
+      "ms": 4455
     },
     {
       "name": "checktable.lua",
@@ -63,7 +63,7 @@
       "name": "closure.lua",
       "status": "timeout",
       "reason": "per-test timeout",
-      "ms": 8003
+      "ms": 8007
     },
     {
       "name": "code.lua",
@@ -75,7 +75,7 @@
       "name": "constructs.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 4113
+      "ms": 4074
     },
     {
       "name": "db.lua",
@@ -87,13 +87,13 @@
       "name": "errors.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 2947
+      "ms": 2974
     },
     {
       "name": "events.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 6820
+      "ms": 6657
     },
     {
       "name": "files.lua",
@@ -111,13 +111,13 @@
       "name": "literals.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 1783
+      "ms": 1730
     },
     {
       "name": "locals.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 1529
+      "ms": 1597
     },
     {
       "name": "main.lua",
@@ -129,43 +129,43 @@
       "name": "math.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 3855
+      "ms": 3721
     },
     {
       "name": "nextvar.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 6738
+      "ms": 6582
     },
     {
       "name": "pm.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 5693
+      "ms": 5582
     },
     {
       "name": "sort.lua",
       "status": "timeout",
       "reason": "per-test timeout",
-      "ms": 8005
+      "ms": 8008
     },
     {
       "name": "strings.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 3837
+      "ms": 3704
     },
     {
       "name": "vararg.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"assertion failed!\\\\\\\"\\",
-      "ms": 2105
+      "ms": 2041
     },
     {
       "name": "verybig.lua",
       "status": "fail",
       "reason": "other: Unhandled exception: \\\"Unhandled exception: \\\\\\\"lua: attempt to call non-functio",
-      "ms": 547
+      "ms": 528
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/lua/scoreboard.md b/lib/lua/scoreboard.md
index ffe09674..ce79ad79 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!\\\"\ | 5513 |
+| attrib.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5565 |
 | big.lua | timeout | per-test timeout | 8008 |
-| calls.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4561 |
+| calls.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4455 |
 | checktable.lua | skip | internal debug helpers | 0 |
-| closure.lua | timeout | per-test timeout | 8003 |
+| closure.lua | timeout | per-test timeout | 8007 |
 | code.lua | skip | bytecode inspection via debug library | 0 |
-| constructs.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4113 |
+| constructs.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 4074 |
 | db.lua | skip | debug library | 0 |
-| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2947 |
-| events.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6820 |
+| errors.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2974 |
+| events.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6657 |
 | files.lua | skip | io library | 0 |
 | gc.lua | skip | collectgarbage / finalisers | 0 |
-| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1783 |
-| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1529 |
+| literals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1730 |
+| locals.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 1597 |
 | main.lua | skip | standalone interpreter driver | 0 |
-| math.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3855 |
-| nextvar.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6738 |
-| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5693 |
-| sort.lua | timeout | per-test timeout | 8005 |
-| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3837 |
-| vararg.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2105 |
-| verybig.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 547 |
+| math.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3721 |
+| nextvar.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 6582 |
+| pm.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 5582 |
+| sort.lua | timeout | per-test timeout | 8008 |
+| strings.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 3704 |
+| vararg.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"assertion failed!\\\"\ | 2041 |
+| verybig.lua | fail | other: Unhandled exception: \"Unhandled exception: \\\"lua: attempt to call non-functio | 528 |
diff --git a/lib/lua/test.sh b/lib/lua/test.sh
index 8b4363dc..8ce047e0 100755
--- a/lib/lua/test.sh
+++ b/lib/lua/test.sh
@@ -902,6 +902,12 @@ cat > "$TMPFILE" << 'EPOCHS'
 (epoch 1705)
 (eval "(lua-eval-ast \"local function f(a, b, ...) return a * 100 + b * 10 + select(\\\"#\\\", ...) end return f(7, 8, 1, 2, 3)\")")
 
+;; ── Phase 7: do-block proper scoping ──────────────────────────
+(epoch 1800)
+(eval "(lua-eval-ast \"local i = 10 do local i = 100 end return i\")")
+(epoch 1801)
+(eval "(lua-eval-ast \"do local i = 10 do local i = 100 assert(i == 100) end assert(i == 10) end return \\\"ok\\\"\")")
+
 EPOCHS
 
 OUTPUT=$(timeout 60 "$SX_SERVER" < "$TMPFILE" 2>/dev/null)
@@ -1358,6 +1364,10 @@ check 1703 "select(2, ...) unpack"          '50'
 check 1704 "sum via ipairs({...})"          '15'
 check 1705 "f(a, b, ...) mixed"             '783'
 
+# ── Phase 7: do-block proper scoping ──────────────────────────
+check 1800 "inner do local shadows"         '10'
+check 1801 "nested do scopes"               '"ok"'
+
 TOTAL=$((PASS + FAIL))
 if [ $FAIL -eq 0 ]; then
   echo "ok $PASS/$TOTAL Lua-on-SX tests passed"
diff --git a/lib/lua/transpile.sx b/lib/lua/transpile.sx
index 27be792f..a1124744 100644
--- a/lib/lua/transpile.sx
+++ b/lib/lua/transpile.sx
@@ -437,7 +437,7 @@
                   (list (make-symbol "_for_loop"))))))
           (list (make-symbol "_for_loop")))))))
 
-(define lua-tx-do (fn (node) (lua-tx (nth node 1))))
+(define lua-tx-do (fn (node) (list (make-symbol "let") (list) (lua-tx (nth node 1)))))
 
 (define
   lua-tx-return
diff --git a/plans/lua-on-sx.md b/plans/lua-on-sx.md
index 807a1757..ad93e2ad 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 — **`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).