Phase 30.1 & 73: Stage-3 features env and JoinIR flag cleanup

This commit is contained in:
nyash-codex
2025-11-30 14:30:28 +09:00
parent 2ea0f2a202
commit a3d5bacc55
163 changed files with 638 additions and 576 deletions

View File

@ -26,8 +26,7 @@ fn phase49_joinir_mainline_pipeline_smoke() {
// Phase 49 mainline route は dev フラグで制御
std::env::set_var("HAKO_JOINIR_PRINT_TOKENS_MAIN", "1");
std::env::set_var("NYASH_JOINIR_MAINLINE_DEBUG", "1");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
// print_tokens を含む最小限の JsonTokenizer 定義
@ -77,8 +76,7 @@ static box Main {
// クリーンアップ
std::env::remove_var("HAKO_JOINIR_PRINT_TOKENS_MAIN");
std::env::remove_var("NYASH_JOINIR_MAINLINE_DEBUG");
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}
@ -87,8 +85,7 @@ static box Main {
fn phase49_joinir_mainline_fallback_without_flag() {
// dev フラグ OFF
std::env::remove_var("HAKO_JOINIR_PRINT_TOKENS_MAIN");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
let src = r#"
@ -128,8 +125,7 @@ static box Main {
);
// クリーンアップ
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}
@ -166,8 +162,7 @@ static box Main {
// Route A: Legacy path (flag OFF)
std::env::remove_var("HAKO_JOINIR_PRINT_TOKENS_MAIN");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
let ast_a: ASTNode =
@ -183,9 +178,8 @@ static box Main {
let blocks_a: usize = module_a.functions.values().map(|f| f.blocks.len()).sum();
// Route B: JoinIR Frontend path (flag ON)
// Re-set parser flags to ensure they're active
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
// Re-set flags to ensure they're active
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
std::env::set_var("HAKO_JOINIR_PRINT_TOKENS_MAIN", "1");
@ -213,8 +207,7 @@ static box Main {
// クリーンアップ
std::env::remove_var("HAKO_JOINIR_PRINT_TOKENS_MAIN");
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}
@ -229,8 +222,7 @@ fn phase49_joinir_array_filter_smoke() {
// Phase 49-4 mainline route は dev フラグで制御
std::env::set_var("HAKO_JOINIR_ARRAY_FILTER_MAIN", "1");
std::env::set_var("NYASH_JOINIR_MAINLINE_DEBUG", "1");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
// ArrayExtBox.filter 簡易実装if-in-loop パターン)
@ -274,8 +266,7 @@ static box Main {
// クリーンアップ
std::env::remove_var("HAKO_JOINIR_ARRAY_FILTER_MAIN");
std::env::remove_var("NYASH_JOINIR_MAINLINE_DEBUG");
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}
@ -284,8 +275,7 @@ static box Main {
fn phase49_joinir_array_filter_fallback() {
// dev フラグ OFF
std::env::remove_var("HAKO_JOINIR_ARRAY_FILTER_MAIN");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
let src = r#"
@ -325,8 +315,7 @@ static box Main {
);
// クリーンアップ
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}
@ -360,8 +349,7 @@ static box Main {
// Route A: Legacy path (flag OFF)
std::env::remove_var("HAKO_JOINIR_ARRAY_FILTER_MAIN");
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
let ast_a: ASTNode =
@ -377,8 +365,7 @@ static box Main {
let blocks_a: usize = module_a.functions.values().map(|f| f.blocks.len()).sum();
// Route B: JoinIR Frontend path (flag ON)
std::env::set_var("NYASH_PARSER_STAGE3", "1");
std::env::set_var("HAKO_PARSER_STAGE3", "1");
std::env::set_var("NYASH_FEATURES", "stage3");
std::env::set_var("NYASH_DISABLE_PLUGINS", "1");
std::env::set_var("HAKO_JOINIR_ARRAY_FILTER_MAIN", "1");
@ -402,7 +389,6 @@ static box Main {
// クリーンアップ
std::env::remove_var("HAKO_JOINIR_ARRAY_FILTER_MAIN");
std::env::remove_var("NYASH_PARSER_STAGE3");
std::env::remove_var("HAKO_PARSER_STAGE3");
std::env::remove_var("NYASH_FEATURES");
std::env::remove_var("NYASH_DISABLE_PLUGINS");
}