tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5b7818f5c96b19d3aca7409297bf793c4320f86d
hakorune/src/tests
History
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
..
archive
fix(loop_builder): ValueId(0)パラメータGUARD check削除 - ループ生成バグ修正
2025-11-20 08:41:37 +09:00
aot_plan_import.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
box_tests.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
core13_smoke_array.rs
🎉 Phase 11.8/12.7: MIR Core-13 完全実装 + 糖衣構文ドキュメント更新
2025-09-04 11:34:15 +09:00
functionbox_call_tests.rs
builder/vm: stabilize json_lint_vm under unified calls
2025-09-28 12:19:49 +09:00
host_reverse_slot.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
identical_exec_collections.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
identical_exec_instance.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
identical_exec_string.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
identical_exec.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
if_form_no_phi_tests.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
if_in_loop_no_phi_regression.rs
selfhost/runtime: Stage 0-1 runner + MIR JSON loader (summary) with trace; compiler: scopebox/loopform prepass wiring (flags, child args); libs: add P1 standard boxes (console/string/array/map) as thin wrappers; runner: pass --box-pref via env; ops_calls dispatcher skeleton; docs: selfhost executor roadmap + scopebox/loopform notes; smokes: selfhost runner + identity prepasses; CURRENT_TASK: update plan and box lib schedule
2025-09-22 21:52:39 +09:00
if_return_exec.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
joinir_json_min.rs
test(joinir): L-2.2 Step-3 - Add Stage-B JoinIR→MIR structure tests
2025-11-26 11:38:45 +09:00
joinir_runner_min.rs
feat(phase32): L-2.1 Stage-1 UsingResolver JoinIR integration + cleanup
2025-11-26 10:17:37 +09:00
joinir_runner_standalone.rs
feat(joinir): promote joinir_runner_standalone_trim to mainline test
2025-11-25 06:54:35 +09:00
joinir_vm_bridge_skip_ws.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
joinir_vm_bridge_stage1_usingresolver.rs
fix(joinir): Stage-1 string concat BinOp::Or → Add + ArrayBox support
2025-11-25 13:33:01 +09:00
joinir_vm_bridge_trim.rs
feat(joinir): FuncScannerBox.trim/1 JoinIR VM Bridge A/B test
2025-11-25 12:22:08 +09:00
json_lint_stringutils_min_vm.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
llvm_bitops_test.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
loop_continue_break_no_phi_tests.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
loop_nested_no_phi_tests.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
loop_return_no_phi_tests.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
macro_derive_test.rs
freeze: macro platform complete; default ON with profiles; env consolidation; docs + smokes\n\n- Profiles: --profile {lite|dev|ci|strict} (dev-like default for macros)\n- Macro paths: prefer NYASH_MACRO_PATHS (legacy envs deprecated with warnings)\n- Selfhost pre-expand: auto mode, PyVM-only, add smokes (array/map)\n- Docs: user-macros updated; new macro-profiles guide; AGENTS freeze note; CURRENT_TASK freeze\n- Compat: non-breaking; legacy envs print deprecation notices\n
2025-09-19 22:27:59 +09:00
macro_pattern_test.rs
freeze: macro platform complete; default ON with profiles; env consolidation; docs + smokes\n\n- Profiles: --profile {lite|dev|ci|strict} (dev-like default for macros)\n- Macro paths: prefer NYASH_MACRO_PATHS (legacy envs deprecated with warnings)\n- Selfhost pre-expand: auto mode, PyVM-only, add smokes (array/map)\n- Docs: user-macros updated; new macro-profiles guide; AGENTS freeze note; CURRENT_TASK freeze\n- Compat: non-breaking; legacy envs print deprecation notices\n
2025-09-19 22:27:59 +09:00
mir_breakfinder_ssa.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mir_controlflow_extras.rs
🚀 Break/Continue/Try-Catch構文のサポート追加とMIRループ制御強化
2025-09-15 22:14:42 +09:00
mir_core13_normalize.rs
Core-13 pure: add CI workflows, VM e2e tests, LLVM parity bridge (minimal); do not touch private docs
2025-09-07 07:28:53 +09:00
mir_ctrlflow_break_continue.rs
🚀 Break/Continue/Try-Catch構文のサポート追加とMIRループ制御強化
2025-09-15 22:14:42 +09:00
mir_funcscanner_parse_params_trim_min.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_funcscanner_skip_ws_min.rs
feat(phi): Phase 26-F-2 - 箱理論による責務分離（IfBodyLocalMergeBox新設）
2025-11-22 11:03:21 +09:00
mir_funcscanner_skip_ws.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mir_funcscanner_ssa.rs
chore: Phase 26-H セッション完了 - 全ドキュメント更新
2025-11-23 05:53:27 +09:00
mir_funcscanner_trim_min.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_funcscanner_append_defs.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_funcscanner_trim.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_if_select.rs
feat(joinir): Phase 33-7 IfMerge lowering for multiple-variable PHI
2025-11-27 08:18:09 +09:00
mir_joinir_min.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_skip_ws.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_stage1_using_resolver_min.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_stageb_body.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_joinir_stageb_funcscanner.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_lambda_functionbox.rs
Phase 12.7完了 + ChatGPT5によるVMリファクタリング
2025-09-04 03:41:02 +09:00
mir_locals_ssa.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mir_loopform_complex.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_loopform_conditional_reassign.rs
feat(phi): Phase 25.1 - LoopForm v2 テスト・最小再現ケース追加
2025-11-21 06:21:45 +09:00
mir_loopform_exit_phi.rs
feat(phi): Phase 25.1 - LoopForm v2 テスト・最小再現ケース追加
2025-11-21 06:21:45 +09:00
mir_no_phi_merge_tests.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
mir_peek_lower.rs
Step 2完了: peek→match完全統一 + 重大PHI命令バグ発見
2025-09-23 09:00:07 +09:00
mir_phi_basic_verify.rs
📦 Hotfix 1 & 2: Parameter ValueId Reservation + Exit PHI Validation (Box-First Theory)
2025-11-18 06:39:45 +09:00
mir_pure_e2e_arith.rs
Merge selfhosting-dev into main (Core-13 pure CI/tests + LLVM bridge) (#126)
2025-09-07 07:36:15 +09:00
mir_pure_e2e_branch.rs
Merge selfhosting-dev into main (Core-13 pure CI/tests + LLVM bridge) (#126)
2025-09-07 07:36:15 +09:00
mir_pure_e2e_vm.rs
feat(loop-phi): Add body-local variable PHI generation for Rust AST loops
2025-11-19 23:12:01 +09:00
mir_pure_envbox.rs
Merge selfhosting-dev into main (Core-13 pure CI/tests + LLVM bridge) (#126)
2025-09-07 07:36:15 +09:00
mir_pure_llvm_build.rs
feat(llvm-py): Major breakthrough in Python LLVM backend! 🎉
2025-09-14 00:44:28 +09:00
mir_pure_llvm_parity.rs
feat(llvm-py): Major breakthrough in Python LLVM backend! 🎉
2025-09-14 00:44:28 +09:00
mir_pure_locals_normalized.rs
Merge selfhosting-dev into main (Core-13 pure CI/tests + LLVM bridge) (#126)
2025-09-07 07:36:15 +09:00
mir_pure_only_core13.rs
Merge selfhosting-dev into main (Core-13 pure CI/tests + LLVM bridge) (#126)
2025-09-07 07:36:15 +09:00
mir_qmark_lower.rs
Phase 12.7: Nyash文法革命とANCP 90%圧縮技法の発見 - 文法改革完了とFunctionBox実装
2025-09-03 20:03:45 +09:00
mir_stage1_cli_emit_program_min.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_stage1_cli_stage1_main_verify.rs
feat(phi): Phase 25.1 - BTreeMap移行 (21ファイル、80%決定性達成)
2025-11-22 05:33:40 +09:00
mir_stage1_staticcompiler_receiver.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_stage1_using_resolver_verify.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_stageb_like_args_length.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mir_stageb_loop_break_continue.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mir_stageb_string_utils_skip_ws.rs
fix(test): テスト調整 - 修正後用成功テストを有効化
2025-11-21 12:38:37 +09:00
mir_static_box_naming.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
mir_value_kind.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
mod.rs
Phase 33-3: If/PHI MIR pattern matching + Select lowering (minimal patterns)
2025-11-27 03:28:32 +09:00
namingbox_static_method_id.rs
Span trace utilities and runner source hint
2025-11-24 14:17:02 +09:00
nyash_abi_basic.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
parser_bitops_test.rs
tests: add parser/vm bitops tests; docs: update cheatsheet and language guide for bitwise ops and shift; note Arrow(>>) removal
2025-09-08 04:04:19 +09:00
parser_block_postfix_catch.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
parser_block_postfix_errors.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
parser_expr_postfix_catch.rs
pyvm: split op handlers into ops_core/ops_box/ops_ctrl; add ops_flow + intrinsic; delegate vm.py without behavior change
2025-09-21 08:53:00 +09:00
parser_lambda_call.rs
Phase 12.7: Nyash文法革命とANCP 90%圧縮技法の発見 - 文法改革完了とFunctionBox実装
2025-09-03 20:03:45 +09:00
parser_lambda.rs
Phase 12.7: Nyash文法革命とANCP 90%圧縮技法の発見 - 文法改革完了とFunctionBox実装
2025-09-03 20:03:45 +09:00
parser_method_postfix.rs
stage3: unify to cleanup; MIR return-defer; docs+smokes updated; LLVM(harness): finalize_phis ownership, ret.py simplified, uses-predeclare; cleanup return override green; method-postfix cleanup return WIP (PHI head)
2025-09-19 02:07:38 +09:00
parser_parent_colon.rs
Phase 12.7: Nyash文法革命とANCP 90%圧縮技法の発見 - 文法改革完了とFunctionBox実装
2025-09-03 20:03:45 +09:00
parser_peek_block.rs
Step 2完了: peek→match完全統一 + 重大PHI命令バグ発見
2025-09-23 09:00:07 +09:00
parser_semicolon.rs
fix(mir): PHI検証panic修正 - update_cfg()を検証前に呼び出し
2025-11-01 13:28:56 +09:00
parser_static_box_members.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
plugin_hygiene.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
policy_mutdeny.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
refcell_assignment_test.rs
builder/vm: stabilize json_lint_vm under unified calls
2025-09-28 12:19:49 +09:00
stage1_cli_entry_ssa_smoke.rs
feat(phi): Phase 25.1 - BTreeMap移行 (21ファイル、80%決定性達成)
2025-11-22 05:33:40 +09:00
sugar_basic_test.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
sugar_coalesce_test.rs
Step 2完了: peek→match完全統一 + 重大PHI命令バグ発見
2025-09-23 09:00:07 +09:00
sugar_comp_assign_test.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
sugar_pipeline_test.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
sugar_range_test.rs
chore(fmt): add legacy stubs and strip trailing whitespace to unblock cargo fmt
2025-09-17 07:43:07 +09:00
sugar_safe_access_test.rs
Step 2完了: peek→match完全統一 + 重大PHI命令バグ発見
2025-09-23 09:00:07 +09:00
tokenizer_unicode_toggle.rs
phase-20.45: PRIMARY no-fallback reps + MIR v0 shape fixes
2025-11-05 18:57:03 +09:00
typebox_tlv_diff.rs
chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
2025-11-21 06:25:17 +09:00
vm_bitops_test.rs
builder/vm: stabilize json_lint_vm under unified calls
2025-09-28 12:19:49 +09:00
vm_compare_box.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vm_functionbox_call.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vtable_map_boundaries.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vtable_map_ext.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vtable_strict.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vtable_string_boundaries.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00
vtable_string.rs
feat(mir/builder): implement BoxCompilationContext for structural metadata isolation
2025-11-17 11:28:18 +09:00