[internal] do block parsing at the same time as expression parsing

2025-10-27 16:49:31 +00:00 · 2024-01-15 17:10:30 +01:00 · 2024-01-15 17:10:30 +01:00 · 1ea06c63eb
commit 1ea06c63eb
parent 09b73301b4
50 changed files with 240 additions and 249 deletions
--- a/test/results/merge
+++ b/test/results/merge
@ -2,18 +2,18 @@
 --- error ---
 [0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31m[0m[31mabort[0m
 	↳ from [4mtest/tests/merge nested mutable error bis.ans:14:7[0m in call: [2merror("abort")[0m[0m
-	↳ from [4mtest/tests/merge nested mutable error bis.ans:3:1[0m in block: [2minsert(a, b)…[0m[0m
+	↳ from [4mtest/tests/merge nested mutable error bis.ans:4:1[0m in block: [2minsert(a, b)…[0m[0m
 	↳ from [4mtest/tests/merge nested mutable error bis.ans:3:18[0m in call: [2m_[0m[0m
 	↳ from [4mstdlib/script.ans:31:6[0m in call: [2mfn![0m[0m
-	↳ from [4mstdlib/script.ans:29:3[0m in block: [2mresume target = ()…[0m[0m
+	↳ from [4mstdlib/script.ans:30:1[0m in block: [2mresume target = ()…[0m[0m
 	↳ from [4mstdlib/script.ans:29:7[0m in call: [2melse![0m[0m
-	↳ from [4mstdlib/script.ans:25:2[0m in block: [2mif(fn . "current checkpoint")…[0m[0m
-	↳ from [4mstdlib/script.ans:25:9[0m in call: [2m_[0m[0m
+	↳ from [4mstdlib/script.ans:26:1[0m in block: [2mif(fn . "current checkpoint")…[0m[0m
+	↳ from [4mstdlib/script.ans:25:8[0m in call: [2m_[0m[0m
 	↳ from [4mstdlib/script.ans:39:9[0m in call: [2mvalue(s)![0m[0m
-	↳ from [4mstdlib/script.ans:38:1[0m in block: [2mvalue(s)![0m[0m
-	↳ from [4mstdlib/script.ans:38:20[0m in call: [2m_[0m[0m
+	↳ from [4mstdlib/script.ans:39:1[0m in block: [2mvalue(s)![0m[0m
+	↳ from [4mstdlib/script.ans:38:19[0m in call: [2m_[0m[0m
 	↳ from [4mtest/tests/merge nested mutable error bis.ans:19:2[0m in call: [2mf![0m[0m
-	↳ from [4m?[0m in block: [2m:a = *[1]…[0m
+	↳ from [4mtest/tests/merge nested mutable error bis.ans:1:1[0m in block: [2m:a = *[1]…[0m
 --# post run check #--
 --- text ---
 | {}"[1,[2,3]]: " {}"*[1, *[2, 3]]" {}"" |