🚀 Break/Continue/Try-Catch構文のサポート追加とMIRループ制御強化
## 主な変更点 ### 🎯 MIRループ制御の実装(根治対応) - src/mir/loop_builder.rs: Break/Continue対応のループコンテキスト管理 - ループのbreak/continueターゲットブロック追跡 - ネストループの適切な処理 - src/mir/builder.rs: Break/Continue文のMIR生成実装 - src/tokenizer.rs: Break/Continue/Tryトークン認識追加 ### 📝 セルフホストパーサーの拡張 - apps/selfhost-compiler/boxes/parser_box.nyash: - Stage-3: break/continue構文受理(no-op実装) - Stage-3: try-catch-finally構文受理(構文解析のみ) - エラー処理構文の将来対応準備 ### 📚 ドキュメント更新 - 論文K(爆速事件簿): 45事例に更新(4件追加) - PyVM迂回路の混乱事件 - Break/Continue無限ループ事件 - EXE-first戦略の再発見 - 論文I(開発秘話): Day 38の重要決定追加 ### 🧪 テストケース追加 - apps/tests/: ループ制御とPHIのテストケース - nested_loop_inner_break_isolated.nyash - nested_loop_inner_continue_isolated.nyash - loop_phi_one_sided.nyash - shortcircuit関連テスト ## 技術的詳細 - Break/ContinueをMIRレベルで適切に処理 - 無限ループ問題(CPU 99.9%暴走)の根本解決 - 将来の例外処理機能への準備 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
12
apps/tests/loop_phi_one_sided.nyash
Normal file
12
apps/tests/loop_phi_one_sided.nyash
Normal file
@ -0,0 +1,12 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local i = 0
|
||||
local sum = 0
|
||||
loop(i < 5) {
|
||||
if (i % 2 == 1) { sum = sum + i } else { }
|
||||
i = i + 1
|
||||
}
|
||||
return sum
|
||||
}
|
||||
}
|
||||
|
||||
18
apps/tests/nested_loop_inner_break_isolated.nyash
Normal file
18
apps/tests/nested_loop_inner_break_isolated.nyash
Normal file
@ -0,0 +1,18 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local i = 0
|
||||
local s = 0
|
||||
loop(i < 3) {
|
||||
local j = 0
|
||||
loop(j < 4) {
|
||||
j = j + 1
|
||||
if (j == 3) { break }
|
||||
s = s + 1
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
// outer=3 回、各回で j=1,2 のみ加算 → 2×3=6
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
18
apps/tests/nested_loop_inner_continue_isolated.nyash
Normal file
18
apps/tests/nested_loop_inner_continue_isolated.nyash
Normal file
@ -0,0 +1,18 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local i = 0
|
||||
local s = 0
|
||||
loop(i < 2) {
|
||||
local j = 0
|
||||
loop(j < 3) {
|
||||
j = j + 1
|
||||
if (j == 1) { continue }
|
||||
s = s + 1
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
// outer=2 回、各回で j=2,3 のみ加算 → 2×2=4
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
9
apps/tests/shortcircuit_and_phi_skip.nyash
Normal file
9
apps/tests/shortcircuit_and_phi_skip.nyash
Normal file
@ -0,0 +1,9 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local x = 0
|
||||
((x = x + 1) < 0) && ((x = x + 1) < 0)
|
||||
// LHS が false → RHS は評価されず x は 1 のまま
|
||||
return x
|
||||
}
|
||||
}
|
||||
|
||||
13
apps/tests/shortcircuit_nested_selective_assign.nyash
Normal file
13
apps/tests/shortcircuit_nested_selective_assign.nyash
Normal file
@ -0,0 +1,13 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local x = 0
|
||||
local a = true
|
||||
local b = false
|
||||
// a && (b || ((x = 1) > 0))
|
||||
if (a && (b || ((x = 1) > 0))) {
|
||||
// x は 1 に設定済み
|
||||
} else { }
|
||||
return x
|
||||
}
|
||||
}
|
||||
|
||||
9
apps/tests/shortcircuit_or_phi_skip.nyash
Normal file
9
apps/tests/shortcircuit_or_phi_skip.nyash
Normal file
@ -0,0 +1,9 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local x = 0
|
||||
((x = x + 1) >= 0) || ((x = x + 1) < 0)
|
||||
// LHS が true → RHS は評価されず x は 1 のまま
|
||||
return x
|
||||
}
|
||||
}
|
||||
|
||||
6
apps/tests/string_method_chain.nyash
Normal file
6
apps/tests/string_method_chain.nyash
Normal file
@ -0,0 +1,6 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
return "abcd".substring(1,3).length()
|
||||
}
|
||||
}
|
||||
|
||||
15
apps/tests/try_catch_finally_no_throw.nyash
Normal file
15
apps/tests/try_catch_finally_no_throw.nyash
Normal file
@ -0,0 +1,15 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local console = new ConsoleBox()
|
||||
try {
|
||||
console.println("T")
|
||||
return 10
|
||||
} catch (Error e) {
|
||||
// 例外なし → ここは通らない想定
|
||||
console.println("C")
|
||||
} finally {
|
||||
console.println("F")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
22
apps/tests/try_finally_break_inner_loop.nyash
Normal file
22
apps/tests/try_finally_break_inner_loop.nyash
Normal file
@ -0,0 +1,22 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local i = 0
|
||||
local fin = 0
|
||||
loop(i < 3) {
|
||||
try {
|
||||
local j = 0
|
||||
loop(j < 5) {
|
||||
if (j == 2) { break }
|
||||
j = j + 1
|
||||
}
|
||||
} finally {
|
||||
// inner の break に関わらず finally は 1 回実行
|
||||
fin = fin + 1
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
// outer 反復回数 = 3
|
||||
return fin
|
||||
}
|
||||
}
|
||||
|
||||
24
apps/tests/try_finally_continue_inner_loop.nyash
Normal file
24
apps/tests/try_finally_continue_inner_loop.nyash
Normal file
@ -0,0 +1,24 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local fin = 0
|
||||
local i = 0
|
||||
loop(i < 2) {
|
||||
local j = 0
|
||||
loop(j < 3) {
|
||||
// 各反復で continue が起きたかを印付け
|
||||
local mark = 0
|
||||
try {
|
||||
j = j + 1
|
||||
if (j == 1) { mark = 1; continue }
|
||||
} finally {
|
||||
// continue でも finally は実行される
|
||||
if (mark == 1) { fin = fin + 1 }
|
||||
}
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
// outer=2 回、各回で j==1 の continue が 1 度発生 → fin=2
|
||||
return fin
|
||||
}
|
||||
}
|
||||
|
||||
13
apps/tests/try_finally_normal.nyash
Normal file
13
apps/tests/try_finally_normal.nyash
Normal file
@ -0,0 +1,13 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
local console = new ConsoleBox()
|
||||
try {
|
||||
console.println("T")
|
||||
return 123
|
||||
} finally {
|
||||
// finally は必ず実行される想定
|
||||
console.println("F")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
11
apps/tests/try_finally_return_override.nyash
Normal file
11
apps/tests/try_finally_return_override.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
// try 内の return より finally の return を優先(現行仕様)
|
||||
try {
|
||||
return 1
|
||||
} finally {
|
||||
return 2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user