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

feat(phase89-a): Ring0Context logs migration - 56 locations

Browse Source 
Phase 89-A 完了: println!/eprintln! → ring0.log.* 移行

**実装内容**:
- 環境変数制御: NYASH_RING0_LOG_LEVEL (DEBUG/INFO/WARN/ERROR)
- selfhost.rs: 24箇所移行 (error:14, warn:2, info:5, debug:3)
- vm.rs: 32箇所移行 (error:5, warn:4, info:2, debug:21)

**実装効果**:
- 総移行箇所: 56箇所 (目標: 10-15箇所 → 373%達成)
- 累計進捗: 58/3,955箇所 (1.47%)
- テスト結果: 521 passed; 33 failed (変化なし)

**次のステップ**: Phase 89-B (IO/time 棚卸し)

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
nyash-codex
2025-12-02 23:27:41 +09:00
parent 5b911f2736
commit a01110e791
3 changed files with 140 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/runner/modes/vm.rs
View File

@ -15,14 +15,15 @@ impl NyashRunner {
// Quiet mode for child pipelines (e.g., selfhost compiler JSON emit)
let quiet_pipe = crate::config::env::env_bool("NYASH_JSON_ONLY");
if std::env::var("NYASH_EMIT_MIR_TRACE").ok().as_deref() == Some("1") {
eprintln!(
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!(
"[runner/vm] entry file={} quiet_pipe={} mode=stage-b?{}",
filename,
quiet_pipe,
std::env::var("HAKO_STAGEB_TRACE")
.ok()
.unwrap_or_else(|| "0".to_string())
);
));
}
// Enforce plugin-first policy for VM on this branch (deterministic):
@ -45,7 +46,8 @@ impl NyashRunner {
let filebox_provider = provider_registry::select_file_provider(filebox_mode);
if let Err(e) = provider_lock::set_filebox_provider(filebox_provider) {
if !quiet_pipe {
eprintln!("[warn] FileBox provider already set: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.warn(&format!("[warn] FileBox provider already set: {}", e));
}
}
@ -69,12 +71,14 @@ impl NyashRunner {
// Use NYASH_BOX_FACTORY_POLICY and NYASH_FILEBOX_MODE instead
if std::env::var("NYASH_USE_PLUGIN_BUILTINS").is_ok() {
if !quiet_pipe {
eprintln!("[vm] warn: NYASH_USE_PLUGIN_BUILTINS is deprecated. Use NYASH_BOX_FACTORY_POLICY instead.");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.warn("[vm] warn: NYASH_USE_PLUGIN_BUILTINS is deprecated. Use NYASH_BOX_FACTORY_POLICY instead.");
}
}
if std::env::var("NYASH_PLUGIN_OVERRIDE_TYPES").is_ok() {
if !quiet_pipe {
eprintln!("[vm] warn: NYASH_PLUGIN_OVERRIDE_TYPES is deprecated. Use NYASH_BOX_FACTORY_POLICY instead.");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.warn("[vm] warn: NYASH_PLUGIN_OVERRIDE_TYPES is deprecated. Use NYASH_BOX_FACTORY_POLICY instead.");
}
}
@ -89,7 +93,8 @@ impl NyashRunner {
let code = match fs::read_to_string(filename) {
Ok(content) => content,
Err(e) => {
eprintln!("❌ Error reading file {}: {}", filename, e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ Error reading file {}: {}", filename, e));
process::exit(1);
}
};
@ -115,15 +120,17 @@ impl NyashRunner {
) {
Ok(merged) => {
if trace {
eprintln!(
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!(
"[using/text-merge] preludes={} (vm)",
prelude_paths.len()
);
));
}
merged
}
Err(e) => {
eprintln!("❌ {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ {}", e));
process::exit(1);
}
}
@ -132,16 +139,16 @@ impl NyashRunner {
}
}
Err(e) => {
eprintln!("❌ {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ {}", e));
process::exit(1);
}
}
} else {
// using disabled: detect and fail fast if present
if code.contains("\nusing ") || code.trim_start().starts_with("using ") {
eprintln!(
"❌ using: prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines."
);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error("❌ using: prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines.");
process::exit(1);
}
code
@ -172,18 +179,21 @@ impl NyashRunner {
if let Err(e) = fs::write(&path, &code_final) {
if trace {
eprintln!("[vm/merged-hako] failed to write {}: {}", path, e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.warn(&format!("[vm/merged-hako] failed to write {}: {}", path, e));
}
} else if trace || crate::config::env::env_bool("NYASH_VM_DUMP_MERGED_HAKO_LOG") {
eprintln!("[vm/merged-hako] dumped merged code to {}", path);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!("[vm/merged-hako] dumped merged code to {}", path));
}
}
if trace && crate::config::env::parser_stage3_enabled() {
eprintln!(
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!(
"[vm] Stage-3: enabled (NYASH_FEATURES/legacy env) for {}",
filename
);
));
}
// Fail‑Fast (opt‑in): Hako 構文を Nyash VM 経路で実行しない
@ -195,9 +205,8 @@ impl NyashRunner {
|| code_final.contains("using selfhost.")
|| code_final.contains("using hakorune.");
if hako_like {
eprintln!(
"❌ Hako-like source detected in Nyash VM path. Use Hakorune VM (v1 dispatcher) or Core/LLVM for MIR.\n hint: set HAKO_VERIFY_PRIMARY=hakovm in verify path"
);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error("❌ Hako-like source detected in Nyash VM path. Use Hakorune VM (v1 dispatcher) or Core/LLVM for MIR.\n hint: set HAKO_VERIFY_PRIMARY=hakovm in verify path");
process::exit(1);
}
}
@ -216,13 +225,14 @@ impl NyashRunner {
let preludes =
crate::runner::modes::common_util::resolve::clone_last_merged_preludes();
if !preludes.is_empty() {
eprintln!("[parse/context] merged prelude files ({}):", preludes.len());
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!("[parse/context] merged prelude files ({}):", preludes.len()));
let show = std::cmp::min(16, preludes.len());
for p in preludes.iter().take(show) {
eprintln!(" - {}", p);
ring0.log.debug(&format!(" - {}", p));
}
if preludes.len() > show {
eprintln!(" ... ({} more)", preludes.len() - show);
ring0.log.debug(&format!(" ... ({} more)", preludes.len() - show));
}
}
process::exit(1);
@ -231,7 +241,8 @@ impl NyashRunner {
// Optional: dump AST statement kinds for quick diagnostics
if std::env::var("NYASH_AST_DUMP").ok().as_deref() == Some("1") {
eprintln!("[ast] dump start (vm)");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug("[ast] dump start (vm)");
if let ASTNode::Program { statements, .. } = &ast_combined {
for (i, st) in statements.iter().enumerate().take(50) {
let kind = match st {
@ -254,10 +265,10 @@ impl NyashRunner {
}
_ => format!("{:?}", st),
};
eprintln!("[ast] {}: {}", i, kind);
ring0.log.debug(&format!("[ast] {}: {}", i, kind));
}
}
eprintln!("[ast] dump end");
ring0.log.debug("[ast] dump end");
}
// Macro expand (if enabled)
@ -449,7 +460,8 @@ impl NyashRunner {
) {
Ok(c) => c,
Err(e) => {
eprintln!("❌ MIR compilation error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ MIR compilation error: {}", e));
process::exit(1);
}
};
@ -469,13 +481,15 @@ impl NyashRunner {
if let Ok(mut f) = std::fs::File::create(&path) {
let p = crate::mir::MirPrinter::new();
let _ = std::io::Write::write_all(&mut f, p.print_module(&module_vm).as_bytes());
eprintln!("[vm] MIR dumped to: {}", path);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.info(&format!("[vm] MIR dumped to: {}", path));
}
}
// Existing: NYASH_VM_DUMP_MIR dumps to stderr
if crate::config::env::env_bool("NYASH_VM_DUMP_MIR") {
let p = crate::mir::MirPrinter::new();
eprintln!("{}", p.print_module(&module_vm));
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&p.print_module(&module_vm));
}
// Execute via MIR interpreter
@ -489,13 +503,14 @@ impl NyashRunner {
// Optional: verify MIR before execution (dev-only)
if crate::config::env::env_bool("NYASH_VM_VERIFY_MIR") {
let ring0 = crate::runtime::ring0::get_global_ring0();
let mut verifier = crate::mir::verification::MirVerifier::new();
for (name, func) in module_vm.functions.iter() {
if let Err(errors) = verifier.verify_function(func) {
if !errors.is_empty() {
eprintln!("[vm-verify] function: {}", name);
ring0.log.warn(&format!("[vm-verify] function: {}", name));
for er in errors {
eprintln!(" • {}", er);
ring0.log.warn(&format!(" • {}", er));
}
}
}
@ -503,9 +518,10 @@ impl NyashRunner {
}
if std::env::var("NYASH_DUMP_FUNCS").ok().as_deref() == Some("1") {
eprintln!("[vm] functions available:");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug("[vm] functions available:");
for k in module_vm.functions.keys() {
eprintln!(" - {}", k);
ring0.log.debug(&format!(" - {}", k));
}
}
@ -531,7 +547,8 @@ impl NyashRunner {
.as_deref()
== Some("1")
{
eprintln!("[runner/vm] calling execute_module");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug("[runner/vm] calling execute_module");
}
match vm.execute_module(&module_vm) {
Ok(ret) => {
@ -542,7 +559,8 @@ impl NyashRunner {
.as_deref()
== Some("1")
{
eprintln!("[runner/vm] vm_result={}", ret.to_string_box().value);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!("[runner/vm] vm_result={}", ret.to_string_box().value));
}
// Extract exit code from return value
@ -561,8 +579,9 @@ impl NyashRunner {
// Optional: print lightweight VM counters for diagnostics
if crate::config::env::env_bool("NYASH_VM_STATS") {
let ring0 = crate::runtime::ring0::get_global_ring0();
let (inst, br, cmp) = vm.stats_counters();
eprintln!("[vm/stats] inst={} compare={} branch={}", inst, cmp, br);
ring0.log.debug(&format!("[vm/stats] inst={} compare={} branch={}", inst, cmp, br));
}
// Quiet mode: suppress "RC:" output for JSON-only pipelines
@ -574,21 +593,23 @@ impl NyashRunner {
.as_deref()
== Some("1")
{
eprintln!("[runner/vm] exit_code={}", exit_code);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.debug(&format!("[runner/vm] exit_code={}", exit_code));
}
// Exit with the return value as exit code
process::exit(exit_code);
}
Err(e) => {
let ring0 = crate::runtime::ring0::get_global_ring0();
if std::env::var("NYASH_EMIT_MIR_TRACE")
.ok()
.as_deref()
== Some("1")
{
eprintln!("[runner/vm] vm_error={}", e);
ring0.log.debug(&format!("[runner/vm] vm_error={}", e));
}
eprintln!("❌ [rust-vm] VM error: {}", e);
ring0.log.error(&format!("❌ [rust-vm] VM error: {}", e));
process::exit(1);
}
}

79
src/runner/selfhost.rs
View File

@ -82,7 +82,8 @@ impl NyashRunner {
let code = match fs::read_to_string(filename) {
Ok(c) => c,
Err(e) => {
eprintln!("[ny-compiler] read error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] read error: {}", e));
return false;
}
};
@ -99,7 +100,8 @@ impl NyashRunner {
code_ref = std::borrow::Cow::Owned(merged);
}
Err(e) => {
eprintln!("[ny-compiler] using text merge error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] using text merge error: {}", e));
return false;
}
}
@ -110,13 +112,15 @@ impl NyashRunner {
) {
Ok((clean, paths)) => {
if !paths.is_empty() {
eprintln!("[ny-compiler] using: AST prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines.");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error("[ny-compiler] using: AST prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines.");
return false;
}
code_ref = std::borrow::Cow::Owned(clean);
}
Err(e) => {
eprintln!("[ny-compiler] {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] {}", e));
return false;
}
}
@ -134,7 +138,8 @@ impl NyashRunner {
let use_tmp_only = crate::config::env::ny_compiler_use_tmp_only();
let tmp_dir = std::path::Path::new("tmp");
if let Err(e) = std::fs::create_dir_all(tmp_dir) {
eprintln!("[ny-compiler] mkdir tmp failed: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] mkdir tmp failed: {}", e));
return false;
}
@ -184,13 +189,15 @@ impl NyashRunner {
}
}
Err(e) => {
eprintln!("[ny-compiler] pre-expand compile error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] pre-expand compile error: {}", e));
return false;
}
}
}
Err(e) => {
eprintln!("[ny-compiler] pre-expand parse error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] pre-expand parse error: {}", e));
return false;
}
}
@ -201,12 +208,14 @@ impl NyashRunner {
match std::fs::File::create(&tmp_path) {
Ok(mut f) => {
if let Err(e) = f.write_all(code_ref.as_bytes()) {
eprintln!("[ny-compiler] write tmp failed: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] write tmp failed: {}", e));
return false;
}
}
Err(e) => {
eprintln!("[ny-compiler] open tmp failed: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] open tmp failed: {}", e));
return false;
}
}
@ -223,10 +232,11 @@ impl NyashRunner {
if parser_prog.exists() {
// Phase 28.2: observation log (NYASH_CLI_VERBOSE>=2)
if verbose_level >= 2 {
eprintln!(
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.info(&format!(
"[selfhost/ny] spawning Ny compiler child process: {}",
parser_prog.display()
);
));
}
// Build extra args forwarded to child program
let mut extra_owned: Vec<String> = Vec::new();
@ -284,42 +294,45 @@ impl NyashRunner {
) {
// Phase 28.2: observation log - JSON received
if verbose_level >= 2 {
eprintln!(
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.info(&format!(
"[selfhost/ny] received Program(JSON v0), size={} bytes",
line.len()
);
));
}
match json::parse_json_v0_line(&line) {
Ok(module) => {
// Phase 28.2: observation log - before maybe_dump_mir
if verbose_level >= 2 {
let ring0 = crate::runtime::ring0::get_global_ring0();
let dump_path = crate::config::env::dump::rust_mir_dump_path();
eprintln!(
ring0.log.info(&format!(
"[selfhost/ny] lowering Program(JSON v0) → MIR via json_v0_bridge (funcs={})",
module.functions.len()
);
eprintln!(
));
ring0.log.info(&format!(
"[selfhost/ny] calling maybe_dump_mir (RUST_MIR_DUMP_PATH={:?}, cli_verbose={})",
dump_path.as_deref().unwrap_or("<unset>"),
crate::config::env::cli_verbose()
);
));
}
super::json_v0_bridge::maybe_dump_mir(&module);
// Phase 28.2: observation log - after maybe_dump_mir
if verbose_level >= 2 {
let ring0 = crate::runtime::ring0::get_global_ring0();
if let Some(ref path) =
crate::config::env::dump::rust_mir_dump_path()
{
if std::path::Path::new(path).exists() {
eprintln!(
ring0.log.info(&format!(
"[selfhost/ny] ✅ MIR dump file created: {}",
path
);
));
} else {
eprintln!(
ring0.log.warn(&format!(
"[selfhost/ny] ⚠️ MIR dump file NOT created: {}",
path
);
));
}
}
}
@ -338,7 +351,8 @@ impl NyashRunner {
return true;
}
Err(e) => {
eprintln!("[ny-compiler] json parse error (child): {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] json parse error (child): {}", e));
}
}
}
@ -360,7 +374,8 @@ impl NyashRunner {
match super::modes::common_util::io::spawn_with_timeout(cmd, timeout_ms) {
Ok(o) => o,
Err(e) => {
eprintln!("[ny-compiler] python harness failed: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] python harness failed: {}", e));
return false;
}
};
@ -377,7 +392,11 @@ impl NyashRunner {
if crate::config::env::vm_use_py() {
let code = match crate::runner::modes::common_util::pyvm::run_pyvm_harness(&module, "selfhost-py") {
Ok(c) => c,
Err(e) => { eprintln!("❌ PyVM error: {}", e); 1 }
Err(e) => {
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ PyVM error: {}", e));
1
}
};
println!("Result: {}", code);
std::process::exit(code);
@ -386,7 +405,8 @@ impl NyashRunner {
return true;
}
Err(e) => {
eprintln!("[ny-compiler] json parse error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("[ny-compiler] json parse error: {}", e));
return false;
}
}
@ -445,7 +465,8 @@ impl NyashRunner {
&mir_json_path,
)
{
eprintln!("❌ PyVM MIR JSON emit error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ PyVM MIR JSON emit error: {}", e));
process::exit(1);
}
crate::cli_v!(
@ -458,7 +479,8 @@ impl NyashRunner {
} else if allow_top && module.functions.contains_key("main") {
"main"
} 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.");
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.warn("[entry] Warning: using top-level 'main' without explicit allow; set NYASH_ENTRY_ALLOW_TOPLEVEL_MAIN=1 to silence.");
"main"
} else {
"Main.main"
@ -536,7 +558,8 @@ impl NyashRunner {
return true;
}
Err(e) => {
eprintln!("❌ JSON v0 bridge error: {}", e);
let ring0 = crate::runtime::ring0::get_global_ring0();
ring0.log.error(&format!("❌ JSON v0 bridge error: {}", e));
return false;
}
}

30
src/runtime/ring0/std_impls.rs
View File

@ -61,11 +61,39 @@ impl TimeApi for StdTime {
/// eprintln!/println! ベースのログ実装
pub struct StdLog;
impl StdLog {
fn should_log(&self, level: LogLevel) -> bool {
let min_level_str = std::env::var("NYASH_RING0_LOG_LEVEL")
.unwrap_or_else(|_| "INFO".to_string());
let min_level = match min_level_str.to_uppercase().as_str() {
"DEBUG" => LogLevel::Debug,
"INFO" => LogLevel::Info,
"WARN" => LogLevel::Warn,
"ERROR" => LogLevel::Error,
_ => LogLevel::Info,
};
// level の優先度が min_level 以上なら true
matches!(
(level, min_level),
(LogLevel::Error, _) |
(LogLevel::Warn, LogLevel::Debug | LogLevel::Info | LogLevel::Warn) |
(LogLevel::Info, LogLevel::Debug | LogLevel::Info) |
(LogLevel::Debug, LogLevel::Debug)
)
}
}
impl LogApi for StdLog {
fn log(&self, level: LogLevel, msg: &str) {
if !self.should_log(level) {
return;
}
match level {
LogLevel::Debug => eprintln!("[DEBUG] {}", msg),
LogLevel::Info => println!("[INFO] {}", msg),
LogLevel::Info => eprintln!("[INFO] {}", msg),
LogLevel::Warn => eprintln!("[WARN] {}", msg),
LogLevel::Error => eprintln!("[ERROR] {}", msg),
}