diff --git a/CURRENT_TASK.md b/CURRENT_TASK.md index 8d6893c0..207f38af 100644 --- a/CURRENT_TASK.md +++ b/CURRENT_TASK.md @@ -333,17 +333,69 @@ - 移行ロードマップ: Phase 74-77(合計 8-12時間、本番影響ゼロ)。 - 実装コミット: `851bf4f8` - SSOT: [phase73-scope-manager-design.md](docs/development/current/main/phase73-scope-manager-design.md), [phase73-completion-summary.md](docs/development/current/main/phase73-completion-summary.md) +34. **Phase 74-INFRASTRUCTURE(完了✅ 2025-12-13)**: binding_map + allocate_binding_id を MirBuilder に追加(dev-only) + - `BindingId` type と `allocate_binding_id()` メソッド実装 + - `MirBuilder.binding_map: BTreeMap` 追加 + - Shadowing test evidence 完備(4 tests PASS) + - 詳細: CURRENT_TASK.md Phase 74 section +35. **Phase 75-PILOT(完了✅ 2025-12-13)**: BindingId 優先 lookup を ConditionEnv に pilot 実装(dev-only) + - `ConditionEnv.resolve_var_with_binding()` メソッド追加(3-tier fallback: BindingId → name → None) + - `ScopeManager.lookup_with_binding()` trait method 追加(default impl) + - 3つのunit test PASS(priority/fallback/legacy) + - 958/958 lib tests PASS(退行なし) + - 詳細: [phase75-bindingid-pilot.md](docs/development/current/main/phase75-bindingid-pilot.md) +36. **Phase 76-PROMOTION(完了✅ 2025-12-13)**: promoted_bindings データ構造導入(dev-only) + - `CarrierInfo.promoted_bindings: BTreeMap` 追加(Original → Promoted mapping) + - `resolve_promoted_with_binding()` / `record_promoted_binding()` メソッド実装 + - Pattern2ScopeManager に promoted BindingId lookup を統合(3-tier: direct → promoted → name fallback) + - 5つのunit test PASS(record/resolve/merge/default/overwrite) + - 958/958 lib tests PASS(退行なし) + - 詳細: [phase76-promotion-binding-migration.md](docs/development/current/main/phase76-promotion-binding-migration.md) +37. **Phase 74-INFRASTRUCTURE(コミット済み✅ `e1574af7` 2025-12-13)**: BindingId infrastructure (dev-only) + - `binding_id.rs`: BindingId type + 5 unit tests + - `builder.rs`: binding_map + allocate_binding_id() + 4 integration tests + - `lexical_scope.rs`: Parallel binding_map restoration + - 9/9 new tests PASS, lib 958/958 PASS + +38. **Phase 75-PILOT(コミット済み✅ `c18dde23` 2025-12-13)**: BindingId pilot lookup (dev-only) + - `scope_manager.rs`: lookup_with_binding() trait method + - `condition_env.rs`: resolve_var_with_binding() 3-tier fallback + - 3/3 pilot tests PASS, lib 958/958 PASS + +39. **Phase 76-PROMOTION(コミット済み✅ `11e68203` 2025-12-13)**: promoted_bindings map (dev-only) + - `carrier_info.rs`: promoted_bindings field + resolve/record methods + - `pattern_pipeline.rs`: Carrier resolution via promoted_bindings + - 5/5 promotion tests PASS, lib 958/958 PASS + +40. **Phase 77-EXPANSION(設計コミット済み✅ `4ab6c4e6` 2025-12-13)**: Pattern2→3→4 面拡大 + legacy 依存削減(実装待ち) + - **設計完了**: 3つの実装ガイド文書作成済み + - **実装スコープ** (2-3時間): + 1. DigitPosPromoter/TrimLoopHelper で promoted_bindings を populate + 2. Pattern3/4 へ BindingId lookup を拡張(dev-only variant) + 3. Legacy name-based コード (~40行) を deprecate(削除は Phase 78+) + 4. E2E verification tests 4件追加 + - **詳細**: + - 設計: [phase77-expansion-completion.md](docs/development/current/main/phase77-expansion-completion.md) + - 実装ガイド: [PHASE_77_IMPLEMENTATION_GUIDE.md](docs/development/current/main/PHASE_77_IMPLEMENTATION_GUIDE.md) + - サマリ: [PHASE_77_EXECUTIVE_SUMMARY.md](docs/development/current/main/PHASE_77_EXECUTIVE_SUMMARY.md) + - **次のステップ**: 実装作業開始(PHASE_77_IMPLEMENTATION_GUIDE.md に従う) --- -## 🚀 次フェーズ(Phase 74-77 BindingId Migration ロードマップ) +## 🚀 次フェーズ(Phase 77 実装 + Phase 78+ BindingId Migration 完結) -- **Phase 74-INFRASTRUCTURE**: binding_map + next_binding_id を MirBuilder に追加(2-3時間) -- **Phase 75-PILOT**: ScopeManager で BindingId 優先 lookup を 1 箇所に試験(1-2時間) -- **Phase 76-PROMOTION**: digit_pos/ch_match のハック撤去、promoted_bindings 対応表に移行(2-3時間) -- **Phase 77-EXPANSION**: Pattern2→3→4 へ適用面拡大、legacy 依存削減(2-3時間) +### 【今すぐ着手】Phase 77-EXPANSION(実装フェーズ) +- **設計書**: [PHASE_77_IMPLEMENTATION_GUIDE.md](docs/development/current/main/PHASE_77_IMPLEMENTATION_GUIDE.md) に従う(Step-by-step code changes) +- **スコープ** (2-3時間): + 1. DigitPosPromoter: `loop_body_digitpos_promoter.rs` で promoted_bindings を populate + 2. TrimLoopHelper: `loop_body_carrier_promoter.rs` (Trim) で promoted_bindings を populate + 3. Pattern3/4: Pattern lowerer で BindingId priority lookup を追加 + 4. Legacy deprecate: ~40行を Phase 78+ 削除予定に注釈 + 5. テスト追加: 4件の E2E verification tests -詳細は [phase73-scope-manager-design.md](docs/development/current/main/phase73-scope-manager-design.md) **Migration Roadmap** セクション参照。 +### 【後続】Phase 78-LEGACY-DELETION(計画のみ) +- Deprecated code 完全削除 (~40行)、BindingId 必須化(1-2時間) +- 詳細: [phase73-scope-manager-design.md](docs/development/current/main/phase73-scope-manager-design.md) **Migration Roadmap** セクション参照 ---