feat(joinir): Phase 224 - DigitPosPromoter for A-4 pattern (core complete)
- New DigitPosPromoter Box for cascading indexOf pattern detection - Two-tier promotion strategy: A-3 Trim → A-4 DigitPos fallback - Unit tests 6/6 PASS (comparison operators, cascading dependency) - Promotion verified: digit_pos → is_digit_pos carrier ⚠️ Lowerer integration gap: lower_loop_with_break_minimal doesn't recognize promoted variables yet (Phase 224-continuation) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
nyash-codex
@ -55,6 +55,20 @@
|
||||
- E2E テスト: `apps/tests/phase223_p4_skip_whitespace_min.hako`（昇格成功 → Pattern4 lowering 続行確認）
|
||||
- 5 unit tests PASS、ビルド成功、ドキュメント更新完了
|
||||
- **残課題**: JoinIR Trim lowering（Phase 172+）で完全な RC 正確性を実現する必要あり
|
||||
- **Phase 223.5 完了** ✅: LoopBodyCondPromoter の Pattern2 統合
|
||||
- **Pattern2 統合**: header/break 条件両方を分析し昇格を試みる
|
||||
- **A-4 テスト追加**: `apps/tests/phase2235_p2_digit_pos_min.hako`（cascading LoopBodyLocal パターン → Fail-Fast 確認）
|
||||
- **error_messages.rs 拡張**: `format_error_pattern2_promotion_failed()` 等追加
|
||||
- **成果**: Pattern2/4 両方から LoopBodyCondPromoter を使う統一構造が完成
|
||||
- **Phase 224 完了** ⚠️: A-4 DigitPos Promoter（Core Implementation Complete）
|
||||
- **DigitPosPromoter 実装**: cascading indexOf パターン（substring → indexOf → comparison）の昇格ロジック完成
|
||||
- **Two-tier 戦略**: A-3 Trim → A-4 DigitPos フォールバック型オーケストレーション
|
||||
- **Unit Tests**: 6/6 PASS（comparison operators, cascading dependency, edge cases）
|
||||
- **Promotion 検証**: Pattern2 パイプラインで digit_pos → is_digit_pos 昇格成功確認
|
||||
- **Lowerer Integration Gap**: lower_loop_with_break_minimal が独立した LoopBodyLocal チェックを実行し、昇格済み変数をエラー検出
|
||||
- **Root Cause**: Break condition AST が元の変数名（digit_pos）を保持したまま lowerer に渡される
|
||||
- **Next Steps**: Option B（promoted variable tracking）で lowerer に昇格済み変数を通知する仕組みを追加（1-2h）
|
||||
- **詳細**: [PHASE_224_SUMMARY.md](docs/development/current/main/PHASE_224_SUMMARY.md)
|
||||
|
||||
### 2. JsonParser / Trim / selfhost への適用状況
|
||||
|
||||
|
||||
358
docs/development/current/main/PHASE_224_SUMMARY.md
Normal file
358
docs/development/current/main/PHASE_224_SUMMARY.md
Normal file
@ -0,0 +1,358 @@
|
||||
# Phase 224: A-4 DigitPos Promoter - Implementation Summary
|
||||
|
||||
**Date**: 2025-12-10
|
||||
**Status**: Core Implementation Complete, Integration Requires Additional Work
|
||||
**Branch**: main
|
||||
**Commits**: TBD
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
Phase 224 successfully implemented the **DigitPosPromoter** Box for A-4 pattern (cascading indexOf) promotion, achieving:
|
||||
|
||||
✅ **Complete**: DigitPosPromoter implementation with full unit test coverage (6/6 tests passing)
|
||||
✅ **Complete**: Integration into LoopBodyCondPromoter orchestrator
|
||||
✅ **Complete**: Two-tier promotion strategy (A-3 Trim → A-4 DigitPos fallback)
|
||||
✅ **Verified**: Promotion detection working correctly in Pattern2 pipeline
|
||||
⚠️ **Partial**: Full E2E flow blocked by lowerer integration issue
|
||||
|
||||
---
|
||||
|
||||
## Accomplishments
|
||||
|
||||
### 1. Design Document (224-2) ✅
|
||||
|
||||
**File**: `docs/development/current/main/phase224-digitpos-promoter-design.md`
|
||||
|
||||
**Key Design Decisions**:
|
||||
- **One Box, One Question**: DigitPosPromoter handles ONLY A-4 pattern (indexOf-based)
|
||||
- **Separation of Concerns**: Trim patterns remain in LoopBodyCarrierPromoter
|
||||
- **Orchestrator Pattern**: LoopBodyCondPromoter delegates to specialized promoters
|
||||
- **Bool Carrier**: Promote to `is_digit_pos` (bool) for consistency with A-3 Trim
|
||||
|
||||
### 2. DigitPosPromoter Implementation (224-3) ✅
|
||||
|
||||
**File**: `src/mir/loop_pattern_detection/loop_body_digitpos_promoter.rs` (467 lines)
|
||||
|
||||
**Features**:
|
||||
- **Pattern Detection**: Identifies cascading substring() → indexOf() → comparison
|
||||
- **Comparison Operators**: Supports `<`, `>`, `<=`, `>=`, `!=` (not equality)
|
||||
- **Dependency Validation**: Verifies indexOf() depends on another LoopBodyLocal
|
||||
- **Comprehensive Tests**: 6 unit tests covering normal/edge cases
|
||||
|
||||
**Test Results**:
|
||||
```bash
|
||||
cargo test --release --lib digitpos
|
||||
# running 6 tests
|
||||
# test result: ok. 6 passed; 0 failed; 0 ignored
|
||||
```
|
||||
|
||||
### 3. LoopBodyCondPromoter Integration (224-4) ✅
|
||||
|
||||
**File**: `src/mir/loop_pattern_detection/loop_body_cond_promoter.rs`
|
||||
|
||||
**Two-Tier Strategy**:
|
||||
```
|
||||
Step 1: Try A-3 Trim promotion (LoopBodyCarrierPromoter)
|
||||
↓ (if fails)
|
||||
Step 2: Try A-4 DigitPos promotion (DigitPosPromoter)
|
||||
↓ (if fails)
|
||||
Step 3: Fail-Fast with clear error message
|
||||
```
|
||||
|
||||
**Logs Verify Success**:
|
||||
```
|
||||
[cond_promoter] A-3 Trim promotion failed: No promotable Trim pattern detected
|
||||
[cond_promoter] Trying A-4 DigitPos promotion...
|
||||
[digitpos_promoter] Phase 224: Found 1 LoopBodyLocal variables: ["digit_pos"]
|
||||
[digitpos_promoter] A-4 DigitPos pattern promoted: digit_pos → is_digit_pos
|
||||
[cond_promoter] A-4 DigitPos pattern promoted: 'digit_pos' → carrier 'is_digit_pos'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Current Limitation: Lowerer Integration Gap
|
||||
|
||||
### Problem Statement
|
||||
|
||||
**Symptom**: E2E test fails despite successful promotion
|
||||
**Root Cause**: `lower_loop_with_break_minimal` performs independent LoopBodyLocal check
|
||||
**Result**: Promoted variables are detected as "unsupported" by the lowerer
|
||||
|
||||
### Error Flow
|
||||
|
||||
```
|
||||
Phase 223.5 (Pattern2) → LoopBodyCondPromoter.try_promote() → SUCCESS ✅
|
||||
↓
|
||||
Phase 180-3 (Pattern2) → TrimLoopLowerer.try_lower() → SKIP (not Trim)
|
||||
↓
|
||||
Pattern2 Lowerer → lower_loop_with_break_minimal() → Analyze break condition
|
||||
↓
|
||||
LoopConditionScopeBox.analyze() → Detects "digit_pos" as LoopBodyLocal
|
||||
↓
|
||||
ERROR ❌: "Unsupported condition: uses loop-body-local variables: [\"digit_pos\"]"
|
||||
```
|
||||
|
||||
### Why A-3 Trim Patterns Work
|
||||
|
||||
For A-3 Trim patterns, TrimLoopLowerer **rewrites the break condition** to remove LoopBodyLocal references before passing to lower_loop_with_break_minimal:
|
||||
|
||||
```rust
|
||||
// TrimLoopLowerer returns trim_result.condition (rewritten)
|
||||
let effective_break_condition = trim_result.condition; // No LoopBodyLocal!
|
||||
```
|
||||
|
||||
But for A-4 DigitPos (Phase 223.5), we:
|
||||
- Successfully promote to carrier: `digit_pos` → `is_digit_pos` ✅
|
||||
- Merge carrier into CarrierInfo ✅
|
||||
- **BUT**: Break condition AST still contains `digit_pos` ❌
|
||||
|
||||
### Root Cause Analysis
|
||||
|
||||
The break condition is an **AST node** containing:
|
||||
```nyash
|
||||
if digit_pos < 0 { break }
|
||||
```
|
||||
|
||||
After promotion:
|
||||
- CarrierInfo knows about `is_digit_pos` carrier ✅
|
||||
- LoopBodyCondPromoter recorded the promotion ✅
|
||||
- **But**: AST node still says `digit_pos`, not `is_digit_pos` ❌
|
||||
|
||||
When lower_loop_with_break_minimal analyzes the condition:
|
||||
```rust
|
||||
let cond_scope = LoopConditionScopeBox::analyze(&conditions);
|
||||
if cond_scope.has_loop_body_local() {
|
||||
// ERROR: Still sees "digit_pos" in AST!
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Solution Options (Phase 224-continuation)
|
||||
|
||||
### Option A: AST Rewriting (Comprehensive)
|
||||
|
||||
**Approach**: Rewrite break condition AST to replace promoted variables with carrier references
|
||||
|
||||
**Implementation**:
|
||||
1. After LoopBodyCondPromoter.try_promote() succeeds
|
||||
2. Create ASTRewriter to traverse break_condition_node
|
||||
3. Replace Variable("digit_pos") → Variable("is_digit_pos")
|
||||
4. Pass rewritten condition to lower_loop_with_break_minimal
|
||||
|
||||
**Pros**: Clean, consistent with Trim pattern flow
|
||||
**Cons**: AST rewriting is complex, error-prone
|
||||
**Effort**: ~2-3 hours
|
||||
|
||||
### Option B: Promoted Variable Tracking (Surgical)
|
||||
|
||||
**Approach**: Add metadata to track promoted variables, exclude from LoopBodyLocal check
|
||||
|
||||
**Implementation**:
|
||||
1. Add `promoted_loopbodylocals: Vec<String>` to CarrierInfo
|
||||
2. In Phase 223.5, record `promoted_var` in CarrierInfo
|
||||
3. Modify lower_loop_with_break_minimal signature:
|
||||
```rust
|
||||
fn lower_loop_with_break_minimal(
|
||||
...,
|
||||
promoted_vars: &[String], // NEW
|
||||
) -> Result<...>
|
||||
```
|
||||
4. In LoopConditionScopeBox::analyze(), filter out promoted_vars:
|
||||
```rust
|
||||
if cond_scope.has_loop_body_local_except(promoted_vars) {
|
||||
// Only error if non-promoted LoopBodyLocal exists
|
||||
}
|
||||
```
|
||||
|
||||
**Pros**: Minimal changes, surgical fix
|
||||
**Cons**: Adds parameter to lowerer API
|
||||
**Effort**: ~1-2 hours
|
||||
|
||||
### Option C: DigitPosLoopHelper Metadata (Consistent)
|
||||
|
||||
**Approach**: Create DigitPosLoopHelper similar to TrimLoopHelper
|
||||
|
||||
**Implementation**:
|
||||
1. Create `loop_body_digitpos_helper.rs` (similar to trim_loop_helper.rs)
|
||||
2. Attach DigitPosLoopHelper to CarrierInfo in DigitPosPromoter
|
||||
3. In Phase 223.5, check for digitpos_helper (like trim_helper check at line 321)
|
||||
4. In lower_loop_with_break_minimal, check CarrierInfo for helpers before error
|
||||
|
||||
**Pros**: Consistent with Trim pattern architecture
|
||||
**Cons**: More boilerplate
|
||||
**Effort**: ~2-3 hours
|
||||
|
||||
---
|
||||
|
||||
## Recommended Next Steps
|
||||
|
||||
### Immediate (P0 - Phase 224 Completion)
|
||||
|
||||
**Goal**: Unblock `phase2235_p2_digit_pos_min.hako` test
|
||||
|
||||
**Approach**: Implement **Option B** (Promoted Variable Tracking)
|
||||
|
||||
**Tasks**:
|
||||
1. Add `promoted_loopbodylocals` field to CarrierInfo
|
||||
2. Record promoted_var in Phase 223.5 (pattern2_with_break.rs:303)
|
||||
3. Pass promoted list to lower_loop_with_break_minimal
|
||||
4. Modify LoopConditionScopeBox to exclude promoted vars
|
||||
5. Verify E2E test passes
|
||||
|
||||
**Estimated Time**: 1-2 hours
|
||||
**Risk**: Low (surgical change)
|
||||
|
||||
### Short-term (P1 - Phase 225)
|
||||
|
||||
**Goal**: Extend to Pattern4 (with continue)
|
||||
|
||||
**Tasks**:
|
||||
1. Apply same promoted variable tracking to Pattern4
|
||||
2. Test with `parser_box_minimal.hako` (skip_ws pattern)
|
||||
3. Verify no regression in existing Trim patterns
|
||||
|
||||
**Estimated Time**: 1 hour
|
||||
**Risk**: Low (reuse Option B infrastructure)
|
||||
|
||||
### Medium-term (P2 - Phase 226)
|
||||
|
||||
**Goal**: A-5/A-6 patterns (multi-variable, cascading)
|
||||
|
||||
**Tasks**:
|
||||
1. Extend DigitPosPromoter to handle multiple indexOf() calls
|
||||
2. Support range check patterns (A-6: `ch < "0" || ch > "9"`)
|
||||
3. Add multi-variable promotion support
|
||||
|
||||
**Estimated Time**: 3-4 hours
|
||||
**Risk**: Medium (more complex patterns)
|
||||
|
||||
---
|
||||
|
||||
## Files Modified
|
||||
|
||||
### New Files (3)
|
||||
- `docs/development/current/main/phase224-digitpos-promoter-design.md` (design doc)
|
||||
- `src/mir/loop_pattern_detection/loop_body_digitpos_promoter.rs` (promoter implementation)
|
||||
- `docs/development/current/main/PHASE_224_SUMMARY.md` (this file)
|
||||
|
||||
### Modified Files (2)
|
||||
- `src/mir/loop_pattern_detection/mod.rs` (add digitpos_promoter module)
|
||||
- `src/mir/loop_pattern_detection/loop_body_cond_promoter.rs` (two-tier integration)
|
||||
|
||||
### Test Coverage
|
||||
- Unit tests: 6/6 passing (100%)
|
||||
- E2E test: 0/1 passing (blocked by lowerer integration)
|
||||
|
||||
---
|
||||
|
||||
## Build & Test Status
|
||||
|
||||
### Build
|
||||
```bash
|
||||
cargo build --release
|
||||
# Finished `release` profile [optimized] target(s) in 1m 11s
|
||||
# 7 warnings (snake_case naming, visibility)
|
||||
```
|
||||
|
||||
### Unit Tests
|
||||
```bash
|
||||
cargo test --release --lib digitpos
|
||||
# running 6 tests
|
||||
# test result: ok. 6 passed; 0 failed; 0 ignored
|
||||
```
|
||||
|
||||
### E2E Test (Current State)
|
||||
```bash
|
||||
./target/release/hakorune apps/tests/phase2235_p2_digit_pos_min.hako
|
||||
# [digitpos_promoter] A-4 DigitPos pattern promoted: digit_pos → is_digit_pos ✅
|
||||
# [cond_promoter] A-4 DigitPos pattern promoted ✅
|
||||
# ERROR: Unsupported condition: uses loop-body-local variables: ["digit_pos"] ❌
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Technical Debt & Future Work
|
||||
|
||||
### Code Quality Improvements
|
||||
1. Fix snake_case warnings in digitpos_promoter.rs (is_indexOf → is_index_of)
|
||||
2. Add LoopScopeShape visibility annotation (pub(crate) or pub)
|
||||
3. Extract common AST traversal logic (find_definition_in_body) to shared module
|
||||
|
||||
### Documentation
|
||||
1. Add DigitPosPromoter to `joinir-architecture-overview.md` box catalog
|
||||
2. Update `phase223-loopbodylocal-condition-inventory.md` with Phase 224 status
|
||||
3. Create integration guide for future pattern promoters
|
||||
|
||||
### Testing
|
||||
1. Add integration tests for Pattern2+DigitPos combination
|
||||
2. Add regression tests for Trim patterns (ensure no impact)
|
||||
3. Add performance benchmarks for promotion detection
|
||||
|
||||
---
|
||||
|
||||
## Appendix: Key Design Insights
|
||||
|
||||
### Why Two Promoters Instead of One?
|
||||
|
||||
**Question**: Why not extend LoopBodyCarrierPromoter to handle A-4 patterns?
|
||||
|
||||
**Answer**: **Separation of Concerns**
|
||||
- LoopBodyCarrierPromoter: Equality-based patterns (A-3 Trim)
|
||||
- `ch == " " || ch == "\t"` (OR chain)
|
||||
- Single LoopBodyLocal
|
||||
- Well-tested, stable
|
||||
|
||||
- DigitPosPromoter: Comparison-based patterns (A-4 DigitPos)
|
||||
- `digit_pos < 0` (comparison)
|
||||
- Cascading dependencies (ch → digit_pos)
|
||||
- New, experimental
|
||||
|
||||
**Box-First Principle**: "One Box = One Question"
|
||||
|
||||
### Why Bool Carrier Instead of Int?
|
||||
|
||||
**Question**: Why not preserve `digit_pos` as int carrier?
|
||||
|
||||
**Answer**: **Consistency with Existing Architecture**
|
||||
- A-3 Trim patterns use bool carriers (`is_whitespace`)
|
||||
- Pattern2/Pattern4 lowerers expect bool carriers in conditions
|
||||
- Bool carrier simplifies condition rewriting (just a flag)
|
||||
|
||||
**Future**: Int carrier variant can be added for downstream use (Phase 226+)
|
||||
|
||||
### Why Not Rewrite AST Immediately?
|
||||
|
||||
**Question**: Why defer AST rewriting to Phase 224-continuation?
|
||||
|
||||
**Answer**: **Incremental Development**
|
||||
- AST rewriting is complex and error-prone
|
||||
- Surgical fix (Option B) unblocks test faster
|
||||
- Learn from A-3 Trim pattern experience first
|
||||
- Can refactor to AST rewriting later if needed
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
Phase 224 successfully implemented the **core promotion logic** for A-4 DigitPos patterns, achieving:
|
||||
|
||||
- ✅ Comprehensive design document
|
||||
- ✅ Robust promoter implementation with full test coverage
|
||||
- ✅ Clean integration into orchestrator pattern
|
||||
- ✅ Verified promotion detection in Pattern2 pipeline
|
||||
|
||||
**Remaining Work**: Lowerer integration (1-2 hours, Option B approach)
|
||||
|
||||
**Next Session**: Implement Option B (promoted variable tracking) to complete Phase 224 and unblock `phase2235_p2_digit_pos_min.hako` test.
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- [Phase 223 Inventory](phase223-loopbodylocal-condition-inventory.md) - A-4 pattern specification
|
||||
- [Phase 224 Design](phase224-digitpos-promoter-design.md) - Detailed design document
|
||||
- [JoinIR Architecture](joinir-architecture-overview.md) - Overall system architecture
|
||||
- [Test File](../../../apps/tests/phase2235_p2_digit_pos_min.hako) - Minimal A-4 test case
|
||||
@ -308,26 +308,62 @@ Local Region (1000+):
|
||||
- Phase 174 で `_parse_string` 最小化版（終端クォート検出）でも動作確認済み。
|
||||
- → 空白文字以外の文字比較ループにも対応可能（TrimLoopHelper の汎用性実証）。
|
||||
|
||||
- **LoopBodyCondPromoter（Phase 223-3 実装完了）**
|
||||
- **LoopBodyCondPromoter（Phase 223-3 + 223.5 + 224 実装完了）**
|
||||
- ファイル: `src/mir/loop_pattern_detection/loop_body_cond_promoter.rs`
|
||||
- 責務:
|
||||
- ループ条件（header/break/continue）に出てくる LoopBodyLocal を carrier に昇格する統一 API。
|
||||
- P0（Category A-3: _skip_whitespace）: 単一変数の Trim パターンのみ対応。
|
||||
- Pattern 2/Pattern 4 両対応の薄いコーディネーター箱（detection は LoopBodyCarrierPromoter に委譲）。
|
||||
- Pattern 2/Pattern 4 両対応の薄いコーディネーター箱（detection は専門 Promoter に委譲）。
|
||||
- **Phase 224: Two-tier strategy** - A-3 Trim → A-4 DigitPos フォールバック型オーケストレーション。
|
||||
- Phase 223-3 実装内容:
|
||||
- `extract_continue_condition()`: body 内の if 文から continue 条件を抽出。
|
||||
- `try_promote_for_condition()`: LoopBodyCarrierPromoter を使った昇格処理。
|
||||
- Pattern4 への統合完了: LoopBodyLocal 条件の昇格成功時に lowering を続行（以前は Fail-Fast）。
|
||||
- Phase 223.5 実装内容:
|
||||
- Pattern2 への統合完了: header/break 条件を分析し昇格を試みる。
|
||||
- A-4（digit_pos）テスト追加: cascading LoopBodyLocal パターンで Fail-Fast 動作を確認。
|
||||
- error_messages.rs に Pattern2 用エラー関数追加: `format_error_pattern2_promotion_failed()` など。
|
||||
- Phase 224 実装内容（Core Implementation Complete ⚠️）:
|
||||
- **Two-tier promotion**: Step1 で A-3 Trim 試行 → 失敗なら Step2 で A-4 DigitPos 試行 → 両方失敗で Fail-Fast。
|
||||
- **DigitPosPromoter 統合**: cascading indexOf パターン（substring → indexOf → comparison）の昇格をサポート。
|
||||
- **Unit test 完全成功**: 6/6 PASS（promoter 自体は完璧動作）。
|
||||
- **Lowerer Integration Gap**: lower_loop_with_break_minimal が昇格済み変数を認識せず、独立チェックでエラー検出（Phase 224-continuation で対応予定）。
|
||||
- 設計原則:
|
||||
- **Thin coordinator**: LoopBodyCarrierPromoter に promotion ロジックを委譲し、metadata のみ返す。
|
||||
- **Thin coordinator**: 専門 Promoter（LoopBodyCarrierPromoter / DigitPosPromoter）に昇格ロジックを委譲。
|
||||
- **Pattern-agnostic**: Pattern2 (break) / Pattern4 (continue) の統一入口として機能。
|
||||
- **Fail-Fast**: 複雑パターン（Category B: 多段 if / method chain）は引き続き reject。
|
||||
- **Fail-Fast with clear routing**: A-3 → A-4 順で試行し、両方失敗なら明示的エラー。
|
||||
- 入出力:
|
||||
- 入力: `ConditionPromotionRequest`（loop_param_name, cond_scope, break_cond/continue_cond, loop_body）
|
||||
- 出力: `ConditionPromotionResult::Promoted { carrier_info, promoted_var, carrier_name }` または `CannotPromote { reason, vars }`
|
||||
- 使用元（Phase 223-3 実装時）:
|
||||
- 使用元（Phase 223.5 実装完了、Phase 224 拡張済み）:
|
||||
- Pattern4: promotion-first（昇格試行 → 成功なら CarrierInfo merge → 失敗なら Fail-Fast）
|
||||
- Pattern2: 既存 TrimLoopLowerer 経由で間接利用（将来的に統一可能）
|
||||
- Pattern2: promotion-first（同上、break条件を分析対象とする）
|
||||
|
||||
- **DigitPosPromoter（Phase 224 実装完了 ⚠️ Core Complete）**
|
||||
- ファイル: `src/mir/loop_pattern_detection/loop_body_digitpos_promoter.rs`（467 lines）
|
||||
- 責務:
|
||||
- **A-4 pattern**: Cascading LoopBodyLocal with indexOf（substring → indexOf → comparison）の昇格。
|
||||
- **Pattern detection**: `local ch = s.substring(...); local digit_pos = digits.indexOf(ch); if digit_pos < 0 { break }`
|
||||
- **Comparison operators**: `<`, `>`, `<=`, `>=`, `!=` をサポート（equality `==` は A-3 Trim 領域）。
|
||||
- **Dependency validation**: indexOf() が別の LoopBodyLocal に依存していることを検証（cascading pattern）。
|
||||
- Phase 224 実装内容:
|
||||
- `try_promote()`: A-4 パターン検出 & bool carrier 昇格（`digit_pos` → `is_digit_pos`）。
|
||||
- **Unit tests**: 6/6 PASS（basic pattern, non-indexOf rejection, no dependency rejection, comparison operators, equality rejection）。
|
||||
- **Integration**: LoopBodyCondPromoter から A-3 Trim フォールバック後に呼ばれる。
|
||||
- 設計原則:
|
||||
- **One Box, One Question**: A-4 DigitPos パターン専用（A-3 Trim は LoopBodyCarrierPromoter に残す）。
|
||||
- **Separation of Concerns**: Trim（equality-based）と DigitPos（comparison-based）を分離。
|
||||
- **Bool carrier consistency**: A-3 Trim と同じく bool carrier に昇格（`is_digit_pos`）。
|
||||
- 入出力:
|
||||
- 入力: `DigitPosPromotionRequest`（cond_scope, break_cond/continue_cond, loop_body）
|
||||
- 出力: `DigitPosPromotionResult::Promoted { carrier_info, promoted_var, carrier_name }` または `CannotPromote { reason, vars }`
|
||||
- 現状の制約（Phase 224-continuation で対応予定）:
|
||||
- **Promotion は成功**: LoopBodyCondPromoter → DigitPosPromoter → Promoted ✅
|
||||
- **Lowerer integration gap**: lower_loop_with_break_minimal が昇格済み変数を認識せず、break condition AST に元の変数名が残っているため独立チェックでエラー。
|
||||
- **Solution**: Option B（promoted variable tracking）で昇格済み変数リストを lowerer に渡す（1-2h 実装予定）。
|
||||
- 参考:
|
||||
- 設計ドキュメント: `docs/development/current/main/phase224-digitpos-promoter-design.md`
|
||||
- 完全サマリ: `docs/development/current/main/PHASE_224_SUMMARY.md`
|
||||
- テストケース: `apps/tests/phase2235_p2_digit_pos_min.hako`
|
||||
|
||||
- **ContinueBranchNormalizer / LoopUpdateAnalyzer**
|
||||
- ファイル:
|
||||
|
||||
@ -0,0 +1,530 @@
|
||||
# Phase 224: A-4 DigitPos Promoter Design
|
||||
|
||||
## Purpose
|
||||
|
||||
Implement carrier promotion support for the **A-4 Digit Position** pattern, enabling cascading LoopBodyLocal conditions like:
|
||||
|
||||
```nyash
|
||||
loop(p < s.length()) {
|
||||
local ch = s.substring(p, p+1) // First LoopBodyLocal
|
||||
local digit_pos = digits.indexOf(ch) // Second LoopBodyLocal (depends on ch)
|
||||
|
||||
if digit_pos < 0 { // Break condition uses digit_pos
|
||||
break
|
||||
}
|
||||
|
||||
// Continue processing...
|
||||
p = p + 1
|
||||
}
|
||||
```
|
||||
|
||||
This pattern is blocked by Phase 223's Fail-Fast mechanism because `digit_pos` is a LoopBodyLocal variable appearing in the loop condition.
|
||||
|
||||
---
|
||||
|
||||
## Pattern Characteristics
|
||||
|
||||
### A-4 Pattern Structure
|
||||
|
||||
**Category**: A-4 Cascading LoopBodyLocal (from phase223-loopbodylocal-condition-inventory.md)
|
||||
|
||||
**Key Elements**:
|
||||
1. **First LoopBodyLocal**: `ch = s.substring(...)` (substring extraction)
|
||||
2. **Second LoopBodyLocal**: `digit_pos = digits.indexOf(ch)` (depends on first)
|
||||
3. **Condition**: `if digit_pos < 0 { break }` (comparison, NOT equality)
|
||||
4. **Dependency Chain**: `s` → `ch` → `digit_pos` → condition
|
||||
|
||||
**AST Structure Requirements**:
|
||||
- First variable must be defined by `substring()` method call
|
||||
- Second variable must be defined by `indexOf()` method call
|
||||
- Second variable depends on first variable (cascading)
|
||||
- Break condition uses comparison operator (`<`, `>`, `<=`, `>=`, `!=`)
|
||||
- NOT equality operator (`==`) like A-3 Trim pattern
|
||||
|
||||
---
|
||||
|
||||
## Design Principles
|
||||
|
||||
### 1. Box-First Architecture
|
||||
|
||||
Following Nyash's "Everything is Box" philosophy:
|
||||
|
||||
- **DigitPosPromoter**: Single responsibility - detect and promote A-4 pattern
|
||||
- **LoopBodyCondPromoter**: Orchestrator - delegates to specialized promoters
|
||||
- **CarrierInfo**: Carrier metadata container
|
||||
|
||||
### 2. Separation of Concerns
|
||||
|
||||
**LoopBodyCarrierPromoter** (existing):
|
||||
- Handles A-3 Trim pattern (equality-based)
|
||||
- substring() + equality chain (`ch == " " || ch == "\t"`)
|
||||
- Remains specialized for Trim/whitespace patterns
|
||||
|
||||
**DigitPosPromoter** (new):
|
||||
- Handles A-4 Digit Position pattern (comparison-based)
|
||||
- substring() → indexOf() → comparison
|
||||
- Specialized for cascading indexOf patterns
|
||||
|
||||
**LoopBodyCondPromoter** (orchestrator):
|
||||
- Tries Trim promotion first (A-3)
|
||||
- Falls back to DigitPos promotion (A-4)
|
||||
- Returns first successful promotion or CannotPromote
|
||||
|
||||
### 3. Fail-Fast Philosophy
|
||||
|
||||
- Explicit error messages for unsupported patterns
|
||||
- Early return on detection failure
|
||||
- Clear distinction between "safe" and "complex" patterns
|
||||
|
||||
---
|
||||
|
||||
## API Design
|
||||
|
||||
### DigitPosPromotionRequest
|
||||
|
||||
```rust
|
||||
pub struct DigitPosPromotionRequest<'a> {
|
||||
/// Loop parameter name (e.g., "p")
|
||||
pub loop_param_name: &'a str,
|
||||
|
||||
/// Condition scope analysis result
|
||||
pub cond_scope: &'a LoopConditionScope,
|
||||
|
||||
/// Loop structure metadata (for future use)
|
||||
pub scope_shape: Option<&'a LoopScopeShape>,
|
||||
|
||||
/// Break condition AST (Pattern2: Some, Pattern4: None)
|
||||
pub break_cond: Option<&'a ASTNode>,
|
||||
|
||||
/// Continue condition AST (Pattern4: Some, Pattern2: None)
|
||||
pub continue_cond: Option<&'a ASTNode>,
|
||||
|
||||
/// Loop body statements
|
||||
pub loop_body: &'a [ASTNode],
|
||||
}
|
||||
```
|
||||
|
||||
### DigitPosPromotionResult
|
||||
|
||||
```rust
|
||||
pub enum DigitPosPromotionResult {
|
||||
/// Promotion successful
|
||||
Promoted {
|
||||
/// Carrier metadata (for Pattern2/Pattern4 integration)
|
||||
carrier_info: CarrierInfo,
|
||||
|
||||
/// Variable name that was promoted (e.g., "digit_pos")
|
||||
promoted_var: String,
|
||||
|
||||
/// Promoted carrier name (e.g., "is_digit")
|
||||
carrier_name: String,
|
||||
},
|
||||
|
||||
/// Cannot promote (Fail-Fast)
|
||||
CannotPromote {
|
||||
/// Human-readable reason
|
||||
reason: String,
|
||||
|
||||
/// List of problematic LoopBodyLocal variables
|
||||
vars: Vec<String>,
|
||||
},
|
||||
}
|
||||
```
|
||||
|
||||
### DigitPosPromoter
|
||||
|
||||
```rust
|
||||
pub struct DigitPosPromoter;
|
||||
|
||||
impl DigitPosPromoter {
|
||||
/// Try to promote A-4 pattern (cascading indexOf)
|
||||
pub fn try_promote(req: DigitPosPromotionRequest) -> DigitPosPromotionResult;
|
||||
|
||||
// Private helpers
|
||||
fn find_indexOf_definition<'a>(body: &'a [ASTNode], var_name: &str) -> Option<&'a ASTNode>;
|
||||
fn is_indexOf_method_call(node: &ASTNode) -> bool;
|
||||
fn extract_comparison_var(cond: &ASTNode) -> Option<String>;
|
||||
fn find_first_loopbodylocal_dependency<'a>(
|
||||
body: &'a [ASTNode],
|
||||
indexOf_call: &'a ASTNode
|
||||
) -> Option<&'a str>;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Detection Algorithm
|
||||
|
||||
### Step 1: Extract LoopBodyLocal Variables
|
||||
|
||||
From `LoopConditionScope`, extract all variables with `CondVarScope::LoopBodyLocal`.
|
||||
|
||||
**Expected for A-4 pattern**: `["ch", "digit_pos"]` (2 variables)
|
||||
|
||||
### Step 2: Find indexOf() Definition
|
||||
|
||||
For each LoopBodyLocal variable, find its definition in loop body:
|
||||
|
||||
```rust
|
||||
// Search for: local digit_pos = digits.indexOf(ch)
|
||||
let def_node = find_indexOf_definition(loop_body, "digit_pos");
|
||||
if !is_indexOf_method_call(def_node) {
|
||||
return CannotPromote("Not an indexOf() pattern");
|
||||
}
|
||||
```
|
||||
|
||||
### Step 3: Extract Comparison Variable
|
||||
|
||||
Extract the variable used in break/continue condition:
|
||||
|
||||
```rust
|
||||
// Pattern: if digit_pos < 0 { break }
|
||||
let cond = break_cond.or(continue_cond);
|
||||
let var_in_cond = extract_comparison_var(cond);
|
||||
```
|
||||
|
||||
### Step 4: Verify Cascading Dependency
|
||||
|
||||
Check that indexOf() call depends on another LoopBodyLocal (e.g., `ch`):
|
||||
|
||||
```rust
|
||||
// digits.indexOf(ch) - extract "ch"
|
||||
let dependency = find_first_loopbodylocal_dependency(loop_body, indexOf_call);
|
||||
if dependency.is_none() {
|
||||
return CannotPromote("indexOf() does not depend on LoopBodyLocal");
|
||||
}
|
||||
```
|
||||
|
||||
### Step 5: Build CarrierInfo
|
||||
|
||||
```rust
|
||||
// Promote to bool carrier: is_digit = (digit_pos >= 0)
|
||||
let carrier_name = format!("is_{}", var_in_cond);
|
||||
let carrier_info = CarrierInfo::with_carriers(
|
||||
carrier_name.clone(),
|
||||
ValueId(0), // Placeholder (will be remapped)
|
||||
vec![],
|
||||
);
|
||||
|
||||
return Promoted {
|
||||
carrier_info,
|
||||
promoted_var: var_in_cond,
|
||||
carrier_name,
|
||||
};
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## CarrierInfo Construction
|
||||
|
||||
### Carrier Type Decision
|
||||
|
||||
**Option A: bool carrier** (Recommended)
|
||||
```rust
|
||||
carrier_name: "is_digit"
|
||||
carrier_type: bool
|
||||
initialization: is_digit = (digit_pos >= 0)
|
||||
```
|
||||
|
||||
**Rationale**:
|
||||
- Consistent with A-3 Trim pattern (also bool)
|
||||
- Simplifies condition rewriting
|
||||
- Pattern2/Pattern4 integration expects bool carriers
|
||||
|
||||
**Option B: int carrier**
|
||||
```rust
|
||||
carrier_name: "digit_pos_carrier"
|
||||
carrier_type: int
|
||||
initialization: digit_pos_carrier = digits.indexOf(ch)
|
||||
```
|
||||
|
||||
**Rationale**:
|
||||
- Preserves original int value
|
||||
- Could be useful for downstream computations
|
||||
|
||||
**Decision**: Use **Option A (bool carrier)** for P0 implementation. Option B can be added later if needed.
|
||||
|
||||
### Carrier Initialization Logic
|
||||
|
||||
```rust
|
||||
// At loop entry (before first iteration):
|
||||
local ch = s.substring(p, p+1)
|
||||
local digit_pos = digits.indexOf(ch)
|
||||
local is_digit = (digit_pos >= 0) // Bool carrier
|
||||
|
||||
// Loop condition uses carrier:
|
||||
loop(p < n && is_digit) {
|
||||
// Body uses original digit_pos if needed
|
||||
num_str = num_str + ch
|
||||
p = p + 1
|
||||
|
||||
// Update carrier at end of body:
|
||||
ch = s.substring(p, p+1)
|
||||
digit_pos = digits.indexOf(ch)
|
||||
is_digit = (digit_pos >= 0)
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## LoopBodyCondPromoter Integration
|
||||
|
||||
### Current Implementation (A-3 Only)
|
||||
|
||||
```rust
|
||||
pub fn try_promote_for_condition(req: ConditionPromotionRequest) -> ConditionPromotionResult {
|
||||
// Build request for LoopBodyCarrierPromoter (A-3 Trim)
|
||||
let promotion_request = PromotionRequest { ... };
|
||||
|
||||
match LoopBodyCarrierPromoter::try_promote(&promotion_request) {
|
||||
PromotionResult::Promoted { trim_info } => {
|
||||
// Return Promoted with CarrierInfo
|
||||
}
|
||||
PromotionResult::CannotPromote { reason, vars } => {
|
||||
// Fail-Fast
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Extended Implementation (A-3 → A-4 Cascade)
|
||||
|
||||
```rust
|
||||
pub fn try_promote_for_condition(req: ConditionPromotionRequest) -> ConditionPromotionResult {
|
||||
// Step 1: Try Trim promotion (A-3 pattern)
|
||||
let trim_request = PromotionRequest { ... };
|
||||
match LoopBodyCarrierPromoter::try_promote(&trim_request) {
|
||||
PromotionResult::Promoted { trim_info } => {
|
||||
eprintln!("[cond_promoter] A-3 Trim pattern promoted");
|
||||
return ConditionPromotionResult::Promoted {
|
||||
carrier_info: trim_info.to_carrier_info(),
|
||||
promoted_var: trim_info.var_name,
|
||||
carrier_name: trim_info.carrier_name,
|
||||
};
|
||||
}
|
||||
PromotionResult::CannotPromote { .. } => {
|
||||
eprintln!("[cond_promoter] A-3 Trim promotion failed, trying A-4 DigitPos");
|
||||
}
|
||||
}
|
||||
|
||||
// Step 2: Try DigitPos promotion (A-4 pattern)
|
||||
let digitpos_request = DigitPosPromotionRequest {
|
||||
loop_param_name: req.loop_param_name,
|
||||
cond_scope: req.cond_scope,
|
||||
scope_shape: req.scope_shape,
|
||||
break_cond: req.break_cond,
|
||||
continue_cond: req.continue_cond,
|
||||
loop_body: req.loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(digitpos_request) {
|
||||
DigitPosPromotionResult::Promoted { carrier_info, promoted_var, carrier_name } => {
|
||||
eprintln!("[cond_promoter] A-4 DigitPos pattern promoted");
|
||||
return ConditionPromotionResult::Promoted {
|
||||
carrier_info,
|
||||
promoted_var,
|
||||
carrier_name,
|
||||
};
|
||||
}
|
||||
DigitPosPromotionResult::CannotPromote { reason, vars } => {
|
||||
eprintln!("[cond_promoter] A-4 DigitPos promotion failed: {}", reason);
|
||||
}
|
||||
}
|
||||
|
||||
// Step 3: Fail-Fast (no pattern matched)
|
||||
ConditionPromotionResult::CannotPromote {
|
||||
reason: "No promotable pattern detected (tried A-3 Trim, A-4 DigitPos)".to_string(),
|
||||
vars: extract_body_local_names(&req.cond_scope.vars),
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Pattern Detection Edge Cases
|
||||
|
||||
### Edge Case 1: Multiple indexOf() Calls
|
||||
|
||||
```nyash
|
||||
local digit_pos1 = digits.indexOf(ch1)
|
||||
local digit_pos2 = digits.indexOf(ch2)
|
||||
```
|
||||
|
||||
**Handling**: Promote the variable that appears in the condition. Use `extract_comparison_var()` to identify it.
|
||||
|
||||
### Edge Case 2: indexOf() on Non-LoopBodyLocal
|
||||
|
||||
```nyash
|
||||
local pos = fixed_string.indexOf(ch) // fixed_string is outer variable
|
||||
```
|
||||
|
||||
**Handling**: This is NOT a cascading pattern. Return `CannotPromote("indexOf() does not depend on LoopBodyLocal")`.
|
||||
|
||||
### Edge Case 3: Comparison with Non-Zero
|
||||
|
||||
```nyash
|
||||
if digit_pos < 5 { break } // Not the standard "< 0" pattern
|
||||
```
|
||||
|
||||
**Handling**: Still promote - comparison operator is what matters, not the literal value. The carrier becomes `is_digit = (digit_pos < 5)`.
|
||||
|
||||
### Edge Case 4: indexOf() with Multiple Arguments
|
||||
|
||||
```nyash
|
||||
local pos = s.indexOf(ch, start_index) // indexOf with start position
|
||||
```
|
||||
|
||||
**Handling**: Still promote - as long as one argument is a LoopBodyLocal, it's a valid cascading pattern.
|
||||
|
||||
---
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
### Unit Tests (in loop_body_digitpos_promoter.rs)
|
||||
|
||||
```rust
|
||||
#[test]
|
||||
fn test_digitpos_promoter_basic_pattern() {
|
||||
// ch = s.substring(...) → digit_pos = digits.indexOf(ch) → if digit_pos < 0
|
||||
// Expected: Promoted
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_promoter_non_indexOf_method() {
|
||||
// ch = s.substring(...) → pos = s.length() → if pos < 0
|
||||
// Expected: CannotPromote
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_promoter_no_loopbodylocal_dependency() {
|
||||
// digit_pos = fixed_string.indexOf("x") // No LoopBodyLocal dependency
|
||||
// Expected: CannotPromote
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_promoter_comparison_operators() {
|
||||
// Test <, >, <=, >=, != operators
|
||||
// Expected: All should be Promoted
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_promoter_equality_operator() {
|
||||
// if digit_pos == -1 { break } // Equality, not comparison
|
||||
// Expected: CannotPromote (this is A-3 Trim territory)
|
||||
}
|
||||
```
|
||||
|
||||
### Integration Test (Pattern2/Pattern4)
|
||||
|
||||
**Test File**: `apps/tests/phase2235_p2_digit_pos_min.hako`
|
||||
|
||||
**Before Phase 224**:
|
||||
```
|
||||
[joinir/freeze] LoopBodyLocal in condition: ["digit_pos"]
|
||||
Cannot promote LoopBodyLocal variables ["digit_pos"]: No promotable Trim pattern detected
|
||||
```
|
||||
|
||||
**After Phase 224**:
|
||||
```
|
||||
[cond_promoter] A-3 Trim promotion failed, trying A-4 DigitPos
|
||||
[cond_promoter] A-4 DigitPos pattern promoted: digit_pos → is_digit
|
||||
[pattern2/lowering] Using promoted carrier: is_digit
|
||||
```
|
||||
|
||||
### E2E Test
|
||||
|
||||
```bash
|
||||
# Compile and run
|
||||
NYASH_JOINIR_DEBUG=1 ./target/release/hakorune apps/tests/phase2235_p2_digit_pos_min.hako
|
||||
|
||||
# Expected output:
|
||||
# p = 3
|
||||
# num_str = 123
|
||||
# (No [joinir/freeze] error)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Comparison: A-3 Trim vs A-4 DigitPos
|
||||
|
||||
| Feature | A-3 Trim (LoopBodyCarrierPromoter) | A-4 DigitPos (DigitPosPromoter) |
|
||||
|---------|-----------------------------------|--------------------------------|
|
||||
| **Method Call** | `substring()` | `substring()` → `indexOf()` |
|
||||
| **Dependency** | Single LoopBodyLocal (`ch`) | Cascading (`ch` → `digit_pos`) |
|
||||
| **Condition Type** | Equality (`==`, `!=`) | Comparison (`<`, `>`, `<=`, `>=`) |
|
||||
| **Condition Structure** | OR chain: `ch == " "` \|\| `ch == "\t"` | Single comparison: `digit_pos < 0` |
|
||||
| **Carrier Type** | Bool (`is_whitespace`) | Bool (`is_digit`) |
|
||||
| **Pattern Count** | 1 variable | 2 variables (cascading) |
|
||||
|
||||
---
|
||||
|
||||
## Future Extensions (Post-P0)
|
||||
|
||||
### A-5: Multi-Variable Patterns (P2)
|
||||
|
||||
```nyash
|
||||
local ch_s = s.substring(...)
|
||||
local ch_lit = literal.substring(...)
|
||||
if ch_s != ch_lit { break }
|
||||
```
|
||||
|
||||
**Challenge**: Two independent LoopBodyLocal variables, not cascading.
|
||||
|
||||
### A-6: Multiple Break Conditions (P2)
|
||||
|
||||
```nyash
|
||||
if ch < "0" || ch > "9" { break } // Range check
|
||||
if pos < 0 { break } // indexOf check
|
||||
```
|
||||
|
||||
**Challenge**: Two separate break conditions using different variables.
|
||||
|
||||
### Option B: Int Carrier Support
|
||||
|
||||
If downstream code needs the actual `digit_pos` value (not just bool), implement int carrier variant:
|
||||
|
||||
```rust
|
||||
carrier_name: "digit_pos_carrier"
|
||||
carrier_type: int
|
||||
initialization: digit_pos_carrier = digits.indexOf(ch)
|
||||
condition: loop(p < n && digit_pos_carrier >= 0)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
```
|
||||
src/mir/loop_pattern_detection/
|
||||
├── loop_body_carrier_promoter.rs (existing - A-3 Trim)
|
||||
├── loop_body_digitpos_promoter.rs (NEW - A-4 DigitPos)
|
||||
├── loop_body_cond_promoter.rs (modified - orchestrator)
|
||||
└── mod.rs (add pub mod)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Success Criteria
|
||||
|
||||
1. **Build Success**: `cargo build --release` with 0 errors, 0 warnings
|
||||
2. **Unit Tests Pass**: All tests in `loop_body_digitpos_promoter.rs` pass
|
||||
3. **Integration Test**: `apps/tests/phase2235_p2_digit_pos_min.hako` no longer Fail-Fasts
|
||||
4. **E2E Test**: Program executes and outputs correct result (`p = 3`, `num_str = 123`)
|
||||
5. **No Regression**: Existing A-3 Trim tests still pass (e.g., `skip_whitespace` tests)
|
||||
6. **Documentation**: This design doc + updated architecture overview
|
||||
|
||||
---
|
||||
|
||||
## Implementation Order
|
||||
|
||||
1. **224-2**: This design document ✅
|
||||
2. **224-3**: Implement `DigitPosPromoter` with unit tests
|
||||
3. **224-4**: Integrate into `LoopBodyCondPromoter`
|
||||
4. **224-5**: E2E test with `phase2235_p2_digit_pos_min.hako`
|
||||
5. **224-6**: Update docs and CURRENT_TASK.md
|
||||
|
||||
---
|
||||
|
||||
## Revision History
|
||||
|
||||
- **2025-12-10**: Phase 224 design document created
|
||||
@ -35,6 +35,7 @@ use crate::ast::ASTNode;
|
||||
use crate::mir::builder::MirBuilder;
|
||||
use crate::mir::ValueId;
|
||||
use super::super::trace;
|
||||
use crate::mir::loop_pattern_detection::error_messages;
|
||||
|
||||
/// Phase 194+: Detection function for Pattern 4
|
||||
///
|
||||
@ -279,9 +280,8 @@ impl MirBuilder {
|
||||
);
|
||||
// Continue with Pattern4 lowering (fall through)
|
||||
} else {
|
||||
return Err(format!(
|
||||
"[cf_loop/pattern4] Trim pattern detected but not safe: carrier='{}', whitespace_count={}",
|
||||
helper.carrier_name,
|
||||
return Err(error_messages::format_error_pattern4_trim_not_safe(
|
||||
&helper.carrier_name,
|
||||
helper.whitespace_count()
|
||||
));
|
||||
}
|
||||
@ -290,10 +290,7 @@ impl MirBuilder {
|
||||
}
|
||||
ConditionPromotionResult::CannotPromote { reason, vars } => {
|
||||
// Fail-Fast on promotion failure
|
||||
return Err(format!(
|
||||
"[cf_loop/pattern4] Cannot promote LoopBodyLocal variables {:?}: {}",
|
||||
vars, reason
|
||||
));
|
||||
return Err(error_messages::format_error_pattern4_promotion_failed(&vars, &reason));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -316,7 +313,7 @@ impl MirBuilder {
|
||||
Err(e) => {
|
||||
// Phase 195: Use unified trace
|
||||
trace::trace().debug("pattern4", &format!("Pattern 4 lowerer failed: {}", e));
|
||||
return Err(format!("[cf_loop/pattern4] Lowering failed: {}", e));
|
||||
return Err(error_messages::format_error_pattern4_lowering_failed(&e));
|
||||
}
|
||||
};
|
||||
|
||||
@ -344,10 +341,7 @@ impl MirBuilder {
|
||||
// (ExitMetaCollector silently skips missing carriers, but Pattern 4 expects all)
|
||||
for carrier in &carrier_info.carriers {
|
||||
if !exit_bindings.iter().any(|b| b.carrier_name == carrier.name) {
|
||||
return Err(format!(
|
||||
"[cf_loop/pattern4] Carrier '{}' not found in variable_map - exit binding missing",
|
||||
carrier.name
|
||||
));
|
||||
return Err(error_messages::format_error_pattern4_carrier_not_found(&carrier.name));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -136,19 +136,23 @@ impl LoopBodyCondPromoter {
|
||||
/// - Condition: Simple equality chain (e.g., `ch == " " || ch == "\t"`)
|
||||
/// - Pattern: Identical to existing Trim pattern
|
||||
///
|
||||
/// ## Algorithm (Delegated to LoopBodyCarrierPromoter)
|
||||
/// ## Algorithm (Phase 224: Two-Tier Promotion Strategy)
|
||||
///
|
||||
/// 1. Extract LoopBodyLocal names from cond_scope
|
||||
/// 2. Build PromotionRequest for LoopBodyCarrierPromoter
|
||||
/// 3. Call LoopBodyCarrierPromoter::try_promote()
|
||||
/// 4. Convert PromotionResult to ConditionPromotionResult
|
||||
/// 5. Return result (Promoted or CannotPromote)
|
||||
/// 2. Try A-3 Trim promotion (LoopBodyCarrierPromoter)
|
||||
/// 3. If A-3 fails, try A-4 DigitPos promotion (DigitPosPromoter)
|
||||
/// 4. If both fail, return CannotPromote
|
||||
///
|
||||
/// ## Differences from TrimLoopLowerer
|
||||
///
|
||||
/// - TrimLoopLowerer: Full lowering pipeline (detection + code generation)
|
||||
/// - LoopBodyCondPromoter: Detection + metadata only (no code generation)
|
||||
pub fn try_promote_for_condition(req: ConditionPromotionRequest) -> ConditionPromotionResult {
|
||||
use crate::mir::loop_pattern_detection::loop_body_digitpos_promoter::{
|
||||
DigitPosPromotionRequest, DigitPosPromotionResult, DigitPosPromoter,
|
||||
};
|
||||
use crate::mir::loop_pattern_detection::loop_condition_scope::CondVarScope;
|
||||
|
||||
// P0 constraint: Need LoopScopeShape for LoopBodyCarrierPromoter
|
||||
let scope_shape = match req.scope_shape {
|
||||
Some(s) => s,
|
||||
@ -165,7 +169,7 @@ impl LoopBodyCondPromoter {
|
||||
// Pattern4: continue_cond (use as break_cond for Trim pattern detection)
|
||||
let condition_for_promotion = req.break_cond.or(req.continue_cond);
|
||||
|
||||
// Build request for LoopBodyCarrierPromoter
|
||||
// Step 1: Try A-3 Trim promotion
|
||||
let promotion_request = PromotionRequest {
|
||||
scope: scope_shape,
|
||||
cond_scope: req.cond_scope,
|
||||
@ -173,31 +177,72 @@ impl LoopBodyCondPromoter {
|
||||
loop_body: req.loop_body,
|
||||
};
|
||||
|
||||
// Delegate to existing LoopBodyCarrierPromoter
|
||||
match LoopBodyCarrierPromoter::try_promote(&promotion_request) {
|
||||
PromotionResult::Promoted { trim_info } => {
|
||||
eprintln!(
|
||||
"[cond_promoter] LoopBodyLocal '{}' promoted to carrier '{}'",
|
||||
"[cond_promoter] A-3 Trim pattern promoted: '{}' → carrier '{}'",
|
||||
trim_info.var_name, trim_info.carrier_name
|
||||
);
|
||||
|
||||
// Convert TrimPatternInfo to CarrierInfo
|
||||
let carrier_info = trim_info.to_carrier_info();
|
||||
|
||||
ConditionPromotionResult::Promoted {
|
||||
return ConditionPromotionResult::Promoted {
|
||||
carrier_info,
|
||||
promoted_var: trim_info.var_name,
|
||||
carrier_name: trim_info.carrier_name,
|
||||
};
|
||||
}
|
||||
PromotionResult::CannotPromote { reason, .. } => {
|
||||
eprintln!("[cond_promoter] A-3 Trim promotion failed: {}", reason);
|
||||
eprintln!("[cond_promoter] Trying A-4 DigitPos promotion...");
|
||||
}
|
||||
}
|
||||
PromotionResult::CannotPromote { reason, vars } => {
|
||||
|
||||
// Step 2: Try A-4 DigitPos promotion
|
||||
let digitpos_request = DigitPosPromotionRequest {
|
||||
loop_param_name: req.loop_param_name,
|
||||
cond_scope: req.cond_scope,
|
||||
scope_shape: req.scope_shape,
|
||||
break_cond: req.break_cond,
|
||||
continue_cond: req.continue_cond,
|
||||
loop_body: req.loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(digitpos_request) {
|
||||
DigitPosPromotionResult::Promoted {
|
||||
carrier_info,
|
||||
promoted_var,
|
||||
carrier_name,
|
||||
} => {
|
||||
eprintln!(
|
||||
"[cond_promoter] Cannot promote LoopBodyLocal variables {:?}: {}",
|
||||
vars, reason
|
||||
"[cond_promoter] A-4 DigitPos pattern promoted: '{}' → carrier '{}'",
|
||||
promoted_var, carrier_name
|
||||
);
|
||||
|
||||
ConditionPromotionResult::CannotPromote { reason, vars }
|
||||
return ConditionPromotionResult::Promoted {
|
||||
carrier_info,
|
||||
promoted_var,
|
||||
carrier_name,
|
||||
};
|
||||
}
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
eprintln!("[cond_promoter] A-4 DigitPos promotion failed: {}", reason);
|
||||
}
|
||||
}
|
||||
|
||||
// Step 3: Fail-Fast (no pattern matched)
|
||||
let body_local_names: Vec<String> = req
|
||||
.cond_scope
|
||||
.vars
|
||||
.iter()
|
||||
.filter(|v| v.scope == CondVarScope::LoopBodyLocal)
|
||||
.map(|v| v.name.clone())
|
||||
.collect();
|
||||
|
||||
ConditionPromotionResult::CannotPromote {
|
||||
reason: "No promotable pattern detected (tried A-3 Trim, A-4 DigitPos)".to_string(),
|
||||
vars: body_local_names,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
691
src/mir/loop_pattern_detection/loop_body_digitpos_promoter.rs
Normal file
691
src/mir/loop_pattern_detection/loop_body_digitpos_promoter.rs
Normal file
@ -0,0 +1,691 @@
|
||||
//! Phase 224: DigitPosPromoter Box
|
||||
//!
|
||||
//! Handles promotion of A-4 pattern: Cascading LoopBodyLocal with indexOf()
|
||||
//!
|
||||
//! ## Pattern Example
|
||||
//!
|
||||
//! ```nyash
|
||||
//! loop(p < s.length()) {
|
||||
//! local ch = s.substring(p, p+1) // First LoopBodyLocal
|
||||
//! local digit_pos = digits.indexOf(ch) // Second LoopBodyLocal (depends on ch)
|
||||
//!
|
||||
//! if digit_pos < 0 { // Comparison condition
|
||||
//! break
|
||||
//! }
|
||||
//!
|
||||
//! // Continue processing...
|
||||
//! p = p + 1
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! ## Design
|
||||
//!
|
||||
//! - **Responsibility**: Detect and promote A-4 digit position pattern
|
||||
//! - **Input**: LoopConditionScope + break/continue condition + loop body
|
||||
//! - **Output**: CarrierInfo with bool carrier (e.g., "is_digit")
|
||||
//!
|
||||
//! ## Key Differences from A-3 Trim
|
||||
//!
|
||||
//! | Feature | A-3 Trim | A-4 DigitPos |
|
||||
//! |---------|----------|--------------|
|
||||
//! | Method | substring() | substring() → indexOf() |
|
||||
//! | Dependency | Single | Cascading (2 variables) |
|
||||
//! | Condition | Equality (==) | Comparison (<, >, !=) |
|
||||
//! | Structure | OR chain | Single comparison |
|
||||
|
||||
use crate::ast::{ASTNode, BinaryOperator};
|
||||
use crate::mir::join_ir::lowering::carrier_info::CarrierInfo;
|
||||
use crate::mir::join_ir::lowering::loop_scope_shape::LoopScopeShape;
|
||||
use crate::mir::loop_pattern_detection::loop_condition_scope::LoopConditionScope;
|
||||
use crate::mir::ValueId;
|
||||
|
||||
/// Promotion request for A-4 digit position pattern
|
||||
pub struct DigitPosPromotionRequest<'a> {
|
||||
/// Loop parameter name (e.g., "p")
|
||||
#[allow(dead_code)]
|
||||
pub loop_param_name: &'a str,
|
||||
|
||||
/// Condition scope analysis result
|
||||
pub cond_scope: &'a LoopConditionScope,
|
||||
|
||||
/// Loop structure metadata (for future use)
|
||||
#[allow(dead_code)]
|
||||
pub scope_shape: Option<&'a LoopScopeShape>,
|
||||
|
||||
/// Break condition AST (Pattern2: Some, Pattern4: None)
|
||||
pub break_cond: Option<&'a ASTNode>,
|
||||
|
||||
/// Continue condition AST (Pattern4: Some, Pattern2: None)
|
||||
pub continue_cond: Option<&'a ASTNode>,
|
||||
|
||||
/// Loop body statements
|
||||
pub loop_body: &'a [ASTNode],
|
||||
}
|
||||
|
||||
/// Promotion result
|
||||
pub enum DigitPosPromotionResult {
|
||||
/// Promotion successful
|
||||
Promoted {
|
||||
/// Carrier metadata
|
||||
carrier_info: CarrierInfo,
|
||||
|
||||
/// Variable name that was promoted (e.g., "digit_pos")
|
||||
promoted_var: String,
|
||||
|
||||
/// Promoted carrier name (e.g., "is_digit")
|
||||
carrier_name: String,
|
||||
},
|
||||
|
||||
/// Cannot promote (Fail-Fast)
|
||||
CannotPromote {
|
||||
/// Human-readable reason
|
||||
reason: String,
|
||||
|
||||
/// List of problematic LoopBodyLocal variables
|
||||
vars: Vec<String>,
|
||||
},
|
||||
}
|
||||
|
||||
/// Phase 224: DigitPosPromoter Box
|
||||
pub struct DigitPosPromoter;
|
||||
|
||||
impl DigitPosPromoter {
|
||||
/// Try to promote A-4 pattern (cascading indexOf)
|
||||
///
|
||||
/// ## Algorithm
|
||||
///
|
||||
/// 1. Extract LoopBodyLocal variables from cond_scope
|
||||
/// 2. Find indexOf() definition in loop body
|
||||
/// 3. Extract comparison variable from condition
|
||||
/// 4. Verify cascading dependency (indexOf depends on another LoopBodyLocal)
|
||||
/// 5. Build CarrierInfo with bool carrier
|
||||
pub fn try_promote(req: DigitPosPromotionRequest) -> DigitPosPromotionResult {
|
||||
use crate::mir::loop_pattern_detection::loop_condition_scope::CondVarScope;
|
||||
|
||||
// Step 1: Extract LoopBodyLocal variables
|
||||
let body_locals: Vec<&String> = req
|
||||
.cond_scope
|
||||
.vars
|
||||
.iter()
|
||||
.filter(|v| v.scope == CondVarScope::LoopBodyLocal)
|
||||
.map(|v| &v.name)
|
||||
.collect();
|
||||
|
||||
if body_locals.is_empty() {
|
||||
return DigitPosPromotionResult::CannotPromote {
|
||||
reason: "No LoopBodyLocal variables to promote".to_string(),
|
||||
vars: vec![],
|
||||
};
|
||||
}
|
||||
|
||||
eprintln!(
|
||||
"[digitpos_promoter] Phase 224: Found {} LoopBodyLocal variables: {:?}",
|
||||
body_locals.len(),
|
||||
body_locals
|
||||
);
|
||||
|
||||
// Step 2: Extract comparison variable from condition
|
||||
let condition = req.break_cond.or(req.continue_cond);
|
||||
if condition.is_none() {
|
||||
return DigitPosPromotionResult::CannotPromote {
|
||||
reason: "No break or continue condition provided".to_string(),
|
||||
vars: body_locals.iter().map(|s| s.to_string()).collect(),
|
||||
};
|
||||
}
|
||||
|
||||
let var_in_cond = Self::extract_comparison_var(condition.unwrap());
|
||||
if var_in_cond.is_none() {
|
||||
return DigitPosPromotionResult::CannotPromote {
|
||||
reason: "No comparison variable found in condition".to_string(),
|
||||
vars: body_locals.iter().map(|s| s.to_string()).collect(),
|
||||
};
|
||||
}
|
||||
|
||||
let var_in_cond = var_in_cond.unwrap();
|
||||
eprintln!(
|
||||
"[digitpos_promoter] Comparison variable in condition: '{}'",
|
||||
var_in_cond
|
||||
);
|
||||
|
||||
// Step 3: Find indexOf() definition for the comparison variable
|
||||
let definition = Self::find_indexOf_definition(req.loop_body, &var_in_cond);
|
||||
|
||||
if let Some(def_node) = definition {
|
||||
eprintln!(
|
||||
"[digitpos_promoter] Found indexOf() definition for '{}'",
|
||||
var_in_cond
|
||||
);
|
||||
|
||||
// Step 4: Verify it's an indexOf() method call
|
||||
if Self::is_indexOf_method_call(def_node) {
|
||||
eprintln!("[digitpos_promoter] Confirmed indexOf() method call");
|
||||
|
||||
// Step 5: Verify cascading dependency
|
||||
let dependency = Self::find_first_loopbodylocal_dependency(req.loop_body, def_node);
|
||||
|
||||
if dependency.is_none() {
|
||||
return DigitPosPromotionResult::CannotPromote {
|
||||
reason: format!(
|
||||
"indexOf() call for '{}' does not depend on LoopBodyLocal",
|
||||
var_in_cond
|
||||
),
|
||||
vars: vec![var_in_cond],
|
||||
};
|
||||
}
|
||||
|
||||
eprintln!(
|
||||
"[digitpos_promoter] Cascading dependency confirmed: {} → indexOf({})",
|
||||
dependency.unwrap(),
|
||||
var_in_cond
|
||||
);
|
||||
|
||||
// Step 6: Build CarrierInfo
|
||||
let carrier_name = format!("is_{}", var_in_cond);
|
||||
let carrier_info = CarrierInfo::with_carriers(
|
||||
carrier_name.clone(),
|
||||
ValueId(0), // Placeholder (will be remapped)
|
||||
vec![],
|
||||
);
|
||||
|
||||
eprintln!(
|
||||
"[digitpos_promoter] A-4 DigitPos pattern promoted: {} → {}",
|
||||
var_in_cond, carrier_name
|
||||
);
|
||||
|
||||
return DigitPosPromotionResult::Promoted {
|
||||
carrier_info,
|
||||
promoted_var: var_in_cond,
|
||||
carrier_name,
|
||||
};
|
||||
} else {
|
||||
eprintln!(
|
||||
"[digitpos_promoter] Definition for '{}' is not indexOf() method",
|
||||
var_in_cond
|
||||
);
|
||||
}
|
||||
} else {
|
||||
eprintln!(
|
||||
"[digitpos_promoter] No definition found for '{}' in loop body",
|
||||
var_in_cond
|
||||
);
|
||||
}
|
||||
|
||||
// No pattern matched
|
||||
DigitPosPromotionResult::CannotPromote {
|
||||
reason: "No A-4 DigitPos pattern detected (indexOf not found or not cascading)"
|
||||
.to_string(),
|
||||
vars: body_locals.iter().map(|s| s.to_string()).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Find indexOf() definition in loop body
|
||||
///
|
||||
/// Searches for assignment: `local var = ...indexOf(...)` or `var = ...indexOf(...)`
|
||||
fn find_indexOf_definition<'a>(body: &'a [ASTNode], var_name: &str) -> Option<&'a ASTNode> {
|
||||
let mut worklist: Vec<&'a ASTNode> = body.iter().collect();
|
||||
|
||||
while let Some(node) = worklist.pop() {
|
||||
match node {
|
||||
// Assignment: target = value
|
||||
ASTNode::Assignment { target, value, .. } => {
|
||||
if let ASTNode::Variable { name, .. } = target.as_ref() {
|
||||
if name == var_name {
|
||||
return Some(value.as_ref());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Local: local var = value
|
||||
ASTNode::Local {
|
||||
variables,
|
||||
initial_values,
|
||||
..
|
||||
} if initial_values.len() == variables.len() => {
|
||||
for (i, var) in variables.iter().enumerate() {
|
||||
if var == var_name {
|
||||
if let Some(Some(init_expr)) = initial_values.get(i) {
|
||||
return Some(init_expr.as_ref());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Nested structures
|
||||
ASTNode::If {
|
||||
then_body,
|
||||
else_body,
|
||||
..
|
||||
} => {
|
||||
for stmt in then_body {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
if let Some(else_stmts) = else_body {
|
||||
for stmt in else_stmts {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ASTNode::Loop {
|
||||
body: loop_body, ..
|
||||
} => {
|
||||
for stmt in loop_body {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
}
|
||||
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
/// Check if node is an indexOf() method call
|
||||
fn is_indexOf_method_call(node: &ASTNode) -> bool {
|
||||
matches!(
|
||||
node,
|
||||
ASTNode::MethodCall { method, .. } if method == "indexOf"
|
||||
)
|
||||
}
|
||||
|
||||
/// Extract variable used in comparison condition
|
||||
///
|
||||
/// Handles: `if digit_pos < 0`, `if digit_pos >= 0`, etc.
|
||||
fn extract_comparison_var(cond: &ASTNode) -> Option<String> {
|
||||
match cond {
|
||||
ASTNode::BinaryOp {
|
||||
operator, left, ..
|
||||
} => {
|
||||
// Check if it's a comparison operator (not equality)
|
||||
match operator {
|
||||
BinaryOperator::Less
|
||||
| BinaryOperator::LessEqual
|
||||
| BinaryOperator::Greater
|
||||
| BinaryOperator::GreaterEqual
|
||||
| BinaryOperator::NotEqual => {
|
||||
// Extract variable from left side
|
||||
if let ASTNode::Variable { name, .. } = left.as_ref() {
|
||||
return Some(name.clone());
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
// UnaryOp: not (...)
|
||||
ASTNode::UnaryOp { operand, .. } => {
|
||||
return Self::extract_comparison_var(operand.as_ref());
|
||||
}
|
||||
|
||||
_ => {}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
/// Find first LoopBodyLocal dependency in indexOf() call
|
||||
///
|
||||
/// Example: `digits.indexOf(ch)` → returns "ch" if it's a LoopBodyLocal
|
||||
fn find_first_loopbodylocal_dependency<'a>(
|
||||
body: &'a [ASTNode],
|
||||
indexOf_call: &'a ASTNode,
|
||||
) -> Option<&'a str> {
|
||||
if let ASTNode::MethodCall { arguments, .. } = indexOf_call {
|
||||
// Check first argument (e.g., "ch" in indexOf(ch))
|
||||
if let Some(arg) = arguments.first() {
|
||||
if let ASTNode::Variable { name, .. } = arg {
|
||||
// Verify it's defined by substring() in body
|
||||
let def = Self::find_definition_in_body(body, name);
|
||||
if let Some(def_node) = def {
|
||||
if Self::is_substring_method_call(def_node) {
|
||||
return Some(name.as_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
/// Find definition in loop body (similar to LoopBodyCarrierPromoter)
|
||||
fn find_definition_in_body<'a>(body: &'a [ASTNode], var_name: &str) -> Option<&'a ASTNode> {
|
||||
let mut worklist: Vec<&'a ASTNode> = body.iter().collect();
|
||||
|
||||
while let Some(node) = worklist.pop() {
|
||||
match node {
|
||||
ASTNode::Assignment { target, value, .. } => {
|
||||
if let ASTNode::Variable { name, .. } = target.as_ref() {
|
||||
if name == var_name {
|
||||
return Some(value.as_ref());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ASTNode::Local {
|
||||
variables,
|
||||
initial_values,
|
||||
..
|
||||
} if initial_values.len() == variables.len() => {
|
||||
for (i, var) in variables.iter().enumerate() {
|
||||
if var == var_name {
|
||||
if let Some(Some(init_expr)) = initial_values.get(i) {
|
||||
return Some(init_expr.as_ref());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ASTNode::If {
|
||||
then_body,
|
||||
else_body,
|
||||
..
|
||||
} => {
|
||||
for stmt in then_body {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
if let Some(else_stmts) = else_body {
|
||||
for stmt in else_stmts {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ASTNode::Loop {
|
||||
body: loop_body, ..
|
||||
} => {
|
||||
for stmt in loop_body {
|
||||
worklist.push(stmt);
|
||||
}
|
||||
}
|
||||
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
/// Check if node is a substring() method call
|
||||
fn is_substring_method_call(node: &ASTNode) -> bool {
|
||||
matches!(
|
||||
node,
|
||||
ASTNode::MethodCall { method, .. } if method == "substring"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::ast::{LiteralValue, Span};
|
||||
use crate::mir::loop_pattern_detection::loop_condition_scope::{
|
||||
CondVarScope, LoopConditionScope,
|
||||
};
|
||||
|
||||
fn cond_scope_with_body_locals(vars: &[&str]) -> LoopConditionScope {
|
||||
let mut scope = LoopConditionScope::new();
|
||||
for var in vars {
|
||||
scope.add_var(var.to_string(), CondVarScope::LoopBodyLocal);
|
||||
}
|
||||
scope
|
||||
}
|
||||
|
||||
fn var_node(name: &str) -> ASTNode {
|
||||
ASTNode::Variable {
|
||||
name: name.to_string(),
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
|
||||
fn int_literal(value: i64) -> ASTNode {
|
||||
ASTNode::Literal {
|
||||
value: LiteralValue::Integer(value),
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
|
||||
fn method_call(object: &str, method: &str, args: Vec<ASTNode>) -> ASTNode {
|
||||
ASTNode::MethodCall {
|
||||
object: Box::new(var_node(object)),
|
||||
method: method.to_string(),
|
||||
arguments: args,
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
|
||||
fn assignment(target: &str, value: ASTNode) -> ASTNode {
|
||||
ASTNode::Assignment {
|
||||
target: Box::new(var_node(target)),
|
||||
value: Box::new(value),
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
|
||||
fn comparison(var: &str, op: BinaryOperator, literal: i64) -> ASTNode {
|
||||
ASTNode::BinaryOp {
|
||||
operator: op,
|
||||
left: Box::new(var_node(var)),
|
||||
right: Box::new(int_literal(literal)),
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_no_body_locals() {
|
||||
let cond_scope = LoopConditionScope::new();
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: None,
|
||||
continue_cond: None,
|
||||
loop_body: &[],
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::CannotPromote { reason, vars } => {
|
||||
assert!(vars.is_empty());
|
||||
assert!(reason.contains("No LoopBodyLocal"));
|
||||
}
|
||||
_ => panic!("Expected CannotPromote when no LoopBodyLocal variables"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_basic_pattern() {
|
||||
// Full A-4 pattern:
|
||||
// local ch = s.substring(...)
|
||||
// local digit_pos = digits.indexOf(ch)
|
||||
// if digit_pos < 0 { break }
|
||||
|
||||
let cond_scope = cond_scope_with_body_locals(&["ch", "digit_pos"]);
|
||||
|
||||
let loop_body = vec![
|
||||
assignment("ch", method_call("s", "substring", vec![])),
|
||||
assignment(
|
||||
"digit_pos",
|
||||
method_call("digits", "indexOf", vec![var_node("ch")]),
|
||||
),
|
||||
];
|
||||
|
||||
let break_cond = comparison("digit_pos", BinaryOperator::Less, 0);
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: Some(&break_cond),
|
||||
continue_cond: None,
|
||||
loop_body: &loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::Promoted {
|
||||
promoted_var,
|
||||
carrier_name,
|
||||
..
|
||||
} => {
|
||||
assert_eq!(promoted_var, "digit_pos");
|
||||
assert_eq!(carrier_name, "is_digit_pos");
|
||||
}
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
panic!("Expected Promoted, got CannotPromote: {}", reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_non_indexOf_method() {
|
||||
// ch = s.substring(...) → pos = s.length() → if pos < 0
|
||||
// Should fail: not indexOf()
|
||||
|
||||
let cond_scope = cond_scope_with_body_locals(&["ch", "pos"]);
|
||||
|
||||
let loop_body = vec![
|
||||
assignment("ch", method_call("s", "substring", vec![])),
|
||||
assignment("pos", method_call("s", "length", vec![])), // NOT indexOf
|
||||
];
|
||||
|
||||
let break_cond = comparison("pos", BinaryOperator::Less, 0);
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: Some(&break_cond),
|
||||
continue_cond: None,
|
||||
loop_body: &loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
assert!(reason.contains("DigitPos pattern"));
|
||||
}
|
||||
_ => panic!("Expected CannotPromote for non-indexOf pattern"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_no_loopbodylocal_dependency() {
|
||||
// digit_pos = fixed_string.indexOf("x") // No LoopBodyLocal dependency
|
||||
// Should fail: indexOf doesn't depend on LoopBodyLocal
|
||||
|
||||
let cond_scope = cond_scope_with_body_locals(&["digit_pos"]);
|
||||
|
||||
let loop_body = vec![assignment(
|
||||
"digit_pos",
|
||||
method_call(
|
||||
"fixed_string",
|
||||
"indexOf",
|
||||
vec![ASTNode::Literal {
|
||||
value: LiteralValue::String("x".to_string()),
|
||||
span: Span::unknown(),
|
||||
}],
|
||||
),
|
||||
)];
|
||||
|
||||
let break_cond = comparison("digit_pos", BinaryOperator::Less, 0);
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: Some(&break_cond),
|
||||
continue_cond: None,
|
||||
loop_body: &loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
assert!(reason.contains("LoopBodyLocal"));
|
||||
}
|
||||
_ => panic!("Expected CannotPromote when no LoopBodyLocal dependency"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_comparison_operators() {
|
||||
// Test different comparison operators: <, >, <=, >=, !=
|
||||
let operators = vec![
|
||||
BinaryOperator::Less,
|
||||
BinaryOperator::Greater,
|
||||
BinaryOperator::LessEqual,
|
||||
BinaryOperator::GreaterEqual,
|
||||
BinaryOperator::NotEqual,
|
||||
];
|
||||
|
||||
for op in operators {
|
||||
let cond_scope = cond_scope_with_body_locals(&["ch", "digit_pos"]);
|
||||
|
||||
let loop_body = vec![
|
||||
assignment("ch", method_call("s", "substring", vec![])),
|
||||
assignment(
|
||||
"digit_pos",
|
||||
method_call("digits", "indexOf", vec![var_node("ch")]),
|
||||
),
|
||||
];
|
||||
|
||||
let break_cond = comparison("digit_pos", op.clone(), 0);
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: Some(&break_cond),
|
||||
continue_cond: None,
|
||||
loop_body: &loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::Promoted { .. } => {
|
||||
// Success
|
||||
}
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
panic!("Expected Promoted for operator {:?}, got: {}", op, reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_digitpos_equality_operator() {
|
||||
// if digit_pos == -1 { break }
|
||||
// Should fail: Equality is A-3 Trim territory, not A-4 DigitPos
|
||||
|
||||
let cond_scope = cond_scope_with_body_locals(&["ch", "digit_pos"]);
|
||||
|
||||
let loop_body = vec![
|
||||
assignment("ch", method_call("s", "substring", vec![])),
|
||||
assignment(
|
||||
"digit_pos",
|
||||
method_call("digits", "indexOf", vec![var_node("ch")]),
|
||||
),
|
||||
];
|
||||
|
||||
let break_cond = ASTNode::BinaryOp {
|
||||
operator: BinaryOperator::Equal, // Equality, not comparison
|
||||
left: Box::new(var_node("digit_pos")),
|
||||
right: Box::new(int_literal(-1)),
|
||||
span: Span::unknown(),
|
||||
};
|
||||
|
||||
let req = DigitPosPromotionRequest {
|
||||
loop_param_name: "p",
|
||||
cond_scope: &cond_scope,
|
||||
scope_shape: None,
|
||||
break_cond: Some(&break_cond),
|
||||
continue_cond: None,
|
||||
loop_body: &loop_body,
|
||||
};
|
||||
|
||||
match DigitPosPromoter::try_promote(req) {
|
||||
DigitPosPromotionResult::CannotPromote { reason, .. } => {
|
||||
assert!(reason.contains("comparison variable"));
|
||||
}
|
||||
_ => panic!("Expected CannotPromote for equality operator"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -781,6 +781,9 @@ pub mod loop_body_carrier_promoter;
|
||||
// Phase 223-3: LoopBodyLocal Condition Promotion (for Pattern4)
|
||||
pub mod loop_body_cond_promoter;
|
||||
|
||||
// Phase 224: A-4 DigitPos Pattern Promotion
|
||||
pub mod loop_body_digitpos_promoter;
|
||||
|
||||
// Phase 171-C-5: Trim Pattern Helper
|
||||
pub mod trim_loop_helper;
|
||||
pub use trim_loop_helper::TrimLoopHelper;
|
||||
|
||||
Reference in New Issue
Block a user