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:
@ -138,7 +138,10 @@ impl UnifiedBoxRegistry {
|
||||
Some("strict_plugin_first") | _ => FactoryPolicy::StrictPluginFirst, // Phase 15.5: Plugin First DEFAULT!
|
||||
};
|
||||
|
||||
eprintln!("[UnifiedBoxRegistry] 🎯 Factory Policy: {:?} (Phase 15.5: Everything is Plugin!)", policy);
|
||||
eprintln!(
|
||||
"[UnifiedBoxRegistry] 🎯 Factory Policy: {:?} (Phase 15.5: Everything is Plugin!)",
|
||||
policy
|
||||
);
|
||||
Self::with_policy(policy)
|
||||
}
|
||||
|
||||
@ -175,7 +178,7 @@ impl UnifiedBoxRegistry {
|
||||
if std::env::var("NYASH_USE_PLUGIN_BUILTINS").is_ok() {
|
||||
if let Ok(types) = std::env::var("NYASH_PLUGIN_OVERRIDE_TYPES") {
|
||||
if types.split(',').any(|t| t.trim() == name) {
|
||||
return false; // 予約型として扱わない
|
||||
return false; // 予約型として扱わない
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -229,19 +232,19 @@ impl UnifiedBoxRegistry {
|
||||
|
||||
match self.policy {
|
||||
FactoryPolicy::StrictPluginFirst => match factory_type {
|
||||
FactoryType::Plugin => 0, // Highest priority
|
||||
FactoryType::User => 1, // Medium priority
|
||||
FactoryType::Builtin => 2, // Lowest priority
|
||||
FactoryType::Plugin => 0, // Highest priority
|
||||
FactoryType::User => 1, // Medium priority
|
||||
FactoryType::Builtin => 2, // Lowest priority
|
||||
},
|
||||
FactoryPolicy::CompatPluginFirst => match factory_type {
|
||||
FactoryType::Plugin => 0, // Highest priority
|
||||
FactoryType::Builtin => 1, // Medium priority
|
||||
FactoryType::User => 2, // Lowest priority
|
||||
FactoryType::Plugin => 0, // Highest priority
|
||||
FactoryType::Builtin => 1, // Medium priority
|
||||
FactoryType::User => 2, // Lowest priority
|
||||
},
|
||||
FactoryPolicy::BuiltinFirst => match factory_type {
|
||||
FactoryType::Builtin => 0, // Highest priority (current default)
|
||||
FactoryType::User => 1, // Medium priority
|
||||
FactoryType::Plugin => 2, // Lowest priority
|
||||
FactoryType::Builtin => 0, // Highest priority (current default)
|
||||
FactoryType::User => 1, // Medium priority
|
||||
FactoryType::Plugin => 2, // Lowest priority
|
||||
},
|
||||
}
|
||||
} else {
|
||||
@ -271,7 +274,9 @@ impl UnifiedBoxRegistry {
|
||||
// Prefer plugin-builtins when enabled and provider is available in v2 registry
|
||||
// BUT: Skip if plugins are explicitly disabled
|
||||
let plugins_disabled = std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref() == Some("1");
|
||||
if !plugins_disabled && std::env::var("NYASH_USE_PLUGIN_BUILTINS").ok().as_deref() == Some("1") {
|
||||
if !plugins_disabled
|
||||
&& std::env::var("NYASH_USE_PLUGIN_BUILTINS").ok().as_deref() == Some("1")
|
||||
{
|
||||
use crate::runtime::{get_global_registry, BoxProvider};
|
||||
// Allowlist types for override: env NYASH_PLUGIN_OVERRIDE_TYPES="ArrayBox,MapBox" (default: none)
|
||||
let allow: Vec<String> = if let Ok(list) = std::env::var("NYASH_PLUGIN_OVERRIDE_TYPES")
|
||||
@ -338,7 +343,8 @@ impl UnifiedBoxRegistry {
|
||||
Err(e) => {
|
||||
// FileBox special case: handle fallback based on mode
|
||||
if name == "FileBox" {
|
||||
if let Some(fallback_result) = self.try_filebox_fallback(name, args, &e) {
|
||||
if let Some(fallback_result) = self.try_filebox_fallback(name, args, &e)
|
||||
{
|
||||
return fallback_result;
|
||||
}
|
||||
}
|
||||
@ -386,14 +392,23 @@ impl UnifiedBoxRegistry {
|
||||
match mode {
|
||||
provider_registry::FileBoxMode::PluginOnly => {
|
||||
// Fail-Fast: return the original error immediately
|
||||
eprintln!("[FileBox] Plugin creation failed in plugin-only mode: {}", original_error);
|
||||
eprintln!(
|
||||
"[FileBox] Plugin creation failed in plugin-only mode: {}",
|
||||
original_error
|
||||
);
|
||||
Some(Err(RuntimeError::InvalidOperation {
|
||||
message: format!("FileBox plugin creation failed (plugin-only mode): {}", original_error),
|
||||
message: format!(
|
||||
"FileBox plugin creation failed (plugin-only mode): {}",
|
||||
original_error
|
||||
),
|
||||
}))
|
||||
}
|
||||
provider_registry::FileBoxMode::Auto => {
|
||||
// Auto mode: try fallback to builtin/core-ro
|
||||
eprintln!("[FileBox] Plugin creation failed, falling back to builtin/core-ro: {}", original_error);
|
||||
eprintln!(
|
||||
"[FileBox] Plugin creation failed, falling back to builtin/core-ro: {}",
|
||||
original_error
|
||||
);
|
||||
|
||||
// Try builtin factory if available
|
||||
for factory in &self.factories {
|
||||
|
||||
Reference in New Issue
Block a user