feat(joinir): Phase 92完了 - ConditionalStep + body-local変数サポート
## Phase 92全体の成果 **Phase 92 P0-P2**: ConditionalStep JoinIR生成とbody-local変数サポート - ConditionalStep(条件付きキャリア更新)のJoinIR生成実装 - Body-local変数(ch等)の条件式での参照サポート - 変数解決優先度: ConditionEnv → LoopBodyLocalEnv **Phase 92 P3**: BodyLocalPolicyBox + 安全ガード - BodyLocalPolicyDecision実装(Accept/Reject判定) - BodyLocalSlot + DualValueRewriter(JoinIR/MIR二重書き込み) - Fail-Fast契約(Cannot promote LoopBodyLocal検出) **Phase 92 P4**: E2E固定+回帰最小化 (本コミット) - Unit test 3本追加(body-local変数解決検証) - Integration smoke追加(phase92_pattern2_baseline.sh、2ケースPASS) - P4-E2E-PLAN.md、P4-COMPLETION.md作成 ## 主要な実装 ### ConditionalStep(条件付きキャリア更新) - `conditional_step_emitter.rs`: JoinIR Select命令生成 - `loop_with_break_minimal.rs`: ConditionalStep検出と統合 - `loop_with_continue_minimal.rs`: Pattern4対応 ### Body-local変数サポート - `condition_lowerer.rs`: body-local変数解決機能 - `lower_condition_to_joinir`: body_local_env パラメータ追加 - 変数解決優先度実装(ConditionEnv優先) - Unit test 3本追加: 変数解決/優先度/エラー - `header_break_lowering.rs`: break条件でbody-local変数参照 - 7ファイルで後方互換ラッパー(lower_condition_to_joinir_no_body_locals) ### Body-local Policy & Safety - `body_local_policy.rs`: BodyLocalPolicyDecision(Accept/Reject) - `body_local_slot.rs`: JoinIR/MIR二重書き込み - `dual_value_rewriter.rs`: ValueId書き換えヘルパー ## テスト体制 ### Unit Tests (+3) - `test_body_local_variable_resolution`: body-local変数解決 - `test_variable_resolution_priority`: 変数解決優先度(ConditionEnv優先) - `test_undefined_variable_error`: 未定義変数エラー - 全7テストPASS(cargo test --release condition_lowerer::tests) ### Integration Smoke (+1) - `phase92_pattern2_baseline.sh`: - Case A: loop_min_while.hako (Pattern2 baseline) - Case B: phase92_conditional_step_minimal.hako (条件付きインクリメント) - 両ケースPASS、integration profileで発見可能 ### 退行確認 - ✅ 既存Pattern2Breakテスト正常(退行なし) - ✅ Phase 135 smoke正常(MIR検証PASS) ## アーキテクチャ設計 ### 変数解決メカニズム ```rust // Priority 1: ConditionEnv (loop params, captured) if let Some(value_id) = env.get(name) { return Ok(value_id); } // Priority 2: LoopBodyLocalEnv (body-local like `ch`) if let Some(body_env) = body_local_env { if let Some(value_id) = body_env.get(name) { return Ok(value_id); } } ``` ### Fail-Fast契約 - Delta equality check (conditional_step_emitter.rs) - Variable resolution error messages (ConditionEnv) - Body-local promotion rejection (BodyLocalPolicyDecision::Reject) ## ドキュメント - `P4-E2E-PLAN.md`: 3レベルテスト戦略(Level 1-2完了、Level 3延期) - `P4-COMPLETION.md`: Phase 92完了報告 - `README.md`: Phase 92全体のまとめ ## 将来の拡張(Phase 92スコープ外) - Body-local promotionシステム拡張 - P5bパターン認識の汎化(flagベース条件サポート) - 完全なP5b E2Eテスト(body-local promotion実装後) 🎯 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
42
apps/tests/phase92_conditional_step_minimal.hako
Normal file
42
apps/tests/phase92_conditional_step_minimal.hako
Normal file
@ -0,0 +1,42 @@
|
||||
// Phase 92 P4-1: Minimal E2E test for ConditionalStep support
|
||||
//
|
||||
// This test verifies that ConditionalStep (conditional carrier increment)
|
||||
// works correctly in Pattern2 with break conditions.
|
||||
//
|
||||
// Pattern: Simple conditional increment based on loop variable
|
||||
// Expected output: 3
|
||||
//
|
||||
// Why 3?
|
||||
// - i=0: flag==0, so i becomes 1
|
||||
// - i=1: flag==0, so i becomes 2
|
||||
// - i=2: flag==0, so i becomes 3
|
||||
// - i=3: break condition triggers
|
||||
//
|
||||
// Phase 92 scope: This test does NOT use body-local variables in conditions
|
||||
// to avoid body-local promotion issues (which are outside Phase 92 scope).
|
||||
|
||||
static box Main {
|
||||
main() {
|
||||
local i = 0
|
||||
local flag = 0 // Condition variable (not body-local)
|
||||
|
||||
loop(i < 10) {
|
||||
// Break condition (uses loop variable only)
|
||||
if i == 3 {
|
||||
break
|
||||
}
|
||||
|
||||
// Conditional increment (ConditionalStep pattern)
|
||||
// Note: In real P5b patterns, this would be: if ch == '\\' { i = i + 2 } else { i = i + 1 }
|
||||
// But we use flag to avoid body-local promotion issues
|
||||
if flag == 1 {
|
||||
i = i + 2
|
||||
} else {
|
||||
i = i + 1
|
||||
}
|
||||
}
|
||||
|
||||
print(i)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user