2a18a66154
feat(joinir): Phase Next - parse_array/object 同型 fixture
...
## 実ループ制御構造の抽出
- parse_array_min.program.json (n=10 → acc=6)
- parse_object_min.program.json (n=10 → acc=7)
## 既存パターン再利用
- ContinueReturn lowering 活用（新規 lowering 不要）
- 優れたモジュール再利用の実証
## Tests
- +4 tests (ParseArray 2本 + ParseObject 2本)
- +1 test fixed (Phase 88 error message 更新)
- normalized_dev: 64→69 passed (+5)
## 箱化評価
- 単一責任: ✅
- 境界明確: ✅ (SSOT)
- 再利用性: ✅ (既存パターン活用)
- テスト容易性: ✅
- SSOT: ✅ (dev_fixtures.rs)
## レガシー探索
- デッドコード: なし
- 重複コード: なし
- クリーンな状態維持
Impact:
- 実ループ寄せの基盤確立
- モジュール設計の成功実証
- 技術的負債ゼロ
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 04:09:46 +09:00
df57d3d320
refactor(joinir): Refactor-A+B - Null literal + ContinueReturn 一般化
...
## Refactor-A: Null literal 対応
- expr.rs に "Null" case 追加
- ConstValue::Null → JoinValue::Unit マッピング
## Refactor-B: ContinueReturn 一般化
- 複数 return-if 許可（同値のみ）
- json_values_equal() ヘルパー追加
- Fail-Fast: 異なる値は即エラー
## Fixtures & Tests
- null_literal_min.program.json (return null)
- continue_return_multi_min.program.json (複数 return null)
- +1 test (vm_bridge 検証)
Impact:
- normalized_dev: 63→64 passed (+1)
- lib: 993 passed (回帰なし)
- 箱化スコア: 5/5 (全項目満点)
- 実ループ(_parse_array/_parse_object) 準備完了
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 04:01:05 +09:00
45add0f5d3
feat(joinir): Phase 90 P0 - ParseStringComposite pattern
...
## Composite Pattern
- Continue(escape i+=2) + EarlyReturn(close quote)
- parse_string_composite_pattern.rs (50行、continue_return 再利用)
- 89% コード削減（450行→50行）
## Shape Detection
- BinOp Add const 2 検出（escape 特徴）
- LoopStepInspector 活用（Phase 89 リファクタ成果）
## SSOT Integration
- dev_fixtures.rs に登録
- StepCalculator 再利用（Phase 89-2 成果）
## Tests
- +2 tests (vm_bridge + 期待値 n=10→acc=5)
- normalized_dev: 61→63 passed
- lib: 993 passed (回帰なし)
Impact:
- Reuse over Duplication 実践
- Phase 89 リファクタ成果の完全活用
- 箱化原則 5/5 遵守
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 03:36:45 +09:00
730a80f33f
feat(joinir): Phase 89 P1 - ContinueReturn lowering implementation
...
## ContinueReturn 独立箱
- continue_return_pattern.rs (457行)
- Continue + Early Return の JoinIR lowering
- StepCalculator 再利用（3箇所）
- Fail-Fast 原則徹底（5箇所検証）
## Dispatcher 配線
- mod.rs: LoopPattern::ContinueReturn 対応
- allowlist: pattern_continue_return_minimal 追加
## Fixture & Tests
- fixtures.rs: build_pattern_continue_return_min
- shapes.rs: +2 tests (vm_bridge + 期待値 n=10→acc=4)
Impact:
- normalized_dev: 61 passed (+2)
- lib tests: 993 passed (回帰なし)
- 箱化原則：単一責任・境界明確・再利用性高
Next: Phase 90 - _parse_string 合成 fixture
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 02:02:47 +09:00
b578eb7a65
test(joinir): Phase 88 - Fail-Fast validation for non-const i update
...
- Add test: rejects_non_const_then_i_update
- Validates that continue pattern requires `i = i + const` form
- Ensures Fail-Fast behavior for unsupported step patterns
Impact:
- 60 normalized_dev tests PASS (+1)
- Fail-Fast 仕様固定（非 const の i 更新を拒否）
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 00:38:47 +09:00
b71a18495d
feat(joinir): Phase 88 - Pattern4 continue + variable step increment
...
Continue Pattern 拡張:
- then側の i=i+const 差分加算 + acc更新を許可
- continue_pattern.rs:193 で可変ステップ検出
Dev Router 許可:
- ast_lowerer/mod.rs:92 で normalized_dev feature時に新パターンを有効化
Fixtures & Tests:
- jsonparser_unescape_string_step2_min fixture追加（submodule）
- normalized_joinir_min.rs に shape テスト追加
- shapes.rs に expected shape 定義
Documentation:
- joinir-architecture-overview.md に Phase 88 到達点を追記
Impact:
- Pattern4 continue + 可変インクリメント（i+=1 or i+=2）対応
- _unescape_string 制御構造の土台確立
- normalized_dev tests PASS
Next: _unescape_string 残り複合ループ対応
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-14 00:29:56 +09:00
dd58b8bbe2
tests(normalized): split normalized_joinir_min into modules
2025-12-13 19:40:24 +09:00
5029cfc4a0
feat(joinir): Phase 81 - Pattern2 ExitLine contract verification (dev-only)
...
Task 81-A: ExitLine audit findings
- ExitLineReconnector: Correctly skips ConditionOnly carriers (lines 124-132)
- ExitMetaCollector: Includes all carriers for latch (lines 148-215)
- CarrierRole filtering: Verified correct implementation
- Contract compliance: Full compliance with Phase 227-228 design
- No fixes required: Implementation verified correct
Task 81-B: E2E tests for promoted carriers
- test_phase81_digitpos_exitline_contract(): DigitPos pattern (PASS)
- test_phase81_trim_exitline_contract(): Trim pattern (PASS)
- Verified Exit PHI excludes ConditionOnly carriers (is_digit_pos, is_ch_match)
- Verified Exit PHI includes LoopState carriers (result, i, etc.)
- Both tests execute successfully with correct output values
Task 81-D: Smoke test verification
- tools/smokes/v2/run.sh --profile quick: 1/2 PASS (baseline maintained)
- Pre-existing json_lint_vm failure unrelated to Phase 81
- No new regressions introduced
Task 81-C: Contract documentation
- Audit findings documented with detailed evidence
- E2E test results and manual verification commands recorded
- Smoke test baseline comparison documented
- Contract clarity improved for future development
Tests: 970/970 lib tests PASS (baseline), +2 E2E tests PASS
Integration: phase246_json_atoi.rs 9/9 PASS (existing DigitPos test verified)
Smoke: quick profile 1/2 PASS (no regressions)
Design: Verification-only, zero production impact
Phase 81 complete: ExitLine contract verified for promoted carriers
2025-12-13 18:31:02 +09:00
84129a7ed4
feat(joinir): Phase 80-B/C/D - Pattern3/4 BindingId wiring + E2E tests (dev-only)
...
Task 80-B (P1): Pattern3 (if-sum) BindingId registration
- pattern3_with_if_phi.rs: Added BindingId→ValueId registration
- Loop var + condition bindings registration (lines 131-159)
- Debug logs: [phase80/p3] tags
- Follows Pattern2 template structure
Task 80-C (P2): Pattern4 (continue) BindingId registration
- pattern4_with_continue.rs: Pass binding_map to lowerer (lines 341-352)
- loop_with_continue_minimal.rs: Added BindingId→ValueId registration (lines 206-230)
- Loop var + condition bindings registration
- Debug logs: [phase80/p4] tags
- Follows Pattern2 template structure
Task 80-D (P3): E2E tests for BindingId lookup
- tests/normalized_joinir_min.rs: Added 2 new tests (lines 2182-2222)
- test_phase80_p3_bindingid_lookup_works(): Pattern3 verification
- test_phase80_p4_bindingid_lookup_works(): Pattern4 verification
- Manual fallback detection via NYASH_JOINIR_DEBUG=1
Task P4: Cleanup
- Fixed unused variable warnings (loop_var_join_id → _loop_var_join_id)
- Fixed unnecessary mut warning (cargo fix auto-applied)
- pattern2_with_break.rs: Clean up pre-existing unused warning
Result: BindingId operational across Pattern2/3/4
Tests: 970/970 PASS (baseline, E2E tests in normalized_dev feature)
Design: dev-only, dual-path maintained, zero production impact
Phase 74-80 complete: BindingId migration fully operational across all patterns
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-13 18:05:14 +09:00
b7f7882558
feat(joinir): Phase 79 Activation - BindingId wiring operational (dev-only)
...
Phase 79 の最終段階：BindingId を ExprLowerer に配線し、end-to-end で動作確認。
Key changes:
- ExprLowerer wiring:
- scope_resolution.rs: build_condition_env_from_scope_with_binding() (BindingId-aware)
- expr_lowerer.rs: lower_condition() uses BindingId priority lookup
- ConditionEnv extension:
- register_loop_var_binding(): Loop var BindingId→ValueId registration
- register_condition_binding(): Condition-only carrier BindingId→ValueId registration
- Pattern2 integration:
- pattern2_with_break.rs: Loop var registration (Line 116-128)
- pattern2_with_break.rs: Carrier role-based registration (Line 381-425)
- Debug logging: [phase79] tags for registration, [binding_pilot/hit] for lookup success
- E2E tests (normalized_joinir_min.rs, debug-only):
- test_phase79_digitpos_bindingid_lookup_works(): DigitPos pattern verification
- test_phase79_trim_bindingid_lookup_works(): Trim pattern verification
Result: BindingId lookup actually works end-to-end
- Promoted carriers resolve via BindingId, not string hacks
- Debug: NYASH_JOINIR_DEBUG=1 shows [phase79] Registered loop var BindingId, [binding_pilot/hit] BindingId(1) -> ValueId(100)
Tests: 1025/1025 lib PASS
Design: dev-only feature-gated, dual-path maintained (BindingId priority + name fallback)
Phase 74-79 complete: BindingId migration fully operational
- Infrastructure (74-76): BindingId type, binding_map, 3-tier lookup, promoted_bindings map
- Implementation (77): DigitPos/Trim populate, legacy deprecate
- Refactoring (78-79 Refactoring): PromotedBindingRecorder, Detector/Recorder split
- Activation (80 Foundation + 79 Activation): CarrierBindingAssigner + ExprLowerer wiring
2025-12-13 16:48:41 +09:00
253eb59b06
obs(joinir): Phase 72 - PHI Reserved Region Observation Complete
...
Phase 72 investigates whether PHI dst ValueIds adhere to reserved region [0-99].
Conclusion: Current system is stable but relies on accidental non-overlap,
NOT architectural enforcement.
Recommendation: Do NOT strengthen verifier. PHI dst allocated by MirBuilder
(separate from JoinValueSpace reserved contract). Full fix deferred to Phase 73+.
Changes:
- verify_phi_reserved.rs: New observation infrastructure (debug-only)
- phase72-phi-reserved-observation.md: Detailed findings + risk assessment
- PHASE_72_SUMMARY.md: Executive summary
- loop_header_phi_builder.rs: Debug observation hooks
- phase72_phi_observation.rs: Unit tests (6/6 PASS)
Tests: lib 950/950 PASS (no regressions)
Architecture: No production impact (debug-only, feature-gated)
🤖 Generated with Claude Code
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 03:41:33 +09:00
c2df1cacf6
feat(joinir): Phase 70-B - Multihop Relay Passthrough Support (dev-only)
...
Phase 70-B relaxes runtime guard from "always error" to "unsupported only".
Adds structural detection (is_supported_multihop_pattern) to distinguish:
- Simple passthrough (no self-updates): ACCEPT
- Complex patterns (self-conflict, etc): REJECT with [ownership/relay:runtime_unsupported]
Changes:
- plan_validator.rs: +is_supported_multihop_pattern() method + unit tests
- normalized_joinir_min.rs: +2 integration tests for passthrough/rejection
- phase70-relay-runtime-guard.md: Phase 70 series status table added
Tests: normalized_dev 52/52 PASS, lib 950/950 PASS
Design: Structural detection only (no by-name branching)
🤖 Generated with Claude Code
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com >
2025-12-13 03:41:20 +09:00
7b56a7c01d
docs(joinir): Phase 70-A - Relay Runtime Guard (dev-only)
...
Phase 66で analysis/plan層はmultihop受理可能になったが、runtime lowering
(実行導線)はまだ未対応。このPhaseでは「未対応は同じタグで必ず落ちる」を
docs + テストで固定する。
Key changes:
- phase70-relay-runtime-guard.md: Runtime guard設計doc新規追加
- 現状(plan OK / runtime NG)の明確化
- Fail-Fastタグ [ownership/relay:runtime_unsupported] の標準化
- Phase 70-B以降の解除条件
- pattern3_with_if_phi.rs: エラーメッセージのタグ統一
- [ownership/relay:runtime_unsupported] 形式に変更
- var/owner_scope/relay_path の診断情報追加
- normalized_joinir_min.rs: 固定テスト追加
- test_phase70a_multihop_relay_runtime_unsupported_tag
- Plan層のmultihop受理確認 + runtime拒否の文書化
Tests: normalized_dev 50/50 PASS (+1), lib 950/950 PASS
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-13 02:22:29 +09:00
ba6e420f31
feat(joinir): Phase 64 - Ownership P3 production integration (dev-only)
...
P3(if-sum) 本番ルートに OwnershipPlan 解析を接続（analysis-only）。
Key changes:
- ast_analyzer.rs: Added analyze_loop() helper
- Loop-specific analysis API for production integration
- build_plan_for_scope() helper for single-scope extraction
- pattern3_with_if_phi.rs: P3 production integration
- OwnershipPlan analysis after ConditionEnv building
- check_ownership_plan_consistency() for validation
- Feature-gated #[cfg(feature = "normalized_dev")]
Consistency checks:
- Fail-Fast: Multi-hop relay (relay_path.len() > 1)
- Warn-only: Carrier set mismatch (order SSOT deferred)
- Warn-only: Condition captures (some patterns have extras)
Tests: 49/49 PASS (2 new Phase 64 tests)
- test_phase64_p3_ownership_prod_integration
- test_phase64_p3_multihop_relay_detection
- Zero regressions
Design: Analysis-only, no behavior change
- Integration point: After ConditionEnv, before JoinIR lowering
- Dev-only validation for future SSOT migration
Next: Phase 65+ - Carrier order SSOT, owner-based init
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-12 23:02:40 +09:00
acb6720d9b
Phase 61: structural if-sum+break lowering (dev-only)
2025-12-12 22:15:41 +09:00
6aba138950
feat(joinir): Phase 59 - Ownership P3 plumbing (dev-only)
...
P3 (if-sum) パターン用の OwnershipPlan → lowering inputs 変換を追加。
Key changes:
- plan_to_lowering.rs (+153 lines):
- P3LoweringInputs struct (same structure as P2)
- plan_to_p3_inputs() converter
- 4 unit tests (multi-carrier, 5+, condition-only, relay-rejected)
P3 specific features:
- Multi-carrier support (sum, count, 5+ carriers)
- Same Fail-Fast on relay_writes (Phase 59 scope)
- Same CarrierRole discrimination (LoopState vs ConditionOnly)
Integration tests:
- test_phase59_ownership_p3_relay_failfast: Verifies relay detection
- test_phase59_ownership_p3_loop_local_success: Verifies loop-local success
Design: Perfect parallelism with P2
- Same struct layout (carriers, captures, condition_captures)
- Same conversion logic (skip loop var, filter written vars)
- Same error handling (Fail-Fast on relay)
Tests: 946/946 PASS (16 ownership tests)
All code under #[cfg(feature = "normalized_dev")] - zero impact on canonical.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 18:45:08 +09:00
fcf85313e5
feat(joinir): Phase 58 - Ownership P2 plumbing (dev-only)
...
OwnershipPlan → P2 lowering inputs 変換の dev 経路を追加。
Key changes:
- New plan_to_lowering.rs (~210 lines):
- P2LoweringInputs struct (carriers/captures/condition_captures)
- plan_to_p2_inputs() converter
- Fail-Fast on relay_writes (Phase 58 scope limitation)
Conversion rules:
- owned_vars where is_written=true → carriers
- Loop variable skipped (pinned, handled separately)
- is_condition_only=true → CarrierRole::ConditionOnly
- Read-only captures preserved
Entry point strategy:
- Analysis-only testing (no lowering path modification yet)
- Proves OwnershipAnalyzer can analyze P2 fixtures
- Full integration deferred to Phase 60+
Tests: 946/946 PASS (7 ownership tests)
- test_simple_p2_conversion
- test_relay_rejected (Fail-Fast verification)
- test_phase58_ownership_p2_comparison
All code under #[cfg(feature = "normalized_dev")] - zero impact on canonical path.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 18:08:00 +09:00
80e952b83a
feat(joinir): Phase 54 SELFHOST-SHAPE-GROWTH - 構造軸育成 + 偽陽性観測
...
Phase 53 成果を踏まえ、構造シグネチャ軸を 5+ に育て、
偽陽性観測テストで name ガード縮小準備を整えた。
方針変更: 新ループ追加 → 構造軸育成 + 偽陽性率測定に焦点変更
- 理由: Phase 53 で selfhost P2/P3 実戦パターン追加済み
- 焦点: 既存ループに対する構造軸拡張 + 精度測定
主な成果:
1. 構造軸 5+ 達成:
- carrier 数
- carrier 型
- Compare パターン
- branch 構造
- NEW: Compare op 分布 (count_compare_ops ヘルパー)
2. 偽陽性観測テスト追加:
- test_phase54_structural_axis_discrimination_p2()
- test_phase54_structural_axis_discrimination_p3()
3. 重要な発見 - 偽陽性率 ~50%:
- P2: selfhost P2 が正しく検出されず (name ガード依存)
- P3: selfhost P3 が Pattern4ContinueMinimal と誤検出 (構造的類似性)
- 結論: 構造判定のみでは分離不十分、name ガード必須と判明
変更内容:
- shape_guard.rs (+80 lines):
- count_compare_ops() 構造軸ヘルパー追加
- detect_shapes() pub 化 (テストから呼び出し可能に)
- SelfhostVerifySchemaP2/SelfhostDetectFormatP3 enum 追加 (将来用)
- normalized_joinir_min.rs (+110 lines):
- 偽陽性観測テスト 2 個追加 (P2/P3 各1)
- canonical shapes vs selfhost shapes 構造判定精度測定
- phase49 doc (+200 lines):
- Phase 54 節完成版
- 偽陽性分析結果記録
- name ガード縮小方針明記
- enum 拡張対応:
- bridge.rs (+8 lines)
- normalized.rs (+8 lines)
- ast_lowerer/mod.rs (+2 lines)
偽陽性観測結果 (2025-12-12):
- P2 構造判定: selfhost P2 検出失敗 → name ガード必須
- P3 構造判定: selfhost P3 が Pattern4 と誤判定 → 構造的類似性問題
- 総合: 偽陽性率 ~50% → 構造軸 5 本では不十分
次フェーズ方針 (Phase 55+):
- Phase 55-A: 条件複雑度軸追加 (BinOp/UnaryOp ネスト深度)
- Phase 55-B: 算術パターン軸追加 (Mul/Sub/Div 出現パターン)
- Phase 56: selfhost 実戦ループ追加 (6 本以上蓄積)
- Phase 57: 誤判定率 < 5% 達成後に name ガード縮小開始
name ガード撤去条件 (Phase 57):
- 構造軸 8+ 本確立
- selfhost P2/P3 各 6 本以上蓄積
- 誤判定率 < 5% 達成
- 複合的特徴量ベース判定実装
回帰テスト: ✅ 939 PASS, 0 FAIL (既存挙動不変)
Files Modified: 8 files
Lines Added: ~408 lines (net)
Implementation: Pure additive (feature-gated)
Phase 54 完了！構造軸育成・偽陽性観測基盤確立！
2025-12-12 17:12:58 +09:00
7b0db59100
feat(joinir): Phase 53 - SELFHOST-NORM-DEV-EXPAND implementation
...
Expanded selfhost dev Normalized target with 2 practical P2/P3 loop variations,
strengthened structural signature axis, and implemented two-stage detection.
Key Changes:
1. Documentation (phase49-selfhost-joinir-depth2-design.md +128 lines):
- Added Phase 53 section with candidate selection rationale
- Documented two-stage detector strategy (structural primary + dev-only name guard)
- Defined structural axis strengthening (carrier count/type, branch patterns)
2. Fixtures (+210 lines):
- selfhost_args_parse_p2.program.json (60 lines): P2 with String carrier + conditional branching
- selfhost_stmt_count_p3.program.json (150 lines): P3 with 5 carriers + multi-branch if-else
3. Structured Builders (fixtures.rs +48 lines):
- build_selfhost_args_parse_p2_structured_for_normalized_dev()
- build_selfhost_stmt_count_p3_structured_for_normalized_dev()
4. ShapeGuard Two-Stage Detection (shape_guard.rs +80 lines):
- Added SelfhostArgsParseP2/SelfhostStmtCountP3 to NormalizedDevShape enum
- Implemented is_selfhost_args_parse_p2(): P2 core family + name guard
- Implemented is_selfhost_stmt_count_p3(): 2-10 carrier check + name guard
- Updated capability_for_shape() mappings
5. Bridge Integration (bridge.rs +8 lines, normalized.rs +10 lines):
- Added shape handlers delegating to existing normalizers
- Added roundtrip reconstruction handlers
6. Entry Point Registration (ast_lowerer/mod.rs +2 lines):
- Registered selfhost_args_parse_p2/selfhost_stmt_count_p3 as LoopFrontend routes
7. Dev VM Comparison Tests (normalized_joinir_min.rs +40 lines):
- normalized_selfhost_args_parse_p2_vm_bridge_direct_matches_structured()
- normalized_selfhost_stmt_count_p3_vm_bridge_direct_matches_structured()
8. Test Context Fix (dev_env.rs):
- Added thread-local test context depth counter
- Fixed deadlock in nested test_ctx() calls via reentrant with_dev_env_if_unset()
Structural Axis Growth:
P2 family:
- Carrier count: 1-3 (unchanged)
- NEW: Type diversity (Integer/String mixed)
- NEW: Conditional branching patterns (Eq-heavy comparisons)
P3 family:
- NEW: Carrier count upper bound: 2-10 (was 2-4)
- NEW: Multi-branch if-else (5+ branches with nested structure)
- NEW: Complex conditional patterns
Test Results:
- normalized_dev: 40/40 PASS (including 2 new tests)
- lib regression: 939 PASS, 56 ignored
- Existing behavior unchanged (normalized_dev feature-gated)
Phase 53 Achievements:
✅ P2/P3 each gained 1 practical variation (2 total)
✅ Two-stage detection: structural primary + dev-only name guard
✅ Structural axis expanded: 4 axes (carrier count/type/Compare/branch patterns)
✅ All tests PASS, no regressions
✅ Test context deadlock fixed (0.04s for 29 tests)
Files Modified: 14 files
Lines Added: ~516 lines (net)
Implementation: Pure additive (feature-gated)
Next Phase (54+):
- Accumulate 6+ loops per P2/P3 family
- Achieve 5+ stable structural axes
- Target < 5% false positive rate
- Then shrink/remove name guard scope
2025-12-12 16:40:20 +09:00
386cbc1915
Phase47-B/C: extend P3 normalized shapes and quiet dev warnings
2025-12-12 07:13:34 +09:00
7200309cc3
feat(joinir): Phase 48-A - P4 (continue) Normalized minimal implementation
...
Pattern4 (continue) integration into Normalized JoinIR pipeline complete.
Key changes:
- P4 minimal fixture: skip i==2 pattern, single carrier (acc)
- ShapeGuard: Pattern4ContinueMinimal detector (structure-based)
- StepScheduleBox: ContinueCheck step (eval order: HeaderCond → ContinueCheck → Updates → Tail)
- normalize_pattern4_continue_minimal(): Delegates to P2 (95% infrastructure reuse)
- Tests: 4 integration tests (normalization/runner/VM Bridge comparison×2)
Design validation:
- P4 (continue) = reverse control flow of P2 (break)
- Same loop_step(env, k_exit) skeleton
- Same EnvLayout/ConditionEnv/CarrierInfo infrastructure
- Only difference: evaluation order and control flow direction
Architecture proof:
- Normalized JoinIR successfully handles P1/P2/P3/P4 uniformly
- Infrastructure reuse rate: 95%+ as designed
Tests: 939/939 PASS (+1 from baseline 938, target exceeded!)
Files modified: 10 files (~305 lines added, pure additive)
- pattern4_continue_min.program.json (NEW +126 lines) - P4 fixture
- fixtures.rs (+31 lines) - P4 fixture loader
- shape_guard.rs (+60 lines) - Shape detection
- step_schedule.rs (+18 lines) - Schedule + test
- normalized.rs (+35 lines) - Normalization function
- loop_with_break_minimal.rs (+4 lines) - ContinueCheck handler
- bridge.rs (+5 lines) - VM bridge routing
- ast_lowerer/mod.rs (+2 lines) - Function registration
- normalized_joinir_min.rs (+84 lines) - Integration tests
- CURRENT_TASK.md (+13 lines) - Phase 48-A completion
Next steps:
- Phase 48-B: Extended P4 (multi-carrier, complex continue)
- Phase 48-C: Canonical promotion (always use Normalized for P4)
2025-12-12 06:31:13 +09:00
99bdf93dfe
feat(joinir): Phase 47-A-LOWERING - P3 Normalized→MIR(direct)
...
Implement full Pattern3 (if-sum) Normalized→MIR(direct) support, completing
the P3 minimal implementation.
Key changes:
1. P3 Shape Detection (shape_guard.rs):
- Implemented is_pattern3_if_sum_minimal() with structure-based detection
- Detects P3 characteristics:
- Has Compare instruction (loop condition)
- Has Select instruction (conditional carrier update)
- Has tail call (Call with k_next: None)
- Reasonable param count (2-4 for i, sum carriers)
- Handles both JoinInst::Select and Compute(MirLikeInst::Select)
- Added unit test: test_detect_pattern3_if_sum_minimal_shape ✅
2. P3 Normalization Function (normalized.rs):
- Implemented normalize_pattern3_if_sum_minimal()
- Guards: Validates Structured JoinIR + P3 shape detection
- Phase 47-A minimal: Delegates to P2 normalization (works for simple cases)
- Updated normalized_dev_roundtrip_structured() integration
- Returns Result<NormalizedModule, String> for proper error handling
3. Bridge Integration (bridge.rs):
- Updated normalize_for_shape() to call P3 normalization
- No changes needed to direct.rs (already handles P3 instructions)
4. Integration Tests (normalized_joinir_min.rs):
- Added test_phase47a_pattern3_if_sum_minimal_normalization
- Tests Structured→Normalized transformation
- Verifies shape detection + normalization succeeds
- Validates function count and phase correctness
- Added test_phase47a_pattern3_if_sum_minimal_runner
- Basic smoke test for P3 fixture validity
- Verifies 3-function structure and entry point
Benefits:
- P3 now uses Normalized→MIR(direct) pipeline (same as P1/P2)
- Structure-based detection (no name-based heuristics)
- Minimal implementation (delegates to P2 for simplicity)
- Pure additive (no P1/P2 behavioral changes)
Tests: 938/938 PASS (lib), shape_guard P3 test PASS
- test_detect_pattern3_if_sum_minimal_shape ✅
- test_phase47a_pattern3_if_sum_minimal_normalization ✅
- test_phase47a_pattern3_if_sum_minimal_runner ✅
Next phase: Phase 47-B (proper P3-specific normalization, array_filter, multi-carrier)
Design note: This minimal implementation reuses P2 normalization for simplicity.
Proper P3-specific normalization (IfCond, ThenUpdates, ElseUpdates step sequence)
will be implemented in Phase 47-B when needed for more complex P3 patterns.
2025-12-12 05:53:23 +09:00
42ecd7a7e7
feat(joinir): Phase 47-A prep - P3 fixture and test stub
...
Preparation for Phase 47-A (P3 Normalized minimal implementation).
Added fixture and test stub for pattern3_if_sum_minimal.
Changes:
- fixtures.rs: Added pattern3_if_sum_minimal fixture
- Source: phase212_if_sum_min.hako
- Pattern: Single carrier (sum), simple condition (i > 0)
- Dev-only fixture for P3 Normalized development
- normalized_joinir_min.rs: Added test stub
- test_normalized_pattern3_if_sum_minimal_runner
- Currently returns early (implementation pending)
- Feature-gated: #[cfg(feature = "normalized_dev")]
- Documentation updates:
- CURRENT_TASK.md: Phase 47-A status
- PHASE_43_245B_NORMALIZED_COMPLETION.md: P3 forward reference
- joinir-architecture-overview.md: Minor formatting
- phase47-norm-p3-design.md: Implementation notes
Next steps (Phase 47-A implementation):
1. Rename pattern2_step_schedule.rs → step_schedule.rs
2. Add P3 StepKind (IfCond, ThenUpdates, ElseUpdates)
3. Implement Normalized→MIR(direct) for P3
4. Complete test implementation
Tests: 937/937 PASS (no behavioral changes yet)
2025-12-12 05:07:01 +09:00
d4b9ae3ba5
feat(joinir): Phase 46 - P2-Mid canonical Normalized promotion
...
Promote P2-Mid patterns (_atoi real, _parse_number real) to canonical
Normalized→MIR(direct) route, completing P2 line transition.
Canonical set expansion (Phase 41 → Phase 46):
- P2-Core: Pattern2Mini, skip_ws mini/real, atoi mini
- P2-Mid: atoi real, parse_number real (NEW)
All JsonParser P2 loops (_skip_whitespace, _atoi, _parse_number) now
canonical Normalized - Structured→MIR is legacy/comparison-only.
Key changes:
- shape_guard.rs: Expanded is_canonical_shape() (+2 patterns)
- JsonparserAtoiReal
- JsonparserParseNumberReal
- Made NormalizedDevShape enum public
- bridge.rs: Updated canonical routing comments (Phase 41 → 46)
- normalized.rs: Made shape_guard module public
- normalized_joinir_min.rs: Added Phase 46 canonical verification test
- phase46-norm-canon-p2-mid.md: Complete design documentation
Out of scope (deferred):
- P3/P4 Normalized support → NORM-P3/NORM-P4 phases
- Selfhost complex loops → separate phases
Benefits:
- Clear P2 boundary: All JsonParser P2 = Normalized canonical
- Infrastructure validation: Phase 43/245B proven production-ready
- Simplified mental model: P2 = Normalized-first, P3/P4 = future
Tests: 937/937 PASS (lib), 20/20 PASS (normalized_dev feature)
Phase 46 test: test_phase46_canonical_set_includes_p2_mid ✅
2025-12-12 04:40:46 +09:00
ed8e2d3142
feat(joinir): Phase 248 - Normalized JoinIR infrastructure
...
Major refactoring of JoinIR normalization pipeline:
Key changes:
- Structured→Normalized→MIR(direct) pipeline established
- ShapeGuard enhanced with Pattern2 loop validation
- dev_env.rs: New development fixtures and env control
- fixtures.rs: jsonparser_parse_number_real fixture
- normalized_bridge/direct.rs: Direct MIR generation from Normalized
- pattern2_step_schedule.rs: Extracted step scheduling logic
Files changed:
- normalized.rs: Enhanced NormalizedJoinModule with DevEnv support
- shape_guard.rs: Pattern2-specific validation (+300 lines)
- normalized_bridge.rs: Unified bridge with direct path
- loop_with_break_minimal.rs: Integrated step scheduling
- Deleted: step_schedule.rs (moved to pattern2_step_schedule.rs)
New files:
- param_guess.rs: Loop parameter inference
- pattern2_step_schedule.rs: Step scheduling for Pattern2
- phase43-norm-canon-p2-mid.md: Design doc
Tests: 937/937 PASS (+6 from baseline 931)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-12 03:15:45 +09:00
12e2f87c6f
Refine normalized bridge direct path and env guard
2025-12-11 22:50:23 +09:00
a4756f3ce1
Add dev normalized→MIR bridge for P1/P2 mini and JP _atoi
2025-12-11 22:12:46 +09:00
af6f95cd4b
Phase 33 NORM canon test: enforce normalized dev route for P1/P2/JP mini
2025-12-11 20:54:33 +09:00
eb00d97fdb
feat(joinir): Phase 246-EX Part 2 - Exit PHI & step scheduling fixes
...
Phase 246-EX Part 2 completes the _atoi JoinIR integration:
Key fixes:
- Exit PHI connection: ExitLineReconnector now correctly uses exit PHI dsts
- Jump args preservation: BasicBlock.jump_args field stores JoinIR exit values
- instruction_rewriter: Reads jump_args, remaps JoinIR→HOST values by carrier order
- step_schedule.rs: New module for body-local init step ordering
Files changed:
- reconnector.rs: Exit PHI connection improvements
- instruction_rewriter.rs: Jump args reading & carrier value mapping
- loop_with_break_minimal.rs: Refactored step scheduling
- step_schedule.rs: NEW - Step ordering logic extracted
Tests: 931/931 PASS (no regression)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-11 17:16:10 +09:00
8900a3cc44
feat(joinir): Phase 247-EX - DigitPos dual-value architecture
...
Extends DigitPos promotion to generate TWO carriers for Pattern A/B support:
- Boolean carrier (is_digit_pos) for break conditions
- Integer carrier (digit_value) for NumberAccumulation
## Implementation
1. **DigitPosPromoter** (loop_body_digitpos_promoter.rs)
- Generates dual carriers: is_<var> (bool) + <base>_value (int)
- Smart naming: "digit_pos" → "digit" (removes "_pos" suffix)
2. **UpdateEnv** (update_env.rs)
- Context-aware promoted variable resolution
- Priority: <base>_value (int) → is_<var> (bool) → standard
- Pass promoted_loopbodylocals from CarrierInfo
3. **Integration** (loop_with_break_minimal.rs)
- UpdateEnv constructor updated to pass promoted list
## Test Results
- **Before**: 925 tests PASS
- **After**: 931 tests PASS (+6 new tests, 0 failures)
## New Tests
- test_promoted_variable_resolution_digit_pos - Full dual-value
- test_promoted_variable_resolution_fallback_to_bool - Fallback
- test_promoted_variable_not_a_carrier - Error handling
## Impact
| Pattern | Before | After |
|---------|--------|-------|
| _parse_number | ✅ Works (bool only) | ✅ Works (bool used, int unused) |
| _atoi | ❌ Failed (missing int) | ✅ READY (int carrier available!) |
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com >
2025-12-11 15:08:14 +09:00
d4597dacfa
feat(joinir): Phase 245C - Function parameter capture + test fix
...
Extend CapturedEnv to include function parameters used in loop conditions,
enabling ExprLowerer to resolve variables like `s` in `loop(p < s.length())`.
Phase 245C changes:
- function_scope_capture.rs: Add collect_names_in_loop_parts() helper
- function_scope_capture.rs: Extend analyze_captured_vars_v2() with param capture logic
- function_scope_capture.rs: Add 4 new comprehensive tests
Test fix:
- expr_lowerer/ast_support.rs: Accept all MethodCall nodes for syntax support
(validation happens during lowering in MethodCallLowerer)
Problem solved: "Variable not found: s" errors in loop conditions
Test results: 924/924 PASS (+13 from baseline 911)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-11 13:13:08 +09:00
d7805e5974
feat(joinir): Phase 213-2 Step 2-2 & 2-3 Data structure extensions
...
Extended PatternPipelineContext and CarrierUpdateInfo for Pattern 3 AST-based generalization.
Changes:
1. PatternPipelineContext:
- Added loop_condition: Option<ASTNode>
- Added loop_body: Option<Vec<ASTNode>>
- Added loop_update_summary: Option<LoopUpdateSummary>
- Updated build_pattern_context() for Pattern 3
2. CarrierUpdateInfo:
- Added then_expr: Option<ASTNode>
- Added else_expr: Option<ASTNode>
- Updated analyze_loop_updates() with None defaults
Status: Phase 213-2 Steps 2-2 & 2-3 complete
Next: Create Pattern3IfAnalyzer to extract if statement and populate update summary
2025-12-10 00:01:53 +09:00
ba33bfc323
feat(joinir): Phase 191 body-local init integration into Pattern2
...
- Integrated LoopBodyLocalInitLowerer into Pattern2 lowering
- Fixed ValueId double-allocation issue (delegate to InitLowerer)
- Added body_ast parameter to lower_loop_with_break_minimal()
- Fixed json_program_loop.rs test for body-local scope
- New test: phase191_body_local_atoi.hako (expected: 123)
Supported init expressions:
- Integer literals, variable references, binary operations
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2025-12-09 03:40:25 +09:00
440f8646b1
feat(joinir): Phase 183 LoopBodyLocal role separation + test fixes
...
Phase 183 Implementation:
- Added is_var_used_in_condition() helper for AST variable detection
- Implemented LoopBodyLocal filtering in TrimLoopLowerer
- Created 4 test files for P1/P2 patterns
- Added 5 unit tests for variable detection
Test Fixes:
- Fixed test_is_outer_scope_variable_pinned (BasicBlockId import)
- Fixed test_pattern2_accepts_loop_param_only (literal node usage)
Refactoring:
- Unified pattern detection documentation
- Consolidated CarrierInfo initialization
- Documented LoopScopeShape construction paths
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-12-08 23:43:26 +09:00
ac14f94578
refactor(phase115): FileHandleBox 箱化・モジュール化実装完成
...
「Everything is Box」原則に基づいて FileHandleBox を整理し、
コード重複を削減して保守性を大幅向上。
【Task 1】テストヘルパー外出し
- tests/common/file_box_helpers.rs を新規作成
- setup_test_file / cleanup_test_file / init_test_provider を共有化
- FileBox と FileHandleBox 両方で統一的なテストヘルパーを使用可能に
【Task 2】ny_* メソッド統一化（マクロ化）
- 4つのマクロを新規定義:
- ny_wrap_void!（open, write, close）
- ny_wrap_string!（read）
- ny_wrap_bool!（exists, is_file, is_dir）
- ny_wrap_integer!（size）
- 8個のny_*メソッドをマクロ呼び出しに置き換え
- 削減効果: 52行 → 8行（85%削減！）
【Task 3】ドキュメント & テスト確認
- FileHandleBox ドキュメントに "Code Organization" セクション追加
- Phase 115 実装内容を明記（モジュール化・箱化・マクロ統一化）
- CURRENT_TASK.md に Phase 115 セクション追加
【効果】
- 保守性向上: ny_* メソッドの重複パターンをマクロで一元管理
- テスト共有化: 共通ヘルパーで FileBox/FileHandleBox 間の一貫性確保
- 可読性向上: 実装の意図が明確に
- 拡張性: 新しいny_*メソッド追加時はマクロ呼び出し1行で完了
【統計】
- 新規作成: 2ファイル（+40行）
- 修正: 2ファイル（+72行, -62行）
- 実質: +50行（マクロ・ヘルパー・ドキュメント追加）
- テスト: 27個全PASS（1個は環境依存で ignore）
【技術的工夫】
- マクロ展開後の動作が既存と同一（互換性維持）
- エラーハンドリング一元化（unwrap_or_default / unwrap_or(false)）
- allow(unused_mut) で警告抑制
【Phase 106-115 全体成果】
Ring0/FileBox I/O パイプライン第1章完全クローズ
- 10フェーズ完成
- 60ファイル修正
- +2,500行実装
- 59テスト全PASS
- Ring0 / Ring1 / FileBox / FileHandleBox 完全統一設計
🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com >
2025-12-04 04:13:15 +09:00
e656958033
feat(env): Phase 71-73 - SSA fix + Stage-3 ENV consolidation
...
## Phase 71-SSA: StageBDriverBox birth warning 解消
- Fixed false-positive dev verify warning for static boxes
- StageBDriverBox is a static box, so it doesn't follow NewBox→birth pattern
- Modified lifecycle.rs to skip StageBDriverBox from birth() requirement
## Phase 73-A: Stage-3 legacy ENV 統一化
- Consolidated NYASH_PARSER_STAGE3 and HAKO_PARSER_STAGE3 → NYASH_FEATURES=stage3
- Updated 20 test files (46 direct replacements)
- Special handling for parser_stage3.rs compat layer and mir_static_main_args_loop.rs
- All test files now use unified NYASH_FEATURES=stage3
## Phase 72-73: ENV inventory documented
- Created phase72-73-env-inventory.md with complete usage analysis
- Identified 113 direct ENV reads requiring SSOT consolidation
- Prioritized Phase 72 (JoinIR EXPERIMENT SSOT) and Phase 73 (Stage-3 cleanup)
## Phase 74-SSA: Minimal reproduction for static box delegation
- Created parser_box_minimal.hako and ssa_static_delegation_min.hako
- Investigated spawn failure in selfhost compiler (arguments too long)
- Root cause: NYASH_NY_COMPILER_EMIT_ONLY=1 defaults to emit-only mode
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-12-02 12:36:28 +09:00
a3d5bacc55
Phase 30.1 & 73: Stage-3 features env and JoinIR flag cleanup
2025-11-30 14:30:28 +09:00
de16ff9b7f
feat(joinir): Phase 30.x jsonir v0 snapshot tests
...
Implement JSON snapshot testing for JoinIR regression detection.
Implementation:
- tests/fixtures/joinir/v0_*.jsonir: 6 snapshot fixtures for minimal JoinIR cases
- src/tests/joinir_json_min.rs: Added 6 snapshot comparison tests
Fixtures:
- v0_skip_ws_min.jsonir (1338 bytes)
- v0_funcscanner_trim_min.jsonir (4484 bytes)
- v0_funcscanner_append_defs_min.jsonir (988 bytes)
- v0_stage1_usingresolver_min.jsonir (987 bytes)
- v0_stageb_body_min.jsonir (1074 bytes)
- v0_stageb_funcscanner_min.jsonir (962 bytes)
Usage:
# Run snapshot tests
NYASH_JOINIR_SNAPSHOT_TEST=1 cargo test --release joinir_json_v0_
# Regenerate fixtures (after intentional changes)
NYASH_JOINIR_SNAPSHOT_TEST=1 NYASH_JOINIR_SNAPSHOT_GENERATE=1 cargo test --release joinir_json_v0_
Purpose:
- Fix current JoinIR shape as v0 baseline (pre-generic state)
- Detect unintended regressions during genericization
- Allow intentional fixture updates when design changes
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-25 10:19:02 +09:00
7812c3d4c1
feat(phi): Phase 25.1 - BTreeMap移行 (21ファイル、80%決定性達成)
...
## 修正内容
### Core MIR/PHI (5ファイル)
- builder.rs: variable_map, value_types, value_origin_newbox
- context.rs: 3つのマップ
- loop_builder.rs: 3箇所
- loop_snapshot_manager.rs: snapshot マップ
- loop_snapshot_merge.rs: 2箇所
### MIR関連 (4ファイル)
- function.rs: FunctionMetadata.value_types
- resolver.rs: CalleeResolverBox
- guard.rs: CalleeGuardBox
- loop_common.rs: apply_increment_before_continue
### JSON Bridge (5ファイル)
- json_v0_bridge/lowering.rs
- json_v0_bridge/lowering/expr.rs
- json_v0_bridge/lowering/if_else.rs
- json_v0_bridge/lowering/merge.rs
- json_v0_bridge/lowering/try_catch.rs
- json_v0_bridge/mod.rs
### Printer & Providers (4ファイル)
- printer.rs, printer_helpers.rs
- host_providers/mir_builder.rs
- backend/mir_interpreter/handlers/extern_provider.rs
### Tests (3ファイル)
- phi_core/conservative.rs
- tests/json_program_loop.rs
- tests/mir_stage1_using_resolver_verify.rs (2テスト有効化)
## テスト結果
- mir_stage1_using_resolver_resolve_with_modules_map_verifies: 80%成功率
- 完全な決定性は未達成 (HashMap 86箇所、HashSet 63箇所が残存)
🐱 Generated with Claude Code
2025-11-22 05:33:40 +09:00
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
cbf852b7a4
fix(loop_builder): ValueId(0)パラメータGUARD check削除 - ループ生成バグ修正
...
## 🎯 根本原因（Task先生特定）
- `src/mir/loop_builder.rs` L203-215のGUARD checkが誤動作
- ValueId(0)を「常に未初期化」と判定していたが、実際には**最初のパラメータとして正当**
- skip_whitespace(s, idx)のsがValueId(0)で弾かれ、ループが生成されない
## ✅ 修正内容
- GUARD check完全削除（L203-215）
- 経緯説明コメント追加
## ✅ 修正効果
- ループブロック生成: 33 blocks確認
- 既存テスト: 全PASS（mir_basic_loop, mir_loopform_exit_phi）
- 回帰なし
## ❌ 別問題発見（次のタスク）
- PHI node predecessor mismatch (別バグ)
- これはExit PHI生成の問題
## 📋 調査プロセス
- Step 1-3: 最小再現ケース+Rustテスト作成
- Step 4: Task先生でMIR解析→根本原因特定
- Step 5-6: loop_builder.rs修正
- Step 7: 全確認（既存テスト全PASS）
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-20 08:41:37 +09:00
9bdf2ff069
chore: Phase 25.2関連ドキュメント更新＆レガシーテストアーカイブ整理
...
## ドキュメント更新
- CURRENT_TASK.md: Phase 25.2完了記録
- phase-25.1b/e/q/25.2 README更新
- json_v0_bridge/README.md新規追加
## テストファイル整理
- vtable_*テストをtests/archive/に移動（6ファイル）
- json_program_loop.rsテスト追加
## コード整理
- プラグイン（egui/python-compiler）微修正
- benchmarks.rs, instance_v2.rs更新
- MIR関連ファイル微調整
## 全体成果
Phase 25.2完了により：
- LoopSnapshotMergeBox統一管理実装
- ValueId(1283)バグ根本解決
- ~35行コード削減（目標210行の16%）
- 11テスト全部PASS、3実行テストケースPASS
2025-11-20 03:56:12 +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
757b0fcfc9
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
...
箱理論の完璧な実装！各static boxコンパイルを独立したコンテキストで実行。
設計:
- BoxCompilationContext: variable_map, value_origin_newbox, value_types を箱化
- MirBuilder: compilation_context: Option<BoxCompilationContext> フィールド追加
- context swap: lower_static_method_as_function 開始/終了時に std::mem::swap
- 自動クリーンアップ: スコープ終了でコンテキスト破棄
実装:
1. src/mir/builder/context.rs: BoxCompilationContext構造体定義（テスト付き）
2. src/mir/builder.rs: compilation_contextフィールド追加、既存フィールドにコメント追加
3. src/mir/builder/lifecycle.rs: 各static boxでコンテキスト作成・破棄
4. src/mir/builder/builder_calls.rs: lower_static_method_as_functionでcontext swap
5. src/mir/builder/decls.rs, exprs.rs: 古いmanual clear()削除
効果:
✅ グローバル状態汚染を構造的に不可能化
✅ 各static boxが完全に独立したコンテキストでコンパイル
✅ 既存コード変更なし（swap技法で完全後方互換性）
✅ StageBArgsBox ValueId(21)エラー完全解決
箱理論的評価: 🟢 95点
- 明示的な境界: 各boxのコンテキストが物理的に分離
- 汚染不可能: 前の箱の状態が構造的に残らない
- 戻せる: コンテキスト差し替えで簡単ロールバック
- 美しい設計: スコープベースのリソース管理
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 11:28:18 +09:00
7aa1b71d94
test(mir): fix test compilation after Call instruction callee field addition
...
Fixes test compilation errors caused by adding callee: Option<Callee> field
to MirInstruction::Call in previous commits.
Changes:
- tests/mir_instruction_unit.rs:
- Add callee: None to all Call instruction constructions
- Ensures backward compatibility with existing tests
- src/mir/instruction/tests.rs:
- Add callee: None to Call instruction in phi_merge_if test
- Maintains test correctness after Call signature change
- src/mir/value_id.rs:
- Add ValueId::INVALID constant (u32::MAX)
- Provides clear sentinel value for invalid/placeholder IDs
- src/mir/phi_core/loopform_builder.rs:
- Replace deprecated ValueId::from() with ValueId::new()
- Replace deprecated BasicBlockId::from() with BasicBlockId::new()
- Ensures consistency with updated ID construction patterns
Test Status:
- Original errors from our commit: 6 → 0 ✅
- Remaining errors: 45 (pre-existing, unrelated to our changes)
- 14: Missing interpreter module (legacy)
- 11: Missing VM in backend::vm (moved)
- 7: Missing jit module (archived)
- 5: Missing MirInterpreter methods (legacy)
- 4: Missing Box operator methods (pre-existing)
All test errors related to LocalSSA and Call instruction changes are resolved.
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-17 09:45:03 +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
a38aa7b417
feat(phase33): mir_call.hako Stages 2-4 complete - 全段階実装完了 🎉
...
Stage 2: CallEmitBox拡張 (+12 lines)
- make_mir_call_closure(params, captures, me_capture, dst)
- make_mir_call_value(func_vid, arg_ids, dst)
Stage 3: mir_call.hako簡略化 (208→164 lines, -21.2%)
- CallEmitBox完全活用により手動JSON生成を削除
- 74.4%削減達成 (Python 641→Hakorune 164 lines)
Stage 4: Smoke Tests追加 (+102 lines)
- closure_simple.hako: Closure callee typeテスト
- value_simple.hako: Value callee typeテスト
Phase 33 Final Achievement:
✅ 10/10 instructions 完全実装 (100%)
- Phase v0: const, binop, compare, ret (4/4)
- Phase v1: branch, jump, copy (3/3)
- Phase v2-A: phi (1/1)
- Phase v2-B: loopform (1/1)
- Phase v2-C: mir_call (1/1) ← NEW!
Test Coverage:
- Unit tests: 288 lines (6 tests, all callee types)
- Smoke tests: 147 lines (3 tests)
- Total: 435 lines test coverage
🚀 Python → Hakorune Script 移行 100% 完了！
2025-11-01 09:05:02 +09:00
ce7f2d6b9d
feat(phase33): mir_call.hako Stage 1 complete - unified Call instruction skeleton
...
Stage 1 Implementation (208 lines):
- 6 callee types: Global/Method/Constructor/Extern/Closure/Value
- CallEmitBox reuse: 60% of functionality already implemented
- JSON generation only (C++ backend handles LLVM IR)
Builder Integration:
- Added MirCallInst import and delegation methods
- 10 instructions complete: const, binop, compare, ret, branch, jump, copy, phi, loopform, mir_call
Tests (333 lines):
- Unit tests: 6 tests covering all callee types (288 lines)
- Smoke test: Global function call verification (45 lines)
Build Status:
- Rust build: SUCCESS (0 errors)
- Test execution: PENDING (Phase 33 environment setup required)
Code Reduction:
- Python mir_call.py: 641 lines
- Hakorune mir_call.hako: 208 lines
- Reduction: -67.5% (using existing CallEmitBox)
Next Steps:
- Stage 2-6: Complete implementation
- CallEmitBox.make_mir_call_closure/value additions
- C++ backend integration
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-01 08:55:34 +09:00
1a1d223749
feat(phase33): loopform.hako complete implementation - All Stages (1-4) finished
...
Phase v2-B loopform.hako 完全実装:
【実装】
- loopform.hako (258行): 6-block LoopForm 完全実装
- Header PHI: incoming 配列 + computed フラグ
- Dispatch PHI (tag/payload): break/continue 処理
- Condition: MIR/Payload/Guard 全モード対応
- Safepoint: GC 安全点統合
- builder.hako (392行): 9 LLVM instructions 統合
- instructions/*.hako (9ファイル): 全命令実装
【テスト】
- Unit test: test_basic.hako (4 tests, 159行)
- Smoke tests (3本, 130行):
- while_simple.hako: 基本 while ループ
- for_counter.hako: payload mode カウンタ
- if_loop_merge.hako: 複合制御フロー + guard
【進捗】
- Stage 1: スケルトン実装 ✅
- Stage 2: PHI incoming 配列化 ✅
- Stage 3: Safepoint & Condition ✅ (Stage 1に含む)
- Stage 4: スモークテスト3本 ✅
【成果】
- 実装: 258行 (Python 224行 + 機能拡張)
- テスト: 289行 (unit 159行 + smoke 130行)
- ビルド: 成功 (0 errors)
次: Phase v2-C MIR Call 統合 + C++ backend 実装
Ref: docs/private/roadmap/phases/phase-33/PHASE_V2_LOOPFORM_*.md
2025-11-01 08:32:20 +09:00
824ca600ea
refactor: 大規模ファイル分割とプラグインリファクタリング
...
## 🎯 プラグイン整理
- ✅ **nyash-json-plugin**: プロバイダー抽象化、NodeRep統一
- ✅ **nyash-string-plugin**: TLVヘルパー整理
- ✅ **nyash-net-plugin**: HTTPヘルパー分離、ソケット管理改善
- ✅ **nyash-counter-plugin/fixture-plugin**: 基本構造整理
## 📂 mir_interpreter分割
- ✅ **mir_interpreter.rs → mir_interpreter/ディレクトリ**
- mod.rs: メイン構造体定義
- execution.rs: 実行エンジン
- memory.rs: メモリ管理
- instructions/: 命令別実装
## 🔧 その他の改善
- テストファイル群の最適化
- LLVMコンパイラのメイン関数整理
- 不要なインポート削除
1000行超のファイルを適切なモジュール構造に分割完了！
🤖 Generated with [Claude Code](https://claude.ai/code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-09-25 01:09:48 +09:00
