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:
@ -1,8 +1,8 @@
|
||||
//! Thin FileBox shim that delegates to a selected provider.
|
||||
//! Not wired into the registry yet (safe placeholder).
|
||||
|
||||
use super::provider::{FileCaps, FileIo, FileResult};
|
||||
use std::sync::Arc;
|
||||
use super::provider::{FileIo, FileCaps, FileResult};
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub struct FileBoxShim {
|
||||
@ -16,9 +16,16 @@ impl FileBoxShim {
|
||||
let caps = provider.caps();
|
||||
Self { provider, caps }
|
||||
}
|
||||
pub fn open(&self, path: &str) -> FileResult<()> { self.provider.open(path) }
|
||||
pub fn read(&self) -> FileResult<String> { self.provider.read() }
|
||||
pub fn close(&self) -> FileResult<()> { self.provider.close() }
|
||||
pub fn caps(&self) -> FileCaps { self.caps }
|
||||
pub fn open(&self, path: &str) -> FileResult<()> {
|
||||
self.provider.open(path)
|
||||
}
|
||||
pub fn read(&self) -> FileResult<String> {
|
||||
self.provider.read()
|
||||
}
|
||||
pub fn close(&self) -> FileResult<()> {
|
||||
self.provider.close()
|
||||
}
|
||||
pub fn caps(&self) -> FileCaps {
|
||||
self.caps
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -3,10 +3,12 @@
|
||||
//! Provides ProviderFactory implementation for the builtin FileBox (core-ro).
|
||||
//! This is auto-registered when feature "builtin-filebox" is enabled.
|
||||
|
||||
use std::sync::Arc;
|
||||
use crate::boxes::file::provider::FileIo;
|
||||
use crate::boxes::file::core_ro::CoreRoFileIo;
|
||||
use crate::runner::modes::common_util::provider_registry::{ProviderFactory, register_provider_factory};
|
||||
use crate::boxes::file::provider::FileIo;
|
||||
use crate::runner::modes::common_util::provider_registry::{
|
||||
register_provider_factory, ProviderFactory,
|
||||
};
|
||||
use std::sync::Arc;
|
||||
|
||||
/// Builtin FileBox factory (static registration)
|
||||
pub struct BuiltinFileBoxFactory;
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
// 参考: 既存Boxの設計思想
|
||||
|
||||
// SSOT provider design (ring‑0/1) — modules are currently placeholders
|
||||
pub mod provider; // trait FileIo / FileCaps / FileError
|
||||
pub mod core_ro; // Core read‑only provider
|
||||
pub mod box_shim; // Thin delegating shim
|
||||
pub mod builtin_factory; // Builtin FileBox ProviderFactory
|
||||
pub mod box_shim; // Thin delegating shim
|
||||
pub mod builtin_factory;
|
||||
pub mod core_ro; // Core read‑only provider
|
||||
pub mod provider; // trait FileIo / FileCaps / FileError // Builtin FileBox ProviderFactory
|
||||
|
||||
use crate::box_trait::{BoolBox, BoxBase, BoxCore, NyashBox, StringBox};
|
||||
use crate::runtime::provider_lock;
|
||||
@ -64,7 +64,8 @@ impl FileBox {
|
||||
.ok_or("FileBox provider not initialized")?
|
||||
.clone();
|
||||
|
||||
provider.open(path)
|
||||
provider
|
||||
.open(path)
|
||||
.map_err(|e| format!("Failed to open: {}", e))?;
|
||||
|
||||
Ok(FileBox {
|
||||
@ -76,8 +77,7 @@ impl FileBox {
|
||||
|
||||
pub fn read_to_string(&self) -> Result<String, String> {
|
||||
if let Some(ref provider) = self.provider {
|
||||
provider.read()
|
||||
.map_err(|e| format!("Read failed: {}", e))
|
||||
provider.read().map_err(|e| format!("Read failed: {}", e))
|
||||
} else {
|
||||
Err("No provider available".to_string())
|
||||
}
|
||||
@ -85,7 +85,8 @@ impl FileBox {
|
||||
|
||||
pub fn write_all(&self, _buf: &[u8]) -> Result<(), String> {
|
||||
// Fail-Fast by capability: consult provider caps
|
||||
let caps = self.provider
|
||||
let caps = self
|
||||
.provider
|
||||
.as_ref()
|
||||
.map(|p| p.caps())
|
||||
.or_else(|| provider_lock::get_filebox_caps())
|
||||
@ -107,15 +108,20 @@ impl FileBox {
|
||||
|
||||
/// ファイルに内容を書き込む
|
||||
pub fn write(&self, _content: Box<dyn NyashBox>) -> Box<dyn NyashBox> {
|
||||
let caps = self.provider
|
||||
let caps = self
|
||||
.provider
|
||||
.as_ref()
|
||||
.map(|p| p.caps())
|
||||
.or_else(|| provider_lock::get_filebox_caps())
|
||||
.unwrap_or_else(|| provider::FileCaps::read_only());
|
||||
if !caps.write {
|
||||
return Box::new(StringBox::new("Error: write unsupported by provider (read-only)"));
|
||||
return Box::new(StringBox::new(
|
||||
"Error: write unsupported by provider (read-only)",
|
||||
));
|
||||
}
|
||||
Box::new(StringBox::new("Error: write supported but not implemented in this build"))
|
||||
Box::new(StringBox::new(
|
||||
"Error: write supported but not implemented in this build",
|
||||
))
|
||||
}
|
||||
|
||||
/// ファイルが存在するかチェック
|
||||
@ -126,28 +132,38 @@ impl FileBox {
|
||||
|
||||
/// ファイルを削除
|
||||
pub fn delete(&self) -> Box<dyn NyashBox> {
|
||||
let caps = self.provider
|
||||
let caps = self
|
||||
.provider
|
||||
.as_ref()
|
||||
.map(|p| p.caps())
|
||||
.or_else(|| provider_lock::get_filebox_caps())
|
||||
.unwrap_or_else(|| provider::FileCaps::read_only());
|
||||
if !caps.write {
|
||||
return Box::new(StringBox::new("Error: delete unsupported by provider (read-only)"));
|
||||
return Box::new(StringBox::new(
|
||||
"Error: delete unsupported by provider (read-only)",
|
||||
));
|
||||
}
|
||||
Box::new(StringBox::new("Error: delete supported but not implemented in this build"))
|
||||
Box::new(StringBox::new(
|
||||
"Error: delete supported but not implemented in this build",
|
||||
))
|
||||
}
|
||||
|
||||
/// ファイルをコピー
|
||||
pub fn copy(&self, _dest: &str) -> Box<dyn NyashBox> {
|
||||
let caps = self.provider
|
||||
let caps = self
|
||||
.provider
|
||||
.as_ref()
|
||||
.map(|p| p.caps())
|
||||
.or_else(|| provider_lock::get_filebox_caps())
|
||||
.unwrap_or_else(|| provider::FileCaps::read_only());
|
||||
if !caps.write {
|
||||
return Box::new(StringBox::new("Error: copy unsupported by provider (read-only)"));
|
||||
return Box::new(StringBox::new(
|
||||
"Error: copy unsupported by provider (read-only)",
|
||||
));
|
||||
}
|
||||
Box::new(StringBox::new("Error: copy supported but not implemented in this build"))
|
||||
Box::new(StringBox::new(
|
||||
"Error: copy supported but not implemented in this build",
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -12,7 +12,12 @@ pub struct FileCaps {
|
||||
}
|
||||
|
||||
impl FileCaps {
|
||||
pub const fn read_only() -> Self { Self { read: true, write: false } }
|
||||
pub const fn read_only() -> Self {
|
||||
Self {
|
||||
read: true,
|
||||
write: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Unified error type (thin placeholder for now)
|
||||
@ -40,9 +45,10 @@ pub trait FileIo: Send + Sync {
|
||||
pub fn normalize_newlines(s: &str) -> String {
|
||||
let mut out = String::with_capacity(s.len());
|
||||
for b in s.as_bytes() {
|
||||
if *b == b'\r' { continue; }
|
||||
if *b == b'\r' {
|
||||
continue;
|
||||
}
|
||||
out.push(*b as char);
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user