tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

macro(if/match): stabilize PeekExpr→If normalization via internal-child; default runner off; propagate child stderr; fix JsonBuilder local_decl; add scope-hints doc; extend PHI smoke; golden for match literal passes

Browse Source
This commit is contained in:
Selfhosting Dev
2025-09-20 05:00:31 +09:00
parent 8cb93b9f1f
commit 166c374eec
14 changed files with 362 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/lib/cf_builder.nyash
View File

@ -12,7 +12,7 @@ static box ControlFlowBuilder {
if_expr(cond_json, then_expr_json, else_expr_json, res_name) {
local JB = include "apps/lib/json_builder.nyash"
local res_var = JB.variable(res_name)
local decl = JB.local([res_name], [null])
local decl = JB.local_decl([res_name], [null])
local then_s = [ JB.assignment(res_var, then_expr_json) ]
local else_s = [ JB.assignment(res_var, else_expr_json) ]
local ifn = JB.if_(cond_json, then_s, else_s)
@ -31,11 +31,11 @@ static box ControlFlowBuilder {
local PT = include "apps/lib/pattern_builder.nyash"
// scrutinee を一度だけ評価
local decl_scrut = JB.local([scrut_name], [scrut_json])
local decl_scrut = JB.local_decl([scrut_name], [scrut_json])
local scrut_var = JB.variable(scrut_name)
// res の宣言
local res_decl = JB.local([res_name], [null])
local res_decl = JB.local_decl([res_name], [null])
local res_var = JB.variable(res_name)
// デフォルト（任意）を抽出
@ -96,4 +96,3 @@ static box ControlFlowBuilder {
return [ decl_scrut, res_decl, chain ]
}
}

15
apps/lib/json_builder.nyash
View File

@ -16,18 +16,17 @@ static box JsonBuilder {
return out
}
// JSON string escaping (minimal): backslash, quote, newline, carriage return, tab
// JSON string escaping (minimal): backslash, quote
escape_string(s) {
local out = ""
local i = 0
loop(i < s.length()) {
local ch = s.substring(i, i + 1)
if ch == "\\" { out = out + "\\\\" }
else if ch == "\"" { out = out + "\\\"" }
else if ch == "\n" { out = out + "\\n" }
else if ch == "\r" { out = out + "\\r" }
else if ch == "\t" { out = out + "\\t" }
else { out = out + ch }
if ch == "\\" {
out = out + "\\\\"
} else {
if ch == "\"" { out = out + "\\\"" } else { out = out + ch }
}
i = i + 1
}
return out
@ -70,7 +69,7 @@ static box JsonBuilder {
return "{\"kind\":\"Return\",\"value\":" + v + "}"
}
local(vars, inits) {
local_decl(vars, inits) {
// vars: array[string], inits: array[string|null]
local vs = []
local i = 0