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:
@ -3,8 +3,8 @@
|
||||
use crate::bid::{BidError, BidResult};
|
||||
use crate::box_trait::NyashBox;
|
||||
use crate::runtime::plugin_loader_v2::enabled::PluginLoaderV2;
|
||||
use std::sync::Arc;
|
||||
use std::env;
|
||||
use std::sync::Arc;
|
||||
|
||||
fn dbg_on() -> bool {
|
||||
std::env::var("PLUGIN_DEBUG").is_ok()
|
||||
@ -49,25 +49,36 @@ impl PluginLoaderV2 {
|
||||
}
|
||||
|
||||
// Optional C-core probe (design): emit tag and optionally call into c-core when enabled
|
||||
if env::var("HAKO_C_CORE_ENABLE").ok().as_deref() == Some("1") && should_route_ccore(box_type, method_name) {
|
||||
if env::var("HAKO_C_CORE_ENABLE").ok().as_deref() == Some("1")
|
||||
&& should_route_ccore(box_type, method_name)
|
||||
{
|
||||
eprintln!("[c-core:invoke:{}.{}]", box_type, method_name);
|
||||
#[cfg(feature = "c-core")]
|
||||
{
|
||||
// MapBox.set: call C-core stub (no-op) with available info
|
||||
if box_type == "MapBox" && method_name == "set" {
|
||||
let key = args.get(0).map(|b| b.to_string_box().value).unwrap_or_default();
|
||||
let val = args.get(1).map(|b| b.to_string_box().value).unwrap_or_default();
|
||||
let key = args
|
||||
.get(0)
|
||||
.map(|b| b.to_string_box().value)
|
||||
.unwrap_or_default();
|
||||
let val = args
|
||||
.get(1)
|
||||
.map(|b| b.to_string_box().value)
|
||||
.unwrap_or_default();
|
||||
let _ = nyash_c_core::core_map_set(type_id as i32, instance_id, &key, &val);
|
||||
} else if box_type == "ArrayBox" && method_name == "push" {
|
||||
// For design stage, pass 0 (we don't rely on c-core result)
|
||||
let _ = nyash_c_core::core_array_push(type_id as i32, instance_id, 0);
|
||||
} else if box_type == "ArrayBox" && method_name == "get" {
|
||||
let _ = nyash_c_core::core_array_get(type_id as i32, instance_id, 0);
|
||||
} else if box_type == "ArrayBox" && (method_name == "size" || method_name == "len" || method_name == "length") {
|
||||
} else if box_type == "ArrayBox"
|
||||
&& (method_name == "size" || method_name == "len" || method_name == "length")
|
||||
{
|
||||
let _ = nyash_c_core::core_array_len(type_id as i32, instance_id);
|
||||
} else {
|
||||
// Generic probe
|
||||
let _ = nyash_c_core::core_probe_invoke(box_type, method_name, args.len() as i32);
|
||||
let _ =
|
||||
nyash_c_core::core_probe_invoke(box_type, method_name, args.len() as i32);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -120,8 +131,12 @@ fn should_trace_tlv_shim(box_type: &str, method: &str) -> bool {
|
||||
let key = format!("{}.{}", box_type, method);
|
||||
for pat in flt.split(',') {
|
||||
let p = pat.trim();
|
||||
if p.is_empty() { continue; }
|
||||
if p == method || p == key { return true; }
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if p == method || p == key {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -135,8 +150,12 @@ fn should_trace_cwrap(box_type: &str, method: &str) -> bool {
|
||||
let key = format!("{}.{}", box_type, method);
|
||||
for pat in flt.split(',') {
|
||||
let p = pat.trim();
|
||||
if p.is_empty() { continue; }
|
||||
if p == method || p == key { return true; }
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if p == method || p == key {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -149,8 +168,12 @@ fn should_trace_call(target: &str, method: &str) -> bool {
|
||||
let key = format!("{}.{}", target, method);
|
||||
for pat in flt.split(',') {
|
||||
let p = pat.trim();
|
||||
if p.is_empty() { continue; }
|
||||
if p == method || p == key { return true; }
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if p == method || p == key {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -162,8 +185,12 @@ fn should_route_ccore(box_type: &str, method: &str) -> bool {
|
||||
let key = format!("{}.{}", box_type, method);
|
||||
for pat in flt.split(',') {
|
||||
let p = pat.trim();
|
||||
if p.is_empty() { continue; }
|
||||
if p == method || p == key { return true; }
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if p == method || p == key {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -203,9 +230,7 @@ fn resolve_type_info(loader: &PluginLoaderV2, box_type: &str) -> BidResult<(Stri
|
||||
|
||||
/// Decode TLV result into a NyashBox
|
||||
fn decode_tlv_result(box_type: &str, data: &[u8]) -> BidResult<Option<Box<dyn NyashBox>>> {
|
||||
if let Some((tag, _sz, payload)) =
|
||||
crate::runtime::plugin_ffi_common::decode::tlv_first(data)
|
||||
{
|
||||
if let Some((tag, _sz, payload)) = crate::runtime::plugin_ffi_common::decode::tlv_first(data) {
|
||||
let bx: Box<dyn NyashBox> = match tag {
|
||||
1 => Box::new(crate::box_trait::BoolBox::new(
|
||||
crate::runtime::plugin_ffi_common::decode::bool(payload).unwrap_or(false),
|
||||
|
||||
Reference in New Issue
Block a user