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

chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更

Browse Source 
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:
nyash-codex
2025-11-21 06:25:17 +09:00
parent baf028a94f
commit f9d100ce01
366 changed files with 14322 additions and 5236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/box_factory/builtin_impls/array_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.4: Delete this file to remove builtin ArrayBox support
*/
use crate::box_trait::NyashBox;
use crate::box_factory::RuntimeError;
use crate::box_trait::NyashBox;
/// Create builtin ArrayBox instance
///
@ -31,4 +31,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<ArrayBox>().is_some());
}
}
}

4
src/box_factory/builtin_impls/bool_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.3: Delete this file to remove builtin BoolBox support
*/
use crate::box_trait::{NyashBox, BoolBox};
use crate::box_factory::RuntimeError;
use crate::box_trait::{BoolBox, NyashBox};
/// Create builtin BoolBox instance
///
@ -35,4 +35,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<BoolBox>().is_some());
}
}
}

4
src/box_factory/builtin_impls/console_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.6: Delete this file to remove builtin ConsoleBox support (LAST)
*/
use crate::box_trait::NyashBox;
use crate::box_factory::RuntimeError;
use crate::box_trait::NyashBox;
/// Create builtin ConsoleBox instance
///
@ -32,4 +32,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<ConsoleBox>().is_some());
}
}
}

6
src/box_factory/builtin_impls/file_box.rs
View File

@ -7,8 +7,8 @@
* 🎯 Core-ro mode: This is used directly
*/
use crate::box_trait::NyashBox;
use crate::box_factory::RuntimeError;
use crate::box_trait::NyashBox;
use crate::boxes::file::core_ro::CoreRoFileIo;
use crate::boxes::file::FileBox;
use std::sync::Arc;
@ -28,9 +28,7 @@ pub fn create(_args: &[Box<dyn NyashBox>]) -> Result<Box<dyn NyashBox>, RuntimeE
});
}
eprintln!(
"[FileBox] Using builtin core-ro fallback implementation"
);
eprintln!("[FileBox] Using builtin core-ro fallback implementation");
// Create FileBox with core-ro provider directly
// Don't rely on global provider_lock which may not be initialized

4
src/box_factory/builtin_impls/integer_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.2: Delete this file to remove builtin IntegerBox support
*/
use crate::box_trait::{NyashBox, IntegerBox};
use crate::box_factory::RuntimeError;
use crate::box_trait::{IntegerBox, NyashBox};
/// Create builtin IntegerBox instance
///
@ -35,4 +35,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<IntegerBox>().is_some());
}
}
}

4
src/box_factory/builtin_impls/map_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.5: Delete this file to remove builtin MapBox support
*/
use crate::box_trait::NyashBox;
use crate::box_factory::RuntimeError;
use crate::box_trait::NyashBox;
/// Create builtin MapBox instance
///
@ -31,4 +31,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<MapBox>().is_some());
}
}
}

16
src/box_factory/builtin_impls/mod.rs
View File

@ -15,15 +15,15 @@
*/
// Phase 2.1-2.6: Delete these modules one by one
pub mod string_box; // DELETE: Phase 2.1 (plugin ready)
pub mod integer_box; // DELETE: Phase 2.2 (plugin ready)
pub mod bool_box; // DELETE: Phase 2.3 (plugin needed)
pub mod array_box; // DELETE: Phase 2.4 (plugin check)
pub mod map_box; // DELETE: Phase 2.5 (plugin check)
pub mod console_box; // DELETE: Phase 2.6 (LAST - critical for logging)
pub mod array_box; // DELETE: Phase 2.4 (plugin check)
pub mod bool_box; // DELETE: Phase 2.3 (plugin needed)
pub mod console_box;
pub mod integer_box; // DELETE: Phase 2.2 (plugin ready)
pub mod map_box; // DELETE: Phase 2.5 (plugin check)
pub mod string_box; // DELETE: Phase 2.1 (plugin ready) // DELETE: Phase 2.6 (LAST - critical for logging)
// Fallback support (Phase 15.5: Fallback Guarantee)
pub mod file_box; // FALLBACK: Core-ro FileBox for auto/core-ro modes
pub mod file_box; // FALLBACK: Core-ro FileBox for auto/core-ro modes
// Special consideration
pub mod null_box; // DISCUSS: Keep as primitive?
pub mod null_box; // DISCUSS: Keep as primitive?

4
src/box_factory/builtin_impls/null_box.rs
View File

@ -5,8 +5,8 @@
* 📋 Discussion needed: Is null a language primitive or plugin concern?
*/
use crate::box_trait::NyashBox;
use crate::box_factory::RuntimeError;
use crate::box_trait::NyashBox;
/// Create builtin NullBox instance
///
@ -26,4 +26,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<NullBox>().is_some());
}
}
}

4
src/box_factory/builtin_impls/string_box.rs
View File

@ -5,8 +5,8 @@
* 🎯 Phase 2.1: Delete this file to remove builtin StringBox support
*/
use crate::box_trait::{NyashBox, StringBox};
use crate::box_factory::RuntimeError;
use crate::box_trait::{NyashBox, StringBox};
/// Create builtin StringBox instance
///
@ -35,4 +35,4 @@ mod tests {
let result = create(&[]).unwrap();
assert!(result.as_any().downcast_ref::<StringBox>().is_some());
}
}
}

47
src/box_factory/mod.rs
View File

@ -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 {

17
src/box_factory/plugin.rs
View File

@ -6,8 +6,8 @@
*/
use super::BoxFactory;
use crate::box_trait::NyashBox;
use super::RuntimeError;
use crate::box_trait::NyashBox;
use crate::runtime::get_global_registry;
/// Factory for plugin-based Box types
@ -29,11 +29,20 @@ impl BoxFactory for PluginBoxFactory {
) -> Result<Box<dyn NyashBox>, RuntimeError> {
// Check if plugins are disabled
let plugins_disabled = std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref() == Some("1");
eprintln!("[PluginBoxFactory] NYASH_DISABLE_PLUGINS={} for {}",
std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref().unwrap_or("not set"), name);
eprintln!(
"[PluginBoxFactory] NYASH_DISABLE_PLUGINS={} for {}",
std::env::var("NYASH_DISABLE_PLUGINS")
.ok()
.as_deref()
.unwrap_or("not set"),
name
);
if plugins_disabled {
return Err(RuntimeError::InvalidOperation {
message: format!("Plugins disabled (NYASH_DISABLE_PLUGINS=1), cannot create {}", name),
message: format!(
"Plugins disabled (NYASH_DISABLE_PLUGINS=1), cannot create {}",
name
),
});
}

2
src/box_factory/user_defined.rs
View File

@ -6,9 +6,9 @@
*/
use super::BoxFactory;
use super::{RuntimeError, SharedState};
use crate::box_trait::NyashBox;
use crate::instance_v2::InstanceBox;
use super::{RuntimeError, SharedState};
/// Factory for user-defined Box types
pub struct UserDefinedBoxFactory {