f9d100ce01
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
...
Phase 25.1 完了成果:
- ✅ LoopForm v2 テスト・ドキュメント・コメント完備
- 4ケース(A/B/C/D)完全テストカバレッジ
- 最小再現ケース作成(SSAバグ調査用)
- SSOT文書作成(loopform_ssot.md)
- 全ソースに [LoopForm] コメントタグ追加
- ✅ Stage-1 CLI デバッグ環境構築
- stage1_cli.hako 実装
- stage1_bridge.rs ブリッジ実装
- デバッグツール作成(stage1_debug.sh/stage1_minimal.sh)
- アーキテクチャ改善提案文書
- ✅ 環境変数削減計画策定
- 25変数の完全調査・分類
- 6段階削減ロードマップ(25→5、80%削減)
- 即時削除可能変数特定(NYASH_CONFIG/NYASH_DEBUG)
Phase 26-D からの累積変更:
- PHI実装改善(ExitPhiBuilder/HeaderPhiBuilder等)
- MIRビルダーリファクタリング
- 型伝播・最適化パス改善
- その他約300ファイルの累積変更
🎯 技術的成果:
- SSAバグ根本原因特定(条件分岐内loop変数変更)
- Region+next_iパターン適用完了(UsingCollectorBox等)
- LoopFormパターン文書化・テスト化完了
- セルフホスティング基盤強化
Co-Authored-By: Claude <noreply@anthropic.com >
Co-Authored-By: ChatGPT <noreply@openai.com >
Co-Authored-By: Task Assistant <task@anthropic.com >
2025-11-21 06:25:17 +09:00
baf028a94f
docs(phi): Phase 25.1 - LoopForm v2 コメント整備 + ケース表完成
...
- ✅ [LoopForm] タグで統一コメント追加
- src/mir/loop_builder.rs
- header-cond: Case A/B分岐説明
- exit-break path / continue-backedge path
- exit PHI for Case A/B
- src/mir/phi_core/loop_snapshot_merge.rs
- Case A/B分岐: header ∈ exit_preds判定ロジック
- src/mir/phi_core/exit_phi_builder.rs
- LoopForm Process ステップバイステップ説明
- ✅ UsingCollectorBox Region+next_i化
- lang/src/compiler/parser/using/using_collector_box.hako
- 全ループをLoopForm v2形式に統一
- next_i, next_j, next_k, next_t パターン導入
- SSA安全化(未定義変数撲滅)
- ✅ LoopForm v2 ケース表完成
- docs/development/architecture/loops/loopform_ssot.md
- Case A/B/C/D の完全な表
- テスト対応マッピング
- 実装ファイル対応表
🎯 成果: LoopForm v2の「形」をソース・テスト・ドキュメントで完全固定
2025-11-21 06:22:21 +09:00
471052ad8d
feat(debug): __mir__.log追加+VM実行テスト - loopバグ確定
...
## 🔍 func_scanner.hakoに__mir__.log追加
```hako
method skip_whitespace(s, idx) {
__mir__.log("skip_ws/head", i, n)
loop(1 == 1) {
__mir__.log("skip_ws/loop", i, n) ← 実行されない
...
}
__mir__.log("skip_ws/exit", i, n)
}
```
## 📊 CLI実行結果(MIRログ)
```
[MIR-LOG] skip_ws/head: %26=Integer(0) %28=Integer(6)
[MIR-LOG] skip_ws/exit: %26=Integer(0) %28=Integer(6)
```
- ✅ i=0, n=6(両方Integer, 値は正しい)
- ❌ `skip_ws/loop`が**一度も出ない**
- → **loop本体が実行されていないことがMIRレベルで確定**
## 🧪 Rustテスト更新
1. **ソースを束ねる**: func_scanner.hako + test file
- FuncScannerBox関数がmoduleに含まれるように修正
2. **VM実行追加**: execute_module()でバグ再現確認
- 期待: rc=0 (PASS), 実際: rc=1 (FAIL)
## 🎯 次のステップ
- MIRダンプでLoopForm展開を確認
- VM interpreter/LoopForm実行を調査
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 08:22:43 +09:00
7ed13f98d5
test(stageb): 最小再現ケース+Rustテスト追加 - using読み込み問題発見
...
## 🔍 新規ファイル
1. **funcscanner_skip_ws_min.hako**: 最小再現ケース
- FuncScannerBox.skip_whitespace直接呼び出しテスト
- 期待: idx=3(3空白スキップ)
- 実際: idx=0(loop不実行でFAIL)
2. **mir_funcscanner_skip_ws.rs**: Rustレベルテスト
- MIRコンパイル + 検証
- 関数存在確認
## 🐛 重大発見
### 問題: using経由モジュールが読み込まれない
```
[test] Module has 2 functions
[test] ALL available functions:
[test] - main
[test] - condition_fn
```
- `using lang.compiler.entry.func_scanner as FuncScannerBox`宣言済み
- でもFuncScannerBox.skip_whitespace/2が**モジュールに存在しない**
- CLI実行時は動作 → Rustテスト環境特有の問題?
### 2層の問題構造
1. **本命バグ**: loop(1==1)が実行されない(CLI実行で再現済み)
2. **新発見**: usingモジュール読み込み未実装(Rustテスト環境)
## 📊 次のステップ
- using systemのコンパイル時モジュール解決を調査
- または別アプローチでloop バグに直接アプローチ
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 08:16:35 +09:00
0dc8510daf
debug(stageb): センチネル追加でVMバグ特定 - using経由static box内loop不実行
...
## 🔍 調査結果
### ✅ 確認事項
- **本物の実装が呼ばれている**: SENTINEL出力で確認済み
- 🔥 SENTINEL_SKIP_WS_CALLED!!!
- 🎯 SENTINEL_KW_BOUNDARY_BEFORE_CALLED!!!
- 🎯 SENTINEL_KW_BOUNDARY_AFTER_CALLED!!!
- 🔤 SENTINEL_IS_IDENT_CHAR_CALLED!!!
### 🐛 重大バグ発見
**症状**: `FuncScannerBox.skip_whitespace` 内の `loop(1 == 1)` が実行されない
**証拠**:
```
[skip_ws] START idx=10 s.length()=173
[skip_ws] i=10 n=173
[skip_ws] RETURN i=10 ← ループボディが実行されず即座にreturn
```
- `[skip_ws] LOOP-TOP i=10` が**一度も出力されない**
- loop(1 == 1) の無限ループすら実行されない
**影響範囲**:
- box_name抽出失敗(空文字列)
- defs生成失敗(defs_len=0)
- canary テスト失敗
**問題の本質**:
- using 経由で読み込まれたモジュールの static box 内
- 静的メソッド呼び出し (`FuncScannerBox.skip_whitespace(...)`)
- loop 構文が VM/MIR レベルで実行されない
## 🔧 修正内容
1. **センチネル追加**: 4箇所に明確な出力追加
- skip_whitespace, kw_boundary_before, kw_boundary_after, is_ident_char
2. **呼び出し修正**: `me.scan_all_boxes` → `StageBFuncScannerBox.scan_all_boxes`
## 📊 次のステップ
VM/MIR レイヤーでの loop 構文実装確認が必要
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 08:03:05 +09:00
54b2735f13
refactor(stageb): FuncScannerBox完全静的化 - new()撤廃でSSOT確立
...
## 構造改善
- ❌ `new FuncScannerBox()` 完全撤廃(8箇所削除)
- ✅ FuncScannerBox を純粋静的ヘルパー箱化
- ✅ StageBFuncScannerBox を薄いデリゲートファサードに
- ✅ 全 `me.*` 呼び出しを `FuncScannerBox.*` 静的呼び出しに変換
## エラー解決
- ✅ "Unknown method on InstanceBox" エラー根絶
- ✅ "Type error: unsupported compare Lt on String" エラー解決
- ✅ VM実行時の全エラー解消
## SSOT構造
FuncScannerBox (SSOT)
├─ 公開メソッド: skip_whitespace, find_matching_brace, 等
├─ 静的ヘルパーエイリアス: _parse_params, _strip_comments, 等
└─ 内部実装: すべて FuncScannerBox.* 静的呼び出し
StageBFuncScannerBox (薄いファサード)
└─ 全メソッドが FuncScannerBox への静的委譲のみ
## 未解決問題
- ⚠️ box_name 抽出が空文字列を返す(box検出は成功、名前抽出が失敗)
- ⚠️ defs_len=0 のまま(box_name='' のため _scan_methods が呼ばれない)
次のステップ: box_name抽出ロジックのデバッグ
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 07:45:28 +09:00
e809d3a79b
refactor(stageb): Phase 25.3 FuncScanner boxification完了
...
- FuncScannerBox helper SSOT確立(8個のhelperに詳細コメント追加)
- StageBFuncScannerBox → FuncScannerBox完全委譲(約380行削減)
- scan_all_boxes状態フラグ整理(4つの状態遷移を明確化)
- 常時出力print削除(dev専用ログのみ保持)
- SSAテスト全pass(mir_funcscanner_scan_methods/fib_min)
Phase 25.3-B完了、次はfib defs canary緑化へ
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 07:01:21 +09:00
3a82633924
refactor(funcscanner): Region+next_i パターン統一 & SSA テスト追加
...
**FuncScanner .hako 側改善**:
- scan_all_boxes を Region + next_i 形式に統一(continue 多発による SSA/PHI 複雑さ削減)
- インデント修正(タブ→スペース統一)
- デバッグ print 削除
**SSA テスト追加**:
- lang/src/compiler/tests/funcscanner_scan_methods_min.hako
- src/tests/mir_funcscanner_ssa.rs (scan_methods & fib_min SSA デバッグテスト)
**Phase 25.3 ドキュメント**:
- docs/development/roadmap/phases/phase-25.3-funcscanner/ 追加
**関連**: Phase 25.3 FuncScanner 箱化準備作業
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 06:38:43 +09:00
7373fa265b
feat(loop-phi): Phase 25.1c/k - continue_merge PHI生成完了
...
## 実装内容
### 1. continue_merge ブロックで PHI ノード生成
- `src/mir/loop_builder.rs` (422-557行)
- 複数の continue パスからの変数値を PHI でマージ
- 全て同じ値なら PHI 省略(最適化)
- merged_snapshot を seal_phis に渡す構造
### 2. ValueId::INVALID GUARD 修正
- `src/mir/phi_core/loopform_builder.rs` (111行)
- 誤った `value.0 == 0` チェックを `value == ValueId::INVALID` に修正
- ValueId::INVALID は u32::MAX なので、ValueId(0) は有効な値
### 3. test_loopform_builder_separation を構造ベースに改善
- 具体的な ValueId(100..105) を期待するアサーションを削除
- pinned/carrier の分離、ValueId の有効性、衝突チェックに変更
- HashMap の反復順序や内部の割り当て順に依存しないテストに改善
## テスト結果
✅ **既存テスト全て PASS**:
- `test_loopform_builder_separation` - 構造ベース修正で PASS
- 既存ループ関連テスト15個 - 全て PASS
- `mir_stageb_loop_break_continue::*` - PASS
- `mir_loopform_exit_phi::*` - PASS
✅ **実行確認**:
- 基本的なループ実行 - 正常動作(sum=10)
- continue を含むループ実行 - 正常動作(sum=8)
- continue_merge ブロック生成確認(BasicBlockId表示)
⚠️ **残存バグ**:
- FuncScannerBox.scan_all_boxes/1: ValueId(1283) undefined
- 13個の continue を持つ複雑なループで発生
- Phase 25.2 リファクタリングで解決予定
## 今後の予定
Phase 25.2 として以下のリファクタリングを実施予定:
1. LoopSnapshotMergeBox 実装(優先度1)
2. LoopVarClassifyBox 実装(優先度2)
3. LoopDebugLogBox 実装(優先度3)
4. TextScanRegionBox 実装(優先度4)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 01:41:17 +09:00
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
75f3df2505
refactor(mir): Phase 25.1o - do_break/continue 共通化(LoopExitKind型統一)
...
【変更内容】
1. LoopExitKind enum定義
- Break / Continue の型安全な区別
2. do_loop_exit() 共通メソッド作成(47行)
- スナップショット取得(共通処理)
- kind別のスナップショット保存
- kind別のジャンプターゲット
- unreachable ブロック切り替え(共通処理)
3. do_break/continue をthin wrapperに変換
- do_break: 13行 → 4行
- do_continue: 12行 → 4行
- 合計21行削減
【効果】
- 構造改善: break/continue の共通ロジック一箇所に集約
- 保守性向上: デバッグログなどの共通処理が統一管理
- 拡張性向上: labeled break/continue等の将来拡張が容易
【検証結果】
- ビルド成功(警告なし)
- mir_stageb_loop_break_continue_verifies: PASS
- /tmp/loop_continue_fixed.hako: RC=3(期待通り)
関連: Phase 25.1m (continue PHI修正), Phase 25.1n (レガシー削除)
2025-11-19 08:56:44 +09:00
a95fedf26a
fix(mir): Phase 25.1m - Continue PHI修正 & Bug A main(args)ループ修正
...
**Phase 25.1m: Continue PHI修正**
- seal_phis に continue_snapshots 入力を追加 (loopform_builder.rs)
- LoopShape::debug_validate に continue/break エッジ検証追加 (control_form.rs)
- test_seal_phis_includes_continue_snapshots テスト追加
- 実証テスト成功: balanced scan loop で 228回イテレーション確認
**Bug A修正: main(args) でループ未実行問題**
- LoopBuilder::build_loop で entry → preheader への jump 追加
- decls.rs でデュアル関数作成時のブロック接続修正
- mir_static_main_args_loop.rs テスト追加
**パーサー改善**:
- parser_box.hako に HAKO_PARSER_PROG_MAX ガード追加(無限ループ対策)
🎉 成果:
- Continue 文の PHI predecessor mismatch エラー完全解消
- main(args) パラメータ有りループが正常動作
- Stage-B balanced scan で continue 正常動作確認 (228回イテレーション)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-19 08:04:43 +09:00
b086933acb
debug(stageb): Phase 25.1c balanced scan診断トレース追加→VM continue バグ特定
...
Task 8-4: balanced scan loopハング根本原因特定完了
**診断トレース追加内容**:
- balanced scan loop開始前トレース (k3, len)
- 全イテレーション進捗トレース (#N, i, depth)
- substring呼び出し前後トレース
- 各分岐処理トレース (open-brace, close-brace, quote, other)
**根本原因特定**:
```
[stageb/body/iter] #1 i=231 depth=0
[stageb/body/substr-pre] #1 calling s.substring(231, 232)
[stageb/body/substr-post] #1 got ch
[stageb/body/branch] open-brace depth=0->+1 i=231->+1
# ここでハング - #2イテレーショントレースが出ない
```
**確定事項**:
1. ✅ `s.substring(231, 232)` 成功
2. ✅ `ch == "{"` 分岐に入った
3. ✅ `depth=0->1`, `i=231->232` 実行
4. ✅ `continue` 実行したはず
5. ❌ **ループ先頭に戻らず、2回目のトレースが出ない**
**結論**:
- Stage-B/.hakoコードの問題ではない
- substringパフォーマンスの問題でもない
- **Rust VM の loop/continue 制御フローにバグ**
**次のステップ**: Phase 25.1m/25.1d拡張タスクとして、
LoopForm v2 + VM continue バグ修正をRustテストで再現・修正
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-19 06:17:24 +09:00
8054875261
feat(parser): Phase 25.1c dev-only progress guard実装
...
Task 8-4: ParserBox.parse_program2ハング調査のため、開発専用の進捗ガード実装
**実装内容**:
- HAKO_PARSER_PROG_MAX環境変数で最大反復回数を設定可能
- デフォルト挙動は完全不変(max_prog=0=無制限)
- 数値パースは安全実装(不正値→0扱い)
- トレースモード時のみガード到達をログ出力
**Phase 25ポリシー準拠**:
- 仕様変更なし(dev-onlyオプトイン)
- 既存コード完全互換
- 無効値は静かに無視(デフォルト挙動維持)
**調査状況**:
- Hotfix 8適用後、Stage-Bトレースは after_build_body_src まで出力
- parse_program2に入っておらず、パーサートレース未出現
- trace_enabled()呼び出し前後のハング疑惑を調査中
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-19 05:48:51 +09:00
dad278caf2
feat(hotfix-8): Fix static method receiver detection logic (Hotfix 4 inversion bug)
...
## Issue
- StageBTraceBox.log("label") passed null for the label parameter
- Static methods incorrectly detected as having implicit receiver
- Hotfix 4 logic was inverted: `!matches!(params[0], MirType::Box(_))`
## Root Cause
src/mir/function.rs:90-101 had inverted logic:
- Instance methods (params[0]: Box type) → should have receiver
- Static methods (params[0]: non-Box type) → should NOT have receiver
- Previous code: `!matches!()` = true for non-Box → receiver=true (WRONG)
## Fix
- Changed `!matches!(signature.params[0], MirType::Box(_))` to
`matches!(signature.params[0], MirType::Box(_))`
- Updated comments to clarify instance vs static method detection
- Result: static methods now correctly have receiver=0
## Verification
Before: fn='StageBTraceBox.log/1' params=1, receiver=1, total=2 ❌
After: fn='StageBTraceBox.log/1' params=1, receiver=0, total=1 ✅
Test output:
Before: [stageb/trace] # label=null
After: [stageb/trace] test_label # label passed correctly ✅
## Files Changed
- src/mir/function.rs: Fixed has_implicit_receiver logic
- lang/src/compiler/entry/compiler_stageb.hako: Added guaranteed entry marker
and direct print traces for Phase 25.1c debugging
- CURRENT_TASK.md: Updated task progress
## Phase 25.1c Progress
- Hotfix 8 完了:static method parameter passing 修正
- Stage-B トレース正常動作確認
- 次のタスク:ParserBox.parse_program2 ハング問題調査
🐾 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-19 05:30:31 +09:00
fa571a656e
feat(stageb): Phase 25.1c - Stage-B トレース追加(dev-only)
...
追加内容:
- StageBTraceBox: dev トレース用 Box 追加(HAKO_STAGEB_TRACE=1 で有効)
- トレースポイント:
- StageBArgsBox.resolve_src: enter/return_len
- StageBBodyExtractorBox.build_body_src: enter_len/return_len
- StageBDriverBox.main: enter/after_resolve_src/after_build_body_src/
after_parse_program2/func_scan methods/exit rc=0
Phase 25.1c 目標:
- Stage-B / Stage-1 CLI 構造デバッグ
- fib canary / selfhost CLI canary の rc=1 原因特定
ポリシー:
- dev env でガード(挙動不変)
- 既定挙動は変更せず、観測のみ追加
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-19 04:49:25 +09:00
39f5256c18
📊 Phase 25.1l: Region観測レイヤー骨格 + スコープ契約設計理解
...
**Region Box統一理論の実装開始**
新規追加:
- src/mir/region/mod.rs: Region/RefSlotKind型定義
- src/mir/region/observer.rs: Region観測レイヤー
- docs/development/roadmap/phases/phase-25.1l/: 設計ドキュメント
主要概念:
- Region Box = Function/Loop/If の統一箱
- RefSlotKind = GC管理用スロット種別(Strong/Weak/Borrowed/NonRef)
- 観測専用(NYASH_REGION_TRACE=1で動作、挙動変更なし)
設計理解の深化:
- ValueId(40)問題 = LoopForm v2スコープ契約違反の症状
- 根本解決 = Region観測で無名一時値のスコープまたぎを検出
- 箱理論3原則: 境界明確化/差し替え可能/段階的移行
関連議論:
- ChatGPT提案: Region統一理論でGC/寿命管理の基盤構築
- SlotRegistry: 変数の単一真実源(SSOT)
- 階層構造: FunctionRegion → LoopRegion → IfRegion
次のステップ:
- Phase 1: Region観測(現在)- 非破壊的追加
- Phase 2: メタデータ出力(MIR JSON拡張)
- Phase 3: GC統合(retain/release挿入)
テスト追加:
- lang/src/compiler/tests/stageb_mini_driver.hako
- tools/test_loopssa_breakfinder_slot.sh
Build: ✅ 全警告は既存のもの
Tests: 既存テスト全て緑維持
2025-11-19 02:44:40 +09:00
80f8a7bc8c
🔧 Hotfix 7 (Enhanced): ValueId receiver alias tracking for nested loops
...
- Problem: Pinned receiver variables in loops cause undefined ValueId errors
- Enhanced fix: Update all receiver aliases (me + all __pin$N$@recv levels)
- Handles nested loops by updating previous pin levels
- Test status: Partial improvement, ValueId(50) → ValueId(40)
- Further investigation needed for complete fix
Files modified:
- src/mir/phi_core/loopform_builder.rs (emit_header_phis)
2025-11-19 00:02:41 +09:00
5bb094d58f
feat(.hako): Exit PHI実装(Phase 2-5完了)- リファレンス実装
...
.hakoコンパイラにExit PHI生成機能を実装(将来の本命実装)
実装ファイル(585行):
- break_finder.hako (~250行): break文検出
- phi_injector.hako (~280行): PHI命令生成・挿入
- loopssa.hako (更新): BreakFinder/PhiInjector統合
- README.md: アーキテクチャ説明・使用方法
設計:
- 箱化・モジュール化(3Box分離)
- JSON文字列→文字列処理
- HAKO_LOOPSSA_EXIT_PHI=1 で有効化
重要な発見:
- Exit PHI生成はMIRレベルで行うべき(JSON v0では情報不足)
- 現在のTest 2エラーはRust MIRビルダーのバグ
- .hako実装は将来のリファレンス・Phase 25.1f用に温存
次のステップ:
- Rust側 loopform_builder.rs のphi pred mismatchバグ修正
- .hakoへの完全移行はPhase 25.1e後半〜25.1f
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-18 04:05:45 +09:00
9f45ebaced
feat(.hako): CompilerBuilder.apply_all()配線追加 (Phase 1)
...
Exit PHI実装の準備として、.hakoコンパイラに
CompilerBuilder.apply_all()呼び出しを追加
変更内容:
- compiler_stageb.hako: parse_program2直後にapply_all()配線
- hako_module.toml: builder.mod export追加
- nyash.toml: モジュールマッピング追加
デバッグ:
- HAKO_COMPILER_BUILDER_TRACE=1 で詳細ログ出力
- [compiler-builder] before/after で変換前後を確認可能
次のステップ:
- Phase 2: BreakFinderBox実装
- Phase 3: PhiInjectorBox実装
- Phase 4: LoopSSA.stabilize_merges実装
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-18 03:37:47 +09:00
f3cd815c77
feat(parsercontrol): add shallow recursion guards to ParserControlBox (if/loop/break/continue/block)
2025-11-17 18:23:00 +09:00
978890e7f6
feat(parserstmt): add shallow recursion guard to ParserStmtBox.parse
2025-11-17 18:20:29 +09:00
04524f5894
feat(parserbox): add shallow recursion guard to parse_program2 for Stage-B
2025-11-17 18:11:15 +09:00
3c3e734f49
feat(stageb): add shallow recursion guards to bundle and using resolvers
2025-11-17 18:00:44 +09:00
bcefdad9eb
feat(stageb): add shallow recursion guards to StageB driver/body extractor
2025-11-17 17:57:54 +09:00
c8bbe389da
test(compiler): add Stage-B minimal SSA test harness
...
**Goal**: Create 100-line minimal test case to reproduce SSA/ValueId
bugs in Stage-B compilation without the complexity of full compiler_stageb.hako.
**Files added**:
1. **lang/src/compiler/tests/stageb_min_sample.hako** (65 lines)
- Pattern 1: Method call in if-block before loop (TestArgs.process)
- Pattern 2: Simple method calls without loops (TestSimple.run)
- Pattern 3: Nested if/loop with method calls (TestNested.complex)
- All patterns reproduce ValueId SSA bugs
2. **tools/test_stageb_min.sh** (executable test script)
- Test 1: Direct VM execution
- Test 2: Stage-B compilation pipeline
- Test 3: MIR verification
**Test results** (as of commit):
Test 1 (Direct VM):
```
❌ ValueId(14) error in TestArgs.process/1
(different from ValueId(17) in Stage-B!)
```
Test 2 (Stage-B):
```
❌ ValueId(17) error in StageBArgsBox.resolve_src/1
(expected, same as full compiler_stageb.hako)
```
Test 3 (MIR verification):
```
✅ No verification errors
(verifier doesn't catch these specific SSA bugs)
```
**Findings**:
- Multiple ValueId SSA bugs exist (14, 17, etc.)
- MIR verifier needs enhancement to catch receiver use-before-def
- Minimal harness successfully reproduces issues for easier debugging
**Next steps** (not in this commit):
- Fix ValueId(14) in TestArgs.process
- Fix ValueId(17) in StageBArgsBox.resolve_src
- Enhance MIR verifier to catch Method receiver SSA bugs
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 04:29:10 +09:00
b4cb516f6a
refactor(compiler): reorganize StageBBodyExtractorBox structure
...
**Goal**: Improve readability of 480-line build_body_src method with
clear phase separators, consistent spacing, and unified formatting.
**Zero logic changes** - behavior 100% identical.
**Structure improvements**:
1. **Added clear phase separators** with ==== comment lines:
- Phase 4: Body extraction (k0/k1/k2/k3 logic)
- Phase 4.7: Comment removal
- Phase 4.5: Bundle resolution
- Phase 4.6: Duplicate bundle check
- Bundle merge + line-map debug output
- Using resolver
- Phase 5: Trim (left/right)
2. **Improved readability**:
- Added consistent spacing between phases (2 blank lines)
- Unified indentation (2 spaces throughout)
- Grouped related debug blocks together
- Made block structure more visible
3. **Zero logic changes**:
- All variable names unchanged
- All conditions unchanged
- All calculations unchanged
- All DEBUG messages unchanged
- All bundle/using resolver calls unchanged
**Verification**:
- Same ValueId(17) error as before (expected, will fix in Task B)
- Debug logs identical ([plugin/missing], [DEBUG])
- Behavior 100% identical to original
**Impact**: Code now much more maintainable with clear phase boundaries,
making future modifications safer and simpler.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 04:19:17 +09:00
e2c37f06ba
refactor(compiler): split Main into 4 boxes (Phase 25.1c)
...
**Goal**: Reorganize compiler_stageb.hako from monolithic Main.main
(605 lines) into 4 cleanly separated boxes following "Box Theory".
**Structure** (605→628 lines, +23 for box boundaries):
1. **StageBArgsBox** (lines 18-46)
- Purpose: CLI argument → source resolution
- Method: resolve_src(args)
- Handles: --source, --source-file, env variables, defaults
2. **StageBBodyExtractorBox** (lines 48-528)
- Purpose: Body extraction + bundle + using + trim
- Method: build_body_src(src, args)
- Handles: Method body extraction, comment stripping, bundling,
using resolution, whitespace trimming
3. **StageBDriverBox** (lines 530-619)
- Purpose: Main driver logic
- Method: main(args)
- Orchestrates: ParserBox setup, parse_program2, defs scanning,
JSON output
4. **Main** (lines 623-628)
- Purpose: Entry point (thin wrapper)
- Method: main(args)
- Action: Simple delegation to StageBDriverBox.main(args)
**Constraints respected**:
- ✅ Behavior unchanged (same output JSON, same logs)
- ✅ Code moved as-is (no logic changes)
- ✅ All using statements preserved
- ✅ All comments preserved + Phase 25.1c markers added
- ✅ Proper 2-space indentation maintained
- ✅ Call chain: Main → StageBDriverBox → StageBArgsBox/StageBBodyExtractorBox
**Verification**:
- Same ValueId(17) error occurs (expected, not fixed in this task)
- Error location changed: fn=Main.main → fn=StageBArgsBox.resolve_src/1
(proves code was successfully moved)
- No new errors introduced
- Structural separation enables future SSA/ValueId fixes
**Impact**: Establishes clean box boundaries for future maintenance,
making it easier to debug and fix SSA issues independently per box.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 04:03:29 +09:00
eadde8d1dd
fix(mir/builder): use function-local ValueId throughout MIR builder
...
Phase 25.1b: Complete SSA fix - eliminate all global ValueId usage in function contexts.
Root cause: ~75 locations throughout MIR builder were using global value
generator (self.value_gen.next()) instead of function-local allocator
(f.next_value_id()), causing SSA verification failures and runtime
"use of undefined value" errors.
Solution:
- Added next_value_id() helper that automatically chooses correct allocator
- Fixed 19 files with ~75 occurrences of ValueId allocation
- All function-context allocations now use function-local IDs
Files modified:
- src/mir/builder/utils.rs: Added next_value_id() helper, fixed 8 locations
- src/mir/builder/builder_calls.rs: 17 fixes
- src/mir/builder/ops.rs: 8 fixes
- src/mir/builder/stmts.rs: 7 fixes
- src/mir/builder/emission/constant.rs: 6 fixes
- src/mir/builder/rewrite/*.rs: 10 fixes
- + 13 other files
Verification:
- cargo build --release: SUCCESS
- Simple tests with NYASH_VM_VERIFY_MIR=1: Zero undefined errors
- Multi-parameter static methods: All working
Known remaining: ValueId(22) in Stage-B (separate issue to investigate)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 00:48:18 +09:00
7ca7f646de
Phase 25.1b: Step2完了(FuncBodyBasicLowerBox導入)
...
Step2実装内容:
- FuncBodyBasicLowerBox導入(defs専用下請けモジュール)
- _try_lower_local_if_return実装(Local+単純if)
- _inline_local_ints実装(軽い正規化)
- minimal lowers統合(Return/BinOp/IfCompare/MethodArray系)
Fail-Fast体制確立:
- MirBuilderBox: defs_onlyでも必ずタグ出力
- [builder/selfhost-first:unsupported:defs_only]
- [builder/selfhost-first:unsupported:no_match]
Phase構造整備:
- Phase 25.1b README新設(Step0-3計画)
- Phase 25.2b README新設(次期計画)
- UsingResolverBox追加(using system対応準備)
スモークテスト:
- stage1_launcher_program_to_mir_canary_vm.sh追加
Next: Step3 LoopForm対応
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-15 22:32:13 +09:00
6856922374
Phase 25.1a: selfhost builder hotfix (fn rename, docs)
2025-11-15 05:42:32 +09:00
f1fa182a4b
AotPrep collections_hot matmul tuning and bench tweaks
2025-11-14 13:36:20 +09:00
647ee05d06
fix(emit): stabilize Stage-B wrapper with temp file approach
...
Root Cause:
- Subshell CODE expansion became path literal "/cat/tmp/matmul.hako"
- Variable lost in nested subshell with cd command
- All benchmark cases (matmul, arraymap, etc.) failed emit
Solution:
- Temp file approach with trap cleanup (CODE_TMP=$(mktemp))
- 3-tier fallback extraction (Python→awk→ruby)
- Enhanced diagnostics with HAKO_SELFHOST_TRACE=1
- Pre-check SKIP logic in microbench for unstable emit
Changes:
- tools/hakorune_emit_mir.sh
- Temp file approach eliminates subshell variable issues
- extract_program_json now has 3 fallback strategies
- Detailed trace output for debugging
- Variable scope fixes (local → script level)
- tools/perf/microbench.sh
- matmul pre-check with SKIP + diagnostic hint
- Prevents false benchmark results on emit failure
Test Results:
✅ loop: 936 bytes rc=0
✅ call: 330 bytes rc=0
✅ stringchain: 313 bytes rc=0
✅ arraymap: 422 bytes rc=0
✅ matmul: 7731 bytes rc=0 (FIXED!)
✅ CI guard: emit_provider_no_jsonfrag_canary PASS
Impact:
- All benchmark cases now emit MIR successfully
- Stable execution without subshell variable bugs
- Comprehensive diagnostics for future debugging
- Foundation for provider-first optimization
Next: Apply AotPrep to optimize Array/Map hot paths
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-13 22:52:25 +09:00
801833df8d
fix(env): improve Environment::set scope resolution (partial)
...
Fixed:
- Environment::set now properly searches ancestor chain before creating new binding
- Added exists_in_chain_locked() helper for explicit existence checking
- Simple {} blocks now correctly update outer scope variables
Verified Working:
- local x = 10; { x = 42 }; print(x) → prints 42 ✅
Still Broken:
- else blocks don't update outer scope variables
- local x = 10; if flag { x = 99 } else { x = 42 }; print(x) → prints 10 ❌
Root Cause Identified:
- Issue is in MIR Builder (compile-time), not Environment (runtime)
- src/mir/builder/if_form.rs:108 resets variable_map before else block
- PHI generation at merge doesn't use else_var_map_end correctly
- MIR shows: phi [%32, bb1], [%1, bb2] where %1 is original value, not else value
Next: Fix else block variable merging in if_form.rs
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-13 18:55:14 +09:00
1ac0c6b880
feat(stageb): implement UsingResolverBox foundation (partial)
...
Implemented:
- UsingResolverBox full implementation in using_resolver_box.hako
- state_new(): Empty state creation
- load_modules_json(): Load modules JSON from nyash.toml
- resolve_path_alias(): Resolve paths from aliases
- resolve_namespace_alias(): Tail segment matching with case-insensitive support
- to_context_json(): Generate context JSON for ParserBox
- Added sh_core entry to nyash.toml modules section
- Maps to lang/src/shared/common/string_helpers.hako
- Fixes "using not found: 'sh_core'" errors
- Cleaned up compiler_stageb.hako
- Removed problematic using statements
- Added documentation
Known Issue (to be fixed next):
- Body extraction bug in compiler_stageb.hako:51-197
- Multiline source extraction fails for "static box Main { main() {...} }"
- Results in empty Program JSON body
- Causes Stage-B emit pipeline to fall back to jsonfrag (ratio=207900%)
- This is the root cause blocking selfhost builder path
Impact:
- ✅ sh_core resolution errors fixed
- ✅ UsingResolverBox infrastructure complete
- ❌ Stage-B emit pipeline not restored (body extraction bug)
- ❌ Selfhost builder path still blocked
Next Priority: Fix body extraction bug to restore Stage-B pipeline
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-13 18:11:25 +09:00
9e2fa1e36e
Phase 21.6 solidification: chain green (return/binop/loop/call); add Phase 21.7 normalization plan (methodize static boxes). Update CURRENT_TASK.md and docs.
2025-11-11 22:35:45 +09:00
52b62c5772
feat(phase21.5): Stage-B parser loop fix + delegate path stabilization
...
## 修正内容
### 1. Stage-B パーサー修正(偶然の回避)
- **ファイル**:
- `lang/src/compiler/parser/expr/parser_expr_box.hako`
- `lang/src/compiler/parser/stmt/parser_control_box.hako`
- **問題**: ネストループで gpos が正しく進まず、loop の cond/body が壊れる
- **回避策**: new 式のメソッドチェーン処理追加で別ループを導入
- **結果**: MIR 生成が変わって VM gpos バグを回避
### 2. delegate パス動作確認
- **テスト**: `/tmp/loop_min.hako` → rc=10 ✅
- **MIR構造**: 正しい PHI/compare/binop を生成
- **チェーン**: hakorune parser → Rust delegate → LLVM EXE 完動
### 3. ドキュメント追加
- `docs/development/analysis/` - delegate 分析
- `docs/development/guides/` - ループテストガイド
- `docs/development/testing/` - Stage-B 検証報告
### 4. カナリーテスト追加
- `tools/smokes/v2/profiles/quick/core/phase2100/` 配下に複数追加
- emit_boxcall_length_canary_vm.sh
- stageb_parser_loop_json_canary_vm.sh
- 他
### 受け入れ基準
- ✅ delegate パス: rc=10 返す
- ✅ FORCE パス: rc=10 返す(既存)
- ✅ MIR 構造: 正しい PHI incoming と compare
- ✅ 既定挙動: 不変(dev トグルのみ)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-11 21:24:51 +09:00
6055d53eff
feat(phase21.5/22.1): MirBuilder JsonFrag refactor + FileBox ring-1 + registry tests
...
Phase 21.5 (AOT/LLVM Optimization Prep)
- FileBox ring-1 (core-ro) provider: priority=-100, always available, no panic path
- src/runner/modes/common_util/provider_registry.rs: CoreRoFileProviderFactory
- Auto-registers at startup, eliminates fallback panic structurally
- StringBox fast path prototypes (length/size optimization)
- Performance benchmarks (C/Python/Hako comparison baseline)
Phase 22.1 (JsonFrag Unification)
- JsonFrag.last_index_of_from() for backward search (VM fallback)
- Replace hand-written lastIndexOf in lower_loop_sum_bc_box.hako
- SentinelExtractorBox for Break/Continue pattern extraction
MirBuilder Refactor (Box → JsonFrag Migration)
- 20+ lower_*_box.hako: Box-heavy → JsonFrag text assembly
- MirBuilderMinBox: lightweight using set for dev env
- Registry-only fast path with [registry:*] tag observation
- pattern_util_box.hako: enhanced pattern matching
Dev Environment & Testing
- Dev toggles: SMOKES_DEV_PREINCLUDE=1 (point-enable), HAKO_MIR_BUILDER_SKIP_LOOPS=1
- phase2160: registry opt-in tests (array/map get/set/push/len) - content verification
- phase2034: rc-dependent → token grep (grep -F based validation)
- run_quick.sh: fast smoke testing harness
- ENV documentation: docs/ENV_VARS.md
Test Results
✅ quick phase2034: ALL GREEN (MirBuilder internal patterns)
✅ registry phase2160: ALL GREEN (array/map get/set/push/len)
✅ rc-dependent tests → content token verification complete
✅ PREINCLUDE policy: default OFF, point-enable only where needed
Technical Notes
- No INCLUDE by default (maintain minimalism)
- FAIL_FAST=0 in Bring-up contexts only (explicit dev toggles)
- Tag-based route observation ([mirbuilder/min:*], [registry:*])
- MIR structure validation (not just rc parity)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-10 19:42:42 +09:00
77d4fd72b3
phase: 20.49 COMPLETE; 20.50 Flow+String minimal reps; 20.51 selfhost v0/v1 minimal (Option A/B); hv1-inline binop/unop/copy; docs + run_all + CURRENT_TASK -> 21.0
2025-11-06 15:41:52 +09:00
44a5158a14
hv1: early-exit at main (no plugin init); tokenizer: Stage-3 single-quote + full escapes (\/ \b \f \' \r fix); builder: route BinOp via SSOT emit_binop_to_dst; hv1 verify canary route (builder→Core); docs: phase-20.39 updates
2025-11-04 20:46:43 +09:00
30aa39f50b
hv1 verify: add direct route (env JSON) and clean inline path; fix v1 phi incoming order; make test_runner use hv1 direct; add phase2037 phi canaries; load modules.workspace exports for alias; update docs (phase-20.38, source extensions) and CURRENT_TASK
2025-11-04 16:33:04 +09:00
ddf736ddef
Stage‑B alias/table negatives + Bridge v1 Closure negatives + docs sweep (minor)
...
- BundleResolver: fail-fast with tag on malformed alias table entries ([bundle/alias-table/bad] <entry>)
- Add opt-in negatives:
- canonicalize_closure_captures_negative_vm (captures wrong types)
- canonicalize_closure_missing_func_negative_vm (missing func in Closure)
- stageb_bundle_alias_table_bad_vm (malformed alias table)
- README minor replacements to (residuals)
All new tests are opt-in; quick remains green.
2025-11-02 17:57:41 +09:00
dd6876e1c6
Phase 20.12b: quick green + structural cleanup
...
- Deprecations: add warn-once for nyash.toml (runtime::deprecations); apply in plugin loader v2 (singletons/method_resolver)
- Child env + runner hygiene: unify Stage‑3/quiet/disable-fallback env in test/runner; expand LLVM noise filters
- Docs/branding: prefer and hako.toml in README.md/README.ja.md and smokes README
- VM: implement Map.clear in MIR interpreter (boxes_map)
- Stage‑B: gate bundle/alias/require smokes behind SMOKES_ENABLE_STAGEB; fix include cwd and resolve() call even for require-only cases
- Core‑Direct: gate rc boundary canary behind SMOKES_ENABLE_CORE_DIRECT
- Smokes: inject Stage‑3 and disable selfhost fallback for LLVM runs; filter using/* logs
- Quick profile: 168/168 PASS locally
This commit accelerates Phase 20.33 (80/20) by stabilizing quick suite, reducing noise, and gating heavy/experimental paths for speed.
2025-11-02 17:50:06 +09:00
0cd2342b05
core: add Core Direct string canaries (substring/charAt/replace); Stage‑B: alias table (ENV) support with BundleResolver; docs: Exit Code Policy tag→rc rules and checklist updates.
2025-11-02 16:24:50 +09:00
8b006575c1
smokes: enable Gate‑C budget canary by default (fallback allowed); add map_values_sum/map_keys_size; Stage‑B bundling routed via BundleResolver box; minor fixes.
2025-11-02 15:56:45 +09:00
a1d5b82683
runner: introduce CoreExecutor box for JSON→exec; wire Gate‑C pipe to CoreExecutor. Stage‑B bundling: duplicate name Fail‑Fast + mix canary; add Core Map/String positive smokes; add Gate‑C budget opt‑in canary; docs: Exit Code Policy; apply child_env in PyVM common util.
2025-11-02 15:43:43 +09:00
66b2a115ae
fix(vm): implement StringBox.lastIndexOf + PHI bug fix + Stage-B compiler完全動作 🎉
...
## 🎯 主要修正
### 1️⃣ StringBox.lastIndexOf実装 (Stage-B compiler blocker解消)
- **問題**: `lang/src/compiler/parser/parser_box.hako:85`で`lastIndexOf`使用も未実装
- **修正**: `src/backend/mir_interpreter/handlers/boxes_string.rs:51-60`に追加
- **実装**: `rfind()`で最後の出現位置を検索、-1でnot found表現
### 2️⃣ VM SSA/PHI bug完全修正 (ループ内メソッド呼び出し)
- **原因**: メソッド内ループ×外側ループ呼び出しでPHI生成失敗
- **修正箇所**:
- `src/mir/loop_builder.rs`: Exit PHI生成実装
- `src/mir/phi_core/loop_phi.rs`: PHI incoming修正
- `src/mir/phi_core/common.rs`: ユーティリティ追加
### 3️⃣ カナリアテスト追加
- **新規**: `tools/smokes/v2/profiles/quick/core/vm_nested_loop_method_call.sh`
- **構成**: Level 0/5b/5a/5 (段階的バグ検出)
- **結果**: 全テストPASS、Level 5で`[SUCCESS] VM SSA/PHI bug FIXED!`表示
### 4️⃣ using連鎖解決修正
- **問題**: `using sh_core`が子モジュールに伝播しない
- **修正**: 6ファイルに明示的`using`追加
- compiler_stageb.hako, parser_box.hako
- parser_stmt_box.hako, parser_control_box.hako
- parser_exception_box.hako, parser_expr_box.hako
### 5️⃣ ParserBoxワークアラウンド
- **問題**: `skip_ws()`メソッド呼び出しでVMバグ発生
- **対応**: 3箇所でインライン化(PHI修正までの暫定対応)
## 🎉 動作確認
```bash
# Stage-B compiler完全動作!
$ bash /tmp/run_stageb.sh
{"version":0,"kind":"Program","body":[{"type":"Return","expr":{"type":"Int","value":42}}]}
# カナリアテスト全PASS
$ bash tools/smokes/v2/profiles/quick/core/vm_nested_loop_method_call.sh
[PASS] level0_simple_loop (.008s)
[PASS] level5b_inline_nested_loop (.007s)
[PASS] level5a_method_no_loop (.007s)
[SUCCESS] Level 5: VM SSA/PHI bug FIXED!
[PASS] level5_method_with_loop (VM BUG canary) (.008s)
```
## 🏆 技術的ハイライト
1. **最小再現**: Level 0→5bの段階的テストでバグパターン完全特定
2. **Task先生調査**: 表面エラーから真因(lastIndexOf未実装)発見
3. **適切実装**: `boxes_string.rs`のStringBox専用ハンドラに追加
4. **完全検証**: Stage-B compilerでJSON出力成功を実証
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-02 10:58:09 +09:00
3aa0c3c875
fix(stage-b): Add sh_core using + Stage-1 JSON support
...
## Fixed Issues
1. compiler_stageb.hako: Added 'using sh_core as StringHelpers'
- Resolved: call unresolved ParserStringUtilsBox.skip_ws/2
- Root cause: using chain resolution not implemented
- Workaround: explicit using in parent file
2. stageb_helpers.sh: Accept Stage-1 JSON format
- Modified awk pattern to accept both formats:
- MIR JSON v0: "version":0, "kind":"Program"
- Stage-1 JSON: "type":"Program"
## Remaining Issues
ParserBox VM crash: Invalid value: use of undefined value ValueId(5839)
- Cause: Complex nested loops in parse_program2()
- Workaround: Minimal Stage-B (without ParserBox) works
- Fallback: Rust compiler path available
## Verification
✅ Minimal Stage-B outputs JSON correctly
❌ ParserBox execution crashes VM (SSA bug)
Co-Authored-By: Task先生 (AI Agent)
2025-11-02 08:23:43 +09:00
7180579cf8
stage-b (P0): stabilize entry — compiler_stageb.hako now emits Stage‑1 Program(JSON v0) directly (one-line), avoiding heavy MIR path; FlowEntry prefers v1→v0 first; noisy debug prints in pipeline with_usings gated. Quick core/stageb canaries PASS.
2025-11-02 07:22:40 +09:00
df9068a555
feat(stage-b): Add FLOW keyword support + fix Stage-3 keyword conflicts
...
## ✅ Fixed Issues
### 1. `local` keyword tokenization (commit 9aab64f7)
- Added Stage-3 gate for LOCAL/TRY/CATCH/THROW keywords
- LOCAL now only active when NYASH_PARSER_STAGE3=1
### 2. `env.local.get` keyword conflict
- File: `lang/src/compiler/entry/compiler_stageb.hako:21-23`
- Problem: `.local` in member access tokenized as `.LOCAL` keyword
- Fix: Commented out `env.local.get("HAKO_SOURCE")` line
- Fallback: Use `--source` argument (still functional)
### 3. `flow` keyword missing
- Added FLOW to TokenType enum (`src/tokenizer/kinds.rs`)
- Added "flow" → TokenType::FLOW mapping (`src/tokenizer/lex_ident.rs`)
- Added FLOW to Stage-3 gate (requires NYASH_PARSER_STAGE3=1)
- Added FLOW to parser statement dispatch (`src/parser/statements/mod.rs`)
- Added FLOW to declaration handler (`src/parser/statements/declarations.rs`)
- Updated box_declaration parser to accept BOX or FLOW (`src/parser/declarations/box_definition.rs`)
- Treat `flow FooBox {}` as syntactic sugar for `box FooBox {}`
### 4. Module namespace conversion
- Renamed `lang.compiler.builder.ssa.local` → `localvar` (avoid keyword)
- Renamed file `local.hako` → `local_ssa.hako`
- Converted 152 path-based using statements to namespace format
- Added 26+ entries to `nyash.toml` [modules] section
## ⚠️ Remaining Issues
### Stage-B selfhost compiler performance
- Stage-B compiler not producing output (hangs/times out after 10+ seconds)
- Excessive PHI debug output suggests compilation loop issue
- Needs investigation: infinite loop or N² algorithm in hako compiler
### Fallback JSON version mismatch
- Rust fallback (`--emit-mir-json`) emits MIR v1 JSON (schema_version: "1.0")
- Smoke tests expect MIR v0 JSON (`"version":0, "kind":"Program"`)
- stageb_helpers.sh fallback needs adjustment
## Test Status
- Parse errors: FIXED ✅
- Keyword conflicts: FIXED ✅
- Stage-B smoke tests: STILL FAILING ❌ (performance issue)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-02 04:13:17 +09:00