tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更

Browse Source 
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:
nyash-codex
2025-11-21 06:25:17 +09:00
parent baf028a94f
commit f9d100ce01
366 changed files with 14322 additions and 5236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/runner/pipe_io.rs
View File

@ -41,7 +41,8 @@ impl NyashRunner {
match super::json_v0_bridge::parse_json_v0_to_module(&json) {
Ok(module) => {
let p = std::path::Path::new(out);
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(&module, p) {
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(&module, p)
{
eprintln!("❌ Program→MIR emit error: {}", e);
std::process::exit(1);
}
@ -61,16 +62,21 @@ impl NyashRunner {
let runner = std::path::Path::new("tools/pyvm_runner.py");
if runner.exists() {
// We need a MIR module for PyVM: try v1 bridge first, then v0 parse
if let Ok(Some(module)) = crate::runner::json_v1_bridge::try_parse_v1_to_module(&json) {
if let Ok(Some(module)) =
crate::runner::json_v1_bridge::try_parse_v1_to_module(&json)
{
super::json_v0_bridge::maybe_dump_mir(&module);
let tmp_dir = std::path::Path::new("tmp");
let _ = std::fs::create_dir_all(tmp_dir);
let mir_json_path = tmp_dir.join("nyash_pyvm_mir.json");
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(&module, &mir_json_path) {
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(
&module,
&mir_json_path,
) {
eprintln!("❌ PyVM MIR JSON emit error: {}", e);
std::process::exit(1);
}
crate::cli_v!("[Bridge] using PyVM (pipe) → {}", mir_json_path.display());
crate::cli_v!("[Bridge] using PyVM (pipe) → {}", mir_json_path.display());
// Determine entry function
let allow_top = crate::config::env::entry_allow_toplevel_main();
let entry = if module.functions.contains_key("Main.main") {
@ -80,7 +86,9 @@ impl NyashRunner {
} else if module.functions.contains_key("main") {
eprintln!("[entry] Warning: using top-level 'main' without explicit allow; set NYASH_ENTRY_ALLOW_TOPLEVEL_MAIN=1 to silence.");
"main"
} else { "Main.main" };
} else {
"Main.main"
};
let mut cmd = std::process::Command::new(py3);
crate::runner::child_env::apply_core_wrapper_env(&mut cmd);
let status = cmd
@ -95,7 +103,9 @@ impl NyashRunner {
.map_err(|e| format!("spawn pyvm: {}", e))
.unwrap();
let code = status.code().unwrap_or(1);
if !status.success() { crate::cli_v!("❌ PyVM (pipe) failed (status={})", code); }
if !status.success() {
crate::cli_v!("❌ PyVM (pipe) failed (status={})", code);
}
std::process::exit(code);
}
// v0 fallback for PyVM
@ -104,11 +114,17 @@ impl NyashRunner {
let tmp_dir = std::path::Path::new("tmp");
let _ = std::fs::create_dir_all(tmp_dir);
let mir_json_path = tmp_dir.join("nyash_pyvm_mir.json");
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(&module, &mir_json_path) {
if let Err(e) = super::mir_json_emit::emit_mir_json_for_harness_bin(
&module,
&mir_json_path,
) {
eprintln!("❌ PyVM MIR JSON emit error: {}", e);
std::process::exit(1);
}
crate::cli_v!("[Bridge] using PyVM (pipe, v0) → {}", mir_json_path.display());
crate::cli_v!(
"[Bridge] using PyVM (pipe, v0) → {}",
mir_json_path.display()
);
let mut cmd = std::process::Command::new(py3);
crate::runner::child_env::apply_core_wrapper_env(&mut cmd);
let status = cmd
@ -121,7 +137,9 @@ impl NyashRunner {
.map_err(|e| format!("spawn pyvm: {}", e))
.unwrap();
let code = status.code().unwrap_or(1);
if !status.success() { crate::cli_v!("❌ PyVM (pipe,v0) failed (status={})", code); }
if !status.success() {
crate::cli_v!("❌ PyVM (pipe,v0) failed (status={})", code);
}
std::process::exit(code);
}
Err(e) => {