301b1d212a
Phase 21.2 Complete: VM Adapter正規実装 + devブリッジ完全撤去
...
## 🎉 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 >
2025-11-07 19:32:44 +09:00
8d1e580ab4
Phase 6: Complete type conversion unification (21 sites, 33 lines)
...
Completed conversion_helpers.rs implementation across all handlers:
- load_as_box(): reg_load().to_nyash_box() unified
- load_args_as_boxes(): bulk conversion helper
Files updated (final):
- boxes.rs: 2 sites (-6 lines) ✅
- calls.rs: 5 sites (-10 lines) ✅
- boxes_plugin.rs: 1 site (-3 lines) ✅
- externals.rs: 3 sites (-4 lines) ✅
- boxes_array.rs: 4 sites (-4 lines) ✅
- boxes_map.rs: 6 sites (-6 lines) ✅
Total: 21 sites unified, -33 lines (manual patterns)
Helper: +137 lines (conversion_helpers.rs)
Net: +104 lines (improved maintainability)
Tests: Phase 21.0 PASS (2/2, 100%)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-07 00:26:07 +09:00
8488df58a8
Phase 6 WIP: Type conversion helpers (11 sites, 23 lines)
...
Added conversion_helpers.rs with unified type conversion:
- load_as_box() for reg_load().to_nyash_box()
- load_as_string() for reg_load().to_string()
- load_as_int/bool() for type-checked loads
- load_args_as_boxes/values() for bulk conversion
Files updated (partial):
- boxes.rs: 2 sites (-6 lines)
- calls.rs: 5 sites (-10 lines)
- boxes_plugin.rs: 1 site (-3 lines)
- externals.rs: 3 sites (-4 lines)
Next: boxes_array, boxes_map, boxes_object_fields, boxes_instance
Tests: Phase 21.0 PASS (2/2, 100%)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-07 00:21:42 +09:00
2429627d04
Phase 5: Complete destination pattern unification (28 sites, 53 lines)
...
Unified remaining destination write patterns with new helpers:
- write_string() for VMValue::String writes
- write_from_box() for VMValue::from_nyash_box() patterns
Files updated:
- boxes.rs: 8 sites unified (-14 lines)
- boxes_plugin.rs: 9 sites unified (-17 lines)
- boxes_object_fields.rs: 7 sites unified (-14 lines)
- boxes_instance.rs: 2 sites unified (-4 lines)
- calls.rs: 2 sites unified (-4 lines)
- destination_helpers.rs: +28 lines (new helpers)
Impact: 28 sites unified, net -25 lines, improved maintainability
Tests: Phase 21.0 PASS (2/2, 100%)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-07 00:13:12 +09:00
22b668927e
refactor: complete error message unification (Phase 3.5)
...
Migrate remaining 45 error generation patterns to unified helpers:
- calls.rs: 13 sites → 0
- extern_provider.rs: 9 sites → 0
- externals.rs: 5 sites → 0
- boxes_plugin.rs: 5 sites → 0
- boxes.rs: 5 sites → 0
- boxes_string.rs: 4 sites → 0
- boxes_instance.rs: 2 sites → 0
- mod.rs + boxes_array.rs: 2 sites → 0
Error patterns now 100% unified:
- All 80 InvalidInstruction sites use helpers (100%)
- Consistent error formatting across entire codebase
- Single source of truth for error messages
Code reduction:
- Phase 3.5: 50-70 lines saved
- Cumulative (Phase 1+2+3+3.5): 200-267 lines removed (6-8% handlers)
- Total patterns unified: 192 (destination 60 + args 52 + errors 80)
Benefits:
- 100% error message consistency achieved
- Easy to modify error formats globally
- Foundation for i18n support ready
- Improved maintainability and testability
Test results: ✓ Build successful, Phase 21.0 smoke tests passing
Related: Phase 21.0 refactoring milestone complete
Risk: Low (error messages only, behavior preserved)
2025-11-06 23:34:46 +09:00
0287020a5b
refactor: unify error message generation (Phase 3)
...
Add ErrorBuilder utility and migrate 35 error generation sites
Phase 3: Error Message Generation Unification
============================================
Infrastructure:
- Add src/backend/mir_interpreter/utils/error_helpers.rs (255 lines)
- Implement ErrorBuilder with 7 standardized error patterns
- Add MirInterpreter convenience methods (err_invalid, err_type_mismatch, etc.)
Migration Results:
- Total patterns migrated: 35 instances (80 → 45, 44% reduction)
- calls.rs: 37 → 13 patterns (65% reduction)
- extern_provider.rs: 20 → 9 patterns (55% reduction)
- Lines saved: 33 lines (1.0% of handlers)
Error Patterns Unified:
1. Invalid instruction errors → ErrorBuilder::invalid_instruction()
2. Type mismatch errors → ErrorBuilder::type_mismatch()
3. Argument count errors → ErrorBuilder::arg_count_mismatch()
4. Method not found → ErrorBuilder::method_not_found()
5. Unsupported operations → ErrorBuilder::unsupported_operation()
6. Context errors → ErrorBuilder::with_context()
7. Bounds errors → ErrorBuilder::out_of_bounds()
Benefits:
- Consistent error message formatting across all handlers
- Single point of change for error improvements
- Better IDE autocomplete support
- Easier future i18n integration
- Reduced code duplication
Cumulative Impact (Phase 1+2+3):
- Total lines saved: 150-187 lines (4.5-5.7% of handlers)
- Total patterns unified: 124 instances
* Phase 1: 37 destination patterns
* Phase 2: 52 argument validation patterns
* Phase 3: 35 error generation patterns
Remaining Work:
- 45 error patterns still to migrate (estimated 50-80 lines)
- Complex cases requiring manual review
Testing:
- Build: ✅ 0 errors, 0 new warnings
- Smoke tests: ⚠️ 8/9 passed (1 timeout unrelated)
- Core functionality: ✅ Verified
Related: Phase 21.0 MIR Interpreter refactoring
Risk: Low (error messages only, behavior preserved)
Impact: High (maintainability, consistency, i18n-ready)
Co-authored-by: Claude Code <claude@anthropic.com >
2025-11-06 23:18:10 +09:00
edf4513b5a
refactor: complete MIR interpreter utility migration (Phase 2)
...
Migrate remaining argument validation and destination write patterns
to utility helpers introduced in Phase 1.
Changes:
- boxes_map.rs: 135 → 123 lines (-12)
* 6 arg validations → validate_args_exact()
* 7 destination writes → write_result()
- externals.rs: 219 → 206 lines (-13)
* 12 destination patterns unified
* Simplified env/future/modules handling
- boxes_string.rs: 209 → 197 lines (-12)
* 4 arg validations + 4 destinations unified
* Methods: replace, contains, lastIndexOf, concat, etc.
- boxes_array.rs: 64 lines (3 validations migrated)
* Methods: push, get, set
- boxes_object_fields.rs: 400 → 394 lines (-6)
* 2 arg validations (getField, setField)
Pattern Elimination:
- Argument validation: 15 → 0 (100% eliminated)
- Destination writes: 51 → 28 (45% eliminated)
Code Reduction:
- Phase 2: 43 lines removed (1.3%)
- Cumulative: 117-154 lines removed (3.5-4.6% of handlers/)
Test Results:
- Build: ✅ SUCCESS (no new warnings)
- MapBox: ✅ 37/37 passed
- StringBox: ✅ 30/30 passed
- ArrayBox: ⚠️ 13/14 (1 pre-existing failure)
Benefits:
- Unified error messages across all handlers
- Single source of truth for validation logic
- Easier maintenance and future refactoring
- Consistent behavior throughout codebase
Related: Phase 21.0 refactoring (DUPLICATION_ANALYSIS_REPORT.md)
Risk: Low (pure refactoring, behavior preserved)
2025-11-06 22:59:47 +09:00
8d179e9499
refactor: add MIR interpreter utility helpers (Phase 1)
...
- Add destination write helpers (write_box_result, write_void, write_result)
- Add argument validation helpers (validate_args_exact/range/min)
- Add receiver conversion helper (convert_to_box)
- Update handlers to use new helpers
Reduces code duplication:
- Destination patterns: 37 call sites converted
- Each replacement saves 2-3 lines (74-111 lines saved)
- Helper infrastructure: 178 lines added
- Net improvement: Reduced duplication + better maintainability
Impact:
- Build: ✓ SUCCESS (0 errors, 146 warnings)
- Tests: ✓ 8/9 smoke tests PASS
- Functionality: ✓ PRESERVED (no behavior changes)
Files created:
- src/backend/mir_interpreter/utils/mod.rs
- src/backend/mir_interpreter/utils/destination_helpers.rs
- src/backend/mir_interpreter/utils/arg_validation.rs
- src/backend/mir_interpreter/utils/receiver_helpers.rs
Files modified: 15 handler files
- arithmetic.rs, boxes.rs, boxes_array.rs, boxes_instance.rs
- boxes_map.rs, boxes_object_fields.rs, boxes_plugin.rs
- boxes_string.rs, calls.rs, extern_provider.rs, externals.rs
- memory.rs, misc.rs, mod.rs
Related: Phase 21.0 refactoring
Risk: Low (pure refactoring, no behavior change)
2025-11-06 22:50:46 +09:00
0455307418
refactor(phase-a): remove Cranelift/JIT backend legacy code (~373 lines)
...
Phase A cleanup - Safe deletions with zero risk:
## Deleted Files (6 files, 373 lines total)
1. Cranelift/JIT Backend (321 lines):
- src/runner/modes/cranelift.rs (45 lines)
- src/runner/modes/aot.rs (55 lines)
- src/runner/jit_direct.rs (152 lines)
- src/tests/core13_smoke_jit.rs (42 lines)
- src/tests/core13_smoke_jit_map.rs (27 lines)
2. Legacy MIR Builder (52 lines):
- src/mir/builder/exprs_legacy.rs
- Functionality inlined into exprs.rs (control flow constructs)
## Module Reference Cleanup
- src/backend/mod.rs: Removed cranelift feature gate exports
- src/runner/mod.rs: Removed jit_direct module reference
- src/runner/modes/mod.rs: Removed aot module reference
- src/mir/builder.rs: Removed exprs_legacy module
## Impact Analysis
- Build: Success (cargo build --release)
- Tests: All passing
- Risk Level: None (feature already archived, code unused)
- Related: Phase 15 JIT archival (archive/jit-cranelift/)
## BID Copilot Status
- Already removed in previous cleanup
- Not part of this commit
Total Reduction: 373 lines (~0.4% of codebase)
Next: Phase B - Dead code investigation
Related: #phase-21.0-cleanup
Part of: Legacy Code Cleanup Initiative
2025-11-06 22:34:18 +09:00
96ea3892af
phase-20.45: PRIMARY no-fallback reps + MIR v0 shape fixes
...
- Fix MIR v0 shape in lowers: functions[] + name="main" + blocks.id
* lower_return_int_box.hako
* lower_return_binop_box.hako
- runner_min: adopt LowerReturnBinOpBox before ReturnInt
- Add PRIMARY no-fallback canaries (all PASS):
* return-binop / array-size / load-store / return-logical (OR)
- Fix phase2043 runner_min canary alias (Runner -> BuilderRunnerMinBox)
- Update docs: phase-20.45 README (PRIMARY reps), CURRENT_TASK progress
Ancillary: keep builder/provider/canary files in sync; no unrelated behavior changes.
2025-11-05 18:57:03 +09:00
30aa39f50b
hv1 verify: add direct route (env JSON) and clean inline path; fix v1 phi incoming order; make test_runner use hv1 direct; add phase2037 phi canaries; load modules.workspace exports for alias; update docs (phase-20.38, source extensions) and CURRENT_TASK
2025-11-04 16:33:04 +09:00
06a729ff40
vm(hako): add v1 reader/dispatcher (flagged), commonize mir_call handler, share block scan; smokes: add v1 hakovm canary; docs: 20.37/20.38 plans, OOB policy; runner: v1 hakovm toggle; include SKIP summary
2025-11-03 23:21:48 +09:00
a4f30ae827
Phase 20.34: expand MirBuilder internal library with comprehensive lowering boxes; add pattern registry and program scanning infrastructure; implement internal lowerers for if/loop/return patterns; add dev tools and comprehensive canary tests; update VM boxes and host providers for internal delegation; wire phase2034 test suite with 30+ canary scripts covering internal lowering scenarios
...
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
2025-11-03 16:09:19 +09:00
dd6876e1c6
Phase 20.12b: quick green + structural cleanup
...
- Deprecations: add warn-once for nyash.toml (runtime::deprecations); apply in plugin loader v2 (singletons/method_resolver)
- Child env + runner hygiene: unify Stage‑3/quiet/disable-fallback env in test/runner; expand LLVM noise filters
- Docs/branding: prefer and hako.toml in README.md/README.ja.md and smokes README
- VM: implement Map.clear in MIR interpreter (boxes_map)
- Stage‑B: gate bundle/alias/require smokes behind SMOKES_ENABLE_STAGEB; fix include cwd and resolve() call even for require-only cases
- Core‑Direct: gate rc boundary canary behind SMOKES_ENABLE_CORE_DIRECT
- Smokes: inject Stage‑3 and disable selfhost fallback for LLVM runs; filter using/* logs
- Quick profile: 168/168 PASS locally
This commit accelerates Phase 20.33 (80/20) by stabilizing quick suite, reducing noise, and gating heavy/experimental paths for speed.
2025-11-02 17:50:06 +09:00
a1d5b82683
runner: introduce CoreExecutor box for JSON→exec; wire Gate‑C pipe to CoreExecutor. Stage‑B bundling: duplicate name Fail‑Fast + mix canary; add Core Map/String positive smokes; add Gate‑C budget opt‑in canary; docs: Exit Code Policy; apply child_env in PyVM common util.
2025-11-02 15:43:43 +09:00
110b4f3321
P0-1: Map bad-key tags for get/set/delete + smokes; String substring clamp smoke; P0-2: Bridge no‑op(Method) + Gate‑C invalid header smokes; P1: v1 bridge Closure captures appended to argv
2025-11-02 13:29:27 +09:00
1a5b269f8d
Bridge canonicalize: add compare/branch/jump diff tests; Map field bad-key stable tag with smoke; Update smokes README with diff canary policy
2025-11-02 12:00:06 +09:00
c81dc20d5c
Bridge canonicalize: add PhiInst.lower_phi and LLVMConstInstructionBox.lower_const diff tests; ArrayBox.pop empty strict tag [array/empty/pop] + smoke; VM README: document [map/missing] and [array/empty/pop] tags
2025-11-02 11:47:58 +09:00
484bea946d
VM: PHI strict default-ON + loop-header PHI fix; add VM step budget; StringBox.lastIndexOf; docs + strict smoke
...
- PHI strict: default ON, disable via HAKO_VM_PHI_STRICT=0 (alias NYASH_VM_PHI_STRICT=0)
- LoopForm: insert initial header PHI (preheader input) and rebind vars before condition; seal updates PHI inputs; avoid duplicate PHIs by replace
- MIR interpreter: add HAKO_VM_MAX_STEPS (alias NYASH_VM_MAX_STEPS) fail-fast budget to prevent infinite loops
- StringBox.lastIndexOf implemented (rfind, returns -1 when not found) in VM handlers
- Smokes: add strict/core/vm_phi_strict_smoke.sh (opt-in); quick remains green 120/120
- Docs: lang/src/vm/README.md and CURRENT_TASK.md updated with PHI strict policy and step budget
2025-11-02 11:01:03 +09:00
66b2a115ae
fix(vm): implement StringBox.lastIndexOf + PHI bug fix + Stage-B compiler完全動作 🎉
...
## 🎯 主要修正
### 1️⃣ StringBox.lastIndexOf実装 (Stage-B compiler blocker解消)
- **問題**: `lang/src/compiler/parser/parser_box.hako:85`で`lastIndexOf`使用も未実装
- **修正**: `src/backend/mir_interpreter/handlers/boxes_string.rs:51-60`に追加
- **実装**: `rfind()`で最後の出現位置を検索、-1でnot found表現
### 2️⃣ VM SSA/PHI bug完全修正 (ループ内メソッド呼び出し)
- **原因**: メソッド内ループ×外側ループ呼び出しでPHI生成失敗
- **修正箇所**:
- `src/mir/loop_builder.rs`: Exit PHI生成実装
- `src/mir/phi_core/loop_phi.rs`: PHI incoming修正
- `src/mir/phi_core/common.rs`: ユーティリティ追加
### 3️⃣ カナリアテスト追加
- **新規**: `tools/smokes/v2/profiles/quick/core/vm_nested_loop_method_call.sh`
- **構成**: Level 0/5b/5a/5 (段階的バグ検出)
- **結果**: 全テストPASS、Level 5で`[SUCCESS] VM SSA/PHI bug FIXED!`表示
### 4️⃣ using連鎖解決修正
- **問題**: `using sh_core`が子モジュールに伝播しない
- **修正**: 6ファイルに明示的`using`追加
- compiler_stageb.hako, parser_box.hako
- parser_stmt_box.hako, parser_control_box.hako
- parser_exception_box.hako, parser_expr_box.hako
### 5️⃣ ParserBoxワークアラウンド
- **問題**: `skip_ws()`メソッド呼び出しでVMバグ発生
- **対応**: 3箇所でインライン化(PHI修正までの暫定対応)
## 🎉 動作確認
```bash
# Stage-B compiler完全動作!
$ bash /tmp/run_stageb.sh
{"version":0,"kind":"Program","body":[{"type":"Return","expr":{"type":"Int","value":42}}]}
# カナリアテスト全PASS
$ bash tools/smokes/v2/profiles/quick/core/vm_nested_loop_method_call.sh
[PASS] level0_simple_loop (.008s)
[PASS] level5b_inline_nested_loop (.007s)
[PASS] level5a_method_no_loop (.007s)
[SUCCESS] Level 5: VM SSA/PHI bug FIXED!
[PASS] level5_method_with_loop (VM BUG canary) (.008s)
```
## 🏆 技術的ハイライト
1. **最小再現**: Level 0→5bの段階的テストでバグパターン完全特定
2. **Task先生調査**: 表面エラーから真因(lastIndexOf未実装)発見
3. **適切実装**: `boxes_string.rs`のStringBox専用ハンドラに追加
4. **完全検証**: Stage-B compilerでJSON出力成功を実証
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-02 10:58:09 +09:00
25b6bd3ae1
Fix VM: string handler no longer hijacks length() on non-strings; ArrayBox.length returns correct values (fixes json_lint loop). Add string-literal reader init guard earlier
2025-11-01 19:26:49 +09:00
47bd2d2ee2
Gate‑C(Core) OOB strict fail‑fast; String VM handler normalization; JSON lint Stage‑B root fixes via scanner field boxing and BinOp operand slotify; docs + smokes update
2025-11-01 18:45:26 +09:00
83db6a715c
refactor(vm): Phase 5 - Call Resolution extraction (49行削減)
...
【目的】
execute_legacy_call関数の肥大化解消、保守性向上
【実装内容】
1. call_resolution.rsの新規作成(87行)
- resolve_function_name() ヘルパー関数
- unique-tail matching algorithm実装
- same-box preference機能
2. calls.rs から重複ロジック削除(65行→14行)
- 関数名解決処理を call_resolution::resolve_function_name() に置き換え
- 51行削減(65-14)
- 実質的には49行削減(モジュール宣言2行追加を考慮)
3. handlers/mod.rs にモジュール宣言追加
- mod call_resolution; 宣言
【技術的改善】
- Single Source of Truth確立
- 関数名解決アルゴリズムが1箇所に集約
- 将来の修正・拡張が容易に
- 解決戦略の明確化
1. Fast path: exact match
2. Normalize with arity: "base/N"
3. Unique-tail matching: ".method/N"
4. Same-box preference: 現在の関数のbox優先
5. Deterministic fallback: ソート後の最初の候補
【テスト】
✅ ビルド成功(0 errors)
✅ userbox_static_call_vm: PASS
✅ userbox_method_arity_vm: PASS
✅ userbox_using_package_vm: PASS
✅ 全6テストPASS(quick/userbox_*)
【累計削減】
3,775行(Phase 1-4+8)+ 49行(Phase 5)= 3,824行削減
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-01 13:59:12 +09:00
167d33ed9e
refactor(vm): Phase 8 - Debug Trace Macro統一化(12行削減)
...
trace_dispatch!マクロで6箇所のVM_TRACEパターンを統一
実装内容:
- mod.rsにtrace_dispatch!マクロ定義
- boxes.rs: 6箇所の3行if文→1行マクロ呼び出し
- 削減: 18行→6行(12行削減)
対象箇所:
- object_fields handler trace
- instance_box handler trace
- string_box handler trace
- array_box handler trace
- map_box handler trace
- fallback(length=0) handler trace
効果:
- 保守性向上: trace条件の一元管理
- 可読性向上: 冗長なif文→簡潔なマクロ
- 一貫性向上: 全handler統一フォーマット
テスト: ビルド成功(0エラー、87警告)
2025-11-01 13:46:34 +09:00
9be50f0a0c
refactor(vm): Phase 4 - Void Guard統一化(重複削減)
...
boxes_void_guards.rs新規作成で28行の重複を排除
実装内容:
- handle_void_method()ヘルパー関数作成
- 7種類のメソッド(is_eof/length/substring/push/get_position/get_line/get_column)統一
- boxes.rs: 30行→18行(12行削減)
- 重複ブロック2箇所→シングルソース化
効果:
- 保守性向上: 単一の真実の源(Single Source of Truth)
- 可読性向上: 大きなmatchブロック→簡潔なヘルパー呼び出し
- バグ修正容易化: 1箇所修正で全体に反映
テスト: Void.is_eof(), Void.length()正常動作確認
2025-11-01 13:41:43 +09:00
6a452b2dca
fix(mir): PHI検証panic修正 - update_cfg()を検証前に呼び出し
...
A案実装: debug_verify_phi_inputs呼び出し前にCFG predecessorを更新
修正箇所(7箇所):
- src/mir/builder/phi.rs:50, 73, 132, 143
- src/mir/builder/ops.rs:273, 328, 351
根本原因:
- Branch/Jump命令でsuccessorは即座に更新
- predecessorはupdate_cfg()で遅延再構築
- PHI検証が先に実行されてpredecessor未更新でpanic
解決策:
- 各debug_verify_phi_inputs呼び出し前に
if let Some(func) = self.current_function.as_mut() {
func.update_cfg();
}
を挿入してCFGを同期
影響: if/else文、論理演算子(&&/||)のPHI生成が正常動作
2025-11-01 13:28:56 +09:00
367066376a
refactor(handlers): extract boxes_plugin module (Phase 2-3) - Phase 2 complete!
...
Split handlers/boxes.rs (497→322 lines, -175 lines, -35.2%)
Changes:
- Created boxes_plugin.rs (175 lines)
- Extracted invoke_plugin_box function
- Handles PluginBoxV2 method dispatch
- Includes fallback handlers for InstanceBox methods
- Special handling for ConsoleBox.readLine, VoidBox methods
- Updated mod.rs to declare new module
- Updated boxes.rs to redirect to new module
- Build verified: 0 errors, 85 warnings
Phase 2 Complete Summary:
- boxes.rs: 1008→322 lines (-686 lines, -68.1% reduction!)
- Split into 3 focused modules:
- boxes_object_fields.rs (359 lines) - getField/setField
- boxes_instance.rs (150 lines) - InstanceBox dispatch
- boxes_plugin.rs (175 lines) - Plugin dispatch
Overall Progress:
- Phase 1: Legacy deletion (2,997 lines)
- Phase 2-1: boxes_object_fields split (360 lines)
- Phase 2-2: boxes_instance split (151 lines)
- Phase 2-3: boxes_plugin split (175 lines)
- Total reduction: 3,683 lines deleted
Next: Phase 3 (builder_calls.rs split, ~142 lines)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-01 12:42:52 +09:00
232547baa3
refactor(handlers): extract boxes_instance module (Phase 2-2)
...
Split handlers/boxes.rs (648→497 lines, -151 lines, -23.3%)
Changes:
- Created boxes_instance.rs (150 lines)
- Extracted try_handle_instance_box function
- Handles InstanceBox method dispatch
- Supports Class.method/arity and ClassInstance.method/arity
- Updated mod.rs to declare new module
- Updated boxes.rs to redirect to new module
- Build verified: 0 errors, 85 warnings
Progress:
- Phase 1: Legacy deletion (2,997 lines)
- Phase 2-1: boxes_object_fields split (360 lines)
- Phase 2-2: boxes_instance split (151 lines)
- Total reduction so far: 3,508 lines
Next: Phase 2-3 (boxes_plugin.rs, ~176 lines)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-01 12:38:48 +09:00
c8856e1a08
refactor(handlers): extract boxes_object_fields module (Phase 2-1)
...
Split handlers/boxes.rs (1008→648 lines, -360 lines, -35.7%)
Changes:
- Created boxes_object_fields.rs (359 lines)
- Extracted try_handle_object_fields function
- Handles getField/setField for InstanceBox
- Updated mod.rs to declare new module
- Updated boxes.rs to redirect to new module
- Build verified: 0 errors, 85 warnings
Progress:
- Phase 1: Legacy deletion (2,997 lines)
- Phase 2-1: boxes_object_fields split (360 lines)
- Total reduction so far: 3,357 lines
Next: Phase 2-2 (boxes_instance.rs), Phase 2-3 (boxes_plugin.rs)
🤖 Generated with [Claude Code](https://claude.com/claude-code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-11-01 12:32:38 +09:00
dd65cf7e4c
builder+vm: unify method calls via emit_unified_call; add RouterPolicy trace; finalize LocalSSA/BlockSchedule guards; docs + selfhost quickstart
...
- Unify standard method calls to emit_unified_call; route via RouterPolicy and apply rewrite::{special,known} at a single entry.\n- Stabilize emit-time invariants: LocalSSA finalize + BlockSchedule PHI→Copy→Call ordering; metadata propagation on copies.\n- Known rewrite default ON (userbox only, strict guards) with opt-out flag NYASH_REWRITE_KNOWN_DEFAULT=0.\n- Expand TypeAnnotation whitelist (is_digit_char/is_hex_digit_char/is_alpha_char/Map.has).\n- Docs: unified-method-resolution design note; Quick Reference normalization note; selfhosting/quickstart.\n- Tools: add tools/selfhost_smoke.sh (dev-only).\n- Keep behavior unchanged for Unknown/core/user-instance via BoxCall fallback; all tests green (quick/integration).
2025-09-28 20:38:09 +09:00
510f4cf523
builder/vm: stabilize json_lint_vm under unified calls
...
- Fix condition_fn resolution: Value call path + dev safety + stub injection
- VM bridge: handle Method::birth via BoxCall; ArrayBox push/get/length/set direct bridge
- Receiver safety: pin receiver in method_call_handlers to avoid undefined use across blocks
- Local vars: materialize on declaration (use init ValueId; void for uninit)
- Prefer legacy BoxCall for Array/Map/String/user boxes in emit_box_or_plugin_call (stability-first)
- Test runner: update LLVM hint to llvmlite harness (remove LLVM_SYS_180_PREFIX guidance)
- Docs/roadmap: update CURRENT_TASK with unified default-ON + guards
Note: NYASH_DEV_BIRTH_INJECT_BUILTINS=1 can re-enable builtin birth() injection during migration.
2025-09-28 12:19:49 +09:00
3768063b1e
vm/router: add DebugHub events for class-reroute and special-reroute (toString->stringify, equals fallback); zero-cost when disabled
2025-09-28 02:08:26 +09:00
34be7d2d79
vm/router: minimal special-method extension (equals/1); toString mapping kept
...
mir: add TypeCertainty to Callee::Method (diagnostic only); plumb through builder/JSON/printer; backends ignore behaviorally
using: confirm unified prelude resolver entry for all runner modes
docs: update Callee architecture with certainty; update call-instructions; CURRENT_TASK note
tests: quick 40/40 PASS; integration (LLVM) 17/17 PASS
2025-09-28 01:33:58 +09:00
8ea95c9d76
docs: add instance-dispatch & birth invariants; smokes probe policy; archive CURRENT_TASK and replace with concise plan; impl VM stringify(Void) safety; tighten heavy probes; enable rewrite default ON
2025-09-27 08:56:43 +09:00
cb236b7f5a
json(vm): fix birth dispatch; unify constructor naming (Box.birth/N); JsonNode factories return JsonNodeInstance; quick: enable heavy JSON with probe; builder: NYASH_BUILDER_DEBUG_LIMIT guard; json_query_min(core) harness; docs/tasks updated
2025-09-27 08:45:25 +09:00
cdf826cbe7
public: publish selfhost snapshot to public repo (SSOT using + AST merge + JSON VM fixes)
...
- SSOT using profiles (aliases/packages via nyash.toml), AST prelude merge
- Parser/member guards; Builder pin/PHI and instance→function rewrite (dev on)
- VM refactors (handlers split) and JSON roundtrip/nested stabilization
- CURRENT_TASK.md updated with scope and acceptance criteria
Notes: dev-only guards remain togglable via env; no default behavior changes for prod.
2025-09-26 14:34:42 +09:00
cf4b615afb
mir/vm: SSA pin+PHI + short-circuit; user-defined method calls → functions; entry single-pred PHIs; compare-operand pin; VM BoxCall fallback to InstanceBox methods; docs: update CURRENT_TASK (plan + acceptance)
...
- Lower And/Or to branch+PHI (RHS not evaluated)
- Always slotify compare operands (dominance safety)
- Insert single-predecessor PHIs at then/else/short-circuit entries
- pin_to_slot now logs (NYASH_PIN_TRACE) and participates in PHI
- Rewrite user-defined instance method calls to Box.method/Arity (builder)
- VM fallback: BoxCall on InstanceBox dispatches to lowered functions with 'me'+args
- Keep plugin/BoxCall path for core boxes (String/Array/Map)
- Add env-gated pre-pin for if/loop (NYASH_MIR_PREPIN)
- CURRENT_TASK: add SSA/userbox plan, debug steps, acceptance criteria
2025-09-26 05:28:20 +09:00
fd56b8049a
mir: implement proper short-circuit lowering (&&/||) via branch+phi; vm: add NYASH_VM_TRACE exec/phi logs and reg_load diagnostics; vm-fallback: minimal Void guards (push/get_position/line/column), MapBox.birth no-op; smokes: filter builtin Array/Map plugin notices; docs: CURRENT_TASK updated
2025-09-26 03:30:59 +09:00
85084664c2
docs+runner+parser: SSOT+AST using finalized (legacy text inlining removed); provider verify reads nyash.toml; preflight warn hook; method-body guard removed; CURRENT_TASK updated for next JSON work
2025-09-26 00:27:02 +09:00
d9f26d4549
feat: nyash.toml SSOT + using AST統合完了(12時間の戦い)
...
- nyash.tomlを唯一の真実(SSOT)として依存管理確立
- dev/ci/prodプロファイルによる段階的厳格化実装
- AST結合で宣言/式の曖昧性を根本解決
- Fail-Fast原則をCLAUDE.md/AGENTS.mdに明文化
- VM fallbackでもASTベース using有効化(NYASH_USING_AST=1)
- 静的メソッドの is_static=true 修正で解決安定化
- STATICブレークハック既定OFF化で堅牢性向上
🎉 usingシステム完全体への道筋確立!JSONライブラリ・Nyash VM開発が可能に
Co-Authored-By: Claude <noreply@anthropic.com >
2025-09-25 16:03:29 +09:00
824ca600ea
refactor: 大規模ファイル分割とプラグインリファクタリング
...
## 🎯 プラグイン整理
- ✅ **nyash-json-plugin**: プロバイダー抽象化、NodeRep統一
- ✅ **nyash-string-plugin**: TLVヘルパー整理
- ✅ **nyash-net-plugin**: HTTPヘルパー分離、ソケット管理改善
- ✅ **nyash-counter-plugin/fixture-plugin**: 基本構造整理
## 📂 mir_interpreter分割
- ✅ **mir_interpreter.rs → mir_interpreter/ディレクトリ**
- mod.rs: メイン構造体定義
- execution.rs: 実行エンジン
- memory.rs: メモリ管理
- instructions/: 命令別実装
## 🔧 その他の改善
- テストファイル群の最適化
- LLVMコンパイラのメイン関数整理
- 不要なインポート削除
1000行超のファイルを適切なモジュール構造に分割完了!
🤖 Generated with [Claude Code](https://claude.ai/code )
Co-Authored-By: Claude <noreply@anthropic.com >
2025-09-25 01:09:48 +09:00