feat(joinir): Phase 27.12 完了 - Stage1UsingResolver 骨格+テスト実装
Phase 27.12 実装内容: - ✅ JoinIR lowering 骨格実装 (169行) - stage1_using_resolver.rs 新規作成 - Shared Builder Pattern 適用 - MIR-based/handwritten 両経路対応 - ✅ テスト基盤整備 (3本) - auto_lowering テスト (#[ignore] + トグル) - type_sanity テスト (常時実行) - no_panic テスト (軽量) - ✅ ドキュメント更新 - 論文に Phase 27.12 完了記録 - IMPLEMENTATION_LOG.md 完了マーク - TASKS.md チェックボックス更新 技術詳細: - LoopForm Case A (loop(i < n)) - Pinned: entries/n/modules/seen - Carrier: i/prefix - Exit: prefix - CFG sanity checks 骨格実装 - Graceful degradation 設計 ビルド: ✅ 成功 (0 エラー) 次: Phase 27.13 JoinIR 本実装 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
128
src/tests/mir_joinir_stage1_using_resolver_min.rs
Normal file
128
src/tests/mir_joinir_stage1_using_resolver_min.rs
Normal file
@ -0,0 +1,128 @@
|
||||
// mir_joinir_stage1_using_resolver_min.rs
|
||||
// Phase 27.12: Stage1UsingResolverBox.resolve_for_source minimal loop JoinIR変換テスト
|
||||
//
|
||||
// 目的:
|
||||
// - Stage1UsingResolverBox.resolve_for_source の entries ループ(lines 44-91)の JoinIR 変換動作確認
|
||||
// - LoopForm Case A (`loop(i < n)`) パターンの変換検証
|
||||
// - Pinned/Carrier/Exit 設計の実装確認
|
||||
//
|
||||
// 実行条件:
|
||||
// - デフォルトでは #[ignore] にしておいて手動実行用にする
|
||||
// - 環境変数 NYASH_JOINIR_EXPERIMENT=1 で実験モード有効化
|
||||
//
|
||||
// Phase 27.12 設計:
|
||||
// - Pinned: entries (ArrayBox), n (Integer), modules (MapBox), seen (MapBox)
|
||||
// - Carrier: i (Integer), prefix (String)
|
||||
// - Exit: prefix (String - 最終的な連結文字列)
|
||||
//
|
||||
// LoopForm Case A:
|
||||
// - 動的条件: `loop(i < n)`
|
||||
// - break: なし(常に i < n までループ)
|
||||
// - continue: `i = next_i` で統一
|
||||
|
||||
use crate::ast::ASTNode;
|
||||
use crate::mir::join_ir::*;
|
||||
use crate::mir::{MirCompiler, ValueId};
|
||||
use crate::parser::NyashParser;
|
||||
|
||||
#[test]
|
||||
#[ignore] // 手動実行用(Phase 27.12 実験段階)
|
||||
fn mir_joinir_stage1_using_resolver_auto_lowering() {
|
||||
// Phase 27.12: Stage1UsingResolverBox.resolve_for_source の MIR → JoinIR 自動変換
|
||||
|
||||
// 環境変数トグルチェック
|
||||
if std::env::var("NYASH_JOINIR_EXPERIMENT").ok().as_deref() != Some("1") {
|
||||
eprintln!("[joinir/stage1_using_resolver] NYASH_JOINIR_EXPERIMENT=1 not set, skipping auto-lowering test");
|
||||
return;
|
||||
}
|
||||
|
||||
// Step 1: MIR までコンパイル
|
||||
// Stage-3 parser を有効化(local キーワード対応)
|
||||
std::env::set_var("NYASH_PARSER_STAGE3", "1");
|
||||
std::env::set_var("HAKO_PARSER_STAGE3", "1");
|
||||
|
||||
let test_file = "lang/src/compiler/entry/using_resolver_box.hako";
|
||||
let src = std::fs::read_to_string(test_file)
|
||||
.unwrap_or_else(|_| panic!("Failed to read {}", test_file));
|
||||
|
||||
let ast: ASTNode = NyashParser::parse_from_string(&src)
|
||||
.expect("stage1_using_resolver: parse failed");
|
||||
|
||||
let mut mc = MirCompiler::with_options(false);
|
||||
let compiled = mc.compile(ast).expect("stage1_using_resolver: MIR compile failed");
|
||||
|
||||
eprintln!(
|
||||
"[joinir/stage1_using_resolver] MIR module compiled, {} functions",
|
||||
compiled.module.functions.len()
|
||||
);
|
||||
|
||||
// Step 2: MIR → JoinIR 自動変換
|
||||
let join_module = lower_stage1_usingresolver_to_joinir(&compiled.module);
|
||||
|
||||
// Phase 27.12 MVP: 骨格実装のみ、JoinIR は None を返す
|
||||
if join_module.is_none() {
|
||||
eprintln!("[joinir/stage1_using_resolver] TODO: JoinIR construction not yet implemented (Phase 27.12 skeleton)");
|
||||
eprintln!("[joinir/stage1_using_resolver] ✅ Skeleton OK - handwritten/MIR paths dispatch correctly");
|
||||
return;
|
||||
}
|
||||
|
||||
let join_module = join_module.unwrap();
|
||||
|
||||
eprintln!("[joinir/stage1_using_resolver] JoinIR module generated:");
|
||||
eprintln!("{:#?}", join_module);
|
||||
|
||||
// Step 3: 妥当性検証(Phase 27.13 以降で実装)
|
||||
assert_eq!(join_module.functions.len(), 2, "Expected 2 functions (resolve_entries + loop_step)");
|
||||
|
||||
let resolve_id = JoinFuncId::new(0);
|
||||
let loop_step_id = JoinFuncId::new(1);
|
||||
|
||||
// resolve_entries 関数の検証
|
||||
let resolve_func = join_module.functions.get(&resolve_id)
|
||||
.expect("resolve_entries function not found");
|
||||
assert_eq!(resolve_func.name, "resolve_entries");
|
||||
assert_eq!(resolve_func.params.len(), 5, "resolve_entries has 5 parameters (entries, n, modules, seen, prefix_init)");
|
||||
|
||||
// loop_step 関数の検証
|
||||
let loop_step_func = join_module.functions.get(&loop_step_id)
|
||||
.expect("loop_step function not found");
|
||||
assert_eq!(loop_step_func.name, "loop_step");
|
||||
assert_eq!(loop_step_func.params.len(), 6, "loop_step has 6 parameters (entries, n, modules, seen, prefix, i)");
|
||||
|
||||
eprintln!("[joinir/stage1_using_resolver] ✅ 自動変換成功(Phase 27.12/27.13)");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mir_joinir_stage1_using_resolver_type_sanity() {
|
||||
// Phase 27.12: 型定義の基本的なサニティチェック(常時実行)
|
||||
// stage1_using_resolver 用の JoinFunction が作成できることを確認
|
||||
|
||||
let resolve_id = JoinFuncId::new(20);
|
||||
let resolve_func = JoinFunction::new(
|
||||
resolve_id,
|
||||
"stage1_using_resolver_test".to_string(),
|
||||
vec![ValueId(1), ValueId(2), ValueId(3), ValueId(4), ValueId(5)],
|
||||
);
|
||||
|
||||
assert_eq!(resolve_func.id, resolve_id);
|
||||
assert_eq!(resolve_func.name, "stage1_using_resolver_test");
|
||||
assert_eq!(resolve_func.params.len(), 5);
|
||||
assert_eq!(resolve_func.body.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mir_joinir_stage1_using_resolver_no_panic() {
|
||||
// Phase 27.12: トグル無し軽量テスト(panic しないことだけ確認)
|
||||
// この段階では JoinModule は None を返すが、dispatcher が正しく動作することを確認
|
||||
|
||||
// 最小限の MIR モジュールを作成
|
||||
use crate::mir::MirModule;
|
||||
let test_module = MirModule::new();
|
||||
|
||||
// Phase 27.12: 骨格実装では None が返される
|
||||
let result = lower_stage1_usingresolver_to_joinir(&test_module);
|
||||
|
||||
// panic しなければ OK
|
||||
eprintln!("[joinir/stage1_using_resolver] no_panic test: result is None (expected for Phase 27.12 skeleton)");
|
||||
assert!(result.is_none(), "Phase 27.12 skeleton should return None");
|
||||
}
|
||||
@ -14,6 +14,7 @@ pub mod mir_funcscanner_ssa;
|
||||
pub mod mir_joinir_min; // Phase 26-H: JoinIR型定義妥当性確認
|
||||
pub mod mir_joinir_skip_ws; // Phase 27.0: minimal_ssa_skip_ws JoinIR変換
|
||||
pub mod mir_joinir_funcscanner_trim; // Phase 27.1: FuncScannerBox.trim JoinIR変換
|
||||
pub mod mir_joinir_stage1_using_resolver_min; // Phase 27.12: Stage1UsingResolverBox.resolve_for_source JoinIR変換
|
||||
pub mod joinir_runner_min; // Phase 27.2: JoinIR 実行器 A/B 比較テスト
|
||||
pub mod mir_locals_ssa;
|
||||
pub mod mir_loopform_conditional_reassign;
|
||||
|
||||
Reference in New Issue
Block a user