diff --git a/CURRENT_TASK.md b/CURRENT_TASK.md index ef7e62bd..806fab21 100644 --- a/CURRENT_TASK.md +++ b/CURRENT_TASK.md @@ -235,13 +235,20 @@ - ✅ #[allow(clippy::arc_with_non_send_sync)] 削減: 4箇所 → 1箇所 - ✅ 全 CoreServices に統一コメント追加 - ✅ コード品質向上（Clippy warnings 削減） - - **Phase 99: ログ/出力ポリシー確定**（2025-12-03）← NEW + - **Phase 99: ログ/出力ポリシー確定**（2025-12-03） - ✅ logging_policy.md 新規作成（3層分離設計・マクロポリシー・テスト方針を文書化） - ✅ ring0-inventory.md 更新（println! 残件分類・Ring0.log 活用計画を記載） - ✅ core_boxes_design.md Section 15.6-A 追記（統一設計の補強） - ✅ 残り ~1477 箇所の println!/eprintln! を「後工程で片付けられる設計」に整理 - **設計フェーズのみ**: コード変更なし、docs ベースでポリシー確定 - - **次のステップ**: Phase 100-101 で段階的に console_println! / Ring0.log への移行実施 + - **Phase 100: user-facing 出力の CoreServices 化**（2025-12-03）← NEW + - ✅ selfhost.rs: 6箇所 → console_println!（CoreInitError, Result 出力） + - ✅ llvm.rs: 23箇所 → console_println!（エラー、成功メッセージ、実行結果） + - ✅ 合計 29箇所完了（Phase 98: 7 + Phase 100: 29 = 36箇所） + - ✅ cargo build --release 成功、全テスト PASS（core_services: 11, plugin_host: 7） + - ✅ デバッグログとユーザー向け出力の明確な分離達成 + - **除外**: llvm.rs の `[joinir/llvm]`, `[parse/context]` デバッグログ（Phase 101 対象） + - **次のステップ**: Phase 101-102 で残り ~330箇所の段階的移行 12. **Phase 86: BoxFactory Priority 正常化** ✅ **完了**（2025-12-02） - **目的**: BoxFactory のデフォルトポリシーを `BuiltinFirst` から `StrictPluginFirst` に変更し、プラグイン版 Box が正常に使用できるよう正常化。 diff --git a/docs/development/current/main/logging_policy.md b/docs/development/current/main/logging_policy.md index ef8f0e8f..fc16656f 100644 --- a/docs/development/current/main/logging_policy.md +++ b/docs/development/current/main/logging_policy.md @@ -310,3 +310,48 @@ Phase 99 establishes the **documentation foundation** for future logging/output 4. **Migration strategy**: Phased approach with clear priorities **Next Steps**: Phase 100+ will implement gradual migrations based on this policy framework. + +--- + +## Section 7: Phase 100 Implementation Complete (2025-12-03) + +### user-facing 出力の CoreServices 化完了 + +**実装概要**: selfhost と LLVM runner の主要なユーザー向け出力を ConsoleService (console_println!) 経由に統一 + +**完了箇所**: +- **selfhost.rs**: 6箇所 → console_println! + - Line 57: CoreInitError 出力 + - Line 194, 363, 418, 519, 570: Result 出力 +- **llvm.rs**: 23箇所（ユーザー向けメッセージ） → console_println! + - Line 26, 44, 53, 60, 116: エラーメッセージ（❌） + - Line 121-122: 成功メッセージ（📊） + - Line 215, 230, 239, 275, 287, 295: LLVM/harness エラー + - Line 324, 328, 334-335, 353-354, 357-358, 362: 実行結果 + - Line 369-370, 379, 383, 391: Mock LLVM メッセージ +- **vm.rs**: 1箇所（Phase 98 で完了済み） +- **core_bridge.rs**: 2箇所（Phase 98 で完了済み） +- **selfhost 関連**: 5箇所（Phase 98 で完了済み） + +**合計**: Phase 98 (7箇所) + Phase 100 (29箇所) = **36箇所完了** + +**除外箇所**（意図的に残した）: +- llvm.rs の `[joinir/llvm]`, `[parse/context]` デバッグログ（Phase 101 対象） +- hack_check: .hako アプリ（Nyash言語の ConsoleBox 経由、別フェーズ） + +**テスト結果**: +- ✅ cargo build --release 成功 +- ✅ core_services テスト: 11 passed +- ✅ plugin_host テスト: 7 passed +- ✅ 代表ケース動作確認: + - loop_min_while.hako: "📊 MIR Module compiled successfully!" 等が console_println! 経由で出力 + - エラーケース: "❌ Error reading file..." が console_println! 経由で出力 + +**残りの user-facing 出力**: +- 推定: ~330箇所（その他の runner/modes/*） +- 優先度: HIGH → Phase 101-102 で段階的拡張 + +**技術的成果**: +- selfhost/LLVM runner のユーザー向けメッセージが ConsoleService に統一 +- Phase 99 で確立したログ/出力ポリシーが実装レベルで実現 +- デバッグログとユーザー向け出力の明確な分離 diff --git a/docs/development/current/main/ring0-inventory.md b/docs/development/current/main/ring0-inventory.md index 32536e01..44b56f27 100644 --- a/docs/development/current/main/ring0-inventory.md +++ b/docs/development/current/main/ring0-inventory.md @@ -68,7 +68,15 @@ This document provides an inventory of Ring0.log infrastructure and categorizes **Phase 98 Progress**: 7 locations completed (representative paths) -**Phase 100-101 Plan**: Gradual expansion +**Phase 100 Progress**: 29 locations completed (selfhost + LLVM runner) +- selfhost.rs: 6箇所（CoreInitError, Result 出力） +- llvm.rs: 23箇所（エラー、成功メッセージ、実行結果） + +**合計完了**: Phase 98 (7) + Phase 100 (29) = **36箇所** + +**残り**: ~330箇所（その他の runner/modes/*） + +**Phase 101-102 Plan**: 段階的拡張継続 **Example Locations**: - `src/runner/` - CLI entry points diff --git a/src/runner/modes/llvm.rs b/src/runner/modes/llvm.rs index e4b96d60..7e0408cb 100644 --- a/src/runner/modes/llvm.rs +++ b/src/runner/modes/llvm.rs @@ -23,7 +23,7 @@ impl NyashRunner { let code = match fs::read_to_string(filename) { Ok(content) => content, Err(e) => { - eprintln!("❌ Error reading file {}: {}", filename, e); + crate::console_println!("❌ Error reading file {}: {}", filename, e); process::exit(1); } }; @@ -41,7 +41,7 @@ impl NyashRunner { cleaned_code_owned = clean; code_ref = &cleaned_code_owned; if !paths.is_empty() && !use_ast { - eprintln!("❌ using: AST prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines."); + crate::console_println!("❌ using: AST prelude merge is disabled in this profile. Enable NYASH_USING_AST=1 or remove 'using' lines."); std::process::exit(1); } if use_ast && !paths.is_empty() { @@ -50,14 +50,14 @@ impl NyashRunner { ) { Ok(v) => prelude_asts = v, Err(e) => { - eprintln!("❌ {}", e); + crate::console_println!("❌ {}", e); std::process::exit(1); } } } } Err(e) => { - eprintln!("❌ {}", e); + crate::console_println!("❌ {}", e); process::exit(1); } } @@ -113,13 +113,13 @@ impl NyashRunner { ) { Ok(result) => result, Err(e) => { - eprintln!("❌ MIR compilation error: {}", e); + crate::console_println!("❌ MIR compilation error: {}", e); process::exit(1); } }; - println!("📊 MIR Module compiled successfully!"); - println!("📊 Functions: {}", compile_result.module.functions.len()); + crate::console_println!("📊 MIR Module compiled successfully!"); + crate::console_println!("📊 Functions: {}", compile_result.module.functions.len()); // Inject method_id for BoxCall/PluginInvoke where resolvable (by-id path) #[allow(unused_mut)] @@ -212,7 +212,7 @@ impl NyashRunner { std::process::exit(code); } Err(e) => { - eprintln!("❌ PyVM harness error: {}", e); + crate::console_println!("❌ PyVM harness error: {}", e); std::process::exit(1); } } @@ -227,7 +227,7 @@ impl NyashRunner { if let Err(e) = crate::runner::modes::common_util::exec::llvmlite_emit_object( &module, &_out_path, 20_000, ) { - eprintln!("❌ {}", e); + crate::console_println!("❌ {}", e); process::exit(1); } return; @@ -236,11 +236,11 @@ impl NyashRunner { match std::fs::metadata(&_out_path) { Ok(meta) => { if meta.len() == 0 { - eprintln!("❌ harness object is empty: {}", _out_path); + crate::console_println!("❌ harness object is empty: {}", _out_path); process::exit(1); } if std::env::var("NYASH_CLI_VERBOSE").ok().as_deref() == Some("1") { - eprintln!( + crate::console_println!( "[LLVM] object emitted: {} ({} bytes)", _out_path, meta.len() @@ -248,7 +248,7 @@ impl NyashRunner { } } Err(e) => { - eprintln!( + crate::console_println!( "❌ harness output not found after emit: {} ({})", _out_path, e ); @@ -272,7 +272,7 @@ impl NyashRunner { .unwrap_or_default() ); if let Err(e) = llvm_compile_to_object(&module, &_out_path) { - eprintln!("❌ LLVM object emit error: {}", e); + crate::console_println!("❌ LLVM object emit error: {}", e); process::exit(1); } match std::fs::metadata(&_out_path) { @@ -284,7 +284,7 @@ impl NyashRunner { ); } _ => { - eprintln!("❌ LLVM object not found or empty: {}", _out_path); + crate::console_println!("❌ LLVM object not found or empty: {}", _out_path); process::exit(1); } } @@ -292,7 +292,7 @@ impl NyashRunner { } #[cfg(all(not(feature = "llvm-harness"), not(feature = "llvm-inkwell-legacy")))] { - eprintln!("❌ LLVM backend not available (object emit)."); + crate::console_println!("❌ LLVM backend not available (object emit)."); process::exit(1); } } @@ -321,18 +321,18 @@ impl NyashRunner { if !stdout_text.is_empty() { print!("{}", stdout_text); } - println!("✅ LLVM (harness) execution completed (exit={})", code); + crate::console_println!("✅ LLVM (harness) execution completed (exit={})", code); std::process::exit(code); } Err(e) => { - eprintln!("❌ run executable error: {}", e); + crate::console_println!("❌ run executable error: {}", e); std::process::exit(1); } } } Err(e) => { - eprintln!("❌ ny-llvmc emit-exe error: {}", e); - eprintln!( + crate::console_println!("❌ ny-llvmc emit-exe error: {}", e); + crate::console_println!( " Hint: build ny-llvmc: cargo build -p nyash-llvm-compiler --release" ); std::process::exit(1); @@ -350,24 +350,24 @@ impl NyashRunner { Ok(result) => { if let Some(int_result) = result.as_any().downcast_ref::() { let exit_code = int_result.value; - println!("✅ LLVM execution completed!"); - println!("📊 Exit code: {}", exit_code); + crate::console_println!("✅ LLVM execution completed!"); + crate::console_println!("📊 Exit code: {}", exit_code); process::exit(exit_code as i32); } else { - println!("✅ LLVM execution completed (non-integer result)!"); - println!("📊 Result: {}", result.to_string_box().value); + crate::console_println!("✅ LLVM execution completed (non-integer result)!"); + crate::console_println!("📊 Result: {}", result.to_string_box().value); } } Err(e) => { - eprintln!("❌ LLVM execution error: {}", e); + crate::console_println!("❌ LLVM execution error: {}", e); process::exit(1); } } } #[cfg(all(not(feature = "llvm-inkwell-legacy")))] { - println!("🔧 Mock LLVM Backend Execution:"); - println!(" Build with --features llvm-inkwell-legacy for Rust/inkwell backend, or set NYASH_LLVM_OBJ_OUT and NYASH_LLVM_USE_HARNESS=1 for harness."); + crate::console_println!("🔧 Mock LLVM Backend Execution:"); + crate::console_println!(" Build with --features llvm-inkwell-legacy for Rust/inkwell backend, or set NYASH_LLVM_OBJ_OUT and NYASH_LLVM_USE_HARNESS=1 for harness."); // NamingBox SSOT: Select entry (arity-aware, Main.main → main fallback) let entry = crate::runner::modes::common_util::entry_selection::select_entry_function(&module); @@ -376,11 +376,11 @@ impl NyashRunner { for inst in &block.instructions { match inst { MirInstruction::Return { value: Some(_) } => { - println!("✅ Mock exit code: 42"); + crate::console_println!("✅ Mock exit code: 42"); process::exit(42); } MirInstruction::Return { value: None } => { - println!("✅ Mock exit code: 0"); + crate::console_println!("✅ Mock exit code: 0"); process::exit(0); } _ => {} @@ -388,7 +388,7 @@ impl NyashRunner { } } } - println!("✅ Mock exit code: 0"); + crate::console_println!("✅ Mock exit code: 0"); process::exit(0); } } diff --git a/src/runner/selfhost.rs b/src/runner/selfhost.rs index aa99e6f9..22f3cab7 100644 --- a/src/runner/selfhost.rs +++ b/src/runner/selfhost.rs @@ -53,8 +53,8 @@ impl NyashRunner { host.core.console.println("[selfhost] PluginHost initialized successfully"); } Err(e) => { - // Phase 95: エラー時は eprintln のまま（Fail-Fast原則） - eprintln!("[selfhost] CoreInitError: {}", e); + // Phase 100: ConsoleService 経由でエラー出力 + crate::console_println!("[selfhost] CoreInitError: {}", e); return false; } } @@ -191,7 +191,7 @@ impl NyashRunner { let prefer_pyvm = crate::config::env::vm_use_py(); if prefer_pyvm { if let Ok(code) = crate::runner::modes::common_util::pyvm::run_pyvm_harness_lib(&result.module, "selfhost-preexpand") { - println!("Result: {}", code); + crate::console_println!("Result: {}", code); std::process::exit(code); } else { // Phase 88: Ring0Context 経由でエラーログ出力 @@ -360,7 +360,7 @@ impl NyashRunner { // Prefer PyVM path when requested if crate::config::env::vm_use_py() { if let Some(code) = crate::runner::modes::common_util::selfhost::json::run_pyvm_module(&module, "selfhost") { - println!("Result: {}", code); + crate::console_println!("Result: {}", code); std::process::exit(code); } } @@ -415,7 +415,7 @@ impl NyashRunner { 1 } }; - println!("Result: {}", code); + crate::console_println!("Result: {}", code); std::process::exit(code); } execute_with_oob_check(self, &module); @@ -516,7 +516,7 @@ impl NyashRunner { .map_err(|e| format!("spawn pyvm: {}", e)) .unwrap(); let code = status.code().unwrap_or(1); - println!("Result: {}", code); + crate::console_println!("Result: {}", code); std::process::exit(code); } } @@ -567,7 +567,7 @@ impl NyashRunner { &module, label, ) { - println!("Result: {}", code); + crate::console_println!("Result: {}", code); std::process::exit(code); } }