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

feat(stageb): add shallow recursion guards to bundle and using resolvers

Browse Source
This commit is contained in:
nyash-codex
2025-11-17 18:00:44 +09:00
parent bcefdad9eb
commit 3c3e734f49
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lang/src/compiler/entry/bundle_resolver.hako
View File

@ -7,6 +7,15 @@ static box BundleResolver {
// - --require-mod Name must appear in named bundles ([bundle/missing] Name) // - --require-mod Name must appear in named bundles ([bundle/missing] Name)
// - Merge order: bundle-src* → bundle-mod* (in given order) // - Merge order: bundle-src* → bundle-mod* (in given order)
resolve(bundle_srcs, bundle_names, bundle_mod_srcs, require_mods) { resolve(bundle_srcs, bundle_names, bundle_mod_srcs, require_mods) {
// Shallow recursion guard to prevent accidental self-recursion in Stage‑B bundler.
{
local depth = env.get("HAKO_STAGEB_BUNDLE_DEPTH")
if depth != null && ("" + depth) != "0" {
print("[stageb/recursion] BundleResolver.resolve recursion detected")
return null
}
env.set("HAKO_STAGEB_BUNDLE_DEPTH", "1")
}
// Alias table via env: HAKO_BUNDLE_ALIAS_TABLE / NYASH_BUNDLE_ALIAS_TABLE // Alias table via env: HAKO_BUNDLE_ALIAS_TABLE / NYASH_BUNDLE_ALIAS_TABLE
// Format: entries separated by '|||', each entry as 'Name:code' // Format: entries separated by '|||', each entry as 'Name:code'
local table = env.get("HAKO_BUNDLE_ALIAS_TABLE") local table = env.get("HAKO_BUNDLE_ALIAS_TABLE")
@ -101,6 +110,8 @@ static box BundleResolver {
local i2 = 0; local m2 = bundle_mod_srcs.length() local i2 = 0; local m2 = bundle_mod_srcs.length()
loop(i2 < m2) { merged = merged + bundle_mod_srcs.get(i2) + "\n" i2 = i2 + 1 } loop(i2 < m2) { merged = merged + bundle_mod_srcs.get(i2) + "\n" i2 = i2 + 1 }
} }
// Clear depth guard before returning
env.set("HAKO_STAGEB_BUNDLE_DEPTH", "0")
return merged return merged
} }
} }

12
lang/src/compiler/entry/using_resolver_box.hako
View File

@ -14,6 +14,16 @@ using selfhost.shared.json.utils.json_frag as JsonFragBox
static box Stage1UsingResolverBox { static box Stage1UsingResolverBox {
resolve_for_source(src) { resolve_for_source(src) {
// Shallow recursion guard to prevent accidental self-recursion in Stage‑1 using resolver.
{
local depth = env.get("HAKO_STAGEB_USING_DEPTH")
if depth != null && ("" + depth) != "0" {
print("[stageb/recursion] Stage1UsingResolverBox.resolve_for_source recursion detected")
return ""
}
env.set("HAKO_STAGEB_USING_DEPTH", "1")
}
if src == null { return "" } if src == null { return "" }
local apply_flag = env.get("HAKO_STAGEB_APPLY_USINGS") local apply_flag = env.get("HAKO_STAGEB_APPLY_USINGS")
if apply_flag != null && ("" + apply_flag) == "0" { return "" } if apply_flag != null && ("" + apply_flag) == "0" { return "" }
@ -52,6 +62,8 @@ static box Stage1UsingResolverBox {
i = i + 1 i = i + 1
} }
// Clear depth guard before returning
env.set("HAKO_STAGEB_USING_DEPTH", "0")
return prefix return prefix
} }