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:
@ -59,6 +59,10 @@ pub struct JoinLoopTrace {
|
||||
mainline_enabled: bool,
|
||||
/// Whether LoopForm debug is enabled (NYASH_LOOPFORM_DEBUG)
|
||||
loopform_enabled: bool,
|
||||
/// Whether JoinIR dev mode is enabled (NYASH_JOINIR_DEV)
|
||||
dev_enabled: bool,
|
||||
/// Whether capture/ConditionEnv construction debug is enabled (NYASH_CAPTURE_DEBUG)
|
||||
capture_enabled: bool,
|
||||
}
|
||||
|
||||
impl JoinLoopTrace {
|
||||
@ -71,6 +75,8 @@ impl JoinLoopTrace {
|
||||
phi_enabled: std::env::var("NYASH_OPTION_C_DEBUG").is_ok(),
|
||||
mainline_enabled: std::env::var("NYASH_JOINIR_MAINLINE_DEBUG").is_ok(),
|
||||
loopform_enabled: std::env::var("NYASH_LOOPFORM_DEBUG").is_ok(),
|
||||
dev_enabled: crate::config::env::joinir_dev_enabled(),
|
||||
capture_enabled: std::env::var("NYASH_CAPTURE_DEBUG").is_ok(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -81,6 +87,8 @@ impl JoinLoopTrace {
|
||||
|| self.phi_enabled
|
||||
|| self.mainline_enabled
|
||||
|| self.loopform_enabled
|
||||
|| self.dev_enabled
|
||||
|| self.capture_enabled
|
||||
}
|
||||
|
||||
/// Check if varmap tracing is enabled
|
||||
@ -199,6 +207,43 @@ impl JoinLoopTrace {
|
||||
}
|
||||
}
|
||||
|
||||
/// Dev-only trace message (NYASH_JOINIR_DEV=1).
|
||||
///
|
||||
/// This is for diagnostics that should never appear in default runs, but are
|
||||
/// useful while developing JoinIR lowering.
|
||||
pub fn dev(&self, tag: &str, msg: &str) {
|
||||
if self.dev_enabled {
|
||||
eprintln!("[trace:dev] {}: {}", tag, msg);
|
||||
}
|
||||
}
|
||||
|
||||
/// Capture/debug output (NYASH_CAPTURE_DEBUG=1).
|
||||
pub fn capture(&self, tag: &str, msg: &str) {
|
||||
if self.capture_enabled {
|
||||
eprintln!("[trace:capture] {}: {}", tag, msg);
|
||||
}
|
||||
}
|
||||
|
||||
/// Emit a message when the caller explicitly enables it (no env checks).
|
||||
///
|
||||
/// This is useful for routing `debug: bool` parameters through a single formatting point,
|
||||
/// instead of scattering ad-hoc `eprintln!`.
|
||||
pub fn emit_if(&self, channel: &str, tag: &str, msg: &str, enabled: bool) {
|
||||
if enabled {
|
||||
eprintln!("[trace:{}] {}: {}", channel, tag, msg);
|
||||
}
|
||||
}
|
||||
|
||||
/// Emit a raw line to stderr when enabled (no formatting).
|
||||
///
|
||||
/// Use this to preserve existing log formats while consolidating the actual `eprintln!`
|
||||
/// call sites into this tracer.
|
||||
pub fn stderr_if(&self, msg: &str, enabled: bool) {
|
||||
if enabled {
|
||||
eprintln!("{}", msg);
|
||||
}
|
||||
}
|
||||
|
||||
/// Trace function routing decisions
|
||||
///
|
||||
/// # Arguments
|
||||
|
||||
Reference in New Issue
Block a user