301b1d212a
## 🎉 Phase 21.2完全達成 ### ✅ 実装完了 - VM static box 永続化（singleton infrastructure） - devブリッジ完全撤去（adapter_dev.rs削除、by-name dispatch削除） - .hako正規実装（MirCallV1Handler, AbiAdapterRegistry等） - text-merge経路完全動作 - 全phase2120 adapter reps PASS（7テスト） ### 🐛 バグ修正 1. strip_local_decl修正 - トップレベルのみlocal削除、メソッド内は保持 - src/runner/modes/common_util/hako.rs:29 2. static box フィールド永続化 - MirInterpreter singleton storage実装 - me parameter binding修正（1:1マッピング） - getField/setField string→singleton解決 - src/backend/mir_interpreter/{mod,exec,handlers/boxes_object_fields}.rs 3. Map.len alias rc=0修正 - [map/missing]パターン検出でnull扱い（4箇所） - lang/src/vm/boxes/mir_call_v1_handler.hako:91-93,131-133,151-153,199-201 ### 📁 主要変更ファイル #### Rust（VM Runtime） - src/backend/mir_interpreter/mod.rs - static box singleton storage - src/backend/mir_interpreter/exec.rs - parameter binding fix - src/backend/mir_interpreter/handlers/boxes_object_fields.rs - singleton resolution - src/backend/mir_interpreter/handlers/calls.rs - dev bridge removal - src/backend/mir_interpreter/utils/mod.rs - adapter_dev module removal - src/backend/mir_interpreter/utils/adapter_dev.rs - DELETED (7555 bytes) - src/runner/modes/vm.rs - static box declaration collection - src/runner/modes/common_util/hako.rs - strip_local_decl fix - src/instance_v2.rs - Clone implementation #### Hako (.hako実装) - lang/src/vm/boxes/mir_call_v1_handler.hako - [map/missing] detection - lang/src/vm/boxes/abi_adapter_registry.hako - NEW (adapter registry) - lang/src/vm/helpers/method_alias_policy.hako - method alias support #### テスト - tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_*.sh - 7 new tests ### 🎯 テスト結果 ``` ✅ s3_vm_adapter_array_len_canary_vm.sh ✅ s3_vm_adapter_array_len_per_recv_canary_vm.sh ✅ s3_vm_adapter_array_length_alias_canary_vm.sh ✅ s3_vm_adapter_array_size_alias_canary_vm.sh ✅ s3_vm_adapter_map_len_alias_state_canary_vm.sh ✅ s3_vm_adapter_map_length_alias_state_canary_vm.sh ✅ s3_vm_adapter_map_size_struct_canary_vm.sh ``` 環境フラグ: HAKO_ABI_ADAPTER=1 HAKO_ABI_ADAPTER_DEV=0 ### 🏆 設計品質 - ✅ ハードコード禁止（AGENTS.md 5.1）完全準拠 - ✅ 構造的・一般化設計（特定Box名のif分岐なし） - ✅ 後方互換性保持（既存コード破壊ゼロ） - ✅ text-merge経路（.hako依存関係正しくマージ） 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
69 lines
2.4 KiB
C
69 lines
2.4 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "hako_json_v1.h"
|
|
|
|
// Reuse vendored yyjson under plugins/nyash-json-plugin/c/yyjson (passed via -I)
|
|
#include "yyjson.h"
|
|
|
|
static int set_err_owned(char** err_out, const char* msg) {
|
|
if (!err_out) return -1;
|
|
if (!msg) { *err_out = NULL; return -1; }
|
|
size_t n = strlen(msg);
|
|
char* p = (char*)malloc(n + 1);
|
|
if (!p) { *err_out = NULL; return -1; }
|
|
memcpy(p, msg, n + 1);
|
|
*err_out = p;
|
|
return -1;
|
|
}
|
|
|
|
int hako_json_v1_validate_file(const char* path, char** err_out) {
|
|
if (!path || !*path) return set_err_owned(err_out, "invalid json path");
|
|
yyjson_read_err rerr;
|
|
yyjson_doc* doc = yyjson_read_file(path, 0, NULL, &rerr);
|
|
if (!doc) {
|
|
char buf[128];
|
|
snprintf(buf, sizeof(buf), "json read error: %s (%ld)", rerr.msg ? rerr.msg : "unknown", (long)rerr.code);
|
|
return set_err_owned(err_out, buf);
|
|
}
|
|
yyjson_val* root = yyjson_doc_get_root(doc);
|
|
if (!yyjson_is_obj(root)) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "root is not object");
|
|
}
|
|
yyjson_val* schema = yyjson_obj_get(root, "schema_version");
|
|
if (!schema || !yyjson_is_str(schema)) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "missing schema_version");
|
|
}
|
|
yyjson_val* fns = yyjson_obj_get(root, "functions");
|
|
if (!fns || !yyjson_is_arr(fns) || yyjson_arr_size(fns) == 0) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "missing functions[]");
|
|
}
|
|
yyjson_val* fn0 = yyjson_arr_get_first(fns);
|
|
if (!fn0 || !yyjson_is_obj(fn0)) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "functions[0] not object");
|
|
}
|
|
yyjson_val* blocks = yyjson_obj_get(fn0, "blocks");
|
|
if (!blocks || !yyjson_is_arr(blocks) || yyjson_arr_size(blocks) == 0) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "missing blocks[]");
|
|
}
|
|
// Quick check first block has instructions
|
|
yyjson_val* b0 = yyjson_arr_get_first(blocks);
|
|
if (!b0 || !yyjson_is_obj(b0)) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "blocks[0] not object");
|
|
}
|
|
yyjson_val* insts = yyjson_obj_get(b0, "instructions");
|
|
if (!insts || !yyjson_is_arr(insts)) {
|
|
yyjson_doc_free(doc);
|
|
return set_err_owned(err_out, "missing instructions[]");
|
|
}
|
|
yyjson_doc_free(doc);
|
|
return 0;
|
|
}
|