tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,709 Commits 1 Branch 0 Tags
eabef397485aef2a3e6a8f2f9c2aa8d137803fdf
Commit Graph

88 Commits

Author SHA1 Message Date
nyash-codex
68615e72fb feat(joinir): Phase 61-2 If-in-loop JoinIR dry-run検証インフラ実装 
## 実装内容

### 61-2.1: dry-runフラグ追加
- `src/config/env.rs`: joinir_if_in_loop_dryrun_enabled() 追加 (+11行)
- `HAKO_JOINIR_IF_IN_LOOP_DRYRUN=1` でdry-runモード有効化

### 61-2.2: loop_builder.rs dry-run統合
- `src/mir/loop_builder.rs`: JoinIR PhiSpec計算とA/B比較実装 (+47行)
- JoinInst取得時にPhiSpec保存、PhiBuilderBox実行後に比較

### 61-2.3: PhiSpec計算ロジック実装
- `src/mir/join_ir/lowering/if_phi_spec.rs`: 新規作成 (+203行)
  - PhiSpec構造体（header_phis/exit_phis）
  - compute_phi_spec_from_joinir(): JoinInstからPHI仕様計算
  - extract_phi_spec_from_builder(): PhiBuilderBox結果抽出
  - compare_and_log_phi_specs(): A/B比較とログ出力
- BTreeMap/BTreeSet使用（決定的イテレーション保証）

### 61-2.4: A/B比較テスト実装
- `src/tests/phase61_if_in_loop_dryrun.rs`: 新規作成 (+49行)
  - phase61_2_dry_run_flag_available: フラグ動作確認
  - phase61_2_phi_spec_creation: PhiSpec構造体テスト
- テスト結果: ✅ 2/2 PASS

## テスト結果

- Phase 61-2新規テスト: ✅ 2/2 PASS
- 既存loopformテスト: ✅ 14/14 PASS（退行なし）
- ビルド: ✅ 成功（エラー0件）

## コード変更量

+312行（env.rs: +11, if_phi_spec.rs: +203, loop_builder.rs: +47, tests: +49, その他: +2）

## 技術的成果

1. PhiSpec構造体完成（JoinIR/PhiBuilderBox統一表現）
2. dry-run検証インフラ（本番動作に影響なし）
3. BTreeMap統一（Option C知見活用）

## 次のステップ（Phase 61-3）

- dry-run → 本番経路への昇格
- PhiBuilderBox If側メソッド削除（-226行）
- JoinIR経路のみでif-in-loop PHI生成

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-29 12:26:02 +09:00
nyash-codex
3ea397fd3e feat(joinir): Phase 61-1 If-in-loop JoinIR化インフラ整備完了 
## 実装内容

### 新規ファイル
- `if_phi_context.rs`: If-in-loop用PHIコンテキスト構造体 (135行)
  - `IfPhiContext::for_loop_body()`: ループ内if用コンストラクタ
  - `is_carrier()`: ループキャリア変数判定
  - 単体テスト2個完全動作

### 既存ファイル拡張
- `if_select.rs`, `if_merge.rs`: context パラメータ追加 (+68行)
  - `with_context()` コンストラクタ実装
  - Pure If との完全互換性維持
- `mod.rs`: `try_lower_if_to_joinir()` シグネチャ拡張 (+25行)
  - `context: Option<&IfPhiContext>` パラメータ追加
  - 既存呼び出し箇所6箇所修正完了
- `loop_builder.rs`: JoinIR経路実装 (+43行)
  - `NYASH_JOINIR_IF_SELECT=1` で試行
  - フォールバック設計（PhiBuilderBox経路保持）
  - デバッグログ完備

## テスト結果
- ✅ loopform テスト 14/14 PASS（退行なし）
- ✅ ビルド成功（エラー0件）
- ✅ Borrow Checker 問題解決

## コード変更量
- 新規: +135行
- 拡張: +136行
- 削除: -18行
- 純増: +253行（インフラ投資、Phase 61-3で-226行削減予定）

## 次のステップ
Phase 61-2: join_inst dry-run実装で実際のPHI生成を行う

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-29 11:53:57 +09:00
nyash-codex
1714eaa00c feat(joinir): Phase 48-2 from_loop_form method for Trio absorption 
- Add LoopScopeShape::from_loop_form() that creates Trio internally
- Remove LoopExitLivenessBox import from loop_to_join.rs
- Switch loop_to_join.rs to use from_loop_form() instead of from_existing_boxes()

This is the first step in absorbing Classifier Trio into LoopScopeShape.
External Trio dependency reduced from 3 boxes to 2 (intake_loop_form only).

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-28 19:00:03 +09:00
nyash-codex
447bbec998 refactor(joinir): Split ast_lowerer and join_ir_vm_bridge into modules 
ast_lowerer.rs → ast_lowerer/ (10 files):
- mod.rs: public surface + entry dispatch
- context.rs: ExtractCtx helpers
- expr.rs: expression-to-JoinIR extraction
- if_return.rs: simple if→Select lowering
- loop_patterns.rs: loop variants (simple/break/continue)
- read_quoted.rs: read_quoted_from lowering (Phase 45-46)
- nested_if.rs: NestedIfMerge lowering
- analysis.rs: loop if-var analysis + metadata helpers
- tests.rs: frontend lowering tests
- README.md: module documentation

join_ir_vm_bridge.rs → join_ir_vm_bridge/ (5 files):
- mod.rs: public surface + shared helpers
- convert.rs: JoinIR→MIR lowering
- runner.rs: VM execution entry (run_joinir_via_vm)
- meta.rs: experimental metadata-aware hooks
- tests.rs: bridge-specific unit tests
- README.md: module documentation

Benefits:
- Clear separation of concerns per pattern
- Easier navigation and maintenance
- Each file has single responsibility
- README documents module boundaries

Co-authored-by: ChatGPT <noreply@openai.com>

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-28 17:42:19 +09:00
nyash-codex
588129db65 feat(joinir): Phase 34-6 MethodCall 構造と本物の substring 意味論 
**Phase 34-6 実装完了**: MethodCall 構造を JoinIR に追加し、本物の substring
呼び出しを通すことに成功。

## 主要変更

### 1. MethodCall 構造追加 (34-6.1)
- `src/mir/join_ir/mod.rs`: JoinInst::MethodCall バリアント (+8 lines)
  - 構造: `{ dst, receiver, method, args }`
  - 設計原則: JoinIR は構造のみ、意味論は MIR レベル

### 2. extract_value 更新 (34-6.2)
- `src/mir/join_ir/frontend/ast_lowerer.rs`: Method 処理本物化 (+37 lines)
  - receiver/args を extract_value で再帰処理
  - ダミー Const(0) 削除 → 本物の MethodCall 生成
  - cond 処理修正: ValueId(0) ハードコード → extract_value で取得

### 3. JoinIR→MIR 変換実装 (34-6.3)
- `src/mir/join_ir_vm_bridge.rs`: MethodCall → BoxCall 変換 (+12 lines)
- `src/mir/join_ir/json.rs`: MethodCall JSON シリアライゼーション (+16 lines)
- `src/mir/join_ir_runner.rs`: MethodCall 未対応エラー (+7 lines)

### 4. テスト更新 (34-6.4)
- `docs/.../fixtures/json_shape_read_value.program.json`: 本物の substring 構造
- `src/tests/joinir_frontend_if_select.rs`: run_joinir_via_vm 使用
- テスト成功: v="hello", at=3 → "hel" ✅

## 成果

- ✅ テスト全通過（1 passed; 0 failed）
- ✅ 設計原則確立: JoinIR = 構造 SSOT、意味論 = MIR レベル
- ✅ Phase 33-10 原則との整合性: Method でも同じ原則適用

**ドキュメント更新**: CURRENT_TASK.md + TASKS.md（Phase 34-6 完了記録）

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 17:05:46 +09:00
nyash-codex
9e9e08eb84 feat(joinir): Phase 33-9.1 Loop/If lowering responsibility separation 
Implement clear separation between Loop and If lowering responsibilities:

**Guard Implementation:**
- Add is_loop_lowered_function() to identify 6 Loop-dedicated functions
- Exclude Loop functions from If lowering path in try_lower_if_to_joinir()
- Enforce "1 function → 1 lowering" principle

**Documentation:**
- Add responsibility comments to loop_to_join.rs
- Add responsibility comments to if_select.rs and if_merge.rs
- Update if_joinir_design.md with Phase 33-9.1 section

**Testing:**
- Add unit test test_is_loop_lowered_function() (PASS)
- Verify no regression in existing JoinIR tests

**Loop-dedicated functions (6):**
- Main.skip/1
- FuncScannerBox.trim/1
- FuncScannerBox.append_defs/2
- Stage1UsingResolverBox.resolve_for_source/5
- StageBBodyExtractorBox.build_body_src/2
- StageBFuncScannerBox.scan_all_boxes/1

This prevents future conflicts when both Loop and If lowering expand.

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 10:58:56 +09:00
nyash-codex
517b20fe88 feat(joinir): Phase 33-8 Stage-1 rollout infrastructure 
Add environment variable controls and debug logging for JoinIR lowering rollout.

Changes:
- Add HAKO_JOINIR_STAGE1 env var for Stage-1 function rollout control
- Add HAKO_JOINIR_DEBUG (0-3) for granular debug logging
  - Level 0: Silent (default)
  - Level 1: Basic lowering info
  - Level 2: Pattern matching details
  - Level 3: Full variable/instruction dump
- Implement 3-tier whitelist system:
  - Tier 1: Test functions (always enabled)
  - Tier 2: Stage-1 rollout (env-controlled)
  - Tier 3: Explicit approvals (validated in Phase 33-4)
- Add A/B test automation script (tools/joinir_ab_test.sh)
- Update if_merge.rs and if_select.rs with debug_level support

Environment variables (with NYASH_* fallback for compatibility):
- HAKO_JOINIR_IF_SELECT: Enable JoinIR lowering
- HAKO_JOINIR_STAGE1: Enable Stage-1 function rollout
- HAKO_JOINIR_DEBUG: Debug log level (0-3)

A/B test verification: PASSED on joinir_if_merge_{simple,multiple}.hako

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 09:30:54 +09:00
nyash-codex
5b7818f5c9 feat(joinir): Phase 33-7 IfMerge lowering for multiple-variable PHI 
Implements IfMerge instruction lowering to support multiple variables
merging from if/else branches (Phase 33-7: return pattern only).

## Changes

- Add src/mir/join_ir/lowering/if_merge.rs (232 lines)
  - IfMergeLowerer with pattern matching for common variables
  - extract_written_vars() / find_written_value() helpers
  - Phase 33-7 constraint: return pattern only (k_next=None)

- Update src/mir/join_ir/lowering/mod.rs
  - Unified entry point: try_lower_if_to_joinir()
  - Priority: IfMerge → Select → if_phi fallback
  - Add IfMergeTest.* to whitelist

- Add unit tests in src/tests/mir_joinir_if_select.rs
  - test_if_merge_simple_pattern (2 variables)
  - test_if_merge_multiple_pattern (3 variables)
  - All 7/7 tests PASS ✅

- Add reference test cases
  - apps/tests/joinir_if_merge_simple.hako (2-var pattern)
  - apps/tests/joinir_if_merge_multiple.hako (3-var pattern)

## Test Results

✅ Simple pattern (2 vars): merges=2, k_next=None
✅ Multiple pattern (3 vars): merges=3, k_next=None
✅ test result: ok. 7 passed; 0 failed

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 08:18:09 +09:00
nyash-codex
2d30277e97 fix(joinir): Correct JsonShapeToMap function name and add Phase 33-5 test whitelist 
Changes:
1. **Naming fix**: JsonShapeParser → JsonShapeToMap
   - Updated function name in whitelist to match actual static box name
   - Affected: JsonShapeToMap._read_value_from_pair/1 (lang/src/runtime/meta/json_shape_parser.hako)

2. **Phase 33-5 test whitelist**: Added Stage1JsonScannerTestBox.* pattern
   - Enables A/B testing for Stage-B if/else patterns
   - Test verified: Route A (if_phi) and Route B (Select) both RC=0 ✅

Testing:
- Route A (NYASH_JOINIR_IF_SELECT=0): RC 0 ✓
- Route B (NYASH_JOINIR_IF_SELECT=1): RC 0 ✓
- Pattern: simple if/else return (Stage1JsonScannerBox.value_start_after_key_pos/2 style)

Phase 33-5: Stage-B if/Select A/B testing実施完了

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 05:39:29 +09:00
nyash-codex
79cbf26f98 Phase 33-4: Stage-1/Stage-B expansion complete (33-4.1 to 33-4.3) 
## Code Changes
- Extended function name whitelist in try_lower_if_to_joinir()
- Added: JsonShapeParser._read_value_from_pair/1 (Stage-1)
- Added: Stage1JsonScannerBox.value_start_after_key_pos/2 (Stage-B)

## Validation
- A/B testing: Route A (if_phi) vs Route B (Select) → identical results (RC 0)
- Test cases: joinir_if_select_simple.hako, joinir_if_select_local.hako
- Build: cargo build --release successful

## Documentation (docs/private submodule)
- TASKS.md: Phase 33-4.1 to 33-4.3 marked complete
- if_joinir_design.md: Section 9 added (candidate analysis)

## Next Steps
- Phase 33-4.4: CI/smoke test updates (pending)
 2025-11-27 04:58:01 +09:00
nyash-codex
5cfb0e1d5b Phase 33-3: If/PHI MIR pattern matching + Select lowering (minimal patterns) 
Implementation:
- Implement MIR pattern matching in if_select.rs (simple/local patterns)
- Add try_lower_if_to_joinir() entry point in lowering/mod.rs
- Create comprehensive integration tests (4/4 passing)

Pattern Support:
- Simple pattern: if cond { return 1 } else { return 2 }
  - Both blocks must have Return only (no instructions)
- Local pattern: if cond { x = a } else { x = b }; return x
  - Each branch has exactly 1 Copy instruction
  - Both branches jump to same merge block
  - Merge block Returns the assigned variable

Safety Mechanisms:
- Dev toggle: NYASH_JOINIR_IF_SELECT=1 required
- Function name filter: Only IfSelectTest.* functions
- Fallback: Returns None on pattern mismatch
- Zero breaking changes: Existing if_phi path untouched

Tests (4/4 PASS):
- test_if_select_simple_pattern
- test_if_select_local_pattern
- test_if_select_disabled_by_default
- test_if_select_wrong_function_name

Files:
- Modified: src/mir/join_ir/lowering/if_select.rs (pattern matching)
- Modified: src/mir/join_ir/lowering/mod.rs (entry point)
- New: src/tests/mir_joinir_if_select.rs (integration tests)
- Modified: src/tests/mod.rs (module registration)

Phase 33-3.2/3.3 (legacy removal) pending

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 03:28:32 +09:00
nyash-codex
35cd93a37a Phase 33-2: JoinInst::Select implementation + minimal If JoinIR lowering 
Implementation:
- Add JoinInst::Select variant to JoinIR schema
- Implement Select execution in JoinIR Runner (Bool/Int cond support)
- Add Select handling in JoinIR→MIR Bridge (4-block structure)
- Create test cases (joinir_if_select_simple/local.hako)
- Add dev toggle NYASH_JOINIR_IF_SELECT=1
- Create lowering infrastructure (if_select.rs, stub for Phase 33-3)

Tests:
- 3/3 unit tests pass (test_select_true/false/int_cond)
- Integration tests pass (RC: 0)
- A/B execution verified (existing if_phi vs JoinIR Select)

Files changed:
- New: apps/tests/joinir_if_select_{simple,local}.hako
- New: src/mir/join_ir/lowering/if_select.rs
- Modified: src/mir/join_ir/{mod,json,runner,vm_bridge}.rs
- Modified: src/config/env.rs (joinir_if_select_enabled)
- Modified: docs/reference/environment-variables.md

Phase 33-3 ready: MIR pattern recognition + auto-lowering pending

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-27 02:58:38 +09:00
nyash-codex
b8893787dc feat(joinir): L-5.3 Phase 1 - progress carrier guard for generic_case_a 
## 実装内容

1. has_safe_progress() helper 追加 (loop_to_join.rs:186-195)
   - Phase 1: scope.progress_carrier.is_some() をチェック (保守的)
   - Phase 2 (future): MirQuery で Add 命令チェック予定

2. is_supported_case_a_loop_view() に progress guard 追加 (256-266)
   - 無限ループの可能性があるループを事前にフォールバック
   - デバッグログで reject 理由を出力

## テスト結果

✅ 25 passed; 0 failed - JoinIR 関連テスト全通過
✅ skip_ws / trim / append_defs / Stage‑1 UsingResolver 全ケース PASS
✅ 既存テストへの影響なし

## 技術メモ

- 保守的アプローチ: progress_carrier.is_some() のみチェック
- LoopScopeShape で progress_carrier を carriers の先頭として設定済み
- ignored テスト失敗は MIR 自体の PHI バグで、本変更とは無関係 (git stash で確認済み)

関連: Phase 29 L-5.3 (TASKS.md), CURRENT_TASK.md 1-00v
 2025-11-26 16:08:49 +09:00
nyash-codex
e61e7a2be6 feat(joinir): L-2.2 Step-2 - Add Stage-B to VM bridge dispatch 
Add Stage-B BodyExtractor and FuncScanner to JoinIR VM bridge dispatch:
- Import stageb_body and stageb_funcscanner lowering functions
- Add routing for StageBBodyExtractorBox.build_body_src/2
- Add routing for StageBFuncScannerBox.scan_all_boxes/1
- Add try_run_stageb_body() and try_run_stageb_funcscanner() (lowering verification only)

Also cleanup unused imports in funcscanner_trim.rs and stage1_using_resolver.rs

Note: Stage-B functions use lowering verification pattern (like Stage-1)
because ArrayBox/MapBox args are not yet supported in JoinValue.

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 11:02:21 +09:00
nyash-codex
9d769e9217 refactor(joinir): L-2.2 Step-1 - Unify Stage-B lowering via LoopToJoinLowerer 
Stage-B minimal JoinIR lowering統一化:

1. Add Case-A helpers to loop_to_join.rs:
   - lower_case_a_for_stageb_body (StageBBodyExtractorBox.build_body_src/2)
   - lower_case_a_for_stageb_funcscanner (StageBFuncScannerBox.scan_all_boxes/1)

2. Update stageb_body.rs and stageb_funcscanner.rs:
   - Replace manual LoopForm construction with construct_simple_while_loopform
   - Route through LoopToJoinLowerer like other Case-A functions
   - Remove unused imports (LoopForm, MirQuery)

Now all 6 JoinIR lowering modules use the same unified pattern:
- skip_ws, trim, append_defs, stage1_resolver, stageb_body, stageb_funcscanner
All route through LoopToJoinLowerer for consistency.

Test results: JSON snapshot 6/6 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 10:47:35 +09:00
nyash-codex
853cb36800 refactor(joinir): L-1.3 - Rename minimal helpers to Case-A helpers 
LoopToJoinLowerer API cleanup:

1. Rename methods to reflect their purpose as Case-A helpers:
   - lower_minimal_skip_ws_case_a → lower_case_a_for_skip_ws
   - lower_minimal_trim_case_a → lower_case_a_for_trim
   - lower_minimal_append_defs_case_a → lower_case_a_for_append_defs
   - lower_minimal_stage1_case_a → lower_case_a_for_stage1_resolver

2. Update comments to clarify these are thin wrappers over `lower()`
   - "Case-A 汎用 lowerer の薄いラッパー"
   - Actual logic is centralized in `lower` method

3. Update all 4 call sites:
   - skip_ws.rs
   - funcscanner_trim.rs
   - funcscanner_append_defs.rs
   - stage1_using_resolver.rs

Test results: standalone (2/2), JSON snapshot (6/6) PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 10:28:03 +09:00
nyash-codex
7d0581c9a4 refactor(joinir): Extract construct_simple_while_loopform helper, delete legacy code 
Phase 32 cleanup:

1. Delete legacy is_supported_case_a_loop function from loop_to_join.rs
   - Replaced by is_supported_case_a_loop_view() in Phase 32 Step 3

2. Extract construct_simple_while_loopform helper to common.rs
   - Unified LoopForm construction for simple while loops
   - Parameters: entry_is_preheader (trim=true, stage1=false)
                 has_break (trim=true, stage1=false)
   - Sets latch=body to satisfy is_simple_case_a_loop check

3. Update lowering modules to use the common helper:
   - funcscanner_trim.rs: entry_is_preheader=true, has_break=true
   - stage1_using_resolver.rs: entry_is_preheader=false, has_break=false

Test results: JSON snapshot 6/6 PASS, VM bridge trim 2/2 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 10:15:31 +09:00
nyash-codex
ec69b49446 feat(mir): Phase 32 Step 0-3B - LoopRegion/LoopControlShape view methods 
Phase 32 introduces a "view pattern" for loop structures, enabling
gradual migration without breaking existing code.

Changes:
- control_form.rs: Add new ID types (LoopId, ExitEdgeId, ContinueEdgeId)
  and structures (LoopRegion, LoopControlShape, ExitEdge, ContinueEdge)
- control_form.rs: Add view methods on LoopShape:
  - to_region_view() - returns LoopRegion
  - to_control_view() - returns LoopControlShape
  - to_exit_edges() - returns Vec<ExitEdge>
  - to_continue_edges() - returns Vec<ContinueEdge>
- loop_scope_shape.rs: Use views in from_existing_boxes_legacy()
- loop_to_join.rs: Add debug logging with Phase 32 views

All 4 minimal lowerers (skip_ws/trim/append_defs/stage1) now use
view-based block ID extraction via shared from_existing_boxes_legacy().

Tests: joinir_runner_standalone_*, joinir_vm_bridge_trim_* PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 08:01:32 +09:00
nyash-codex
acffd9974b feat(phase31): Step 3-A/B - Add early return and structure checks to LoopToJoinLowerer 
Phase 31 Step 3-A: Add early return using is_case_a_minimal_target() filter
- Check before LoopScopeShape construction for efficiency
- Returns None immediately for non-target functions

Phase 31 Step 3-B: Add structural validation to is_supported_case_a_loop()
- Single exit check: loop_form.break_targets.len() <= 1
- Variable presence check: !carriers.is_empty() || !pinned.is_empty()
- Debug logging for rejection reasons

Also refactored lower_with_scope() from if-else chain to match expression for clarity.

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 06:02:52 +09:00
nyash-codex
7a29ebd268 refactor(phase31): Connect 4 lowerers to LoopToJoinLowerer 
Phase 31 Step 2 complete:
- skip_ws.rs: use LoopToJoinLowerer::lower_minimal_skip_ws_case_a()
- funcscanner_trim.rs: use LoopToJoinLowerer::lower_minimal_trim_case_a()
- funcscanner_append_defs.rs: use LoopToJoinLowerer::lower_minimal_append_defs_case_a()
- stage1_using_resolver.rs: use LoopToJoinLowerer::lower_minimal_stage1_case_a()

Eliminates direct generic_case_a calls, routing through unified box.

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 02:36:43 +09:00
nyash-codex
ef9fd4417a feat(phase31): Add LoopToJoinLowerer unified box 
Phase 31 Step 1 complete:
- Create src/mir/join_ir/lowering/loop_to_join.rs
- Add LoopToJoinLowerer struct with lower() method
- Implement lower_minimal_skip_ws_case_a() via generic_case_a
- Support for trim, append_defs, stage1 patterns
- Re-export from mod.rs

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 01:18:32 +09:00
nyash-codex
bf3893b2cc feat(mir): Phase 30 F-3.0.7 LoopScopeShape Case-A minimal routing 
Add func_name-based routing in LoopScopeShape::from_existing_boxes()
to prepare for MIR-based independent analysis:

- Add is_case_a_minimal_target() helper for 4 Case-A targets
- Add analyze_case_a() method (delegates to legacy, future MIR-based)
- Add from_existing_boxes_legacy() for backward compatibility
- Update from_existing_boxes() with func_name: Option<&str> parameter
- Update 4 production call sites with specific func_name
- Update 6 test cases with None for legacy path
- Update module documentation with routing logic diagram

Tests: 10/10 LoopScopeShape tests PASS, 6/7 JoinIR VM bridge tests PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-26 00:36:41 +09:00
nyash-codex
a898ff3f83 refactor(joinir): Phase 30 F-2.0/F-3 - PHI箱インベントリと旧APIレガシー削除 
F-3 レガシー削除:
- generic_case_a.rs: 旧API関数4個削除（_with_scope 移行完了）
- loop_scope_shape.rs: CaseAContext::new() 削除（from_scope() に統一）
- mod.rs: 不要な pub use 削除
- #[allow(dead_code)] 除去（5関数）
- 未使用import削除（コード削減約150行）

F-2.0 PHI箱インベントリ:
- PHI_BOX_INVENTORY.md 作成: 13箱+11補助構造体の棚卸し
- 削除順ポリシー: 早期/中期/最終の3段階
- TASKS.md/CURRENT_TASK.md 更新

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-25 23:25:39 +09:00
nyash-codex
6598cd3272 refactor(joinir): F-3 add _with_scope variant for skip_ws lowering 
Phase 30 F-3: LoopScopeShape 実データ運用の一歩目

変更内容:
- lower_case_a_skip_ws_with_scope(scope) 追加
  - LoopScopeShape を直接受け取る新 API
  - CaseAContext::from_scope() 経由で ctx 構築
- lower_case_a_skip_ws_core(ctx) 抽出
  - 共通ロジックを分離
  - _for_minimal_skip_ws と _with_scope で共有

設計意図:
- lowerer が scope を明示的に構築できる API を提供
- 将来の boxes 削除時に移行しやすい構造を準備
- 既存 API は後方互換性を維持

テスト結果:
- JoinIR 関連テスト: 全 PASS
- loop_scope_shape テスト: 10/10 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-25 15:48:00 +09:00
nyash-codex
de5d5fae52 feat(mir): Phase 30 F-1 LoopScopeShape SSOT preparation 
LoopScopeShape を変数分類の唯一の情報源 (SSOT) にするための準備:

F-1.1 LoopVarClassBox:
- 4分類(Pinned/Carrier/BodyLocalExit/BodyLocalInternal)の仕様を
  loop_scope_shape.rs にドキュメント化（PHI生成ルール表付き）
- LoopScopeShape.classify() / classify_all() メソッド追加
- LoopVarClassBox.classify_with_scope() 委譲メソッド追加
- 旧APIにPhase 30 TODOコメント追加

F-1.2 LoopExitLivenessBox:
- exit_live フィールドにSSOT説明ドキュメント追加
- get_exit_live_from_scope() 委譲メソッド追加

F-1.3 LocalScopeInspectorBox:
- Phase 30移行中のTODOコメント追加
- is_available_in_all_with_scope() 委譲メソッド追加

未使用フィールド削除:
- CaseAContext::scope フィールド削除
- LoopBypassFlags::exit フィールド削除
- PhiBuilderBox::loop_context / LoopPhiContext 削除

テスト結果: 37テスト全てPASS
- loop_scope_shape: 12 PASS (+2 new)
- loop_var_classifier: 11 PASS
- loop_exit_liveness: 3 PASS
- local_scope_inspector: 11 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-25 15:14:54 +09:00
nyash-codex
e93727dd37 fix(joinir): Stage-1 string concat BinOp::Or → Add + ArrayBox support 
Fixes:
1. BinOp::Or → BinOp::Add for string concatenation in Stage-1 lowering
2. ArrayBox/MapBox support via JoinValue::BoxRef (ChatGPT implementation)

Results:
- n=0: JoinIR → "init" ✅ (VM → "void" PHI bug)
- n=3: JoinIR → "ABC" ✅ (VM → "void" PHI bug)

Stage-1 JoinIR VM Bridge now fully working!

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-25 13:33:01 +09:00
nyash-codex
31e458e7fa refactor(joinir): introduce CaseAContext to consolidate common lowering logic 
- Add CaseAContext struct in loop_scope_shape.rs to centralize:
  - LoopForm validation
  - intake_loop_form invocation
  - LoopScopeShape construction
  - Variable name → ValueId mapping
  - pinned_ids/carrier_ids/exit_args resolution

- Refactor all 4 generic_case_a.rs functions to use CaseAContext:
  - lower_case_a_loop_to_joinir_for_minimal_skip_ws
  - lower_case_a_loop_to_joinir_for_trim_minimal
  - lower_case_a_loop_to_joinir_for_append_defs_minimal
  - lower_case_a_loop_to_joinir_for_stage1_usingresolver_minimal

- Remove unused name_to_header_id field from LoopFormIntake
  (was duplicate of header_snapshot)

Code reduction: ~200 lines of duplicated pattern → 4 lines

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-25 06:32:08 +09:00
nyash-codex
da1a5558e5 Normalize passes keep spans and clean warnings 2025-11-24 15:02:51 +09:00
nyash-codex
466e636af6 Span trace utilities and runner source hint 2025-11-24 14:17:02 +09:00
nyash-codex
b7c7e48526 feat(joinir): Phase 27.14 - FuncScannerBox._append_defs JoinIR lowering完了 + コード品質改善 
## Phase 27.14: FuncScannerBox._append_defs/2 JoinIR lowering
- **新規実装**: `funcscanner_append_defs.rs` (322行)
  - Shared Builder Pattern採用
  - MIR-based lowering with CFG sanity checks
  - ValueId range 9000-10999 割り当て
- **テスト**: `mir_joinir_funcscanner_append_defs.rs` (3テスト)
  - type_sanity, empty_module_returns_none, auto_lowering (ignored)
- **最小.hako**: `funcscanner_append_defs_minimal.hako`

## コード品質改善 (5項目完了)
1. **CFG Sanity Checks強化** (`common.rs`)
   - `has_array_method()`: ArrayBox操作検出
   - `has_loop_increment()`: i+1パターン検出
2. **ValueIdテスト自動化** (`value_id_ranges.rs`)
   - マクロ化 + 自動overlap検証で30→15行に削減
3. **モジュール名統一確認** (作業不要、既に統一済み)
4. **Shared Builder命名統一** (`funcscanner_trim.rs`)
   - `build_trim_joinir` → `build_funcscanner_trim_joinir`
5. **全テストPASS確認**
   - value_id_ranges, funcscanner_trim, funcscanner_append_defs全てPASS ✅

## 効果
- CFG検証関数: 1個 → 3個 (200%↑)
- テストコード: 50%削減 (保守性向上)
- 命名一貫性: 75% → 100%
- ビルド成功率: 100%維持

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-24 05:23:26 +09:00
nyash-codex
49864983bd feat(joinir): Phase 27.13 最小.hakoファイル作成とauto_loweringテスト完全動作 
## 実装内容
- 新規ファイル作成: apps/tests/stage1_usingresolver_minimal.hako
  - using文、@記法、FileBoxを含まない最小構成
  - 関数シグネチャ: resolve_for_source/5 (5パラメータ)
  - シンプルなloop(i < n)構造でJoinIRテスト用

- テストファイル更新: src/tests/mir_joinir_stage1_using_resolver_min.rs
  - test_file パスを minimal.hako に変更
  - パーサーエラー回避（using文問題の対策）

- 関数名修正: src/mir/join_ir/lowering/stage1_using_resolver.rs
  - /1 → /5 に修正（2箇所: build関数とlower_from_mir関数）
  - 5パラメータ関数シグネチャに対応

## テスト結果
✅ auto_lowering テスト完全成功
- NYASH_JOINIR_EXPERIMENT=1 + NYASH_JOINIR_LOWER_FROM_MIR=1
- MIR → JoinIR 自動変換動作
- CFG sanity checks passed
- 2関数生成確認（resolve_entries + loop_step）
- ValueId range 7000-8999 正常動作

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-24 04:13:41 +09:00
nyash-codex
a554109b8e refactor(phase27.13): Introduce ValueId range management system 
Introduce centralized ValueId range allocation to prevent ID conflicts
between lowering modules.

Changes:
1. New file: src/mir/join_ir/lowering/value_id_ranges.rs
   - Base address constants for each lowering module
   - Helper functions: entry(offset), loop_step(offset)
   - Range validation test: test_value_id_ranges_no_overlap

2. Range allocation (resolved conflict):
   - min_loop:              1000-2999 (entry: 1000+, loop: 2000+)
   - skip_ws:               3000-4999 (entry: 3000+, loop: 4000+)
   - funcscanner_trim:      5000-6999 (entry: 5000+, loop: 6000+)
   - stage1_using_resolver: 7000-8999 (entry: 7000+, loop: 8000+) ← CHANGED

3. Updated stage1_using_resolver.rs to use value_id_ranges helpers
   - ValueId(5000) → vid::entry(0)  // 7000
   - ValueId(6000) → vid::loop_step(0)  // 8000

4. Updated lowering/mod.rs to include value_id_ranges module

Results:
- ✅ Build success (warnings only, no errors)
- ✅ Tests: 2/2 existing tests pass (type_sanity, empty_module_returns_none)
- ✅ value_id_ranges test pass (range overlap validation)
- ✅ ValueId conflict resolved (trim vs stage1_using_resolver)

Benefits:
- Centralized range management prevents conflicts
- Type-safe: const fn for compile-time calculation
- Self-documenting: comments clarify ranges
- Easy extension: future lowerings can use 9000+, 11000+, etc.
 2025-11-24 03:58:30 +09:00
nyash-codex
f257070668 feat(joinir): Phase 27.12 完了 - Stage1UsingResolver 骨格+テスト実装 
Phase 27.12 実装内容:
- ✅ JoinIR lowering 骨格実装 (169行)
  - stage1_using_resolver.rs 新規作成
  - Shared Builder Pattern 適用
  - MIR-based/handwritten 両経路対応
- ✅ テスト基盤整備 (3本)
  - auto_lowering テスト (#[ignore] + トグル)
  - type_sanity テスト (常時実行)
  - no_panic テスト (軽量)
- ✅ ドキュメント更新
  - 論文に Phase 27.12 完了記録
  - IMPLEMENTATION_LOG.md 完了マーク
  - TASKS.md チェックボックス更新

技術詳細:
- LoopForm Case A (loop(i < n))
- Pinned: entries/n/modules/seen
- Carrier: i/prefix
- Exit: prefix
- CFG sanity checks 骨格実装
- Graceful degradation 設計

ビルド: ✅ 成功 (0 エラー)
次: Phase 27.13 JoinIR 本実装

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-24 02:34:36 +09:00
nyash-codex
b0311e4bd2 feat(joinir): Phase 27.11.1 - skip_ws.rs Shared Builder Pattern 完了 
## 成果
- **コード削減**: 444行 → 310行 (134行削除、30%削減)
- **重複コード根絶**: handwritten版とMIR版の重複JoinIR生成を統一
- **テスト結果**:
  - Baseline (toggle OFF): 380 passed
  - MIR-based (toggle ON): 385 passed ✅ (5件改善!)

## 実装内容
1. `lower_skip_ws_handwritten()` → `build_skip_ws_joinir()` にリネーム
   - 共通JoinIRビルダー化
2. 新しい thin wrapper `lower_skip_ws_handwritten()` を作成
3. `lower_skip_ws_from_mir()` の重複コード (140行) を削除
   - CFGチェック後に `build_skip_ws_joinir()` を呼び出す構造に変更

## 設計パターン
- **Shared Builder Pattern**: funcscanner_trim.rs と同じパターン適用
- **CFG Sanity Checks**: MIR解析は軽量パターンマッチのみ
- **Graceful Degradation**: CFGチェック失敗時は自動フォールバック

Phase 27.11シリーズ 100%完了！

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-24 01:59:48 +09:00
nyash-codex
bc42da30b0 feat(joinir): Phase 27.11 - FuncScannerBox.trim/1 MIR-based lowering 完了 
実装内容:
- build_trim_joinir() 共通関数を作成 (handwritten/MIR 両方から使用)
- lower_trim_handwritten() を薄いラッパーに変更
- lower_trim_from_mir() が CFG checks 後に build_trim_joinir() を呼ぶように更新

技術成果:
- Shared Builder Pattern の確立
- テスト退行なし (baseline/MIR 両方で PASS)
- コード重複ゼロ (448行の実装が1箇所に集約)

テスト結果:
- cargo build --release: ✅ 成功
- cargo test (toggle OFF): ✅ PASS
- NYASH_JOINIR_LOWER_FROM_MIR=1 cargo test (toggle ON): ✅ PASS
 2025-11-23 23:18:49 +09:00
nyash-codex
ff9ea58e59 refactor(joinir): Phase 27.10 - CFG sanity checks + dispatcher pattern 共通化 
- common.rs 新規作成（162行）:
  - CFG sanity check helpers: ensure_entry_has_succs, has_const_int, has_const_string, has_string_method, has_binop
  - Logging helper: log_fallback
  - Dispatcher: dispatch_lowering
- skip_ws.rs: CFG checks (-25行) + dispatcher (-2行) = -27行削減
- funcscanner_trim.rs: CFG checks (-25行) + dispatcher (-4行) = -29行削減
- mod.rs: pub mod common 追加

設計原則:
- 軽量パターンマッチング（命令の存在確認のみ）
- Graceful degradation（予期しない構造で即座にfallback）
- DRY原則（重複コード1箇所に集約）

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-23 22:51:30 +09:00
nyash-codex
c1aa3c8c2b feat(joinir): Phase 27.8-4/5 — skip_ws CFG sanity checks + fallback design 
- MirQuery API を使用した軽量 CFG チェック実装
  - Entry block successors >= 1
  - Const(0) 存在確認
  - String.length() 存在確認
- 予期しない MIR 構造時の手書き版 fallback 設計
- A/B テスト完了: 手書き版・MIR-based 版両方 PASS ✅
- ドキュメント更新: joinir_coverage.md + IMPLEMENTATION_LOG.md

Phase 27.9 modular refactoring: commit 3d5979c7
Phase 27.8-4/5 verification: CFG checks + docs updates
 2025-11-23 18:03:33 +09:00
nyash-codex
3d5979c78e refactor(joinir): Phase 27.9 - Modular separation of join_ir.rs into directory structure 
Phase 27.9 で join_ir.rs (~1,336行) を以下のモジュール構造に分離：

## 新規ディレクトリ構造:
```
src/mir/join_ir/
├── mod.rs                           # 型定義・共通ユーティリティ (~330行)
└── lowering/
    ├── mod.rs                       # lowering インターフェース
    ├── min_loop.rs                  # lower_min_loop_to_joinir (~140行)
    ├── skip_ws.rs                   # skip_ws lowering 3関数 (~390行)
    └── funcscanner_trim.rs          # trim lowering (~480行)
```

## 技術的変更:
- **型定義統一**: JoinFuncId, JoinInst, JoinModule 等を mod.rs に集約
- **lowering 分離**: 3つの lowering 関数を個別モジュールに移動
- **後方互換性**: pub use で lowering 関数を re-export（既存コード影響なし）
- **削除**: src/mir/join_ir.rs (旧単一ファイル)

## テスト結果:
- **385 passed** (+1 from 384)
- **9 failed** (-1 from 10)
- **ビルド成功**: 0 errors, 18 warnings (変化なし)

## 効果:
- **保守性向上**: 1,336行 → 4ファイル（各300-500行）で可読性向上
- **モジュール境界明確化**: 型定義 vs lowering 実装の責務分離
- **将来の拡張容易**: 新 lowering 関数追加が簡単に

Phase 27.8 で実装した MIR 自動解析 lowering の基盤整備完了。

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

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-11-23 16:49:49 +09:00