b71a18495d
feat(joinir): Phase 88 - Pattern4 continue + variable step increment
...
Continue Pattern 拡張:
- then側の i=i+const 差分加算 + acc更新を許可
- continue_pattern.rs:193 で可変ステップ検出
Dev Router 許可:
- ast_lowerer/mod.rs:92 で normalized_dev feature時に新パターンを有効化
Fixtures & Tests:
- jsonparser_unescape_string_step2_min fixture追加（submodule）
- normalized_joinir_min.rs に shape テスト追加
- shapes.rs に expected shape 定義
Documentation:
- joinir-architecture-overview.md に Phase 88 到達点を追記
Impact:
- Pattern4 continue + 可変インクリメント（i+=1 or i+=2）対応
- _unescape_string 制御構造の土台確立
- normalized_dev tests PASS
Next: _unescape_string 残り複合ループ対応
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 00:29:56 +09:00
33f03d9775
refactor(joinir): Phase 86 - Carrier init builder, debug migration, error tags
...
P1: Carrier Initialization Builder (HIGH) ✅
- New module: carrier_init_builder.rs (197 lines, 8 tests)
- Refactored loop_header_phi_builder.rs (-34 lines)
- Centralized CarrierInit value generation (SSOT)
- Eliminates scattered match patterns across header PHI, exit line
- Consistent debug output: [carrier_init_builder] format
- Net: -34 lines of duplicated logic
P2: Remaining DebugOutputBox Migration (QUICK) ✅
- Migrated carrier_info.rs::record_promoted_binding()
- Uses DebugOutputBox for JOINIR_DEBUG checks
- Maintains JOINIR_TEST_DEBUG override for test diagnostics
- Consistent log formatting: [context/category] message
- Net: +3 lines (SSOT migration)
P3: Error Message Centralization (LOW) ✅
- New module: error_tags.rs (136 lines, 5 tests)
- Migrated 3 error sites:
* ownership/relay:runtime_unsupported (plan_validator.rs)
* joinir/freeze (control_flow/mod.rs)
* (ExitLine errors were debug messages, not returns)
- Centralized error tag generation (freeze, exit_line_contract, ownership_relay_unsupported, etc.)
- Net: +133 lines (SSOT module + tests)
Total changes:
- New files: carrier_init_builder.rs (197), error_tags.rs (136)
- Modified: 6 files
- Production code: +162 lines (SSOT investment)
- Tests: 987/987 PASS (982→987, +5 new tests)
- Phase 81 ExitLine: 2/2 PASS
- Zero compilation errors/warnings
Benefits:
✅ Single Responsibility: Each helper has one concern
✅ Testability: 13 new unit tests (8 carrier init, 5 error tags)
✅ Consistency: Uniform debug/error formatting
✅ SSOT: Centralized CarrierInit and error tag generation
✅ Discoverability: Easy to find all error types
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 21:48:02 +09:00
8c2bc45be6
refactor(joinir): Phase 85 - Quick wins: loop_patterns removal, DebugOutputBox, dead_code audit
...
Quick Win 1: Remove loop_patterns_old.rs (COMPLETED)
- Deleted obsolete legacy loop pattern dispatcher (914 lines)
- All patterns (Break/Continue/Simple) now in modular loop_patterns/ system
- Moved helper functions (has_break_in_loop_body, has_continue_in_loop_body) to analysis.rs
- Updated loop_frontend_binding.rs to remove fallback
- Verified zero regressions: 974/974 lib tests PASS
Quick Win 2: DebugOutputBox consolidation (COMPLETED)
- New module: src/mir/join_ir/lowering/debug_output_box.rs (170 lines)
- Centralized debug output management with automatic HAKO_JOINIR_DEBUG checking
- Refactored 4 files to use DebugOutputBox:
- condition_env.rs: 3 scattered checks → 3 Box calls
- carrier_binding_assigner.rs: 1 check → 1 Box call
- scope_manager.rs: 3 checks → 3 Box calls
- analysis.rs: Updated lower_loop_with_if_meta to use new pattern system
- Benefits: Consistent formatting, centralized control, zero runtime cost when disabled
- Added 4 unit tests for DebugOutputBox
Quick Win 3: Dead code directive audit (COMPLETED)
- Audited all 40 #[allow(dead_code)] directives in lowering/
- Findings: All legitimate (Phase utilities, future placeholders, API completeness)
- No unsafe removals needed
- Categories:
- Phase 192 utilities (whitespace_check, entry_builder): Public API with tests
- Phase 231 placeholders (expr_lowerer): Explicitly marked future use
- Const helpers (value_id_ranges): API completeness
- Loop metadata (loop_update_summary): Future phase fields
Result: Net -858 lines, improved code clarity, zero regressions
Tests: 974/974 PASS (gained 4 from DebugOutputBox tests)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 19:25:11 +09:00
9e32807a96
refactor(joinir): Phase 82-83 - Debug flag SSOT + Fallback verification
...
Phase 82: Centralized JoinIR debug flag reading
- Added is_joinir_debug() SSOT function in joinir_flags.rs
- Replaced 16 direct env::var() calls across 8 files
- Updated docs to recommend HAKO_JOINIR_DEBUG (NYASH_ deprecated)
- Backward compat: Both env vars work
Phase 83: Verified promoted carrier fallback behavior
- Confirmed NO fallback to name-based lookup for DigitPos/Trim
- Documented fallback expectations in Phase 80/81 docs
- Added verification commands and expected output
Changes:
- src/config/env/joinir_flags.rs: +187 lines (new SSOT module)
- 8 files: env var reads → is_joinir_debug() calls
- 3 docs: HAKO_JOINIR_DEBUG examples + fallback sections
- 1 summary doc: phase82-83-debug-flag-ssot-summary.md
Tests: 970/970 lib PASS, 58/58 normalized_dev PASS
Impact: Dev-only (zero production changes)
2025-12-13 19:01:14 +09:00
d150cecc36
docs(joinir): phase80 plan finalize + fix p3 cond_env mut (dev-only)
...
Phase 80 後処理:
- phase80-bindingid-p3p4-plan.md: Status を Completed に更新、Task 80-B/C/D チェックマーク追加
- pattern3_with_if_phi.rs: cond_env を mut に修正 + #[allow(unused_mut)] 追加（将来の登録処理に備える）
Phase 80 完全完了（commit 84129a7e）: Pattern2/3/4 全て BindingId 配線完了
Next: Phase 81 - Pattern2 ExitLine contract stabilization
2025-12-13 18:14:37 +09:00
84129a7ed4
feat(joinir): Phase 80-B/C/D - Pattern3/4 BindingId wiring + E2E tests (dev-only)
...
Task 80-B (P1): Pattern3 (if-sum) BindingId registration
- pattern3_with_if_phi.rs: Added BindingId→ValueId registration
- Loop var + condition bindings registration (lines 131-159)
- Debug logs: [phase80/p3] tags
- Follows Pattern2 template structure
Task 80-C (P2): Pattern4 (continue) BindingId registration
- pattern4_with_continue.rs: Pass binding_map to lowerer (lines 341-352)
- loop_with_continue_minimal.rs: Added BindingId→ValueId registration (lines 206-230)
- Loop var + condition bindings registration
- Debug logs: [phase80/p4] tags
- Follows Pattern2 template structure
Task 80-D (P3): E2E tests for BindingId lookup
- tests/normalized_joinir_min.rs: Added 2 new tests (lines 2182-2222)
- test_phase80_p3_bindingid_lookup_works(): Pattern3 verification
- test_phase80_p4_bindingid_lookup_works(): Pattern4 verification
- Manual fallback detection via NYASH_JOINIR_DEBUG=1
Task P4: Cleanup
- Fixed unused variable warnings (loop_var_join_id → _loop_var_join_id)
- Fixed unnecessary mut warning (cargo fix auto-applied)
- pattern2_with_break.rs: Clean up pre-existing unused warning
Result: BindingId operational across Pattern2/3/4
Tests: 970/970 PASS (baseline, E2E tests in normalized_dev feature)
Design: dev-only, dual-path maintained, zero production impact
Phase 74-80 complete: BindingId migration fully operational across all patterns
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 18:05:14 +09:00
b7f7882558
feat(joinir): Phase 79 Activation - BindingId wiring operational (dev-only)
...
Phase 79 の最終段階：BindingId を ExprLowerer に配線し、end-to-end で動作確認。
Key changes:
- ExprLowerer wiring:
- scope_resolution.rs: build_condition_env_from_scope_with_binding() (BindingId-aware)
- expr_lowerer.rs: lower_condition() uses BindingId priority lookup
- ConditionEnv extension:
- register_loop_var_binding(): Loop var BindingId→ValueId registration
- register_condition_binding(): Condition-only carrier BindingId→ValueId registration
- Pattern2 integration:
- pattern2_with_break.rs: Loop var registration (Line 116-128)
- pattern2_with_break.rs: Carrier role-based registration (Line 381-425)
- Debug logging: [phase79] tags for registration, [binding_pilot/hit] for lookup success
- E2E tests (normalized_joinir_min.rs, debug-only):
- test_phase79_digitpos_bindingid_lookup_works(): DigitPos pattern verification
- test_phase79_trim_bindingid_lookup_works(): Trim pattern verification
Result: BindingId lookup actually works end-to-end
- Promoted carriers resolve via BindingId, not string hacks
- Debug: NYASH_JOINIR_DEBUG=1 shows [phase79] Registered loop var BindingId, [binding_pilot/hit] BindingId(1) -> ValueId(100)
Tests: 1025/1025 lib PASS
Design: dev-only feature-gated, dual-path maintained (BindingId priority + name fallback)
Phase 74-79 complete: BindingId migration fully operational
- Infrastructure (74-76): BindingId type, binding_map, 3-tier lookup, promoted_bindings map
- Implementation (77): DigitPos/Trim populate, legacy deprecate
- Refactoring (78-79 Refactoring): PromotedBindingRecorder, Detector/Recorder split
- Activation (80 Foundation + 79 Activation): CarrierBindingAssigner + ExprLowerer wiring
2025-12-13 16:48:41 +09:00
8b48bec962
feat(joinir): Phase 78 - BindingId infrastructure for promoted carriers (dev-only)
...
Phase 78 adds infrastructure to assign BindingIds to synthetic promoted
carriers (e.g., is_digit_pos, is_ch_match), enabling type-safe promoted
variable lookup without string-based naming conventions.
Key Changes:
1. CarrierVar.binding_id field (dev-only):
- Added Option<BindingId> to track BindingId for each carrier
- Updated all constructors and struct instantiations
2. CarrierBindingAssigner Box (new file, 273 lines):
- Allocates BindingIds for promoted carriers via builder.allocate_binding_id()
- Records original → promoted mapping in promoted_bindings
- Sets binding_id field on promoted CarrierVar
- Includes 3 comprehensive unit tests
3. ConditionEnv.register_carrier_binding() (new method):
- Registers carrier BindingId → ValueId mappings
- Enables type-safe lookup via binding_id_map
4. Logging cleanup:
- Gated 6 eprintln! statements with NYASH_JOINIR_DEBUG
- Unified logging tags to [binding_pilot/*]
Design Decisions:
- Promoters create CarrierInfo, lowering code assigns BindingIds
- CarrierBindingAssigner called from Pattern2/4 lowering (has builder access)
- Clear documentation prevents misuse (promoters lack builder access)
Files modified (18):
- carrier_info.rs: binding_id field added to CarrierVar
- carrier_binding_assigner.rs: New Box for BindingId allocation
- condition_env.rs: register_carrier_binding() method
- mod.rs: Module exports
- pattern2_with_break.rs, pattern4_with_continue.rs: Updated for binding_id
- loop_body_*_promoter.rs: Logging cleanup + binding_id in structs
- phase78-bindingid-promoted-carriers.md: Architecture documentation
Tests: 970/970 PASS (zero regressions)
Status: Infrastructure complete, integration deferred to Phase 79
Next Phase: Wire CarrierBindingAssigner in Pattern2/4 lowering + E2E tests
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 16:20:33 +09:00
48bdf2fb98
refactor(joinir): Phase 79 - Detector/Recorder separation + BindingMapProvider
...
**Phase 79 Medium-Priority Refactoring Complete**
## Action 1: Detector/Recorder Separation
**New Pure Detection Logic:**
- `digitpos_detector.rs` (~350 lines, 7 tests)
- Pure detection for A-4 DigitPos pattern
- No binding_map dependency
- Independently testable
- `trim_detector.rs` (~410 lines, 9 tests)
- Pure detection for A-3 Trim pattern
- No binding_map dependency
- Comprehensive test coverage
**Simplified Promoters:**
- `DigitPosPromoter`: 200+ → 80 lines (60% reduction)
- Uses DigitPosDetector for detection
- Focuses on orchestration + recording
- Removed 6 helper methods
- `LoopBodyCarrierPromoter`: 160+ → 70 lines (56% reduction)
- Uses TrimDetector for detection
- Clean separation of concerns
- Removed 3 helper methods
## Action 2: BindingMapProvider Trait
**Centralized Feature Gate:**
- `binding_map_provider.rs` (~100 lines, 3 tests)
- Trait to abstract binding_map access
- #[cfg] guards: 10+ locations → 2 locations (80% reduction)
- `MirBuilder` implementation
- Clean feature-gated access
- Single point of control
## Quality Metrics
**Code Reduction:**
- DigitPosPromoter: 200+ → 80 lines (60%)
- LoopBodyCarrierPromoter: 160+ → 70 lines (56%)
- Feature guards: 10+ → 2 locations (80%)
**Tests:**
- All tests passing: 970/970 (100%)
- New test coverage: 19+ tests for detectors
- No regressions
**Design Improvements:**
- ✅ Single Responsibility Principle
- ✅ Independent unit testing
- ✅ Reusable detection logic
- ✅ Centralized feature gating
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 07:05:30 +09:00
10e78fa313
refactor(joinir): Phase 78 Quick Wins - PromotedBindingRecorder Box
...
**Quick Win 1: PromotedBindingRecorder Box Introduction**
- **New file**: `promoted_binding_recorder.rs` (167 lines)
- Type-safe BindingId recording for promoted variables
- Centralizes scattered binding_map wiring logic
- Result-based error handling (BindingRecordError enum)
- 4 unit tests (1 always-on + 3 feature-gated)
- Dual impl blocks for feature gate handling
- **Updated DigitPosPromoter**: `loop_body_digitpos_promoter.rs`
- Replaced 30-line binding_map wiring with 2-line recorder call
- Added log_promotion_error() helper function
- Removed scattered eprintln! warnings
- **Updated TrimLoopHelper**: `loop_body_carrier_promoter.rs`
- Replaced 30-line binding_map wiring with 2-line recorder call
- Added log_trim_promotion_error() helper function
- Updated 4 tests to include binding_map field
**Quick Win 2: Error Handling Improvement**
- Replaced eprintln! with Result-based errors
- Added clear error messages via helper functions
- Both promoters now use same error logging pattern
- Testable error paths (3 error tests added)
**Impact**:
- **Code reduction**: ~30 lines deleted (duplicated wiring logic)
- **Maintainability**: Single reusable Box for future promoters
- **Testability**: Error cases now covered by unit tests
- **Consistency**: Unified error message format
**Test Results**:
- Without feature: 959/959 PASS (1 new test added)
- With normalized_dev: 1010/1013 PASS (4 new tests total)
- 3 failing tests are pre-existing phase49 issues
- All PromotedBindingRecorder tests: 4/4 PASS
- All DigitPosPromoter tests: 6/6 PASS
- All CarrierPromoter tests: 10/10 PASS
**Build Status**: ✅ Clean (0 errors, 0 warnings)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 06:33:44 +09:00
0aad016be2
chore(joinir): quiet legacy promoted lookup warning
2025-12-13 06:12:21 +09:00
72173c1ac8
feat(joinir): Phase 77 - BindingId expansion implementation (dev-only)
...
Phase 77 implements promoted_bindings population in DigitPos/Trim promoters
and deprecates legacy name-based resolution paths.
Changes:
- DigitPosPromoter: Added binding_map field and record_promoted_binding() calls
- TrimLoopHelper: Added binding_map field for ch → is_ch_match tracking
- Pattern2/4: Wired binding_map from builder.binding_map to promoters
- Legacy deprecation: Added #[deprecated] to resolve_promoted_join_id()
- Dual-path design: BindingId priority + name fallback maintained
Files modified (8):
- pattern2_with_break.rs, pattern4_with_continue.rs: binding_map wiring
- trim_loop_lowering.rs: Trim promoter integration
- carrier_info.rs: Deprecation warnings
- scope_manager.rs: Deprecated fallback paths
- loop_body_carrier_promoter.rs: Trim binding_map support
- loop_body_cond_promoter.rs: Orchestrator updates
- loop_body_digitpos_promoter.rs: DigitPos binding_map support
Tests: 958/958 PASS (zero regressions)
Design: Type-safe BindingId mapping replaces string-based promoted variable resolution
Phase 78+ will delete deprecated code (~50 lines) and make binding_map required.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 05:58:57 +09:00
342bcb8f50
fix(joinir): Phase 76 - Fix test struct initialization for promoted_bindings
2025-12-13 05:36:35 +09:00
11e68203c8
feat(joinir): Phase 76 - promoted_bindings map (dev-only)
...
Phase 76 introduces type-safe promotion tracking via promoted_bindings
(BindingId→BindingId map). Replaces fragile string matching hacks with
compiler-checked identity mapping.
Changes:
- carrier_info.rs: Added promoted_bindings field and resolution methods
- pattern4_carrier_analyzer.rs: Updated for BindingId integration
- pattern_pipeline.rs: Carrier resolution via promoted_bindings
- loop_with_break_minimal/tests.rs: Added promoted_bindings tests
- normalized/fixtures.rs: Extended with Phase 76 fixtures
Tests: 5/5 new unit tests PASS (record/resolve/merge/default/overwrite)
Tests: lib 958/958 PASS, normalized_dev 54/54 PASS (no regressions)
Design: Dual-path (BindingId OR name) enables gradual Phase 77+ transition.
🤖 Generated with Claude Code
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 05:35:14 +09:00
c18dde238a
feat(joinir): Phase 75 - BindingId pilot lookup (dev-only)
...
Phase 75 pilots BindingId-based variable lookup in the ScopeManager and
ConditionEnv components. Demonstrates "BindingId priority → name fallback"
strategy with comprehensive testing and zero production impact.
Changes:
- scope_manager.rs: Added lookup_with_binding() trait method
- condition_env.rs: Implemented resolve_var_with_binding() with 3-tier fallback
- expr_lowerer.rs: Integrated pilot lookup paths
- condition_lowering_box.rs: Updated with BindingId support
Tests: 3/3 new pilot tests PASS (priority/fallback/legacy)
Tests: lib 958/958 PASS, normalized_dev 54/54 PASS (no regressions)
Design: Feature-gated with normalized_dev, enables Phase 76 expansion.
🤖 Generated with Claude Code
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 05:35:04 +09:00
e1574af741
feat(mir): Phase 74 - BindingId infrastructure (dev-only)
...
Phase 74 implements BindingId as parallel allocation alongside ValueId for
lexical scope tracking and shadowing-aware variable identity.
Changes:
- binding_id.rs: New BindingId type with overflow protection (5 unit tests)
- builder.rs: Added next_binding_id counter and binding_map (4 integration tests)
- lexical_scope.rs: Extended restoration logic for BindingId management
- mod.rs: Public re-export of BindingId
Tests: 9/9 new PASS, lib 958/958 PASS (no regressions)
Architecture: Parallel BindingId/ValueId allocation for deterministic shadowing
Phase 75-77 will build on this infrastructure for type-safe promotion tracking.
🤖 Generated with Claude Code
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 05:34:56 +09:00
851bf4f8a5
design(joinir): Phase 73 - ScopeManager BindingId Migration Design + PoC
...
Phase 73 plans migration from name-based to BindingId-based scope management
in JoinIR lowering, aligning with MIR's lexical scope model.
Design decision: Option A (Parallel BindingId Layer) with gradual migration.
Migration roadmap: Phases 74-77, ~8-12 hours total, zero production impact.
Changes:
- phase73-scope-manager-design.md: SSOT design (~700 lines)
- phase73-completion-summary.md: Deliverables summary
- phase73-index.md: Navigation index
- scope_manager_bindingid_poc/: Working PoC (437 lines, dev-only)
Tests: 6/6 PoC tests PASS, lib 950/950 PASS
Implementation: Parallel layer (no changes to existing code paths)
🤖 Generated with Claude Code
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 03:41:40 +09:00
c2df1cacf6
feat(joinir): Phase 70-B - Multihop Relay Passthrough Support (dev-only)
...
Phase 70-B relaxes runtime guard from "always error" to "unsupported only".
Adds structural detection (is_supported_multihop_pattern) to distinguish:
- Simple passthrough (no self-updates): ACCEPT
- Complex patterns (self-conflict, etc): REJECT with [ownership/relay:runtime_unsupported]
Changes:
- plan_validator.rs: +is_supported_multihop_pattern() method + unit tests
- normalized_joinir_min.rs: +2 integration tests for passthrough/rejection
- phase70-relay-runtime-guard.md: Phase 70 series status table added
Tests: normalized_dev 52/52 PASS, lib 950/950 PASS
Design: Structural detection only (no by-name branching)
🤖 Generated with Claude Code
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 03:41:20 +09:00
db9c9055fa
obs(joinir): Phase 72 - PHI Reserved Region Observation Complete
...
## Summary
Observed PHI dst ValueId distribution to determine if verifier can enforce
reserved region (0-99). **Conclusion: Verifier strengthening NOT recommended.**
## Key Finding
PHI dst allocation does NOT architecturally respect reserved region:
- PHI dst comes from `builder.next_value_id()` (host MirBuilder)
- Reserved region (0-99) is a JoinValueSpace contract for JoinIR lowering
- These are separate allocation pools with no enforcement mechanism
- Current stability is accidental (ValueId allocation ordering)
## Evidence
Manual verification (`apps/tests/loop_min_while.hako`):
- PHI dst = %3 (ValueId(3)) ✅ in reserved region
- Works because PHI allocated early in function (0-20 typical)
- JoinValueSpace allocates high (100+, 1000+)
- Accidental separation, not enforced
## Implementation
Added observation infrastructure (debug-only):
- `src/mir/join_ir/verify_phi_reserved.rs` (266 lines)
- PHI dst observer with distribution analyzer
- Region classifier (Reserved/Param/Local)
- Human-readable report generator
- Instrumentation at PHI allocation points:
- loop_header_phi_builder.rs:94, 151
- Debug-only `observe_phi_dst()` calls
## Test Results
- Unit tests: ✅ 4/4 PASS (verify_phi_reserved module)
- Lib tests: ✅ 950/950 PASS, 56 ignored
- Normalized tests: ✅ 54/54 PASS
- Manual verification: ✅ PHI dst in 0-99 observed
## Decision: Document, Don't Enforce
**Rationale**:
1. No architectural mechanism to enforce PHI dst ∈ [0, 99]
2. Adding verifier creates false assumptions about allocation order
3. Current system stable through separate pools (950/950 tests)
4. Future architectural fix possible (Phase 73+) but not urgent
## Documentation
- PHASE_72_SUMMARY.md: Executive summary and implementation record
- phase72-phi-reserved-observation.md: Detailed findings and analysis
- CURRENT_TASK.md: Phase 72 completion entry
## Next Steps
- Phase 73: Update architecture overview with Phase 72 findings
- Optional: Explicit PHI reserved pool (future enhancement)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-13 03:23:02 +09:00
1424aac901
refactor(joinir): Phase 71-Pre - OwnershipPlanValidator Box (dev-only)
...
pattern3_with_if_phi.rs の check_ownership_plan_consistency() を独立した
OwnershipPlanValidator Box に抽出。P2/P4 での再利用を可能にする。
Key changes:
- plan_validator.rs: 新規作成 (~190行)
- validate_relay_support(): Multi-hop relay Fail-Fast (Phase 70-A タグ)
- validate_carrier_consistency(): Carrier set 整合性チェック (warn-only)
- validate_condition_captures(): Condition captures チェック (warn-only)
- validate_all(): All-in-one 検証
- pattern3_with_if_phi.rs: Validator box への委譲
- check_ownership_plan_consistency() → OwnershipPlanValidator::validate_all()
Unit tests: 3 PASS
- test_validate_relay_support_single_hop_ok
- test_validate_relay_support_multihop_rejected
- test_validate_all_with_consistent_data
Tests: normalized_dev 50/50 PASS, lib 950/950 PASS
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-13 02:30:12 +09:00
7b56a7c01d
docs(joinir): Phase 70-A - Relay Runtime Guard (dev-only)
...
Phase 66で analysis/plan層はmultihop受理可能になったが、runtime lowering
(実行導線)はまだ未対応。このPhaseでは「未対応は同じタグで必ず落ちる」を
docs + テストで固定する。
Key changes:
- phase70-relay-runtime-guard.md: Runtime guard設計doc新規追加
- 現状(plan OK / runtime NG)の明確化
- Fail-Fastタグ [ownership/relay:runtime_unsupported] の標準化
- Phase 70-B以降の解除条件
- pattern3_with_if_phi.rs: エラーメッセージのタグ統一
- [ownership/relay:runtime_unsupported] 形式に変更
- var/owner_scope/relay_path の診断情報追加
- normalized_joinir_min.rs: 固定テスト追加
- test_phase70a_multihop_relay_runtime_unsupported_tag
- Plan層のmultihop受理確認 + runtime拒否の文書化
Tests: normalized_dev 50/50 PASS (+1), lib 950/950 PASS
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-13 02:22:29 +09:00
795d68ecf1
joinir(ownership): shadowing-aware AST ownership analyzer
2025-12-13 02:04:04 +09:00
0913ee8bbc
MIR: fix free-vars lexical scoping
2025-12-13 01:35:39 +09:00
1fae4f1648
MIR: lexical scoping + builder vars modules
2025-12-13 01:30:04 +09:00
5c75506dcc
feat(joinir): Phase 66 - Ownership-Relay Multihop Implementation (dev-only)
...
Phase 65設計に基づき、relay_path.len() > 1 を analysis/plan 層で受理するよう実装。
Key changes:
- plan_to_lowering.rs: relay_path.len() > 1 制限撤去 + 構造的 Fail-Fast 維持
- relay_path.is_empty() → Err（loop relay は最低 1 hop）
- relay_path[0] != plan.scope_id → Err（この scope が最初の hop）
- relay.owner_scope == plan.scope_id → Err（relay と owned は排他）
- owned_vars ∩ relay_writes ≠ ∅ → Err（同名は不変条件違反）
- ast_analyzer.rs: 3階層 multihop テスト追加
- multihop_relay_detected_for_3_layer_nested_loops
Unit tests (plan_to_lowering):
- test_relay_multi_hop_accepted_in_with_relay
- test_relay_path_empty_rejected_in_with_relay
- test_relay_path_not_starting_at_plan_scope_rejected
- test_relay_owner_same_as_plan_scope_rejected
- test_owned_and_relay_same_name_rejected
Tests: normalized_dev 49/49 PASS, lib 947/947 PASS
Design: Analysis-only, no behavior change in production lowering
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 23:33:16 +09:00
ba6e420f31
feat(joinir): Phase 64 - Ownership P3 production integration (dev-only)
...
P3(if-sum) 本番ルートに OwnershipPlan 解析を接続（analysis-only）。
Key changes:
- ast_analyzer.rs: Added analyze_loop() helper
- Loop-specific analysis API for production integration
- build_plan_for_scope() helper for single-scope extraction
- pattern3_with_if_phi.rs: P3 production integration
- OwnershipPlan analysis after ConditionEnv building
- check_ownership_plan_consistency() for validation
- Feature-gated #[cfg(feature = "normalized_dev")]
Consistency checks:
- Fail-Fast: Multi-hop relay (relay_path.len() > 1)
- Warn-only: Carrier set mismatch (order SSOT deferred)
- Warn-only: Condition captures (some patterns have extras)
Tests: 49/49 PASS (2 new Phase 64 tests)
- test_phase64_p3_ownership_prod_integration
- test_phase64_p3_multihop_relay_detection
- Zero regressions
Design: Analysis-only, no behavior change
- Integration point: After ConditionEnv, before JoinIR lowering
- Dev-only validation for future SSOT migration
Next: Phase 65+ - Carrier order SSOT, owner-based init
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-12 23:02:40 +09:00
0ff96612cf
docs(joinir): Phase 63 - AST ownership analyzer (dev-only)
...
ASTNode → OwnershipPlan の解析器を追加（analysis-only, normalized_dev）。
Key changes:
- New ast_analyzer.rs (~370 lines):
- AstOwnershipAnalyzer: AST → Vec<OwnershipPlan>
- ScopeKind: Function/Loop/If/Block
- Invariants: owned_vars/relay_writes/captures/condition_captures
Design:
- JSON v0 "Local=rebind" を使わず、AST の Statement::Local を正しく扱う
- "読むのは自由、管理は直下だけ" アーキテクチャ維持
Tests: 3 unit tests + 47/47 normalized_dev PASS
- loop_local_carrier_is_owned_and_written
- condition_capture_is_reported_for_loop
- relay_write_detected_for_outer_owned_var
Next: Phase 64 - P3(if-sum) 本番ルートへ dev-only で接続
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-12 22:51:21 +09:00
acb6720d9b
Phase 61: structural if-sum+break lowering (dev-only)
2025-12-12 22:15:41 +09:00
6aba138950
feat(joinir): Phase 59 - Ownership P3 plumbing (dev-only)
...
P3 (if-sum) パターン用の OwnershipPlan → lowering inputs 変換を追加。
Key changes:
- plan_to_lowering.rs (+153 lines):
- P3LoweringInputs struct (same structure as P2)
- plan_to_p3_inputs() converter
- 4 unit tests (multi-carrier, 5+, condition-only, relay-rejected)
P3 specific features:
- Multi-carrier support (sum, count, 5+ carriers)
- Same Fail-Fast on relay_writes (Phase 59 scope)
- Same CarrierRole discrimination (LoopState vs ConditionOnly)
Integration tests:
- test_phase59_ownership_p3_relay_failfast: Verifies relay detection
- test_phase59_ownership_p3_loop_local_success: Verifies loop-local success
Design: Perfect parallelism with P2
- Same struct layout (carriers, captures, condition_captures)
- Same conversion logic (skip loop var, filter written vars)
- Same error handling (Fail-Fast on relay)
Tests: 946/946 PASS (16 ownership tests)
All code under #[cfg(feature = "normalized_dev")] - zero impact on canonical.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 18:45:08 +09:00
fcf85313e5
feat(joinir): Phase 58 - Ownership P2 plumbing (dev-only)
...
OwnershipPlan → P2 lowering inputs 変換の dev 経路を追加。
Key changes:
- New plan_to_lowering.rs (~210 lines):
- P2LoweringInputs struct (carriers/captures/condition_captures)
- plan_to_p2_inputs() converter
- Fail-Fast on relay_writes (Phase 58 scope limitation)
Conversion rules:
- owned_vars where is_written=true → carriers
- Loop variable skipped (pinned, handled separately)
- is_condition_only=true → CarrierRole::ConditionOnly
- Read-only captures preserved
Entry point strategy:
- Analysis-only testing (no lowering path modification yet)
- Proves OwnershipAnalyzer can analyze P2 fixtures
- Full integration deferred to Phase 60+
Tests: 946/946 PASS (7 ownership tests)
- test_simple_p2_conversion
- test_relay_rejected (Fail-Fast verification)
- test_phase58_ownership_p2_comparison
All code under #[cfg(feature = "normalized_dev")] - zero impact on canonical path.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 18:08:00 +09:00
c722dc3bf6
feat(joinir): Phase 57 - OwnershipAnalyzer implementation (dev-only)
...
AST/ProgramJSON から OwnershipPlan を生成する解析箱を実装。
Key changes:
- New analyzer.rs (632 lines):
- OwnershipAnalyzer: Main analysis engine
- ScopeKind: Function/Loop/Block/If scope types
- ScopeInfo: Internal scope representation with reads/writes tracking
Algorithm:
1. Build scope tree (Function/Loop/Block/If hierarchy)
2. Collect reads/writes/condition_reads per scope
3. Apply body-local ownership rule (if/block locals → enclosing Loop/Function)
4. Generate OwnershipPlan: owned_vars, relay_writes, captures, condition_captures
Core invariants enforced:
- Ownership Uniqueness: Each variable has exactly one owner
- Carrier Locality: carriers = writes ∩ owned
- Relay Propagation: writes to ancestor-owned → relay up
- Capture Read-Only: captures have no PHI at this scope
Tests: 7 ownership unit tests + 946 existing (0 regressions)
- test_simple_loop_ownership: relay writes to function
- test_loop_local_carrier: owned AND written = carrier
- test_capture_read_only: read-only captures
- test_nested_loop_relay: relay chains through nested loops
Design: "読むのは自由、管理は直下だけ"
Phase 57 is dev-only - not yet connected to lowering.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 17:51:53 +09:00
2d10c5ce3f
docs(joinir): Phase 56 - Ownership-Relay Design + interface skeleton
...
「読むのは自由、管理は直下 owned だけ」アーキテクチャの設計文書と型定義。
Key changes:
- Design doc: phase56-ownership-relay-design.md
- Core definitions: owned/carriers/captures/relay
- Invariants: Ownership Uniqueness, Carrier Locality, Relay Propagation
- Shadowing rules, multi-writer merge semantics
- JoinIR mapping from current system to new system
- Implementation phases roadmap (56-61)
- New module: src/mir/join_ir/ownership/
- types.rs: ScopeId, ScopeOwnedVar, RelayVar, CapturedVar, OwnershipPlan
- mod.rs: Module documentation with responsibility boundaries
- README.md: Usage guide and examples
- API methods:
- OwnershipPlan::carriers() - owned AND written variables
- OwnershipPlan::condition_only_carriers() - condition-only carriers
- OwnershipPlan::verify_invariants() - invariant checking
Tests: 942/942 PASS (+3 unit tests)
Zero behavioral change - analysis module skeleton only.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 17:39:59 +09:00
80e952b83a
feat(joinir): Phase 54 SELFHOST-SHAPE-GROWTH - 構造軸育成 + 偽陽性観測
...
Phase 53 成果を踏まえ、構造シグネチャ軸を 5+ に育て、
偽陽性観測テストで name ガード縮小準備を整えた。
方針変更: 新ループ追加 → 構造軸育成 + 偽陽性率測定に焦点変更
- 理由: Phase 53 で selfhost P2/P3 実戦パターン追加済み
- 焦点: 既存ループに対する構造軸拡張 + 精度測定
主な成果:
1. 構造軸 5+ 達成:
- carrier 数
- carrier 型
- Compare パターン
- branch 構造
- NEW: Compare op 分布 (count_compare_ops ヘルパー)
2. 偽陽性観測テスト追加:
- test_phase54_structural_axis_discrimination_p2()
- test_phase54_structural_axis_discrimination_p3()
3. 重要な発見 - 偽陽性率 ~50%:
- P2: selfhost P2 が正しく検出されず (name ガード依存)
- P3: selfhost P3 が Pattern4ContinueMinimal と誤検出 (構造的類似性)
- 結論: 構造判定のみでは分離不十分、name ガード必須と判明
変更内容:
- shape_guard.rs (+80 lines):
- count_compare_ops() 構造軸ヘルパー追加
- detect_shapes() pub 化 (テストから呼び出し可能に)
- SelfhostVerifySchemaP2/SelfhostDetectFormatP3 enum 追加 (将来用)
- normalized_joinir_min.rs (+110 lines):
- 偽陽性観測テスト 2 個追加 (P2/P3 各1)
- canonical shapes vs selfhost shapes 構造判定精度測定
- phase49 doc (+200 lines):
- Phase 54 節完成版
- 偽陽性分析結果記録
- name ガード縮小方針明記
- enum 拡張対応:
- bridge.rs (+8 lines)
- normalized.rs (+8 lines)
- ast_lowerer/mod.rs (+2 lines)
偽陽性観測結果 (2025-12-12):
- P2 構造判定: selfhost P2 検出失敗 → name ガード必須
- P3 構造判定: selfhost P3 が Pattern4 と誤判定 → 構造的類似性問題
- 総合: 偽陽性率 ~50% → 構造軸 5 本では不十分
次フェーズ方針 (Phase 55+):
- Phase 55-A: 条件複雑度軸追加 (BinOp/UnaryOp ネスト深度)
- Phase 55-B: 算術パターン軸追加 (Mul/Sub/Div 出現パターン)
- Phase 56: selfhost 実戦ループ追加 (6 本以上蓄積)
- Phase 57: 誤判定率 < 5% 達成後に name ガード縮小開始
name ガード撤去条件 (Phase 57):
- 構造軸 8+ 本確立
- selfhost P2/P3 各 6 本以上蓄積
- 誤判定率 < 5% 達成
- 複合的特徴量ベース判定実装
回帰テスト: ✅ 939 PASS, 0 FAIL (既存挙動不変)
Files Modified: 8 files
Lines Added: ~408 lines (net)
Implementation: Pure additive (feature-gated)
Phase 54 完了！構造軸育成・偽陽性観測基盤確立！
2025-12-12 17:12:58 +09:00
7b0db59100
feat(joinir): Phase 53 - SELFHOST-NORM-DEV-EXPAND implementation
...
Expanded selfhost dev Normalized target with 2 practical P2/P3 loop variations,
strengthened structural signature axis, and implemented two-stage detection.
Key Changes:
1. Documentation (phase49-selfhost-joinir-depth2-design.md +128 lines):
- Added Phase 53 section with candidate selection rationale
- Documented two-stage detector strategy (structural primary + dev-only name guard)
- Defined structural axis strengthening (carrier count/type, branch patterns)
2. Fixtures (+210 lines):
- selfhost_args_parse_p2.program.json (60 lines): P2 with String carrier + conditional branching
- selfhost_stmt_count_p3.program.json (150 lines): P3 with 5 carriers + multi-branch if-else
3. Structured Builders (fixtures.rs +48 lines):
- build_selfhost_args_parse_p2_structured_for_normalized_dev()
- build_selfhost_stmt_count_p3_structured_for_normalized_dev()
4. ShapeGuard Two-Stage Detection (shape_guard.rs +80 lines):
- Added SelfhostArgsParseP2/SelfhostStmtCountP3 to NormalizedDevShape enum
- Implemented is_selfhost_args_parse_p2(): P2 core family + name guard
- Implemented is_selfhost_stmt_count_p3(): 2-10 carrier check + name guard
- Updated capability_for_shape() mappings
5. Bridge Integration (bridge.rs +8 lines, normalized.rs +10 lines):
- Added shape handlers delegating to existing normalizers
- Added roundtrip reconstruction handlers
6. Entry Point Registration (ast_lowerer/mod.rs +2 lines):
- Registered selfhost_args_parse_p2/selfhost_stmt_count_p3 as LoopFrontend routes
7. Dev VM Comparison Tests (normalized_joinir_min.rs +40 lines):
- normalized_selfhost_args_parse_p2_vm_bridge_direct_matches_structured()
- normalized_selfhost_stmt_count_p3_vm_bridge_direct_matches_structured()
8. Test Context Fix (dev_env.rs):
- Added thread-local test context depth counter
- Fixed deadlock in nested test_ctx() calls via reentrant with_dev_env_if_unset()
Structural Axis Growth:
P2 family:
- Carrier count: 1-3 (unchanged)
- NEW: Type diversity (Integer/String mixed)
- NEW: Conditional branching patterns (Eq-heavy comparisons)
P3 family:
- NEW: Carrier count upper bound: 2-10 (was 2-4)
- NEW: Multi-branch if-else (5+ branches with nested structure)
- NEW: Complex conditional patterns
Test Results:
- normalized_dev: 40/40 PASS (including 2 new tests)
- lib regression: 939 PASS, 56 ignored
- Existing behavior unchanged (normalized_dev feature-gated)
Phase 53 Achievements:
✅ P2/P3 each gained 1 practical variation (2 total)
✅ Two-stage detection: structural primary + dev-only name guard
✅ Structural axis expanded: 4 axes (carrier count/type/Compare/branch patterns)
✅ All tests PASS, no regressions
✅ Test context deadlock fixed (0.04s for 29 tests)
Files Modified: 14 files
Lines Added: ~516 lines (net)
Implementation: Pure additive (feature-gated)
Next Phase (54+):
- Accumulate 6+ loops per P2/P3 family
- Achieve 5+ stable structural axes
- Target < 5% false positive rate
- Then shrink/remove name guard scope
2025-12-12 16:40:20 +09:00
386cbc1915
Phase47-B/C: extend P3 normalized shapes and quiet dev warnings
2025-12-12 07:13:34 +09:00
7200309cc3
feat(joinir): Phase 48-A - P4 (continue) Normalized minimal implementation
...
Pattern4 (continue) integration into Normalized JoinIR pipeline complete.
Key changes:
- P4 minimal fixture: skip i==2 pattern, single carrier (acc)
- ShapeGuard: Pattern4ContinueMinimal detector (structure-based)
- StepScheduleBox: ContinueCheck step (eval order: HeaderCond → ContinueCheck → Updates → Tail)
- normalize_pattern4_continue_minimal(): Delegates to P2 (95% infrastructure reuse)
- Tests: 4 integration tests (normalization/runner/VM Bridge comparison×2)
Design validation:
- P4 (continue) = reverse control flow of P2 (break)
- Same loop_step(env, k_exit) skeleton
- Same EnvLayout/ConditionEnv/CarrierInfo infrastructure
- Only difference: evaluation order and control flow direction
Architecture proof:
- Normalized JoinIR successfully handles P1/P2/P3/P4 uniformly
- Infrastructure reuse rate: 95%+ as designed
Tests: 939/939 PASS (+1 from baseline 938, target exceeded!)
Files modified: 10 files (~305 lines added, pure additive)
- pattern4_continue_min.program.json (NEW +126 lines) - P4 fixture
- fixtures.rs (+31 lines) - P4 fixture loader
- shape_guard.rs (+60 lines) - Shape detection
- step_schedule.rs (+18 lines) - Schedule + test
- normalized.rs (+35 lines) - Normalization function
- loop_with_break_minimal.rs (+4 lines) - ContinueCheck handler
- bridge.rs (+5 lines) - VM bridge routing
- ast_lowerer/mod.rs (+2 lines) - Function registration
- normalized_joinir_min.rs (+84 lines) - Integration tests
- CURRENT_TASK.md (+13 lines) - Phase 48-A completion
Next steps:
- Phase 48-B: Extended P4 (multi-carrier, complex continue)
- Phase 48-C: Canonical promotion (always use Normalized for P4)
2025-12-12 06:31:13 +09:00
99bdf93dfe
feat(joinir): Phase 47-A-LOWERING - P3 Normalized→MIR(direct)
...
Implement full Pattern3 (if-sum) Normalized→MIR(direct) support, completing
the P3 minimal implementation.
Key changes:
1. P3 Shape Detection (shape_guard.rs):
- Implemented is_pattern3_if_sum_minimal() with structure-based detection
- Detects P3 characteristics:
- Has Compare instruction (loop condition)
- Has Select instruction (conditional carrier update)
- Has tail call (Call with k_next: None)
- Reasonable param count (2-4 for i, sum carriers)
- Handles both JoinInst::Select and Compute(MirLikeInst::Select)
- Added unit test: test_detect_pattern3_if_sum_minimal_shape ✅
2. P3 Normalization Function (normalized.rs):
- Implemented normalize_pattern3_if_sum_minimal()
- Guards: Validates Structured JoinIR + P3 shape detection
- Phase 47-A minimal: Delegates to P2 normalization (works for simple cases)
- Updated normalized_dev_roundtrip_structured() integration
- Returns Result<NormalizedModule, String> for proper error handling
3. Bridge Integration (bridge.rs):
- Updated normalize_for_shape() to call P3 normalization
- No changes needed to direct.rs (already handles P3 instructions)
4. Integration Tests (normalized_joinir_min.rs):
- Added test_phase47a_pattern3_if_sum_minimal_normalization
- Tests Structured→Normalized transformation
- Verifies shape detection + normalization succeeds
- Validates function count and phase correctness
- Added test_phase47a_pattern3_if_sum_minimal_runner
- Basic smoke test for P3 fixture validity
- Verifies 3-function structure and entry point
Benefits:
- P3 now uses Normalized→MIR(direct) pipeline (same as P1/P2)
- Structure-based detection (no name-based heuristics)
- Minimal implementation (delegates to P2 for simplicity)
- Pure additive (no P1/P2 behavioral changes)
Tests: 938/938 PASS (lib), shape_guard P3 test PASS
- test_detect_pattern3_if_sum_minimal_shape ✅
- test_phase47a_pattern3_if_sum_minimal_normalization ✅
- test_phase47a_pattern3_if_sum_minimal_runner ✅
Next phase: Phase 47-B (proper P3-specific normalization, array_filter, multi-carrier)
Design note: This minimal implementation reuses P2 normalization for simplicity.
Proper P3-specific normalization (IfCond, ThenUpdates, ElseUpdates step sequence)
will be implemented in Phase 47-B when needed for more complex P3 patterns.
2025-12-12 05:53:23 +09:00
c3a26e705e
feat(joinir): Phase 47-A-IMPL - P3 Normalized infrastructure
...
Implement Pattern3 (if-sum) Normalized infrastructure, extending existing P2
StepSchedule and ShapeGuard systems.
Key changes:
1. StepSchedule generalization (P2 → P2/P3):
- Renamed: pattern2_step_schedule.rs → step_schedule.rs
- Extended StepKind enum with P3 variants:
- IfCond (if condition in body)
- ThenUpdates (carrier updates in then branch)
- ElseUpdates (carrier updates in else branch)
- Added pattern3_if_sum_schedule() function
- Added unit test: test_pattern3_if_sum_schedule()
- Updated module references (mod.rs, loop_with_break_minimal.rs)
2. ShapeGuard extension:
- Added Pattern3IfSumMinimal variant to NormalizedDevShape
- Added is_pattern3_if_sum_minimal() detector (placeholder)
- Updated shape detector table
- Extended capability_for_shape() mapping
3. Bridge integration:
- bridge.rs: Added P3 shape handling in normalize_for_shape()
- normalized.rs: Added P3 roundtrip match (uses P2 temporarily)
4. P2/P3 separation:
- loop_with_break_minimal.rs: Added panic for P3 steps in P2 lowering
- Clear boundary enforcement (P2 lowerer rejects P3 steps)
5. Documentation:
- CURRENT_TASK.md: Phase 47-A-IMPL status
- phase47-norm-p3-design.md: Implementation status section
Benefits:
- Reuses 90% of P2 infrastructure (ConditionEnv, CarrierInfo, ExitLine)
- Clean P2/P3 separation via StepKind
- Pure additive changes (no P2 behavioral changes)
- Ready for Phase 47-A-LOWERING (full P3 Normalized implementation)
Tests: 938/938 PASS (+1 from step_schedule unit test)
- All existing P1/P2 tests pass (no regressions)
- P3 test uses Structured path temporarily (proper lowering in next phase)
Next phase: Implement full P3 Normalized→MIR(direct) lowering
2025-12-12 05:23:18 +09:00
42ecd7a7e7
feat(joinir): Phase 47-A prep - P3 fixture and test stub
...
Preparation for Phase 47-A (P3 Normalized minimal implementation).
Added fixture and test stub for pattern3_if_sum_minimal.
Changes:
- fixtures.rs: Added pattern3_if_sum_minimal fixture
- Source: phase212_if_sum_min.hako
- Pattern: Single carrier (sum), simple condition (i > 0)
- Dev-only fixture for P3 Normalized development
- normalized_joinir_min.rs: Added test stub
- test_normalized_pattern3_if_sum_minimal_runner
- Currently returns early (implementation pending)
- Feature-gated: #[cfg(feature = "normalized_dev")]
- Documentation updates:
- CURRENT_TASK.md: Phase 47-A status
- PHASE_43_245B_NORMALIZED_COMPLETION.md: P3 forward reference
- joinir-architecture-overview.md: Minor formatting
- phase47-norm-p3-design.md: Implementation notes
Next steps (Phase 47-A implementation):
1. Rename pattern2_step_schedule.rs → step_schedule.rs
2. Add P3 StepKind (IfCond, ThenUpdates, ElseUpdates)
3. Implement Normalized→MIR(direct) for P3
4. Complete test implementation
Tests: 937/937 PASS (no behavioral changes yet)
2025-12-12 05:07:01 +09:00
d4b9ae3ba5
feat(joinir): Phase 46 - P2-Mid canonical Normalized promotion
...
Promote P2-Mid patterns (_atoi real, _parse_number real) to canonical
Normalized→MIR(direct) route, completing P2 line transition.
Canonical set expansion (Phase 41 → Phase 46):
- P2-Core: Pattern2Mini, skip_ws mini/real, atoi mini
- P2-Mid: atoi real, parse_number real (NEW)
All JsonParser P2 loops (_skip_whitespace, _atoi, _parse_number) now
canonical Normalized - Structured→MIR is legacy/comparison-only.
Key changes:
- shape_guard.rs: Expanded is_canonical_shape() (+2 patterns)
- JsonparserAtoiReal
- JsonparserParseNumberReal
- Made NormalizedDevShape enum public
- bridge.rs: Updated canonical routing comments (Phase 41 → 46)
- normalized.rs: Made shape_guard module public
- normalized_joinir_min.rs: Added Phase 46 canonical verification test
- phase46-norm-canon-p2-mid.md: Complete design documentation
Out of scope (deferred):
- P3/P4 Normalized support → NORM-P3/NORM-P4 phases
- Selfhost complex loops → separate phases
Benefits:
- Clear P2 boundary: All JsonParser P2 = Normalized canonical
- Infrastructure validation: Phase 43/245B proven production-ready
- Simplified mental model: P2 = Normalized-first, P3/P4 = future
Tests: 937/937 PASS (lib), 20/20 PASS (normalized_dev feature)
Phase 46 test: test_phase46_canonical_set_includes_p2_mid ✅
2025-12-12 04:40:46 +09:00
c82ae2365f
refactor(joinir): Phase 44 - Capability-based shape guard
...
Refactor shape detection from function-name-based to capability-based
architecture for better extensibility and maintainability.
Key changes:
- ShapeCapabilityKind enum: P2CoreSimple/SkipWs/Atoi/ParseNumber
- ShapeCapability: Capability descriptor with future extensibility
- Helper functions:
- capability_for_shape(): Map shape to capability
- is_canonical_shape(): Exact shape-level check
- is_p2_core_capability(): Broad capability family check
- is_supported_by_normalized(): Normalized dev support
Benefits:
- Extensibility: Easy to add new capability kinds
- Clarity: Shape purpose explicit in kind names
- Maintainability: Centralized mapping vs scattered ifs
- Future-ready: Infrastructure for carrier roles, method signatures
Backward compatibility:
- Zero behavioral changes (pure refactoring)
- Canonical set preserved: Pattern2Mini, skip_ws mini/real, atoi mini
- All existing code paths unchanged
Tests: 937/937 PASS
Files: +78 lines (shape_guard.rs), design doc created
2025-12-12 04:06:03 +09:00
a763651162
refactor(joinir): Modularize function_scope_capture (1588→4 modules)
...
Break down monolithic function_scope_capture.rs into 4 focused Box-First modules:
**File structure**:
- mod.rs (57 lines): Public API and module organization
- types.rs (110 lines): CapturedVar, CapturedEnv type definitions
- helpers.rs (411 lines): 11 helper functions for AST analysis
- analyzers.rs (1015 lines): Core analysis functions and FunctionScopeCaptureAnalyzer
**Separation of concerns**:
- types.rs: Pure data structures
- helpers.rs: Reusable utility functions (find_stmt_index, ast_matches, etc.)
- analyzers.rs: High-level analysis logic and orchestration
- mod.rs: Clean public API
**Benefits**:
- Single Responsibility Principle: Each module has one clear purpose
- Maintainability: ~400 line modules instead of 1588 line monolith
- Testability: 12 tests organized by module
- Box-First design: Clear separation with well-defined boundaries
**Verification**:
- 937/937 tests PASS (no regression)
- cargo build --release succeeds
- All docs and comments preserved
- No functional changes
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 03:42:57 +09:00
879d3ee08e
feat(joinir): Phase 45 - JoinIR mode unification
...
Unified JoinIR routing logic through centralized JoinIrMode enum:
Key changes:
- Added JoinIrMode enum (StructuredOnly / NormalizedDev / NormalizedCanonical)
- Added current_joinir_mode() for centralized mode determination
- Refactored normalized_dev_enabled() as thin wrapper over mode enum
- Updated bridge.rs: mode-based routing with canonical P2-Core special handling
- Updated runner.rs: mode pattern matching for dev roundtrip path
Files modified:
- joinir_dev.rs: JoinIrMode enum + current_joinir_mode() (+49 lines)
- bridge.rs: Replaced boolean checks with mode pattern matching (+29 lines)
- runner.rs: Mode-based routing logic (+9 lines)
- CURRENT_TASK.md: Phase 45 implementation summary
Documentation:
- phase45-norm-mode-design.md: Complete design spec and implementation guide
Behavior preservation:
- Canonical P2-Core shapes: always Normalized→MIR(direct) (mode-independent)
- NormalizedDev mode: Structured→Normalized→MIR for supported shapes
- StructuredOnly mode: Structured→MIR direct (default)
Tests: 937/937 PASS (no regression, pure refactor)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 03:31:58 +09:00
ed8e2d3142
feat(joinir): Phase 248 - Normalized JoinIR infrastructure
...
Major refactoring of JoinIR normalization pipeline:
Key changes:
- Structured→Normalized→MIR(direct) pipeline established
- ShapeGuard enhanced with Pattern2 loop validation
- dev_env.rs: New development fixtures and env control
- fixtures.rs: jsonparser_parse_number_real fixture
- normalized_bridge/direct.rs: Direct MIR generation from Normalized
- pattern2_step_schedule.rs: Extracted step scheduling logic
Files changed:
- normalized.rs: Enhanced NormalizedJoinModule with DevEnv support
- shape_guard.rs: Pattern2-specific validation (+300 lines)
- normalized_bridge.rs: Unified bridge with direct path
- loop_with_break_minimal.rs: Integrated step scheduling
- Deleted: step_schedule.rs (moved to pattern2_step_schedule.rs)
New files:
- param_guess.rs: Loop parameter inference
- pattern2_step_schedule.rs: Step scheduling for Pattern2
- phase43-norm-canon-p2-mid.md: Design doc
Tests: 937/937 PASS (+6 from baseline 931)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 03:15:45 +09:00
12e2f87c6f
Refine normalized bridge direct path and env guard
2025-12-11 22:50:23 +09:00
a4756f3ce1
Add dev normalized→MIR bridge for P1/P2 mini and JP _atoi
2025-12-11 22:12:46 +09:00
af6f95cd4b
Phase 33 NORM canon test: enforce normalized dev route for P1/P2/JP mini
2025-12-11 20:54:33 +09:00
59a985b7fa
joinir: clean pattern visibility and refactor pattern2 pipeline
2025-12-11 19:11:26 +09:00
eb00d97fdb
feat(joinir): Phase 246-EX Part 2 - Exit PHI & step scheduling fixes
...
Phase 246-EX Part 2 completes the _atoi JoinIR integration:
Key fixes:
- Exit PHI connection: ExitLineReconnector now correctly uses exit PHI dsts
- Jump args preservation: BasicBlock.jump_args field stores JoinIR exit values
- instruction_rewriter: Reads jump_args, remaps JoinIR→HOST values by carrier order
- step_schedule.rs: New module for body-local init step ordering
Files changed:
- reconnector.rs: Exit PHI connection improvements
- instruction_rewriter.rs: Jump args reading & carrier value mapping
- loop_with_break_minimal.rs: Refactored step scheduling
- step_schedule.rs: NEW - Step ordering logic extracted
Tests: 931/931 PASS (no regression)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-11 17:16:10 +09:00
e356524b0a
feat(joinir): Phase 246-EX Part 1 - FromHost carrier infrastructure
...
Extends Phase 247-EX dual-value architecture for _atoi NumberAccumulation
support. Implements FromHost carrier handling throughout JoinIR pipeline.
## Problem Analysis
_atoi requires `result = result * 10 + digit_pos` where:
- digit_pos is promoted to dual carriers: is_digit_pos (bool) + digit_value (int)
- digit_value is used in NumberAccumulation but NOT updated itself
- Existing infrastructure filtered out carriers without updates
## Implementation
### 1. Carrier Filtering (pattern2_with_break.rs:507-514)
**Added FromHost retention**:
```rust
carrier_updates.contains_key(&carrier.name)
|| carrier.role == CarrierRole::ConditionOnly
|| carrier.init == CarrierInit::FromHost // Phase 247-EX
```
**Effect**: Keeps digit_value carrier despite no update expression
### 2. Carrier Update Passthrough (loop_with_break_minimal.rs:411-426)
**Added FromHost passthrough**:
- FromHost carriers without updates pass through from env
- Similar to Phase 227 ConditionOnly handling
- Logged as `[loop/carrier_update] Phase 247-EX: FromHost carrier passthrough`
### 3. Exit Bindings Collection (meta_collector.rs:156-172)
**Added FromHost exit_bindings inclusion**:
```rust
Some((CarrierRole::LoopState, CarrierInit::FromHost)) => {
// Include in exit_bindings for latch incoming
// Not for exit PHI or variable_map
}
```
**Effect**: digit_value gets latch incoming for header PHI
## Test Results
- **Before**: 931 tests PASS
- **After**: 931 tests PASS (0 regressions)
## Verification
**Phase 247-EX UpdateEnv working**:
```
[update_env/phase247ex] Resolved promoted 'digit_pos' → 'digit_value' (integer carrier): ValueId(111)
```
**NumberAccumulation MIR generated**:
```
%39 = %14 Mul %38 ← result * 10
%40 = %39 Add %9 ← tmp + digit_value
```
## Status
- ✅ Pattern2 classification
- ✅ NumberAccumulation detection
- ✅ dual-value carrier resolution
- ✅ FromHost carrier handling
- ⚠️ RC:0 issue (runtime value problem, Part 2)
## Related
- Phase 247-EX: DigitPos dual-value architecture (commit 8900a3cc🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-11 15:28:36 +09:00
