Commit Graph

9 Commits

Author SHA1 Message Date
99d329096f feat(joinir): Phase 176 Pattern2 multi-carrier lowering complete
Task 176-1: Pattern2 limitation investigation
- Identified 10 limitation points where only position carrier was handled
- Added TODO markers for Phase 176-2/3 implementation
- Created phase176-pattern2-limitations.md documentation

Task 176-2: CarrierUpdateLowerer helper implementation
- Implemented emit_carrier_update() helper function
- Supports CounterLike and AccumulationLike UpdateExpr patterns
- Added 6 unit tests (all passing)
- Fail-Fast error handling for carrier/variable not found

Task 176-3: Pattern2 lowerer multi-carrier extension
- Extended header PHI generation for all carriers
- Implemented loop update for all carriers using emit_carrier_update()
- Extended ExitLine/ExitMeta construction for all carriers
- Updated function call/jump args to include all carriers
- 9/10 tests passing (1 pre-existing test issue)

Task 176-4: E2E testing and bug fixes
- Fixed Trim pattern loop_var_name overwrite bug (pattern2_with_break.rs)
- Fixed InstructionRewriter latch_incoming mapping bug
- All E2E tests passing (RC=0): pos + result dual-carrier loops work
- test_jsonparser_parse_string_min2.hako verified

Task 176-5: Documentation updates
- Created phase176-completion-report.md
- Updated phase175-multicarrier-design.md with completion status
- Updated joinir-architecture-overview.md roadmap
- Updated CURRENT_TASK.md with Phase 176 completion + Phase 177 TODO
- Updated loop_pattern_space.md F-axis (multi-carrier support complete)

Technical achievements:
- Pattern2 now handles single/multiple carriers uniformly
- CarrierInfo architecture proven to work end-to-end
- Two critical bugs fixed (loop_var overwrite, latch_incoming mapping)
- No regressions in existing tests

Next: Phase 177 - Apply to JsonParser _parse_string full implementation
2025-12-08 15:17:53 +09:00
309d0803c7 feat(joinir): Phase 174 - JsonParser complex loop P5 extension design
- Task 174-1: Complex loop inventory (_parse_string/_parse_array/_parse_object)
  - Analyzed remaining JsonParser loops for P5 expansion potential
  - Identified _parse_string as most Trim-like structure (99% similarity)
  - Documented complexity scores and minimization potential

- Task 174-2: Selected _parse_string as next P5 target (closest to Trim)
  - Reason: LoopBodyLocal 'ch' usage matches Trim pattern exactly
  - Structure: loop(pos < len) + substring + char comparison + break
  - Minimization: Remove escape/buffer/continue → identical to Trim

- Task 174-3: Design doc for P5B extension (TrimLoopHelper reuse strategy)
  - File: docs/development/current/main/phase174-jsonparser-p5b-design.md
  - Strategy: Reuse existing TrimLoopHelper without modifications
  - Proven: Pattern applies to any character comparison, not just whitespace

- Task 174-4: Minimal PoC (_parse_string without escape) successful
  - Test: local_tests/test_jsonparser_parse_string_min.hako
  - Result: [pattern2/trim] Safe Trim pattern detected 
  - Detection: Trim with literals=['"'] (quote instead of whitespace)
  - Routing: Added whitelist entries for JsonParserStringTest methods

- Task 174-5: Documentation updates
  - Updated CURRENT_TASK.md with Phase 174 summary
  - Updated joinir-architecture-overview.md with P5 generality proof
  - Created phase174-jsonparser-loop-inventory-2.md (detailed analysis)
  - Created phase174-jsonparser-p5b-design.md (implementation strategy)

Success Criteria Met:
 _parse_string minimized version runs on P5 pipeline
 TrimLoopHelper works with '"' (non-whitespace character)
 Proven: Trim pattern is character-comparison-generic, not whitespace-specific
 Two new design docs (inventory + design)
 Phase 175+ roadmap established (multi-carrier, escape sequences)

Technical Achievement:
The P5 Trim pipeline successfully handled a quote-detection loop with zero code changes,
proving the architecture's generality beyond whitespace trimming.
2025-12-08 13:08:44 +09:00
cbeab6abd7 feat(joinir): Phase 201 - JoinInlineBoundaryBuilder expansion to Pattern3/4
- Task 201-1: Established canonical Builder pattern documentation
  - Created docs/development/current/main/joinir-boundary-builder-pattern.md
  - Documented Builder usage patterns for all patterns (P1/P2/P3/P4)
  - Added reference comments in pattern lowerers

- Task 201-2: Refactored Pattern3 to use Builder (removed field mutations)
  - Replaced new_with_exit_bindings + field mutation with Builder chain
  - Pattern3: 2 carriers (i + sum), exit_bindings, loop_var_name
  - Proper LoopExitBinding struct usage

- Task 201-3: Refactored Pattern4 to use Builder (continue/Trim support)
  - Replaced new_with_exit_bindings + field mutation with Builder chain
  - Pattern4: Dynamic carrier count, proper boundary construction

- Task 201-4: Added unit tests for Pattern3/4 style boundaries
  - test_builder_pattern3_style: Two carriers, exit_bindings validation
  - test_builder_pattern4_style: Dynamic carrier count validation
  - Verified no field mutations remain (exit_binding.rs uses deprecated fields only)

- Task 201-5: Updated architecture docs and CURRENT_TASK
  - joinir-architecture-overview.md: Builder now applied to all patterns
  - CURRENT_TASK.md: Phase 201 completion entry

All patterns now use consistent boundary construction via Builder.
Tests: All patterns pass (挙動不変).
2025-12-08 06:14:03 +09:00
891c39c67f docs(joinir): Task 200-4 - Update CURRENT_TASK and overview for Phase 200 Pipeline Cleanup
- Added Phase 200 completion status to CURRENT_TASK.md
- Updated joinir-architecture-overview.md with:
  - JoinInlineBoundaryBuilder (Phase 200-2)
  - JoinIRVerifier (Phase 200-3)
- Phase 200 achievements:
  - Task 200-1: Pattern × Box matrix table (21 boxes documented)
  - Task 200-2: Builder pattern for JoinInlineBoundary (Pattern2 pilot)
  - Task 200-3: Debug contract verifier for LoopHeader PHI/ExitLine
  - Task 200-4: Documentation updates

Phase 200 cleanup focuses on pipeline structure improvement without
changing behavior, establishing foundation for future refactoring.
2025-12-08 04:35:13 +09:00
69ce196fb4 feat(joinir): Phase 33-23 Stage 2 - Pattern-specific analyzers (Issue 2, Issue 6)
Implements Stage 2 of the JoinIR refactoring roadmap, extracting specialized
analyzer logic from pattern implementations.

## Issue 2: Continue Analysis Extraction (80-100 lines reduction)

**New Module**: `pattern4_carrier_analyzer.rs` (346 lines)
- `analyze_carriers()` - Filter carriers based on loop body updates
- `analyze_carrier_updates()` - Delegate to LoopUpdateAnalyzer
- `normalize_continue_branches()` - Delegate to ContinueBranchNormalizer
- `validate_continue_structure()` - Verify continue pattern validity
- **6 unit tests** covering validation, filtering, normalization

**Updated**: `pattern4_with_continue.rs`
- Removed direct ContinueBranchNormalizer usage (24 lines)
- Removed carrier filtering logic (replaced with analyzer call)
- Cleaner delegation to Pattern4CarrierAnalyzer

**Line Reduction**: 24 lines direct removal from pattern4

## Issue 6: Break Condition Analysis Extraction (60-80 lines reduction)

**New Module**: `break_condition_analyzer.rs` (466 lines)
- `extract_break_condition()` - Extract break condition from if-else-break
- `has_break_in_else_clause()` - Check for else-break pattern
- `validate_break_structure()` - Validate condition well-formedness
- `extract_condition_variables()` - Collect variable dependencies
- `negate_condition()` - Helper for condition negation
- **10 unit tests** covering all analyzer functions

**Updated**: `ast_feature_extractor.rs`
- Delegated `has_break_in_else_clause()` to BreakConditionAnalyzer (40 lines)
- Delegated `extract_break_condition()` to BreakConditionAnalyzer
- Added Phase 33-23 documentation
- Cleaner separation of concerns

**Line Reduction**: 40 lines direct removal from feature extractor

## Module Structure Updates

**Updated**: `src/mir/builder/control_flow/joinir/patterns/mod.rs`
- Added pattern4_carrier_analyzer module export
- Phase 33-23 documentation

**Updated**: `src/mir/loop_pattern_detection/mod.rs`
- Added break_condition_analyzer module export
- Phase 33-23 documentation

## Test Results

 **cargo build --release**: Success (0 errors, warnings only)
 **New tests**: 16/16 PASS
  - pattern4_carrier_analyzer: 6/6 PASS
  - break_condition_analyzer: 10/10 PASS
 **No regressions**: All new analyzer tests pass

## Stage 2 Summary

**Total Implementation**:
- 2 new analyzer modules (812 lines)
- 16 comprehensive unit tests
- 4 files updated
- 2 mod.rs exports added

**Total Line Reduction**: 64 lines direct removal
- pattern4_with_continue.rs: -24 lines
- ast_feature_extractor.rs: -40 lines

**Combined with Stage 1**: 130 lines total reduction (66 + 64)
**Progress**: 130/630 lines (21% of 30% goal achieved)

## Design Benefits

**Pattern4CarrierAnalyzer**:
- Single responsibility: Continue pattern analysis only
- Reusable for future continue-based patterns
- Independent testability
- Clear delegation hierarchy

**BreakConditionAnalyzer**:
- Generic break pattern analysis
- Used by Pattern 2 and future patterns
- No MirBuilder dependencies
- Pure function design

## Box Theory Compliance

 Single responsibility per module
 Clear public API boundaries
 Appropriate visibility (pub(in control_flow::joinir::patterns))
 No cross-module leakage
 Testable units

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-08 04:00:44 +09:00
5ba11468e4 feat(joinir): Phase 172 - Trim pattern JoinIR lowering implementation
Implement actual MIR generation for Trim pattern loops, enabling
LoopBodyLocal variables to work through bool carrier promotion.

## Implementation (pattern2_with_break.rs)
- emit_whitespace_check(): Generate OR chain for whitespace comparison
- extract_substring_args(): Extract s, start from substring call
- Initial carrier generation: ch0 = s.substring(start, start+1)
- Whitespace check: is_ch_match0 = (ch0 == " " || "\t" || "\n" || "\r")
- ConditionEnv integration: Register carrier for JoinIR condition
- Break condition replacement: !is_ch_match instead of original ch checks

## Architecture
- Host MIR: substring calls, OR chain evaluation, BoxCall
- JoinIR: Only sees bool carrier for break control
- No new JoinIR instructions added

## Documentation
- phase172-trim-lowering-impl.md: Design and implementation details
- loop_pattern_space.md: Analysis of all loop pattern combinations

Test: Trim loops compile and generate JoinIR successfully
Build: 0 errors, clean compilation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-08 03:06:20 +09:00
88400e7e22 feat(joinir): Phase 171-C-2 Trim pattern detection in LoopBodyCarrierPromoter
Implements the Trim pattern detection logic for carrier promotion:

- find_definition_in_body(): Iterative AST traversal to locate variable definitions
- is_substring_method_call(): Detects substring() method calls
- extract_equality_literals(): Extracts string literals from OR chains (ch == " " || ch == "\t")
- TrimPatternInfo: Captures detected pattern details for carrier promotion

This enables Pattern 5 to detect trim-style loops:
```hako
loop(start < end) {
    local ch = s.substring(start, start+1)
    if ch == " " || ch == "\t" || ch == "\n" || ch == "\r" {
        start = start + 1
    } else {
        break
    }
}
```

Unit tests cover:
- Simple and nested definition detection
- substring method call detection
- Single and chained equality literal extraction
- Full Trim pattern detection with 2-4 whitespace characters

Next: Phase 171-C-3 integration with Pattern 2/4 routing

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-07 23:09:25 +09:00
1356b61ff7 feat(joinir): Phase 170-D-impl-1 LoopConditionScopeBox skeleton creation
Implement the LoopConditionScope analysis infrastructure for Pattern2/4 validation:

New module:
- src/mir/loop_pattern_detection/loop_condition_scope.rs (220 lines)

Types:
- CondVarScope enum: LoopParam, OuterLocal, LoopBodyLocal
- CondVarInfo: Variable name + scope classification
- LoopConditionScope: Collection of analyzed variables with helper methods

Box implementation (LoopConditionScopeBox):
- analyze(): Main entry point - extracts and classifies condition variables
- extract_vars(): Recursive AST traversal to find all variable references
- is_outer_local(): Heuristic for outer scope detection (phase 170-D simplified)

Helper methods:
- has_loop_body_local(): Check for unsupported loop-body variables
- all_in(): Validate scope compatibility
- var_names(): Get variable set
- add_var(): Add with deduplication

Tests: 5 unit tests for core functionality

Architecture: Refactored loop_pattern_detection.rs → loop_pattern_detection/mod.rs
for modular organization.

Build:  Passed with no errors

🤖 Generated with Claude Code
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-07 21:29:19 +09:00
4e32a803a7 feat(joinir): Phase 33-22 CommonPatternInitializer & JoinIRConversionPipeline integration
Unifies initialization and conversion logic across all 4 loop patterns,
eliminating code duplication and establishing single source of truth.

## Changes

### Infrastructure (New)
- CommonPatternInitializer (117 lines): Unified loop var extraction + CarrierInfo building
- JoinIRConversionPipeline (127 lines): Unified JoinIR→MIR→Merge flow

### Pattern Refactoring
- Pattern 1: Uses CommonPatternInitializer + JoinIRConversionPipeline (-25 lines)
- Pattern 2: Uses CommonPatternInitializer + JoinIRConversionPipeline (-25 lines)
- Pattern 3: Uses CommonPatternInitializer + JoinIRConversionPipeline (-25 lines)
- Pattern 4: Uses CommonPatternInitializer + JoinIRConversionPipeline (-40 lines)

### Code Reduction
- Total reduction: ~115 lines across all patterns
- Zero code duplication in initialization/conversion
- Pattern files: 806 lines total (down from ~920)

### Quality Improvements
- Single source of truth for initialization
- Consistent conversion flow across all patterns
- Guaranteed boundary.loop_var_name setting (prevents SSA-undef bugs)
- Improved maintainability and testability

### Testing
- All 4 patterns tested and passing:
  - Pattern 1 (Simple While): 
  - Pattern 2 (With Break): 
  - Pattern 3 (If-Else PHI): 
  - Pattern 4 (With Continue): 

### Documentation
- Phase 33-22 inventory and results document
- Updated joinir-architecture-overview.md with new infrastructure

## Breaking Changes
None - pure refactoring with no API changes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-07 21:02:20 +09:00