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>
This commit is contained in:
@ -26,13 +26,18 @@ pub fn run_json_v0(runner: &NyashRunner, json: &str) -> i32 {
|
||||
let looks_like_mir = json.contains("\"functions\"") && json.contains("\"blocks\"");
|
||||
if looks_like_mir {
|
||||
// In-proc prototype (opt-in): HAKO_CORE_DIRECT_INPROC=1 (alias NYASH_CORE_DIRECT_INPROC)
|
||||
let core_direct_inproc = std::env::var("HAKO_CORE_DIRECT_INPROC").ok().as_deref() == Some("1")
|
||||
let core_direct_inproc = std::env::var("HAKO_CORE_DIRECT_INPROC").ok().as_deref()
|
||||
== Some("1")
|
||||
|| std::env::var("NYASH_CORE_DIRECT_INPROC").ok().as_deref() == Some("1");
|
||||
if core_direct_inproc {
|
||||
if let Some(rc) = try_run_core_direct_inproc(runner, json) { return rc; }
|
||||
if let Some(rc) = try_run_core_direct_inproc(runner, json) {
|
||||
return rc;
|
||||
}
|
||||
eprintln!("[core-exec] direct Core (inproc) failed; trying child wrapper");
|
||||
}
|
||||
if let Some(rc) = try_run_core_direct(json) { return rc; }
|
||||
if let Some(rc) = try_run_core_direct(json) {
|
||||
return rc;
|
||||
}
|
||||
eprintln!("[core-exec] direct Core (child) failed; falling back to VM interpreter");
|
||||
}
|
||||
// else: skip direct Core and continue to bridge/VM path
|
||||
@ -41,7 +46,9 @@ pub fn run_json_v0(runner: &NyashRunner, json: &str) -> i32 {
|
||||
|
||||
// Optional: downconvert/canonicalize even for v1 when requested (dev diagnostics)
|
||||
if crate::config::env::nyvm_v1_downconvert() {
|
||||
if let Ok(j) = crate::runner::modes::common_util::core_bridge::canonicalize_module_json(&payload) {
|
||||
if let Ok(j) =
|
||||
crate::runner::modes::common_util::core_bridge::canonicalize_module_json(&payload)
|
||||
{
|
||||
payload = j;
|
||||
}
|
||||
}
|
||||
@ -90,7 +97,9 @@ pub fn run_json_v0(runner: &NyashRunner, json: &str) -> i32 {
|
||||
}
|
||||
|
||||
// For non‑v1 input, attempt canonicalization and v1 bridge (Stage‑B program → MIR).
|
||||
if let Ok(j) = crate::runner::modes::common_util::core_bridge::canonicalize_module_json(&payload) {
|
||||
if let Ok(j) =
|
||||
crate::runner::modes::common_util::core_bridge::canonicalize_module_json(&payload)
|
||||
{
|
||||
payload = j;
|
||||
}
|
||||
match crate::runner::json_v1_bridge::try_parse_v1_to_module(&payload) {
|
||||
|
||||
Reference in New Issue
Block a user