hakorune

tomoaki/hakorune

Fork 0

Commit Graph

Author	SHA1	Message	Date
nyash-codex	525e59bc8d	feat(loop-phi): Add body-local variable PHI generation for Rust AST loops Phase 25.1c/k: Fix ValueId undefined errors in loops with body-local variables Problem: - FuncScannerBox.scan_all_boxes/1 and BreakFinderBox._find_loops/2 had ValueId undefined errors for variables declared inside loop bodies - LoopFormBuilder only generated PHIs for preheader variables, missing body-locals - Example: `local ch = s.substring(i, i+1)` inside loop → undefined on next iteration Solution: 1. Rust AST path (src/mir/loop_builder.rs): - Detect body-local variables by comparing body_end_vars vs current_vars - Generate empty PHI nodes at loop header for body-local variables - Seal PHIs with latch + continue snapshot inputs after seal_phis() - Added HAKO_LOOP_PHI_TRACE=1 logging for debugging 2. JSON v0 path (already fixed in previous session): - src/runner/json_v0_bridge/lowering/loop_.rs handles body-locals - Uses same strategy but for JSON v0 bridge lowering Results: - ✅ FuncScannerBox.scan_all_boxes: 41 body-local PHIs generated - ✅ Main.main (demo harness): 23 body-local PHIs generated - ⚠️ Still some ValueId undefined errors remaining (exit PHI issue) Files changed: - src/mir/loop_builder.rs: body-local PHI generation logic - lang/src/compiler/entry/func_scanner.hako: debug logging - /tmp/stageb_funcscan_demo.hako: test harness 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-11-19 23:12:01 +09:00
nyash-codex	1747ec976c	refactor(json_v0_bridge): Phase 25.1p - FunctionDefBuilder箱化＋me予約修正【変更内容】 1. FunctionDefBuilder 箱化（SSOT化） - インスタンスメソッド判定の一元化 - パラメータ ValueId 生成の統一 - 変数マップ初期化の統一 2. ValueId(0) me 予約バグ修正 - is_instance_method() で box_name != "Main" 判定 - インスタンスメソッドは me を ValueId(0) に予約 - variable_map["me"] = ValueId(0) を自動設定 3. コード削減・可読性向上 - 60行 → 40行（関数定義処理） - 重複ロジック削除 - デバッグログ追加（is_instance表示）【効果】 - json_v0_bridge 経路の ValueId(0) 未定義エラー解消 - Stage-B compiler で static box メソッドが正しく動作 - 設計の一貫性向上（me の扱いが明確）【非スコープ】 - Rust MirBuilder 側は未修正（Phase 26で統一予定） - lower_static_method_as_function は現状維持関連: Phase 25.1m (静的メソッド修正), Phase 25.1c/k (SSA修正) 🐱 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-11-19 10:08:04 +09:00

Author

SHA1

Message

Date

nyash-codex

525e59bc8d

feat(loop-phi): Add body-local variable PHI generation for Rust AST loops

Phase 25.1c/k: Fix ValueId undefined errors in loops with body-local variables

**Problem:**
- FuncScannerBox.scan_all_boxes/1 and BreakFinderBox._find_loops/2 had ValueId
  undefined errors for variables declared inside loop bodies
- LoopFormBuilder only generated PHIs for preheader variables, missing body-locals
- Example: `local ch = s.substring(i, i+1)` inside loop → undefined on next iteration

**Solution:**
1. **Rust AST path** (src/mir/loop_builder.rs):
   - Detect body-local variables by comparing body_end_vars vs current_vars
   - Generate empty PHI nodes at loop header for body-local variables
   - Seal PHIs with latch + continue snapshot inputs after seal_phis()
   - Added HAKO_LOOP_PHI_TRACE=1 logging for debugging

2. **JSON v0 path** (already fixed in previous session):
   - src/runner/json_v0_bridge/lowering/loop_.rs handles body-locals
   - Uses same strategy but for JSON v0 bridge lowering

**Results:**
- ✅ FuncScannerBox.scan_all_boxes: 41 body-local PHIs generated
- ✅ Main.main (demo harness): 23 body-local PHIs generated
- ⚠️ Still some ValueId undefined errors remaining (exit PHI issue)

**Files changed:**
- src/mir/loop_builder.rs: body-local PHI generation logic
- lang/src/compiler/entry/func_scanner.hako: debug logging
- /tmp/stageb_funcscan_demo.hako: test harness

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

Co-Authored-By: Claude <noreply@anthropic.com>

2025-11-19 23:12:01 +09:00

nyash-codex

1747ec976c

refactor(json_v0_bridge): Phase 25.1p - FunctionDefBuilder箱化＋me予約修正

【変更内容】
1. FunctionDefBuilder 箱化（SSOT化）
   - インスタンスメソッド判定の一元化
   - パラメータ ValueId 生成の統一
   - 変数マップ初期化の統一

2. ValueId(0) me 予約バグ修正
   - is_instance_method() で box_name != "Main" 判定
   - インスタンスメソッドは me を ValueId(0) に予約
   - variable_map["me"] = ValueId(0) を自動設定

3. コード削減・可読性向上
   - 60行 → 40行（関数定義処理）
   - 重複ロジック削除
   - デバッグログ追加（is_instance表示）

【効果】
- json_v0_bridge 経路の ValueId(0) 未定義エラー解消
- Stage-B compiler で static box メソッドが正しく動作
- 設計の一貫性向上（me の扱いが明確）

【非スコープ】
- Rust MirBuilder 側は未修正（Phase 26で統一予定）
- lower_static_method_as_function は現状維持

関連: Phase 25.1m (静的メソッド修正), Phase 25.1c/k (SSA修正)

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

Co-Authored-By: Claude <noreply@anthropic.com>

2025-11-19 10:08:04 +09:00

2 Commits