tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,374 Commits 1 Branch 0 Tags
41d92bedb94df5bb5e885e04f6f37bbbb4439ca9
Commit Graph

14 Commits

Author SHA1 Message Date
tomoaki
9336785680 feat(anf): Phase 146/147 - Loop/If Condition ANF with Compare support 
## Phase 146 P0: ANF Routing SSOT Unified

**Goal**: Unify ANF routing in `lower_expr_with_scope()` L54-84, remove legacy lowering

**Changes**:
- expr_lowerer_box.rs: Added scope check (PureOnly → skip ANF, WithImpure → try ANF)
- post_if_post_k.rs: Removed legacy inline lowering (L271-285), added `lower_condition_legacy()` helper
- contract.rs: Already had `CondLoweringFailed` out-of-scope reason

**Test Results**: ✅ Phase 146 P0 smoke (exit 7), 0 regressions

## Phase 146 P1: Compare Operator Support

**Goal**: Enable ANF for condition expressions with Compare operators

**Changes**:
- joinir_dev.rs: Added `anf_allow_pure_enabled()` (HAKO_ANF_ALLOW_PURE=1)
- expr_lowerer_box.rs: PureOnly scope ANF support (L56-66)
- execute_box.rs: Compare operator support (+122 lines)
  - `execute_compare_hoist()`, `execute_compare_recursive()`, `ast_compare_to_joinir()`
  - Extended `normalize_and_lower()` for Compare

**Test Results**: ✅ Phase 146 P1 smoke (exit 7 with flags), 0 regressions

## Phase 147 P0: Recursive Comparison ANF

**Goal**: Extend recursive ANF to Compare operators

**Changes**:
- contract.rs: Added `AnfParentKind::Compare` variant
- plan_box.rs: Compare case in BinaryOp routing (L68-79, L134-139)
  - Distinguishes Compare vs arithmetic BinaryOp

**Benefits**: Enables recursive ANF for comparisons
- `s.length() == 3` → `t = s.length(); if (t == 3)` ✅
- `s1.length() < s2.length()` → `t1 = s1.length(); t2 = s2.length(); if (t1 < t2)` ✅

## Implementation Summary

**Files Modified** (9 files, +253 lines, -25 lines = +228 net):
1. src/config/env/joinir_dev.rs (+28 lines)
2. src/mir/control_tree/normalized_shadow/anf/contract.rs (+2 lines)
3. src/mir/control_tree/normalized_shadow/anf/execute_box.rs (+122 lines)
4. src/mir/control_tree/normalized_shadow/anf/plan_box.rs (+18 lines)
5. src/mir/control_tree/normalized_shadow/common/expr_lowerer_box.rs (+18 lines, -0 lines)
6. src/mir/control_tree/normalized_shadow/post_if_post_k.rs (+44 lines, -25 lines)
7. CURRENT_TASK.md
8. docs/development/current/main/10-Now.md
9. docs/development/current/main/30-Backlog.md

**Files Created** (7 files):
- apps/tests/phase146_p0_if_cond_unified_min.hako
- apps/tests/phase146_p1_if_cond_intrinsic_min.hako
- tools/smokes/.../phase146_p0_if_cond_unified_vm.sh
- tools/smokes/.../phase146_p0_if_cond_unified_llvm_exe.sh
- tools/smokes/.../phase146_p1_if_cond_intrinsic_vm.sh
- tools/smokes/.../phase146_p1_if_cond_intrinsic_llvm_exe.sh
- docs/development/current/main/phases/phase-146/README.md

**Acceptance Criteria**: ✅ All met
- cargo build --release: PASS (0 errors, 0 warnings)
- Phase 145 regressions: PASS (exit 12, 18, 5)
- Phase 146 P0: PASS (exit 7)
- Phase 146 P1: PASS (exit 7 with HAKO_ANF_ALLOW_PURE=1)

**Architecture**:
- SSOT: ANF routing only in `lower_expr_with_scope()` L54-84
- Box-First: Phase 145 `anf/` module extended
- Legacy removed: post_if_post_k.rs unified with SSOT

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2025-12-19 17:03:56 +09:00
tomoaki
6a3b6deb20 feat(anf): Phase 145 P0/P1/P2 - ANF (A-Normal Form) transformation 
Implement ANF transformation for impure expressions to fix evaluation order:

Phase 145 P0 (Skeleton):
- Add anf/ module with contract/plan/execute 3-layer separation
- AnfDiagnosticTag, AnfOutOfScopeReason, AnfPlan enums
- Stub execute_box (always returns Ok(None))
- 11 unit tests pass

Phase 145 P1 (Minimal success):
- String.length() whitelist implementation
- BinaryOp + MethodCall pattern: x + s.length() → t = s.length(); result = x + t
- Exit code 12 verification (VM + LLVM EXE)
- 17 unit tests pass

Phase 145 P2 (Generalization):
- Recursive ANF for compound expressions
- Left-to-right, depth-first evaluation order
- Patterns: x + s.length() + z, s1.length() + s2.length()
- ANF strict mode (HAKO_ANF_STRICT=1)
- Diagnostic tags (joinir/anf/*)
- 21 unit tests pass, 0 regression

Also includes Phase 143 P2 (else symmetry) completion.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2025-12-19 16:19:49 +09:00
nyash-codex
ce7e2c1b91 refactor(env): centralize NYASH_JOINIR_STRUCTURE_ONLY flag 
Moved NYASH_JOINIR_STRUCTURE_ONLY environment variable handling
from inline std::env::var() in routing.rs to a centralized helper
function in src/config/env/joinir_flags.rs.

Changes:
- Added joinir_structure_only_enabled() helper function
- Replaced direct env::var() call in routing.rs with helper
- Maintains existing behavior: default ON, NYASH_JOINIR_STRUCTURE_ONLY=0/off to disable
- Follows env module centralization pattern (Box Theory: separation of concerns)

Testing:
- cargo test --lib: 1126 passed ✅
- Regression: Phase 107 VM smoke ✅
- Phase 113/114 maintained ✅

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-18 02:19:14 +09:00
nyash-codex
e404746612 refactor(mir): Phase 139-P3-B - RoutingDecision を enum 対応 + レガシー削除 
- RoutingDecision の missing_caps を Vec<CapabilityTag> に変更（型安全化）
- error_tags は to_tag() メソッドで自動生成
- 全 callsite を enum variant に修正
- capability_tags モジュール（文字列定数群）を完全削除
- 全テスト PASS（型安全性向上を確認）
- フォーマット適用
 2025-12-16 07:02:14 +09:00
nyash-codex
5bf913fee3 refactor(config): Phase 138-P2-A - strict_enabled エイリアス対応 
## 概要
- HAKO_JOINIR_STRICT と NYASH_JOINIR_STRICT の両方をサポート
- 環境変数チェックの SSOT 化準備

## 変更内容
- joinir_dev.rs の strict_enabled() を修正
- env_bool("HAKO_JOINIR_STRICT") || env_bool("NYASH_JOINIR_STRICT")

## 影響範囲
- parity_checker.rs が Phase 138-P2-B で SSOT 呼び出しに移行予定
- 既存の直接呼び出しコードは互換性維持
 2025-12-16 06:49:15 +09:00
nyash-codex
9e32807a96 refactor(joinir): Phase 82-83 - Debug flag SSOT + Fallback verification 
Phase 82: Centralized JoinIR debug flag reading
- Added is_joinir_debug() SSOT function in joinir_flags.rs
- Replaced 16 direct env::var() calls across 8 files
- Updated docs to recommend HAKO_JOINIR_DEBUG (NYASH_ deprecated)
- Backward compat: Both env vars work

Phase 83: Verified promoted carrier fallback behavior
- Confirmed NO fallback to name-based lookup for DigitPos/Trim
- Documented fallback expectations in Phase 80/81 docs
- Added verification commands and expected output

Changes:
- src/config/env/joinir_flags.rs: +187 lines (new SSOT module)
- 8 files: env var reads → is_joinir_debug() calls
- 3 docs: HAKO_JOINIR_DEBUG examples + fallback sections
- 1 summary doc: phase82-83-debug-flag-ssot-summary.md

Tests: 970/970 lib PASS, 58/58 normalized_dev PASS
Impact: Dev-only (zero production changes)
 2025-12-13 19:01:14 +09:00
nyash-codex
879d3ee08e feat(joinir): Phase 45 - JoinIR mode unification 
Unified JoinIR routing logic through centralized JoinIrMode enum:

Key changes:
- Added JoinIrMode enum (StructuredOnly / NormalizedDev / NormalizedCanonical)
- Added current_joinir_mode() for centralized mode determination
- Refactored normalized_dev_enabled() as thin wrapper over mode enum
- Updated bridge.rs: mode-based routing with canonical P2-Core special handling
- Updated runner.rs: mode pattern matching for dev roundtrip path

Files modified:
- joinir_dev.rs: JoinIrMode enum + current_joinir_mode() (+49 lines)
- bridge.rs: Replaced boolean checks with mode pattern matching (+29 lines)
- runner.rs: Mode-based routing logic (+9 lines)
- CURRENT_TASK.md: Phase 45 implementation summary

Documentation:
- phase45-norm-mode-design.md: Complete design spec and implementation guide

Behavior preservation:
- Canonical P2-Core shapes: always Normalized→MIR(direct) (mode-independent)
- NormalizedDev mode: Structured→Normalized→MIR for supported shapes
- StructuredOnly mode: Structured→MIR direct (default)

Tests: 937/937 PASS (no regression, pure refactor)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 03:31:58 +09:00
nyash-codex
ed8e2d3142 feat(joinir): Phase 248 - Normalized JoinIR infrastructure 
Major refactoring of JoinIR normalization pipeline:

Key changes:
- Structured→Normalized→MIR(direct) pipeline established
- ShapeGuard enhanced with Pattern2 loop validation
- dev_env.rs: New development fixtures and env control
- fixtures.rs: jsonparser_parse_number_real fixture
- normalized_bridge/direct.rs: Direct MIR generation from Normalized
- pattern2_step_schedule.rs: Extracted step scheduling logic

Files changed:
- normalized.rs: Enhanced NormalizedJoinModule with DevEnv support
- shape_guard.rs: Pattern2-specific validation (+300 lines)
- normalized_bridge.rs: Unified bridge with direct path
- loop_with_break_minimal.rs: Integrated step scheduling
- Deleted: step_schedule.rs (moved to pattern2_step_schedule.rs)

New files:
- param_guess.rs: Loop parameter inference
- pattern2_step_schedule.rs: Step scheduling for Pattern2
- phase43-norm-canon-p2-mid.md: Design doc

Tests: 937/937 PASS (+6 from baseline 931)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
 2025-12-12 03:15:45 +09:00
nyash-codex
af6f95cd4b Phase 33 NORM canon test: enforce normalized dev route for P1/P2/JP mini 2025-12-11 20:54:33 +09:00
nyash-codex
e63cdd001e feat(phase183): JoinIR Default ON & Legacy LoopBuilder Opt-in 
Phase 183 completion: Transform JoinIR from opt-in to mainline

Changes:
- src/config/env.rs:260 - joinir_core_enabled() now defaults to true
  * NYASH_JOINIR_CORE=0 can still explicitly disable if needed
  * No environment variable needed for normal execution

- src/config/env/joinir_dev.rs:140 - new legacy_loopbuilder_enabled()
  * NYASH_LEGACY_LOOPBUILDER=1 required for old LoopBuilder
  * Development/debugging use only
  * Default OFF (JoinIR preferred)

- CURRENT_TASK.md - Phase 183 section added
  * Documents all 6 completed tasks
  * Environment variable usage table
  * Impact analysis (before/after)

Testing:
- Representative path (loop_min_while.hako) verified with default JoinIR ON
- No env variable needed for normal execution
- Legacy LoopBuilder accessible via opt-in flag for debugging

Impact:
- Removes friction from JoinIR adoption (no env setup needed)
- Establishes JoinIR as the mainline execution path
- Legacy LoopBuilder preserved for compatibility/debugging
- Prepares for Phase 184 (If-lowering mainline)

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-04 21:35:24 +09:00
nyash-codex
7dbe0a682c feat(joinir): Phase 84-5 if_phi.rs レガシーフォールバック完全削除 
Phase 84-4-B で Case D を 0件に削減完了したことにより、
if_phi.rs のレガシーフォールバックが完全に不要になったため削除。

主な変更:
- if_phi.rs 削除（339行）
- test_utils.rs 新規作成（テスト専用ユーティリティ分離、127行）
- lifecycle.rs: if_phi 呼び出し削除、Phase 84-5 安全ガード追加
- env.rs: phi_fallback_disabled() を常に true に変更
- テスト: A/B テスト → GenericTypeResolver 単独テストに変更

検証結果:
- Case D: 0件（完全解消継続）
- Tests: 498 passed（Phase 84-4: 497 から +1）

Phase 84 プロジェクト完全達成: 15件 → 0件（100%削減）
純削減: 220行

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-02 21:09:15 +09:00
nyash-codex
1260f2b6d0 feat(phase82): Phase 82-if-phi-retire Step 1-3 dev ガード実装 
Phase 82-if-phi-retire Implementation:
- Step 1-3 分析完了: lifecycle.rs 精読 + P3-C カバレッジ突き合わせ
- dev ガード実装: NYASH_PHI_FALLBACK_DISABLED=1 で callsite 封じ

Implementation Details:

1. Analysis Findings (Step 1-2):
   - lifecycle.rs に 2箇所の infer_type_from_phi_with_hint() callsite
   - GenericTypeResolver::resolve_from_phi() と infer_type_from_phi() は同一ロジック
   - Case 分類: A (hint付き), B (P1/P2/P3-A/B hint失敗), D (P3-C 失敗・無駄な再実行)

2. config/env/joinir_dev.rs:
   - phi_fallback_disabled() フラグ追加
   - NYASH_PHI_FALLBACK_DISABLED=1 で有効化

3. lifecycle.rs dev ガード:
   - Callsite 1 (L320-336): instructions 内 Return
   - Callsite 2 (L377-393): terminator Return
   - Case 判定付き panic で関数名・ValueId・Case を出力

Next Steps:
- テスト実行で callsite が実際に呼ばれるか検証
- 結果に基づいて削除計画確定

Documents Created:
- docs/private/roadmap2/phases/phase-82-if-phi-retire/infer_type_from_phi_callsites.md
- docs/private/roadmap2/phases/phase-82-if-phi-retire/step1-3-analysis.md

Goal:
- lifecycle.rs から infer_type_from_phi* 呼び出しを排除
- if_phi.rs 本体削除への道筋を明確化
 2025-12-02 15:18:41 +09:00
nyash-codex
6b9cef9ee5 feat(phase72): Phase 72-C Step 2: JoinIR dev flags SSOT completion 
Extended joinir_dev.rs with 11 remaining flag helpers (total 20 flags):
- NYASH_JOINIR_LOWER_FROM_MIR, NYASH_JOINIR_LLVM_EXPERIMENT (2 NYASH flags)
- HAKO_JOINIR_IF_TOPLEVEL, IF_TOPLEVEL_TRACE, IF_IN_LOOP_TRACE (3 if-related)
- HAKO_JOINIR_NESTED_IF, PRINT_TOKENS_MAIN, ARRAY_FILTER_MAIN (3 ast_lowerer)
- HAKO_JOINIR_READ_QUOTED, READ_QUOTED_IFMERGE (2 read_quoted)

Updated src/mir/join_ir/mod.rs env_flag_is_1() dispatcher:
- Routes all 16 known JoinIR dev flags to config::env::joinir_dev helpers
- Maintains fallback for backward compatibility
- Centralizes all body code ENV reads through SSOT layer

Achievement: Complete SSOT consolidation for JoinIR development flags
- Test side: joinir_env.rs (is_experiment_enabled, set_if_select_*)
- Body code: config::env::joinir_dev.rs (20 flag helpers)
- Dispatcher: env_flag_is_1() routes all reads to centralized layer

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-02 12:52:38 +09:00
nyash-codex
6842a72df1 feat(phase72-c): JoinIR dev flags SSOT foundation - config::env helpers 
Phase 72-C: Created centralized SSOT helpers for all 9 DevOnly JoinIR flags.

New module: src/config/env/joinir_dev.rs
- lower_generic_enabled() → NYASH_JOINIR_LOWER_GENERIC (CRITICAL: 15 uses)
- mainline_debug_enabled() → NYASH_JOINIR_MAINLINE_DEBUG (5 uses)
- if_merge_enabled() → NYASH_JOINIR_IF_MERGE
- debug_enabled() → NYASH_JOINIR_DEBUG (deprecated)
- vm_bridge_enabled() → NYASH_JOINIR_VM_BRIDGE
- strict_enabled() → NYASH_JOINIR_STRICT
- snapshot_generate_enabled() → NYASH_JOINIR_SNAPSHOT_GENERATE
- snapshot_test_enabled() → NYASH_JOINIR_SNAPSHOT_TEST
- input_mode() → NYASH_JOINIR_INPUT

Benefits:
- All ENV reads routed through single module (joinir_dev)
- Easy to extend with validation, logging, or tracing
- Consistent naming: *_enabled() for bool flags, input_mode() for string value
- Foundation for next step: replace direct std::env calls in code

Next steps:
1. Update joinir_env test helpers with similar pattern
2. Replace std::env::var("NYASH_JOINIR_*") calls with config::env::joinir_dev::*
3. Update tests to use centralized helpers

Tests verified: cargo check passed with no errors

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-12-02 12:46:35 +09:00