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
8b6cbd8f70
chore: update docs/private submodule to latest
2025-11-06 17:36:22 +09:00
fc23497e1e
chore: add tmp/ to .gitignore to prevent large files
2025-11-06 17:33:41 +09:00
e326e787a4
release: v21.0.0 – Full Self‑Hosting (S1/S2/S3 complete)
...
- DoD met: S1/S2 determinism (const/compare/threeblock-collect), PRIMARY hv1 inline no-fallback, S3 (llvmlite+kernel) reps green
- Harness: v1→llvmlite direct, EXE links to libnyash_kernel.a
- Python LLVM builder fixes: cmp normalization, ret PHI synthesis, mir_call flat shape
- Using/alias polish (prod): modules-first; missing aliases added; duplicate using cleaned
- Docs: phase-21.0 COMPLETE; CurrentTask closed; release notes added
2025-11-06 16:59:34 +09:00
c40fdd95bc
phase: 21.0 bring-up — add phase2100 run_all, provider v1 minimal rep, v0 Core exec fix; docs and CURRENT_TASK updated
2025-11-06 15:50:14 +09:00
77d4fd72b3
phase: 20.49 COMPLETE; 20.50 Flow+String minimal reps; 20.51 selfhost v0/v1 minimal (Option A/B); hv1-inline binop/unop/copy; docs + run_all + CURRENT_TASK -> 21.0
2025-11-06 15:41:52 +09:00
2dc370223d
phase-20.46: add reps and adjust hv1 expectations
...
- hv1 inline: add array push→size (stateful, expect rc=1 currently)
- MirBuilder-prefer: add If(Int<Var) rep (rc=1)
- All new canaries PASS
2025-11-05 22:32:33 +09:00
27102f9a24
phase-20.46: hv1 inline reps (compare/branch, array.size)
...
- Add hv1_inline_compare_branch_rc_canary_vm.sh (expect rc=1)
- Add hv1_inline_array_size_rc_canary_vm.sh (expect rc=1; current hv1 stub semantics)
- All hv1 inline canaries PASS
2025-11-05 22:22:58 +09:00
233bc9eb14
phase-20.46: hv1 inline representative (const 42)
...
- Add phase2041/hv1_inline_const42_canary_vm.sh using HAKO_VERIFY_PRIMARY=hakovm direct route
2025-11-05 21:52:59 +09:00
3e5b122f67
phase-20.46: add second codegen llvmlite canary (const 42)
...
- tools/smokes/v2/profiles/quick/core/phase2044/codegen_provider_llvmlite_const42_canary_vm.sh
- Confirms provider returns .o path reliably (llvmlite)
2025-11-05 21:32:15 +09:00
5d41b62add
phase-20.46 kickoff: update CURRENT_TASK focus and next steps
...
- Switch CURRENT_TASK to Phase 20.46 (self-host E2E 2/2)
- Focus: PRIMARY completion + codegen reps + MirBuilder-prefer breadth + loop JsonFragBox subset
2025-11-05 21:29:00 +09:00
f6fe4f332d
phase-20.45: MirBuilder-prefer match canary
...
- Add mirbuilder_prefer_mirbuilder_match_core_exec_canary_vm.sh (Expect rc=42)
2025-11-05 21:27:39 +09:00
981a36dafc
phase-20.45: MirBuilder-prefer ternary canary
...
- Add mirbuilder_prefer_mirbuilder_ternary_core_exec_canary_vm.sh (Expect rc=42)
2025-11-05 21:26:12 +09:00
8a58bfb55e
phase-20.45: MirBuilder-prefer canary (If Int-Int)
...
- Add mirbuilder_prefer_mirbuilder_if_intint_core_exec_canary_vm.sh (Expect rc=1)
- v0 string-lower shape sweep stays green across phase2043/2044
2025-11-05 21:18:25 +09:00
261b03b8a4
phase-20.45: v0 shape sweep (string JSON) for internal lowers
...
- lower_if_compare_box.hako: switch to functions[]/name="main"/blocks.id
- MirBuilderBox string fallbacks (if/binop/ret-int): same v0 shape update
- All quick canaries (phase2043/2044) remain green
2025-11-05 21:16:47 +09:00
57ad6a13b4
phase-20.45: PRIMARY Return(Bool) support
...
- lower_return_bool_box.hako: emit MIR v0 as JSON string
- runner_min: adopt LowerReturnBoolBox
- add PRIMARY no-fallback canary: Return(Bool true) → rc=1
- phase2044 quick now 25/25 PASS
2025-11-05 21:11:17 +09:00
755bbb7742
phase-20.45: Logical(AND) PRIMARY fix
...
- lower_return_logical_box.hako: emit MIR v0 as JSON string (functions[]/main/blocks.id)
- runner_min: adopt lower.logical before binop/int
- lower_return_bool_box.hako: restrict to Return(expr=Bool) to avoid logical bleed
- add canaries: PRIMARY AND-only; update OR canary; all phase2044 quick PASS
2025-11-05 21:09:11 +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
0996090d6d
ssot(cf): bridge set_branch/set_jump/insert_phi adopted across expr/ternary/match/try_catch/loop; builder emission compare/branch/jump delegate to cf_common; add canaries (ternary/match); docs: note cf_common adoption
2025-11-04 21:33:09 +09:00
51bf7ff410
docs(20.39): add Next Steps and mark hv1 unify + string scanner fix DONE; loop count_param: accept swapped < / <= (cmp Gt/Ge); add canaries for swapped_lt/lte
2025-11-04 20:51:15 +09:00
44a5158a14
hv1: early-exit at main (no plugin init); tokenizer: Stage-3 single-quote + full escapes (\/ \b \f \' \r fix); builder: route BinOp via SSOT emit_binop_to_dst; hv1 verify canary route (builder→Core); docs: phase-20.39 updates
2025-11-04 20:46:43 +09:00
31ce798341
phase-20.39 step3 (partial): concat-safety in vm helpers – add StrCast, refactor MiniMap, ValueManager, MiniArray/MiniMap2, mir_call_v1_handler, extern provider/call; keep behavior; canaries PASS
2025-11-04 16:50:59 +09:00
ab81564174
phase-20.39 step1: introduce typed IR shadow in hv1 dispatcher; step2: remove hv1 include fallback from verify (direct route only); add IR types module export; docs+current_task updated
2025-11-04 16:45:01 +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
5a1bb549a7
vm(resolve): add text-based prelude merge for selfhost compilation
...
- Add merge_prelude_text() function for fast using system support
- Implement normalize_text_for_inline() for parser robustness
- Update selfhost.rs to use text-based merge when NYASH_USING_AST=1
- Add merge_prelude_text export to mod.rs
- Improves Phase 15 selfhost compilation speed and reliability
Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
2025-11-04 09:25:36 +09:00
70a98ae09b
vm(hako): dispatcher v1 flow scan (opt-in HAKO_V1_DISPATCHER_FLOW), extend extern_provider stubs, parity canary; share block scan used from Mini-VM; keep Core fallback for unsupported ops
2025-11-03 23:30:23 +09:00
3bda84b136
vm(hako): v1 dispatcher internal scan (opt-in), hook extern provider (flag), share block scan; add v1 phi adapter placeholder; runner: v1→hakovm primary with Core fallback; add canary for internal dispatcher
2025-11-03 23:27:36 +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
8827b8d416
Phase 20.34: wire Host providers via externs (env.mirbuilder.emit, env.codegen.emit_object); implement MirBuilder provider (Program→MIR JSON) and ny-llvmc wrapper; update Hako boxes (MirBuilderBox, LLVMEmitProviderBox) to delegate; adjust canaries to PASS (MirBuilder PASS, LLVM SKIP on unresolved or missing ny-llvmc).
2025-11-02 20:06:00 +09:00
63f1242a57
Phase 20.34 prep: add using aliases in nyash.toml for hako.mir.builder & hako.llvm.emit; add README contracts for MirBuilderBox/LLVMEmitBox; verify canaries green
2025-11-02 19:27:29 +09:00
4edd9517a4
Phase 20.34: add MirBuilderBox + LLVMEmitBox (Hako, delegate/provider stubs with stable tags); add quick canaries (phase2034) for presence and SKIP policy; update phase docs + CURRENT_TASK
2025-11-02 19:19:55 +09:00
cf3908d438
deprecations: warn-once for nyash.toml (already wired) + child_env audit (spawns use helper); docs sweep to prefer and hako.toml in README.*; smokes: add Core‑Direct negative rc canaries (array oob set, map bad key) and verified quick/core core_direct suite green
2025-11-02 19:02:23 +09:00
65aa79b575
BuildBox opts (structured arrays) + README note for Program→MIR CLI
...
- BuildBox: accept bundles/bundle_names/bundle_srcs/require_mods/alias_table via opts Map (ArrayBox/String)
- Fallback to env when opts missing; normalize empties; Fail‑Fast on resolver failure
- README: document --program-json-to-mir usage
2025-11-02 18:56:07 +09:00
9c67343420
Selfhost: EXE path switched to Program(JSON v0) → MIR(JSON) → ny-llvmc; BuildBox opts (structured via env/array) and Bridge v1 positive canary
...
- selfhost_build.sh: EXE now converts Stage‑B Program(JSON v0) to MIR(JSON) via --json-file + --program-json-to-mir, then feeds ny-llvmc
- BuildBox: accept minimal opts via env or simple array parsing (alias_table, require_mods)
- Add positive v1 bridge canary: canonicalize_method_size_on_array_vm.sh (quick)
2025-11-02 18:54:16 +09:00
cd67911dae
BuildBox: env alias/require minimal bundling; selfhost tool: add --mir and docs
...
- BuildBox.emit_program_json_v0: use BundleResolver via env (HAKO_BUNDLE_ALIAS_TABLE, HAKO_REQUIRE_MODS)
- selfhost_build.sh: add --mir to emit MIR(JSON); document HAKO_USE_BUILDBOX for emit-only path
2025-11-02 18:48:34 +09:00
0eeae54434
Selfhost: prefer BuildBox for emit-only (opt-in) and fix selfhost smokes root detection
...
- selfhost_build.sh: HAKO_USE_BUILDBOX=1 uses BuildBox.emit_program_json_v0 for emit-only paths
- Fix ROOT detection in selfhost and bridge negative smokes
- All selfhost smokes pass (opt-in)
2025-11-02 18:22:15 +09:00
981555261d
Bridge v1 negatives (Method/Constructor/ModuleFunction) + BuildBox skeleton
...
- Add v1 bridge negative canaries (opt-in via SMOKES_ENABLE_BRIDGE_CANON):
- canonicalize_method_missing_receiver_negative_vm.sh
- canonicalize_constructor_missing_boxtype_negative_vm.sh
- canonicalize_modulefn_unsupported_negative_vm.sh
- Add BuildBox skeleton under lang/src/compiler/build (README + build_box.hako)
- Provides interface for emit/verify plan; real wiring to be added incrementally
2025-11-02 18:19:28 +09:00
2dcf5006c6
Selfhost build: add EXE path via ny-llvmc (tools) + smoke
...
- tools/selfhost/selfhost_build.sh: support --exe <out>, using LLVM harness (ny-llvmc)
- Add selfhost EXE canary (opt-in): selfhost_build_exe_return.sh
- Keep Stage‑B JSON emit for verification; EXE path currently parses original Hako source (80/20)
2025-11-02 18:16:11 +09:00
075257a948
Hybrid selfhost build (tools) + opt-in smokes
...
- Add tools/selfhost/selfhost_build.sh: Stage‑B emit(JSON v0) + optional Core‑Direct (in-proc) run
- Add tools/selfhost/README.md
- Add opt-in smokes: selfhost_build_return_vm, selfhost_build_binop_vm (SMOKES_ENABLE_SELFHOST=1)
This establishes the mixed selfhost route (Hakorune Stage‑B front), ready to expand toward full build.
2025-11-02 18:07:33 +09:00
dcd474926f
Phase 20.33 plan/checklist + CURRENT_TASK updated (80/20 fast track)
...
- PLAN: add Core‑Direct in‑proc (opt‑in) and Hybrid selfhost build next steps
- CHECKLIST: mark alias-table bad, Core‑Direct in‑proc; add Hybrid selfhost build TODOs
- CURRENT_TASK: add fast-track update, outline Hybrid selfhost build plan
2025-11-02 18:03:53 +09:00
102c837d72
Core‑Direct in-proc (opt-in) + negative canaries
...
- Runner: add HAKO_CORE_DIRECT_INPROC=1 to run MIR(JSON v0) directly in-proc (avoid child Hako wrapper); fallback preserved
- Update core_direct_string_bounds_rc_vm to enable in-proc toggle
- Add Bridge v1 negatives (Method/ModuleFunction/Constructor via Closure variants already added)
- Stage‑B alias table fail-fast tag in resolver; quick remains green
2025-11-02 17:59:20 +09:00
ddf736ddef
Stage‑B alias/table negatives + Bridge v1 Closure negatives + docs sweep (minor)
...
- BundleResolver: fail-fast with tag on malformed alias table entries ([bundle/alias-table/bad] <entry>)
- Add opt-in negatives:
- canonicalize_closure_captures_negative_vm (captures wrong types)
- canonicalize_closure_missing_func_negative_vm (missing func in Closure)
- stageb_bundle_alias_table_bad_vm (malformed alias table)
- README minor replacements to (residuals)
All new tests are opt-in; quick remains green.
2025-11-02 17:57:41 +09:00
b988d309f0
Stage‑B + Bridge v1 tests and docs sweep
...
- Add opt-in negative canary: canonicalize_closure_captures_negative_vm (v1 bridge Closure malformed captures)
- Add opt-in Stage‑B canary: stageb_bundle_alias_table_bad_vm (malformed alias table fails)
- README.md/ja: replace hardcoded ./target/release/nyash with (branding/prefs)
- Keep Stage‑B heavy tests opt-in (SMOKES_ENABLE_STAGEB); quick remains green
2025-11-02 17:54:35 +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
0cd2342b05
core: add Core Direct string canaries (substring/charAt/replace); Stage‑B: alias table (ENV) support with BundleResolver; docs: Exit Code Policy tag→rc rules and checklist updates.
2025-11-02 16:24:50 +09:00
8b006575c1
smokes: enable Gate‑C budget canary by default (fallback allowed); add map_values_sum/map_keys_size; Stage‑B bundling routed via BundleResolver box; minor fixes.
2025-11-02 15:56:45 +09:00
