0dc9b838d6
Phase 179 Task 1: Modular separation for single responsibility Changes: - NEW: carrier_update_emitter.rs (416 lines) - emit_carrier_update() function + 6 unit tests - Focused module for UpdateExpr → JoinInst conversion - REDUCED: loop_with_break_minimal.rs (998→597 lines, -401 lines) - Removed emit_carrier_update() and carrier_update_tests module - Now imports from carrier_update_emitter - UPDATED: mod.rs - added carrier_update_emitter module Benefits: - Single responsibility: carrier update emission isolated - Reusability: can be used by Pattern 3, 4, and future patterns - Testability: independent unit tests - Maintainability: 40% size reduction in loop_with_break_minimal.rs Note: Pre-existing test failure in test_pattern2_accepts_loop_param_only is unrelated to this refactoring (test expects 1 var but gets 3 due to literal "10" and "5" being counted as variables).
233 lines
10 KiB
Rust
233 lines
10 KiB
Rust
//! JoinIR Lowering Functions
|
||
//!
|
||
//! Phase 27.9: Modular separation of MIR → JoinIR lowering implementations.
|
||
//! Phase 33-12: Router-based If/Loop lowering organization.
|
||
//!
|
||
//! このモジュールは各種 MIR 関数を JoinIR に変換する lowering 関数を提供します。
|
||
//!
|
||
//! ## 構成:
|
||
//! - `common.rs`: CFG sanity checks と lowering 共通ユーティリティ（Phase 27.10）
|
||
//! - `value_id_ranges.rs`: ValueId 範囲管理（Phase 27.13+）
|
||
//! - `min_loop.rs`: JoinIrMin.main/0 専用の最小ループ lowering
|
||
//! - `skip_ws.rs`: Main.skip/1 の空白スキップ lowering（手書き版＋MIR自動解析版）
|
||
//! - `funcscanner_trim.rs`: FuncScannerBox.trim/1 の trim lowering
|
||
//! - `stage1_using_resolver.rs`: Stage1UsingResolverBox.resolve_for_source entries loop lowering（Phase 27.12）
|
||
//! - `funcscanner_append_defs.rs`: FuncScannerBox._append_defs/2 の配列結合 lowering（Phase 27.14）
|
||
//! - `if_select.rs`: Phase 33 If/Else → Select lowering
|
||
//! - `if_dry_runner.rs`: Phase 33-10 If lowering dry-run スキャナー（箱化版）
|
||
//! - `bool_expr_lowerer.rs`: Phase 168 Boolean expression lowering (AST → SSA)
|
||
//! - `if_lowering_router.rs`: Phase 33-12 If-expression routing (Select/IfMerge dispatcher)
|
||
//! - `loop_pattern_router.rs`: Phase 33-12 Loop pattern routing (Pattern 1-4 dispatcher)
|
||
|
||
pub mod bool_expr_lowerer; // Phase 168: Boolean expression lowering for complex conditions
|
||
pub mod carrier_info; // Phase 196: Carrier metadata for loop lowering
|
||
pub mod carrier_update_emitter; // Phase 179: Carrier update instruction emission
|
||
pub mod common;
|
||
pub mod condition_env; // Phase 171-fix: Condition expression environment
|
||
pub mod condition_lowerer; // Phase 171-fix: Core condition lowering logic
|
||
pub mod condition_to_joinir; // Phase 169: JoinIR condition lowering orchestrator (refactored)
|
||
pub mod condition_var_extractor; // Phase 171-fix: Variable extraction from condition AST
|
||
pub mod continue_branch_normalizer; // Phase 33-19: Continue branch normalization for Pattern B
|
||
pub mod loop_update_analyzer; // Phase 197: Update expression analyzer for carrier semantics
|
||
pub mod loop_update_summary; // Phase 170-C-2: Update pattern summary for shape detection
|
||
pub mod exit_args_resolver;
|
||
pub mod funcscanner_append_defs;
|
||
pub mod funcscanner_trim;
|
||
pub mod generic_case_a; // Phase 192: Modularized Case A lowering
|
||
pub mod generic_type_resolver; // Phase 66: P3-C ジェネリック型推論箱
|
||
pub mod method_return_hint; // Phase 83: P3-D 既知メソッド戻り値型推論箱
|
||
pub mod if_dry_runner; // Phase 33-10.0
|
||
pub mod if_lowering_router; // Phase 33-12: If-expression routing
|
||
pub mod if_merge; // Phase 33-7
|
||
pub mod if_phi_context; // Phase 61-1
|
||
pub mod if_phi_spec; // Phase 61-2
|
||
pub mod if_select; // Phase 33
|
||
pub mod inline_boundary; // Phase 188-Impl-3: JoinIR→Host boundary
|
||
pub mod inline_boundary_builder; // Phase 200-2: Builder pattern for JoinInlineBoundary
|
||
pub mod loop_form_intake;
|
||
pub mod loop_pattern_router; // Phase 33-12: Loop pattern routing
|
||
pub mod loop_pattern_validator; // Phase 33-23: Loop structure validation
|
||
pub mod loop_patterns; // Phase 188: Pattern-based loop lowering (3 patterns)
|
||
pub mod loop_scope_shape;
|
||
pub mod loop_to_join;
|
||
pub mod loop_view_builder; // Phase 33-23: Loop lowering dispatch
|
||
pub mod loop_with_break_minimal; // Phase 188-Impl-2: Pattern 2 minimal lowerer
|
||
pub mod loop_with_continue_minimal; // Phase 195: Pattern 4 minimal lowerer
|
||
pub mod loop_with_if_phi_minimal; // Phase 188-Impl-3: Pattern 3 minimal lowerer
|
||
pub mod simple_while_minimal; // Phase 188-Impl-1: Pattern 1 minimal lowerer
|
||
pub mod min_loop;
|
||
pub mod skip_ws;
|
||
pub mod stage1_using_resolver;
|
||
pub mod stageb_body;
|
||
pub mod stageb_funcscanner;
|
||
pub mod type_hint_policy; // Phase 65.5: 型ヒントポリシー箱化
|
||
pub mod type_inference; // Phase 65-2-A
|
||
pub mod value_id_ranges;
|
||
|
||
// Re-export public lowering functions
|
||
pub use funcscanner_append_defs::lower_funcscanner_append_defs_to_joinir;
|
||
pub use funcscanner_trim::lower_funcscanner_trim_to_joinir;
|
||
// Phase 200-2: Builder pattern
|
||
pub use inline_boundary_builder::JoinInlineBoundaryBuilder;
|
||
// Phase 31: LoopToJoinLowerer 統一箱
|
||
pub use loop_to_join::LoopToJoinLowerer;
|
||
// Phase 188: Pattern-based loop lowering
|
||
pub use loop_with_if_phi_minimal::lower_loop_with_if_phi_pattern;
|
||
// Phase 30 F-3: 旧 lower_case_a_loop_to_joinir_for_minimal_skip_ws は _with_scope に置き換え済みのため削除
|
||
pub use min_loop::lower_min_loop_to_joinir;
|
||
pub use skip_ws::lower_skip_ws_to_joinir;
|
||
pub use stage1_using_resolver::lower_stage1_usingresolver_to_joinir;
|
||
pub use stageb_body::lower_stageb_body_to_joinir;
|
||
pub use stageb_funcscanner::lower_stageb_funcscanner_to_joinir;
|
||
|
||
// Phase 33-12: Re-export router functions (backward compatibility)
|
||
pub use if_lowering_router::try_lower_if_to_joinir;
|
||
pub use loop_pattern_router::try_lower_loop_pattern_to_joinir;
|
||
|
||
/// Phase 33-9.1: Loop lowering対象関数の判定
|
||
///
|
||
/// これらの関数は Phase 32/33 で LoopToJoinLowerer によって処理されます。
|
||
/// If lowering (Select/IfMerge) の対象から除外することで、Loop/If の責務を明確に分離します。
|
||
///
|
||
/// Phase 82 SSOT: JOINIR_TARGETS テーブルから Exec 対象を参照
|
||
/// （テーブルは vm_bridge_dispatch/targets.rs で一元管理）
|
||
///
|
||
/// ## 対象関数（6本）
|
||
/// - Main.skip/1: 空白スキップループ
|
||
/// - FuncScannerBox.trim/1: 前後空白削除ループ
|
||
/// - FuncScannerBox.append_defs/2: 配列結合ループ
|
||
/// - Stage1UsingResolverBox.resolve_for_source/5: using解析ループ
|
||
/// - StageBBodyExtractorBox.build_body_src/2: Stage-B本体抽出ループ
|
||
/// - StageBFuncScannerBox.scan_all_boxes/1: Stage-B Box走査ループ
|
||
///
|
||
/// ## 将来の拡張
|
||
/// NYASH_JOINIR_LOWER_GENERIC=1 で汎用 Case-A ループにも拡張可能
|
||
pub(crate) fn is_loop_lowered_function(name: &str) -> bool {
|
||
// Phase 82 SSOT: vm_bridge_dispatch テーブルから Loop 関数を抽出
|
||
// Phase 33-9.1: If lowering の除外対象は、JOINIR_TARGETS に登録されたすべての関数
|
||
// （Exec/LowerOnly 問わず、ループ専任関数として Loop lowering で処理）
|
||
crate::mir::join_ir_vm_bridge_dispatch::JOINIR_TARGETS
|
||
.iter()
|
||
.any(|t| t.func_name == name)
|
||
}
|
||
|
||
// ============================================================================
|
||
// Phase 80: JoinIR Mainline Unification - Core ON 時の本線化判定
|
||
// ============================================================================
|
||
|
||
/// Phase 80: JoinIR 本線化対象（Loop）の判定
|
||
///
|
||
/// `joinir_core_enabled()=true` の時、これらの関数のループは
|
||
/// 必ず JoinIR → MIR 経路を本線として試行します。
|
||
pub fn is_loop_mainline_target(name: &str) -> bool {
|
||
is_loop_lowered_function(name)
|
||
}
|
||
|
||
/// Phase 80/184: JoinIR 本線化対象（If）の判定
|
||
///
|
||
/// `joinir_core_enabled()=true` の時、これらの関数の if/else は
|
||
/// 必ず JoinIR → MIR 経路を本線として試行します。
|
||
///
|
||
/// Phase 184: JOINIR_IF_TARGETS テーブルからの参照に変更
|
||
pub fn is_if_mainline_target(name: &str) -> bool {
|
||
crate::mir::join_ir_vm_bridge_dispatch::is_if_lowered_function(name)
|
||
}
|
||
|
||
/// Phase 80: Core ON 時に JoinIR を本線として試行すべきか判定
|
||
///
|
||
/// Returns true if:
|
||
/// - `joinir_core_enabled()=true` AND
|
||
/// - 関数が本線化対象 (Loop or If)
|
||
pub fn should_try_joinir_mainline(func_name: &str, is_loop: bool) -> bool {
|
||
if !crate::config::env::joinir_core_enabled() {
|
||
return false;
|
||
}
|
||
if is_loop {
|
||
is_loop_mainline_target(func_name)
|
||
} else {
|
||
is_if_mainline_target(func_name)
|
||
}
|
||
}
|
||
|
||
/// Phase 80/81: Strict モードで JoinIR lowering 失敗時にパニックすべきか判定
|
||
pub fn should_panic_on_joinir_failure(func_name: &str, is_loop: bool) -> bool {
|
||
if !crate::config::env::joinir_strict_enabled() {
|
||
return false;
|
||
}
|
||
should_try_joinir_mainline(func_name, is_loop)
|
||
}
|
||
|
||
/// Phase 61-4/184: ループ外 If の JoinIR 対象関数判定
|
||
///
|
||
/// HAKO_JOINIR_IF_TOPLEVEL=1 有効時に、ループ外 if の JoinIR 経路を試行する関数。
|
||
/// Phase 184: JOINIR_IF_TARGETS テーブルに統一（SSOT化）
|
||
///
|
||
/// ## 対象関数（テーブル管理）
|
||
/// - IfSelectTest.*: テスト専用関数群
|
||
/// - IfMergeTest.*: 複数変数テスト（Phase 33-7）
|
||
/// - IfToplevelTest.*: ループ外 if テスト専用（Phase 61-4）
|
||
/// - JsonShapeToMap._read_value_from_pair/1: Phase 33-4 Stage-1 実用関数
|
||
/// - Stage1JsonScannerBox.value_start_after_key_pos/2: Phase 33-4 Stage-B 実用関数
|
||
///
|
||
/// ## 使用方法
|
||
/// if_form.rs から呼び出され、関数名がテーブルに含まれる場合のみ
|
||
/// JoinIR 経路を試行する。
|
||
///
|
||
/// Phase 184: テーブル参照に変更（プレフィックス判定は併用）
|
||
pub fn is_joinir_if_toplevel_target(name: &str) -> bool {
|
||
// Phase 184: JOINIR_IF_TARGETS テーブルから参照（exact match）
|
||
if crate::mir::join_ir_vm_bridge_dispatch::JOINIR_IF_TARGETS
|
||
.iter()
|
||
.any(|t| t.func_name == name)
|
||
{
|
||
return true;
|
||
}
|
||
|
||
// Test prefixes (backward compatibility - allows any test function)
|
||
if name.starts_with("IfSelectTest.")
|
||
|| name.starts_with("IfToplevelTest.")
|
||
|| name.starts_with("IfMergeTest.")
|
||
{
|
||
return true;
|
||
}
|
||
|
||
false
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
/// Phase 33-9.1: is_loop_lowered_function() の動作確認
|
||
#[test]
|
||
fn test_is_loop_lowered_function() {
|
||
// Loop 専任関数（6本）は true を返す
|
||
assert!(is_loop_lowered_function("Main.skip/1"));
|
||
assert!(is_loop_lowered_function("FuncScannerBox.trim/1"));
|
||
assert!(is_loop_lowered_function("FuncScannerBox.append_defs/2"));
|
||
assert!(is_loop_lowered_function(
|
||
"Stage1UsingResolverBox.resolve_for_source/5"
|
||
));
|
||
assert!(is_loop_lowered_function(
|
||
"StageBBodyExtractorBox.build_body_src/2"
|
||
));
|
||
assert!(is_loop_lowered_function(
|
||
"StageBFuncScannerBox.scan_all_boxes/1"
|
||
));
|
||
|
||
// If lowering 対象関数は false を返す
|
||
assert!(!is_loop_lowered_function("IfSelectTest.simple_return/0"));
|
||
assert!(!is_loop_lowered_function("IfMergeTest.multiple_true/0"));
|
||
assert!(!is_loop_lowered_function(
|
||
"JsonShapeToMap._read_value_from_pair/1"
|
||
));
|
||
assert!(!is_loop_lowered_function(
|
||
"Stage1JsonScannerBox.value_start_after_key_pos/2"
|
||
));
|
||
|
||
// 一般的な関数も false を返す
|
||
assert!(!is_loop_lowered_function("SomeBox.some_method/3"));
|
||
assert!(!is_loop_lowered_function("Main.main/0"));
|
||
}
|
||
}
|