feat(mir): Phase 137-5 - Decision Policy SSOT化完了
## 目的 Canonicalizer の RoutingDecision.chosen を「lowerer 選択の最終結果」にする (構造クラス名ではなく ExitContract ベースの決定) ## 実装内容 ### 1. Canonicalizer の決定ロジック修正 - `src/mir/loop_canonicalizer/mod.rs` - `skip_whitespace` パターン認識で ExitContract (has_break=true) を考慮 - Pattern3IfPhi → Pattern2Break に修正(構造は似ているが break あり) - 単体テスト更新(Pattern2Break 期待に変更) ### 2. Parity 検証テスト修正 - `src/mir/builder/control_flow/joinir/routing.rs` - `test_parity_check_mismatch_detected` → `test_parity_check_skip_whitespace_match` - Canonicalizer と Router の一致を検証(ミスマッチ検出からマッチ検証へ) - Phase 137-5 の SSOT 原則を反映 ### 3. ドキュメント更新 - `docs/development/current/main/design/loop-canonicalizer.md` - Phase 137-5: Decision Policy SSOT セクション追加 - ExitContract 優先の原則を明記 - skip_whitespace の例を追加 - `docs/development/current/main/phases/phase-137/README.md` - Phase 4 完了マーク追加 - Phase 5 完了セクション追加(実装・検証・効果) ## 検証結果 - ✅ 単体テスト: `cargo test --release --lib loop_canonicalizer::tests` (11/11 passed) - ✅ Parity テスト: `cargo test --release --lib 'routing::tests::test_parity'` (2/2 passed) - ✅ Strict モード: `HAKO_JOINIR_STRICT=1` で skip_whitespace parity OK ## 効果 - Router と Canonicalizer の pattern 選択が一致 - ExitContract が pattern 決定の SSOT として明確化 - 構造的特徴(if-else 等)は notes に記録(将来拡張に備える) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@ -503,8 +503,10 @@ pub fn canonicalize_loop_expr(
|
||||
break_has_value: false,
|
||||
};
|
||||
|
||||
// Success! Return Pattern3WithIfPhi
|
||||
let decision = RoutingDecision::success(LoopPatternKind::Pattern3IfPhi);
|
||||
// Phase 137-5: Decision policy SSOT - ExitContract determines pattern choice
|
||||
// Since has_break=true, this should route to Pattern2Break (not Pattern3IfPhi)
|
||||
// Pattern3IfPhi is for if-else PHI *without* break statements
|
||||
let decision = RoutingDecision::success(LoopPatternKind::Pattern2Break);
|
||||
return Ok((skeleton, decision));
|
||||
}
|
||||
|
||||
@ -694,7 +696,8 @@ mod tests {
|
||||
|
||||
// Verify success
|
||||
assert!(decision.is_success());
|
||||
assert_eq!(decision.chosen, Some(LoopPatternKind::Pattern3IfPhi));
|
||||
// Phase 137-5: Pattern choice reflects ExitContract (has_break=true → Pattern2Break)
|
||||
assert_eq!(decision.chosen, Some(LoopPatternKind::Pattern2Break));
|
||||
assert_eq!(decision.missing_caps.len(), 0);
|
||||
|
||||
// Verify skeleton structure
|
||||
@ -804,7 +807,8 @@ mod tests {
|
||||
|
||||
// Verify success
|
||||
assert!(decision.is_success());
|
||||
assert_eq!(decision.chosen, Some(LoopPatternKind::Pattern3IfPhi));
|
||||
// Phase 137-5: Pattern choice reflects ExitContract (has_break=true → Pattern2Break)
|
||||
assert_eq!(decision.chosen, Some(LoopPatternKind::Pattern2Break));
|
||||
|
||||
// Verify skeleton has Body step
|
||||
assert_eq!(skeleton.steps.len(), 3); // HeaderCond + Body + Update
|
||||
|
||||
Reference in New Issue
Block a user