7812c3d4c1
## 修正内容
### 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
51 lines
1.5 KiB
Rust
51 lines
1.5 KiB
Rust
mod ast;
|
|
mod lexer;
|
|
mod lowering;
|
|
|
|
use ast::{ProgramV0, StmtV0};
|
|
use lowering::lower_program;
|
|
use std::collections::BTreeMap;
|
|
|
|
pub fn parse_json_v0_to_module(json: &str) -> Result<crate::mir::MirModule, String> {
|
|
parse_json_v0_to_module_with_imports(json, BTreeMap::new())
|
|
}
|
|
|
|
pub fn parse_json_v0_to_module_with_imports(
|
|
json: &str,
|
|
imports: BTreeMap<String, String>,
|
|
) -> Result<crate::mir::MirModule, String> {
|
|
let prog: ProgramV0 =
|
|
serde_json::from_str(json).map_err(|e| format!("invalid JSON v0: {}", e))?;
|
|
if crate::config::env::cli_verbose() {
|
|
let first = prog
|
|
.body
|
|
.get(1)
|
|
.map(|s| match s {
|
|
StmtV0::Try { .. } => "Try",
|
|
_ => "Other",
|
|
})
|
|
.unwrap_or("<none>");
|
|
eprintln!(
|
|
"[Bridge] JSON v0: body_len={} first_type={}",
|
|
prog.body.len(),
|
|
first
|
|
);
|
|
}
|
|
if prog.version != 0 || prog.kind != "Program" {
|
|
return Err("unsupported IR: expected {version:0, kind:\"Program\"}".into());
|
|
}
|
|
lower_program(prog, imports)
|
|
}
|
|
|
|
pub fn parse_source_v0_to_module(input: &str) -> Result<crate::mir::MirModule, String> {
|
|
let json = lexer::parse_source_v0_to_json(input)?;
|
|
if std::env::var("NYASH_DUMP_JSON_IR").ok().as_deref() == Some("1") {
|
|
println!("{}", json);
|
|
}
|
|
parse_json_v0_to_module(&json)
|
|
}
|
|
|
|
pub fn maybe_dump_mir(module: &crate::mir::MirModule) {
|
|
lowering::maybe_dump_mir(module)
|
|
}
|