Files

nyash-codex 8b44c5009f fix(mir): fix else block scope bug - PHI materialization order

Root Cause:
- Else blocks were not propagating variable assignments to outer scope
- Bug 1 (if_form.rs): PHI materialization happened before variable_map reset,
  causing PHI nodes to be lost
- Bug 2 (phi.rs): Variable merge didn't check if else branch modified variables

Changes:
- src/mir/builder/if_form.rs:93-127
  - Reordered: reset variable_map BEFORE materializing PHI nodes
  - Now matches then-branch pattern (reset → materialize → execute)
  - Applied to both "else" and "no else" branches for consistency
- src/mir/builder/phi.rs:137-154
  - Added else_modified_var check to detect variable modifications
  - Use modified value from else_var_map_end_opt when available
  - Fall back to pre-if value only when truly not modified

Test Results:
✅ Simple block: { x=42 } → 42
✅ If block: if 1 { x=42 } → 42
✅ Else block: if 0 { x=99 } else { x=42 } → 42 (FIXED!)
✅ Stage-B body extraction: "return 42" correctly extracted (was null)

Impact:
- Else block variable assignments now work correctly
- Stage-B compiler body extraction restored
- Selfhost builder path can now function
- Foundation for Phase 21.x progress

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

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

2025-11-13 20:16:20 +09:00

README.md

Hakorune Smoke Tests v2 — Guide (Nyash-compatible)

Overview

Entry: tools/smokes/v2/run.sh — unified runner for quick/integration/full.
Profiles:
- quick — fast developer checks.
- integration — VM↔LLVM parity, basic stability.
- full — comprehensive matrix.

🎯 Two Baselines (Runbook)

これから開発の基準となる2つのベースライン：

📦 VM ライン（Rust VM - 既定）

用途: 開発・デバッグ・検証用（高速・型安全）

# ビルド
cargo build --release

# 一括スモークテスト
tools/smokes/v2/run.sh --profile quick

# 個別スモークテスト
tools/smokes/v2/run.sh --profile quick --filter "<glob>"
# 例: --filter "core/json_query_min_vm.sh"

# 単発実行（参考）
$NYASH_BIN --backend vm apps/APP/main.hako

⚡ llvmlite ライン（LLVMハーネス）

用途: 本番・最適化・配布用（実証済み安定性）

前提: Python3 + llvmlite

pip install llvmlite  # 未導入の場合

実行手順:

# ビルド（LLVM_SYS_180_PREFIX不要！）
cargo build --release --features llvm

# 一括スモークテスト
tools/smokes/v2/run.sh --profile integration

# 個別スモークテスト
tools/smokes/v2/run.sh --profile integration --filter "<glob>"

# 単発実行
NYASH_LLVM_USE_HARNESS=1 $NYASH_BIN --backend llvm apps/tests/peek_expr_block.hako

# 有効化確認
$NYASH_BIN --version | rg -i 'features.*llvm'

💡 重要: 両方のラインのテストが通ることで、MIR14統一アーキテクチャの品質を保証！

🔁 QuickでAST/LLVM系も実行したいとき

通常、quick は LLVM未ビルド時に AST/LLVM系テストを自動で SKIP します。 Quickでも実行したい場合は、先に LLVM 有効でビルドしてください：

LLVM_SYS_180_PREFIX=$(llvm-config-18 --prefix) cargo build --release --features llvm
tools/smokes/v2/run.sh --profile quick

テストランナーは LLVM 非対応時にヒントを出力します（buildコマンドの案内）。

Notes

Using resolution: prefer nyash.toml aliases (SSOT). Some tests may enable NYASH_ALLOW_USING_FILE=1 internally for convenience.
Plugin warnings are informational; smokes are designed to pass without dynamic plugins.
Harness single-run may take longer due to link+exec; integration profile includes generous timeouts.
Binary selection in scripts: always use $NYASH_BIN (the runner sets it to target/release/hakorune when present, otherwise falls back to nyash).
Branding: user‑visible messages prefer “Hakorune”; the legacy nyash binary remains for compatibility but may be gated（HAKO_ALLOW_NYASH=1）。

Dev Mode (defaults)

In v2 smokes, the quick profile exports NYASH_DEV=1 by default.
- This enables CLI --dev-equivalent defaults inside Nyash:
  - AST using ON (SSOT + AST prelude merge)
  - Operator Boxes in observe mode (no adoption)
  - Minimal diagnostics; output parity is preserved
You can also run manually with nyash --dev script.hako.

Common commands

Quick suite (auto NYASH_DEV=1):
- tools/smokes/v2/run.sh --profile quick
Focus JSON smokes:
- tools/opbox-json.sh (Roundtrip/Nested, plugins disabled, generous timeout)
One-off program (VM):
- $NYASH_BIN --backend vm --dev apps/APP/main.hako

Key env knobs

NYASH_DEV=1 — enable dev defaults (same effect as --dev).
SMOKES_DEFAULT_TIMEOUT — per test timeout seconds (default 15 for quick).
SMOKES_PLUGIN_MODE=dynamic|static — plugin mode for preflight (auto by default).
SMOKES_FORCE_CONFIG=rust_vm_dynamic|llvm_static — force backend config.
SMOKES_NOTIFY_TAIL — lines to show on failure tail (default 80).