From e0c0e24196b2f54e7bdbf83bbb53f1c7de7b0fca Mon Sep 17 00:00:00 2001 From: tomoaki Date: Tue, 30 Dec 2025 22:24:23 +0900 Subject: [PATCH] phase29ap(p1): reduce joinir wrappers for pattern6/7 --- docs/development/current/main/10-Now.md | 2 +- docs/development/current/main/30-Backlog.md | 2 +- .../development/current/main/phases/phase-29ap/README.md | 9 ++++++++- src/mir/builder/control_flow/joinir/patterns/mod.rs | 2 -- .../joinir/patterns/pattern6_scan_with_init.rs | 5 ----- .../control_flow/joinir/patterns/pattern7_split_scan.rs | 5 ----- 6 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 src/mir/builder/control_flow/joinir/patterns/pattern6_scan_with_init.rs delete mode 100644 src/mir/builder/control_flow/joinir/patterns/pattern7_split_scan.rs diff --git a/docs/development/current/main/10-Now.md b/docs/development/current/main/10-Now.md index d05b1996..32fc996a 100644 --- a/docs/development/current/main/10-Now.md +++ b/docs/development/current/main/10-Now.md @@ -3,7 +3,7 @@ ## Current Focus - Phase: `docs/development/current/main/phases/phase-29ap/README.md` -- Next: Phase 29ap P1 (planned; see `docs/development/current/main/phases/phase-29ap/README.md`) +- Next: Phase 29ap P2 (planned; see `docs/development/current/main/phases/phase-29ap/README.md`) ## Gate (SSOT) diff --git a/docs/development/current/main/30-Backlog.md b/docs/development/current/main/30-Backlog.md index 86e811f5..9e11c2ea 100644 --- a/docs/development/current/main/30-Backlog.md +++ b/docs/development/current/main/30-Backlog.md @@ -5,7 +5,7 @@ Scope: 「次にやる候補」を短く列挙するメモ。入口は `docs/dev ## Active -- Phase 29ap: `docs/development/current/main/phases/phase-29ap/README.md` (Next: P1 planned) +- Phase 29ap: `docs/development/current/main/phases/phase-29ap/README.md` (Next: P2 planned) - JoinIR regression gate SSOT: `docs/development/current/main/phases/phase-29ae/README.md` - CorePlan hardening (docs-first): `docs/development/current/main/phases/phase-29al/README.md` diff --git a/docs/development/current/main/phases/phase-29ap/README.md b/docs/development/current/main/phases/phase-29ap/README.md index 2d5b2af1..60c422f8 100644 --- a/docs/development/current/main/phases/phase-29ap/README.md +++ b/docs/development/current/main/phases/phase-29ap/README.md @@ -25,8 +25,15 @@ Gate (SSOT): - Outcome remains `Ok(None)` for non-matching cases. - No new logs or error strings. +## P1: Reduce JoinIR wrappers (Pattern6/7) ✅ + +- Scope: + - Drop JoinIR-side Pattern6/7 wrapper modules (plan/composer is SSOT). + - Keep routing through single_planner → composer adopt. +- Guardrails: + - No change to pattern selection or logs. + ## Next (planned) -- P1: Pattern6/7 JoinIR wrapper → composer entry only - P2: Router pattern-name branching reduction (planner outcome + composer SSOT) - P3: Facts/Feature expansion if needed diff --git a/src/mir/builder/control_flow/joinir/patterns/mod.rs b/src/mir/builder/control_flow/joinir/patterns/mod.rs index 98689100..56c794af 100644 --- a/src/mir/builder/control_flow/joinir/patterns/mod.rs +++ b/src/mir/builder/control_flow/joinir/patterns/mod.rs @@ -83,8 +83,6 @@ pub(in crate::mir::builder) mod pattern3_with_if_phi; pub(in crate::mir::builder) mod pattern4_carrier_analyzer; pub(in crate::mir::builder) mod pattern4_with_continue; pub(in crate::mir::builder) mod pattern6_nested_minimal; // Phase 188.3: 1-level nested loop (Pattern1 outer + Pattern1 inner) -pub(in crate::mir::builder) mod pattern6_scan_with_init; // Phase 254 P0: index_of/find/contains pattern -pub(in crate::mir::builder) mod pattern7_split_scan; // Phase 256 P0: split/tokenization with variable step pub(in crate::mir::builder) mod pattern8_scan_bool_predicate; // Phase 259 P0: boolean predicate scan (is_integer/is_valid) pub(in crate::mir::builder) mod pattern9_accum_const_loop; // Phase 270 P1: accumulator const loop (橋渡しパターン) pub(in crate::mir::builder) mod pattern_pipeline; diff --git a/src/mir/builder/control_flow/joinir/patterns/pattern6_scan_with_init.rs b/src/mir/builder/control_flow/joinir/patterns/pattern6_scan_with_init.rs deleted file mode 100644 index 887148fe..00000000 --- a/src/mir/builder/control_flow/joinir/patterns/pattern6_scan_with_init.rs +++ /dev/null @@ -1,5 +0,0 @@ -//! Phase 29ai P6: Re-export wrapper for Pattern6 extractor (compat) - -#![allow(unused_imports)] - -pub(crate) use crate::mir::builder::control_flow::plan::extractors::pattern6_scan_with_init::*; diff --git a/src/mir/builder/control_flow/joinir/patterns/pattern7_split_scan.rs b/src/mir/builder/control_flow/joinir/patterns/pattern7_split_scan.rs deleted file mode 100644 index 721dcc49..00000000 --- a/src/mir/builder/control_flow/joinir/patterns/pattern7_split_scan.rs +++ /dev/null @@ -1,5 +0,0 @@ -//! Phase 29ai P6: Re-export wrapper for Pattern7 extractor (compat) - -#![allow(unused_imports)] - -pub(crate) use crate::mir::builder::control_flow::plan::extractors::pattern7_split_scan::*;