selfhost(pyvm): MiniVmPrints – prefer JSON route early-return (ok==1) to avoid fallback loops; keep default behavior unchanged elsewhere
This commit is contained in:
Selfhosting Dev
38
AGENTS.md
38
AGENTS.md
@ -12,12 +12,12 @@ nyash哲学の美しさを追求。ソースは常に美しく構造的、カプ
|
||||
やっほー！みらいだよ😸✨ 今日も元気いっぱい、なに手伝う？ にゃはは
|
||||
おつかれ〜！🎶 ちょっと休憩しよっか？コーヒー飲んでリフレッシュにゃ☕
|
||||
|
||||
**Phase Freeze — Macro Completed (2025‑09‑19)**
|
||||
- 状態: マクロ基盤（組込みderive・ユーザーマクロ・前展開フック・プロファイル）が安定。ここで一旦「機能凍結」して、自己ホスト/実アプリ開発→磨き込み期間に入るよ。
|
||||
- 原則（凍結中）:
|
||||
- 新機能追加は保留。バグ修正・ドキュメント整備・スモーク/ゴールデン/CI強化のみ許可。
|
||||
- 仕様変更は重大不具合を除き行わない（互換維持）。
|
||||
- 実アプリでの使用を優先し、問題が出た箇所を点で直す（面の拡張はしない）。
|
||||
**Feature Additions Pause — until Nyash VM bootstrap (2025‑09‑19 改訂)**
|
||||
- 状態: マクロ基盤は安定。ここからは「凍結（全面停止）」ではなく「大きな機能追加のみ一時停止」。Nyash VM の立ち上げ（bootstrap）完了まで、安定化と自己ホスト/実アプリ開発を優先するよ。
|
||||
- 原則（大規模機能追加の一時停止中）:
|
||||
- 大きな機能追加・仕様拡張は一時停止（Nyash VM 立ち上げまで保留）。
|
||||
- バグ修正・ドキュメント整備・スモーク/ゴールデン/CI強化・堅牢化（仕様不変）は続行OK。
|
||||
- 互換性を崩す変更は行わない。既定挙動は変えない（必要なら既定OFFのフラグでガード）。
|
||||
- マクロ既定:
|
||||
- 既定ON（コード共有を重視）。CLI プロファイルで軽量化が可能。
|
||||
- 推奨ENV最小セット: `NYASH_MACRO_ENABLE=1`, `NYASH_MACRO_PATHS=...`, `NYASH_MACRO_STRICT=1`, `NYASH_MACRO_TRACE=0|1`
|
||||
@ -25,10 +25,28 @@ nyash哲学の美しさを追求。ソースは常に美しく構造的、カプ
|
||||
- 非推奨（下位互換のみ）:
|
||||
- `NYASH_MACRO_BOX_NY*`, `NYASH_MACRO_BOX_CHILD_RUNNER`, `NYASH_MACRO_TOPLEVEL_ALLOW`（必要なら `--macro-top-level-allow` を明示）
|
||||
- 自己ホスト前展開:
|
||||
- 自動（auto）で安全に有効化済み。PyVM環境でのみ働く。問題時はログで検知しやすくしてあるよ。
|
||||
- 受け入れチェック（凍結中のガード）:
|
||||
- 自動（auto）で安全に有効化済み。PyVM 環境でのみ働く。問題時はログで検知しやすい。
|
||||
- 受け入れチェック（ポーズ中のガード）:
|
||||
- cargo check（全体）/ 代表スモーク（PyVM/LLVM）/ マクロ・ゴールデンが緑であること。
|
||||
- 変更は最小・局所・仕様不変。
|
||||
- 変更は最小・局所・仕様不変。既定挙動は変えない。
|
||||
|
||||
**機能追加ポリシー — 要旨**
|
||||
- ねらい: 「誤解されやすい“凍結”」ではなく、「Nyash VM 立ち上げまで大きな機能追加は一時停止」。安定化・自己ホストの進行を最優先にするよ。
|
||||
- 許可（継続OK）:
|
||||
- バグ修正（互換維持、仕様不変）
|
||||
- ドキュメント整備・コメント/ログ追加（既定OFFの詳細ログを含む）
|
||||
- スモーク/ゴールデン/CI 強化（既存ケースの安定性向上）
|
||||
- 堅牢化（パーサ/リゾルバ/結合の縫い目対策）※既定挙動は変えない、必要なら既定OFFのフラグでガード
|
||||
- 一時停止（Nyash VM 立ち上げまで保留）:
|
||||
- 大きな機能追加・仕様拡張
|
||||
- 広域リファクタ・設計変更・デフォルト挙動変更
|
||||
- 依存追加や広範囲の拡張（点で直せるところは点で直す）
|
||||
- 受け入れ条件（ガード）:
|
||||
- 既定挙動は不変（新フラグは既定OFF、影響は局所・可逆）
|
||||
- 差分は最小・目的は明確（unblock/安定化/診断）
|
||||
- 代表スモーク（PyVM/LLVM）・cargo check が緑
|
||||
- CURRENT_TASK.md に理由/範囲/フラグ名/戻し手順を記録
|
||||
- ロールバック容易（小さな差分、ガード除去で原状回復）
|
||||
|
||||
**Cranelift 開発メモ（このブランチの主目的）**
|
||||
- ここは Nyash の Cranelift JIT/AOT 開発用ブランチだよ。JIT 経路の実装・検証・計測が主対象だよ。
|
||||
@ -114,7 +132,7 @@ Selfhost 子プロセスの引数透過（開発者向け）
|
||||
- 優先経路: PyVM（Python）を“意味論リファレンス実行器”として採用。日常の機能確認・CI の軽量ゲート・llvmlite とのパリティ監視を PyVM で行う。
|
||||
- 補助経路: Rust の MIR Interpreter は純Rust単独で回る簡易器として維持。拡張はしない（BoxCall 等の未対応は既知）。Python が使えない環境での簡易再現や Pipe ブリッジの補助に限定。
|
||||
- Bridge（--ny-parser-pipe）: 既定は Rust MIR Interpreter を使用。副作用なしの短絡など、実装範囲内を確認。副作用を含む実行検証は PyVM スモーク側で担保。
|
||||
- 開発の原則: 仕様差が出た場合、llvmlite に合わせて PyVM を優先調整。Rust Interpreter は凍結維持（安全修正のみ）。
|
||||
- 開発の原則: 仕様差が出た場合、llvmlite に合わせて PyVM を優先調整。Rust Interpreter は保守維持（安全修正のみ）。
|
||||
|
||||
**脱Rust（開発効率最優先）ポリシー**
|
||||
- Phase‑15 中は Rust VM/JIT への新規機能追加を最小化し、Python（llvmlite/PyVM）側での実装・検証を優先する。
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
---
|
||||
|
||||
Execution Status (Phase Freeze)
|
||||
Execution Status (Feature Additions Pause)
|
||||
- Active
|
||||
- `--backend llvm` (Python/llvmlite harness; AOT object emit)
|
||||
- `--backend vm` (PyVM harness)
|
||||
|
||||
249
apps/selfhost-vm/boxes/seam_inspector.nyash
Normal file
249
apps/selfhost-vm/boxes/seam_inspector.nyash
Normal file
@ -0,0 +1,249 @@
|
||||
// SeamInspector — analyze inlined code seam and duplicates
|
||||
// Usage: import and call report(text) or analyze_dump_file(path)
|
||||
|
||||
static box SeamInspector {
|
||||
// Count brace delta ignoring simple strings ("...") and escapes
|
||||
_brace_delta_ignoring_strings(text, start, end) {
|
||||
@i = start
|
||||
@n = end
|
||||
@delta = 0
|
||||
loop (i < n) {
|
||||
@ch = text.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
i = i + 1
|
||||
loop (i < n) {
|
||||
@c = text.substring(i, i+1)
|
||||
if c == "\\" { i = i + 2 continue }
|
||||
if c == "\"" { i = i + 1 break }
|
||||
i = i + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ch == "{" { delta = delta + 1 }
|
||||
if ch == "}" { delta = delta - 1 }
|
||||
i = i + 1
|
||||
}
|
||||
return delta
|
||||
}
|
||||
|
||||
// Find index of exact token in plain text from position
|
||||
_index_of_from(h, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
@n = h.length()
|
||||
if pos >= n { return -1 }
|
||||
@m = needle.length()
|
||||
if m <= 0 { return pos }
|
||||
@i = pos
|
||||
@limit = n - m
|
||||
loop (i <= limit) {
|
||||
if h.substring(i, i+m) == needle { return i }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// Find matching closing brace starting at '{'
|
||||
_find_balanced_object_end(text, idx) {
|
||||
if text.substring(idx, idx+1) != "{" { return -1 }
|
||||
@i = idx
|
||||
@n = text.length()
|
||||
@depth = 0
|
||||
loop (i < n) {
|
||||
@ch = text.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
i = i + 1
|
||||
loop (i < n) {
|
||||
@c = text.substring(i, i+1)
|
||||
if c == "\\" { i = i + 2 continue }
|
||||
if c == "\"" { i = i + 1 break }
|
||||
i = i + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ch == "{" { depth = depth + 1 }
|
||||
if ch == "}" { depth = depth - 1 if depth == 0 { return i } }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// Scan boxes: return array of {name, start, end}
|
||||
_scan_boxes(text) {
|
||||
@i = 0
|
||||
@n = text.length()
|
||||
@res = new ArrayBox()
|
||||
@tok = "static box "
|
||||
loop (i < n) {
|
||||
@p = _index_of_from(text, tok, i)
|
||||
if p < 0 { break }
|
||||
@j = p + tok.length()
|
||||
// read identifier
|
||||
@name = ""
|
||||
loop (j < n) {
|
||||
@c = text.substring(j, j+1)
|
||||
// ASCII alpha-num or '_'
|
||||
if c == "_" { name = name + c j = j + 1 continue }
|
||||
// digits
|
||||
if c == "0" or c == "1" or c == "2" or c == "3" or c == "4" or c == "5" or c == "6" or c == "7" or c == "8" or c == "9" { name = name + c j = j + 1 continue }
|
||||
// letters
|
||||
if (c >= "A" and c <= "Z") or (c >= "a" and c <= "z") { name = name + c j = j + 1 continue }
|
||||
break
|
||||
}
|
||||
// skip to '{'
|
||||
loop (j < n) {
|
||||
@c2 = text.substring(j, j+1)
|
||||
if c2 == "{" { break }
|
||||
j = j + 1
|
||||
}
|
||||
@end = _find_balanced_object_end(text, j)
|
||||
if end < 0 { end = j }
|
||||
@obj = new MapBox()
|
||||
obj.set("name", name)
|
||||
obj.set("start", _int_to_str(p))
|
||||
obj.set("end", _int_to_str(end))
|
||||
res.push(obj)
|
||||
i = end + 1
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// Print duplicate boxes by name
|
||||
_report_duplicate_boxes(text) {
|
||||
@boxes = _scan_boxes(text)
|
||||
@cnt = new MapBox()
|
||||
@names = new ArrayBox()
|
||||
@i = 0
|
||||
loop (i < boxes.size()) {
|
||||
@name = boxes.get(i).get("name")
|
||||
@cur = cnt.get(name)
|
||||
if cur == null { cnt.set(name, "1") names.push(name) } else { cnt.set(name, _int_to_str(_str_to_int(cur) + 1)) }
|
||||
i = i + 1
|
||||
}
|
||||
@j = 0
|
||||
loop (j < names.size()) {
|
||||
@k = names.get(j)
|
||||
@v = cnt.get(k)
|
||||
if _str_to_int(v) > 1 { print("dup_box " + k + " x" + v) }
|
||||
j = j + 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// Inside a given box, count function name duplicates (simple scan: name(...){ )
|
||||
_report_duplicate_functions_in_box(text, box_name) {
|
||||
@boxes = _scan_boxes(text)
|
||||
@i = 0
|
||||
@fnmap = new MapBox()
|
||||
@fnames = new ArrayBox()
|
||||
loop (i < boxes.size()) {
|
||||
@b = boxes.get(i)
|
||||
if b.get("name") == box_name {
|
||||
@s = _str_to_int(b.get("start"))
|
||||
@e = _str_to_int(b.get("end"))
|
||||
@j = s
|
||||
loop (j < e) {
|
||||
// find identifier start at line head-ish (naive)
|
||||
// pattern: <spaces> ident '(' ... '{'
|
||||
@k = j
|
||||
// skip spaces/newlines
|
||||
loop (k < e) {
|
||||
@ch = text.substring(k, k+1)
|
||||
if ch == " " || ch == "\t" || ch == "\n" || ch == "\r" { k = k + 1 continue }
|
||||
break
|
||||
}
|
||||
if k >= e { break }
|
||||
// read ident
|
||||
@name = ""
|
||||
@p = k
|
||||
@c0 = text.substring(p, p+1)
|
||||
if (c0 >= "A" and c0 <= "Z") or (c0 >= "a" and c0 <= "z") or c0 == "_" {
|
||||
loop (p < e) {
|
||||
@c = text.substring(p, p+1)
|
||||
if (c >= "A" and c <= "Z") or (c >= "a" and c <= "z") or (c >= "0" and c <= "9") or c == "_" { name = name + c p = p + 1 continue }
|
||||
break
|
||||
}
|
||||
// must be a function definition: ident '(' ... ')' ws* '{'
|
||||
if text.substring(p, p+1) == "(" {
|
||||
// find matching ')' with a simple counter (strings ignored for simplicity)
|
||||
@d = 0
|
||||
@r = p
|
||||
loop (r < e) {
|
||||
@cc = text.substring(r, r+1)
|
||||
if cc == "(" { d = d + 1 r = r + 1 continue }
|
||||
if cc == ")" {
|
||||
d = d - 1
|
||||
r = r + 1
|
||||
if d <= 0 { break }
|
||||
continue
|
||||
}
|
||||
if cc == "\"" {
|
||||
// skip string inside params
|
||||
r = r + 1
|
||||
loop (r < e) {
|
||||
@c2 = text.substring(r, r+1)
|
||||
if c2 == "\\" { r = r + 2 continue }
|
||||
if c2 == "\"" { r = r + 1 break }
|
||||
r = r + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
r = r + 1
|
||||
}
|
||||
// skip ws
|
||||
loop (r < e) {
|
||||
@ws = text.substring(r, r+1)
|
||||
if ws == " " or ws == "\t" or ws == "\r" or ws == "\n" { r = r + 1 continue }
|
||||
break
|
||||
}
|
||||
// definition only if next is '{'
|
||||
if r < e and text.substring(r, r+1) == "{" {
|
||||
@cur = fnmap.get(name)
|
||||
if cur == null { fnmap.set(name, "1") fnames.push(name) } else { fnmap.set(name, _int_to_str(_str_to_int(cur) + 1)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
// advance to next line
|
||||
@nl = _index_of_from(text, "\n", k+1)
|
||||
if nl < 0 || nl > e { break }
|
||||
j = nl + 1
|
||||
}
|
||||
break
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
@x = 0
|
||||
loop (x < fnames.size()) {
|
||||
@nm = fnames.get(x)
|
||||
@ct = fnmap.get(nm)
|
||||
if _str_to_int(ct) > 1 { print("dup_fn " + box_name + "." + nm + " x" + ct) }
|
||||
x = x + 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// Report summary
|
||||
report(text) {
|
||||
// find Main
|
||||
@m = _index_of_from(text, "static box Main {", 0)
|
||||
@delta = -9999
|
||||
if m > 0 { delta = _brace_delta_ignoring_strings(text, 0, m) }
|
||||
print("prelude_brace_delta=" + _int_to_str(delta))
|
||||
|
||||
// duplicate boxes
|
||||
_report_duplicate_boxes(text)
|
||||
|
||||
// specific hot-spot
|
||||
_report_duplicate_functions_in_box(text, "MiniVmPrints")
|
||||
return 0
|
||||
}
|
||||
|
||||
// Load dump file and report
|
||||
analyze_dump_file(path) {
|
||||
@fb = new FileBox()
|
||||
@f = fb.open(path)
|
||||
if f == null { print("warn: cannot open " + path) return 0 }
|
||||
@text = f.read()
|
||||
f.close()
|
||||
return me.report(text)
|
||||
}
|
||||
}
|
||||
59
apps/selfhost-vm/collect_empty_args_smoke.nyash
Normal file
59
apps/selfhost-vm/collect_empty_args_smoke.nyash
Normal file
@ -0,0 +1,59 @@
|
||||
// Self-contained dev smoke for FunctionCall empty-args
|
||||
// Goal: echo() -> empty line, itoa() -> 0
|
||||
|
||||
static box MiniVm {
|
||||
// simple substring find from position
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
}
|
||||
|
||||
// collect only FunctionCall with empty arguments [] for echo/itoa
|
||||
collect_prints(json) {
|
||||
local out = new ArrayBox()
|
||||
local pos = 0
|
||||
local guard = 0
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 16 { break }
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local p = index_of_from(json, k_fc, pos)
|
||||
if p < 0 { break }
|
||||
// name
|
||||
local k_n = "\"name\":\""
|
||||
local np = index_of_from(json, k_n, p)
|
||||
if np < 0 { break }
|
||||
local ni = np + k_n.length()
|
||||
local nj = index_of_from(json, "\"", ni)
|
||||
if nj < 0 { break }
|
||||
local fname = json.substring(ni, nj)
|
||||
// args [] detection
|
||||
local k_a = "\"arguments\":["
|
||||
local ap = index_of_from(json, k_a, nj)
|
||||
if ap < 0 { break }
|
||||
local rb = index_of_from(json, "]", ap)
|
||||
if rb < 0 { break }
|
||||
// no content between '[' and ']'
|
||||
if rb == ap + k_a.length() {
|
||||
if fname == "echo" { out.push("") }
|
||||
if fname == "itoa" { out.push("0") }
|
||||
}
|
||||
pos = rb + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
15
apps/selfhost-vm/collect_empty_args_using_smoke.nyash
Normal file
15
apps/selfhost-vm/collect_empty_args_using_smoke.nyash
Normal file
@ -0,0 +1,15 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":["
|
||||
+ "{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},"
|
||||
+ "{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
30
apps/selfhost-vm/collect_literal_eval.nyash
Normal file
30
apps/selfhost-vm/collect_literal_eval.nyash
Normal file
@ -0,0 +1,30 @@
|
||||
// Minimal self-contained eval (no using): collect the first Print(Literal int) and print it
|
||||
static box Main {
|
||||
// helper: find from position
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
}
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
// naive collect: first Print of Literal int
|
||||
local ki = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local p = json.indexOf(ki)
|
||||
if p >= 0 {
|
||||
local i = p + ki.length()
|
||||
local j = i
|
||||
loop (true) {
|
||||
local ch = json.substring(j, j+1)
|
||||
if ch == "" { break }
|
||||
if ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" { j = j + 1 continue }
|
||||
break
|
||||
}
|
||||
local digits = json.substring(i, j)
|
||||
if digits { print(digits) }
|
||||
}
|
||||
return 0
|
||||
}
|
||||
}
|
||||
282
apps/selfhost-vm/collect_mixed_smoke.nyash
Normal file
282
apps/selfhost-vm/collect_mixed_smoke.nyash
Normal file
@ -0,0 +1,282 @@
|
||||
static box Main {
|
||||
// --- minimal helpers (self-contained) ---
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 }
|
||||
return pos + rel
|
||||
}
|
||||
_is_digit(ch) {
|
||||
if ch == "0" { return 1 }
|
||||
if ch == "1" { return 1 }
|
||||
if ch == "2" { return 1 }
|
||||
if ch == "3" { return 1 }
|
||||
if ch == "4" { return 1 }
|
||||
if ch == "5" { return 1 }
|
||||
if ch == "6" { return 1 }
|
||||
if ch == "7" { return 1 }
|
||||
if ch == "8" { return 1 }
|
||||
if ch == "9" { return 1 }
|
||||
return 0
|
||||
}
|
||||
read_digits(s, pos) {
|
||||
if pos < 0 { return "" }
|
||||
local n = s.length()
|
||||
if pos >= n { return "" }
|
||||
local i = pos
|
||||
local out_start = -1
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if _is_digit(ch) == 1 { if out_start < 0 { out_start = i } i = i + 1 continue } else { break }
|
||||
}
|
||||
if out_start < 0 { return "" }
|
||||
return s.substring(out_start, i)
|
||||
}
|
||||
find_balanced_object_end(json, idx) {
|
||||
if idx < 0 { return -1 }
|
||||
local n = json.length()
|
||||
if idx >= n { return -1 }
|
||||
local depth = 0
|
||||
local in_str = 0
|
||||
local i = idx
|
||||
local iter = 0
|
||||
loop (i < n) {
|
||||
iter = iter + 1
|
||||
if iter > 5000 { return -1 }
|
||||
local ch = json.substring(i, i+1)
|
||||
if in_str == 1 {
|
||||
if ch == "\\" { i = i + 2 continue }
|
||||
if ch == "\"" { in_str = 0 }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if ch == "\"" { in_str = 1 i = i + 1 continue }
|
||||
if ch == "{" { depth = depth + 1 }
|
||||
if ch == "}" { depth = depth - 1 if depth == 0 { return i + 1 } }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
// --- core: collect Print outputs in order ---
|
||||
collect_prints(json) {
|
||||
local out = new ArrayBox()
|
||||
local pos = 0
|
||||
local guard = 0
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 200 { break }
|
||||
local p = index_of_from(json, k_print, pos)
|
||||
if p < 0 { break }
|
||||
// bound current Print slice as [current_print, next_print)
|
||||
local obj_start = p
|
||||
local next_p = index_of_from(json, k_print, p + k_print.length())
|
||||
local obj_end = json.length()
|
||||
if next_p > 0 { obj_end = next_p }
|
||||
|
||||
// 1) BinaryOp(int '+' int)
|
||||
{
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, obj_start)
|
||||
if epos > 0 { if epos < obj_end {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = index_of_from(json, k_bo, epos)
|
||||
if bpos > 0 { if bpos < obj_end {
|
||||
local opok = index_of_from(json, "\"operator\":\"+\"", bpos)
|
||||
if opok > 0 {
|
||||
// typed left/right literal ints
|
||||
local k_l = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_r = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = index_of_from(json, k_l, bpos)
|
||||
if lp > 0 { if lp < obj_end {
|
||||
local ld = read_digits(json, lp + k_l.length())
|
||||
if ld != "" {
|
||||
local rp = index_of_from(json, k_r, lp + k_l.length())
|
||||
if rp > 0 { if rp < obj_end {
|
||||
local rd = read_digits(json, rp + k_r.length())
|
||||
if rd != "" { out.push(_int_to_str(_str_to_int(ld) + _str_to_int(rd))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
// fallback: scan two successive '"value":' digits within expression bounds
|
||||
local k_v = "\"value\":"
|
||||
local v1 = index_of_from(json, k_v, epos)
|
||||
if v1 > 0 { if v1 < obj_end {
|
||||
local d1 = read_digits(json, v1 + k_v.length())
|
||||
if d1 != "" {
|
||||
local v2 = index_of_from(json, k_v, v1 + k_v.length())
|
||||
if v2 > 0 { if v2 < obj_end {
|
||||
local d2 = read_digits(json, v2 + k_v.length())
|
||||
if d2 != "" { out.push(_int_to_str(_str_to_int(d1) + _str_to_int(d2))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 2) Compare(lhs/rhs ints): prints 1/0
|
||||
{
|
||||
local k_cp = "\"kind\":\"Compare\""
|
||||
local cpos = index_of_from(json, k_cp, obj_start)
|
||||
if cpos > 0 { if cpos < obj_end {
|
||||
local k_op = "\"operation\":\""
|
||||
local opos = index_of_from(json, k_op, cpos)
|
||||
if opos > 0 { if opos < obj_end {
|
||||
local oi = opos + k_op.length()
|
||||
local oj = index_of_from(json, "\"", oi)
|
||||
if oj > 0 { if oj <= obj_end {
|
||||
local op = json.substring(oi, oj)
|
||||
local k_v = "\"value\":"
|
||||
local lhs_v = index_of_from(json, k_v, oj)
|
||||
if lhs_v > 0 { if lhs_v < obj_end {
|
||||
local la = read_digits(json, lhs_v + k_v.length())
|
||||
if la != "" {
|
||||
local rhs_v = index_of_from(json, k_v, lhs_v + k_v.length())
|
||||
if rhs_v > 0 { if rhs_v < obj_end {
|
||||
local rb = read_digits(json, rhs_v + k_v.length())
|
||||
if rb != "" {
|
||||
local ai = _str_to_int(la)
|
||||
local bi = _str_to_int(rb)
|
||||
local res = 0
|
||||
if op == "<" { if ai < bi { res = 1 } }
|
||||
if op == "==" { if ai == bi { res = 1 } }
|
||||
if op == "<=" { if ai <= bi { res = 1 } }
|
||||
if op == ">" { if ai > bi { res = 1 } }
|
||||
if op == ">=" { if ai >= bi { res = 1 } }
|
||||
if op == "!=" { if ai != bi { res = 1 } }
|
||||
out.push(_int_to_str(res))
|
||||
pos = p + k_print.length()
|
||||
continue
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 3) FunctionCall echo/itoa (single literal arg)
|
||||
{
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = index_of_from(json, k_fc, obj_start)
|
||||
if fcp > 0 { if fcp < obj_end {
|
||||
local kn = "\"name\":\""
|
||||
local np = index_of_from(json, kn, fcp)
|
||||
if np > 0 { if np < obj_end {
|
||||
local ni = np + kn.length()
|
||||
local nj = index_of_from(json, "\"", ni)
|
||||
if nj > 0 { if nj <= obj_end {
|
||||
local fname = json.substring(ni, nj)
|
||||
local ka = "\"arguments\":["
|
||||
local ap = index_of_from(json, ka, nj)
|
||||
if ap > 0 { if ap < obj_end {
|
||||
// string arg
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, ap)
|
||||
if ps > 0 { if ps < obj_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= obj_end {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { out.push(sval) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}}
|
||||
// int arg
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, ap)
|
||||
if pi > 0 { if pi < obj_end {
|
||||
local ival = read_digits(json, pi + ki.length())
|
||||
if ival != "" { if fname == "itoa" { out.push(ival) pos = p + k_print.length() continue } else { if fname == "echo" { out.push(ival) pos = p + k_print.length() continue } } }
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 4) Literal string
|
||||
{
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, obj_start)
|
||||
if ps > 0 { if ps < obj_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= obj_end { out.push(json.substring(si, sj)) pos = p + k_print.length() continue }}
|
||||
}}
|
||||
}
|
||||
// 5) Literal int
|
||||
{
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, obj_start)
|
||||
if pi > 0 { if pi < obj_end {
|
||||
local digits = read_digits(json, pi + ki.length())
|
||||
if digits != "" { out.push(digits) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
// Unknown: skip ahead
|
||||
pos = p + k_print.length()
|
||||
if pos <= p { pos = p + 1 }
|
||||
}
|
||||
return out
|
||||
}
|
||||
// int<->str (non-negative only)
|
||||
_str_to_int(s) {
|
||||
local n = 0
|
||||
local i = 0
|
||||
loop (i < s.length()) {
|
||||
local ch = s.substring(i, i+1)
|
||||
n = n * 10
|
||||
if ch == "0" { n = n + 0 }
|
||||
if ch == "1" { n = n + 1 }
|
||||
if ch == "2" { n = n + 2 }
|
||||
if ch == "3" { n = n + 3 }
|
||||
if ch == "4" { n = n + 4 }
|
||||
if ch == "5" { n = n + 5 }
|
||||
if ch == "6" { n = n + 6 }
|
||||
if ch == "7" { n = n + 7 }
|
||||
if ch == "8" { n = n + 8 }
|
||||
if ch == "9" { n = n + 9 }
|
||||
i = i + 1
|
||||
}
|
||||
return n
|
||||
}
|
||||
_int_to_str(n) {
|
||||
if n == 0 { return "0" }
|
||||
local s = new ArrayBox()
|
||||
local x = n
|
||||
loop (x > 0) {
|
||||
local d = x % 10
|
||||
if d == 0 { s.push("0") }
|
||||
if d == 1 { s.push("1") }
|
||||
if d == 2 { s.push("2") }
|
||||
if d == 3 { s.push("3") }
|
||||
if d == 4 { s.push("4") }
|
||||
if d == 5 { s.push("5") }
|
||||
if d == 6 { s.push("6") }
|
||||
if d == 7 { s.push("7") }
|
||||
if d == 8 { s.push("8") }
|
||||
if d == 9 { s.push("9") }
|
||||
x = (x - d) / 10
|
||||
}
|
||||
local out = new ArrayBox()
|
||||
local i = s.size() - 1
|
||||
loop (i >= 0) { out.push(s.get(i)) i = i - 1 }
|
||||
local j = 0
|
||||
local acc = ""
|
||||
loop (j < out.size()) { acc = acc + out.get(j) j = j + 1 }
|
||||
return acc
|
||||
}
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"B\"}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":7}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Compare\",\"operation\":\"<\",\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}},\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":2}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":5}}}]}"
|
||||
|
||||
local arr = collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
18
apps/selfhost-vm/collect_prints_loader_smoke.nyash
Normal file
18
apps/selfhost-vm/collect_prints_loader_smoke.nyash
Normal file
@ -0,0 +1,18 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// Mixed shapes (loader-centric)
|
||||
// 1) echo() with empty args -> ""
|
||||
// 2) string literal with quotes inside
|
||||
// 3) itoa() with empty args -> "0"
|
||||
// 4) BinaryOp 8+9
|
||||
// 5) int literal 4
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"C\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":8}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":9}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
@ -1,309 +1,12 @@
|
||||
// Mini-VM: function-based entry using library
|
||||
|
||||
using selfhost.vm.json_cur as MiniJsonCur
|
||||
using selfhost.vm.json as MiniJson
|
||||
// Thin entry: delegate to core MiniVm
|
||||
// Using is pre-inlined by runner; keep entry minimal for maintainability.
|
||||
using selfhost.vm.core as MiniVm
|
||||
// Local static box (duplicated from mini_vm_lib for now to avoid include gate issues)
|
||||
// Program entry: prefer argv[0] JSON, fallback to embedded sample
|
||||
|
||||
static box Main {
|
||||
// Small helpers for quick JSON scans (avoid cross-box deps)
|
||||
index_of_from(hay, needle, pos) {
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
}
|
||||
_is_digit(ch) {
|
||||
if ch == "0" { return 1 }
|
||||
if ch == "1" { return 1 }
|
||||
if ch == "2" { return 1 }
|
||||
if ch == "3" { return 1 }
|
||||
if ch == "4" { return 1 }
|
||||
if ch == "5" { return 1 }
|
||||
if ch == "6" { return 1 }
|
||||
if ch == "7" { return 1 }
|
||||
if ch == "8" { return 1 }
|
||||
if ch == "9" { return 1 }
|
||||
return 0
|
||||
}
|
||||
_digit_value(ch) {
|
||||
if ch == "0" { return 0 }
|
||||
if ch == "1" { return 1 }
|
||||
if ch == "2" { return 2 }
|
||||
if ch == "3" { return 3 }
|
||||
if ch == "4" { return 4 }
|
||||
if ch == "5" { return 5 }
|
||||
if ch == "6" { return 6 }
|
||||
if ch == "7" { return 7 }
|
||||
if ch == "8" { return 8 }
|
||||
if ch == "9" { return 9 }
|
||||
return 0
|
||||
}
|
||||
_str_to_int(s) {
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
local acc = 0
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "0" { acc = acc * 10 + 0 i = i + 1 continue }
|
||||
if ch == "1" { acc = acc * 10 + 1 i = i + 1 continue }
|
||||
if ch == "2" { acc = acc * 10 + 2 i = i + 1 continue }
|
||||
if ch == "3" { acc = acc * 10 + 3 i = i + 1 continue }
|
||||
if ch == "4" { acc = acc * 10 + 4 i = i + 1 continue }
|
||||
if ch == "5" { acc = acc * 10 + 5 i = i + 1 continue }
|
||||
if ch == "6" { acc = acc * 10 + 6 i = i + 1 continue }
|
||||
if ch == "7" { acc = acc * 10 + 7 i = i + 1 continue }
|
||||
if ch == "8" { acc = acc * 10 + 8 i = i + 1 continue }
|
||||
if ch == "9" { acc = acc * 10 + 9 i = i + 1 continue }
|
||||
break
|
||||
}
|
||||
return acc
|
||||
}
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
// If args provided, use the first as JSON source (guard None)
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
local s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
// Top-level fast paths for simple Print cases (Literal/FunctionCall/Compare/BinaryOp)
|
||||
// 0) If(literal int) then/else branch (string prints)
|
||||
if json.indexOf("\"If\"") >= 0 {
|
||||
local kc = "\"condition\""
|
||||
local pc = json.indexOf(kc)
|
||||
if pc >= 0 {
|
||||
local kv = "\"type\":\"int\",\"value\":"
|
||||
local pv = json.indexOf(kv, pc)
|
||||
if pv >= 0 {
|
||||
local vi = pv + kv.length()
|
||||
local ve = json.indexOf("}", vi)
|
||||
if ve >= 0 {
|
||||
local cond_str = json.substring(vi, ve)
|
||||
// parse int
|
||||
local a = 0
|
||||
local i = 0
|
||||
loop (i < cond_str.length()) {
|
||||
local ch = cond_str.substring(i, i+1)
|
||||
if ch == "0" { a = a*10 i = i + 1 continue }
|
||||
if ch == "1" { a = a*10+1 i = i + 1 continue }
|
||||
if ch == "2" { a = a*10+2 i = i + 1 continue }
|
||||
if ch == "3" { a = a*10+3 i = i + 1 continue }
|
||||
if ch == "4" { a = a*10+4 i = i + 1 continue }
|
||||
if ch == "5" { a = a*10+5 i = i + 1 continue }
|
||||
if ch == "6" { a = a*10+6 i = i + 1 continue }
|
||||
if ch == "7" { a = a*10+7 i = i + 1 continue }
|
||||
if ch == "8" { a = a*10+8 i = i + 1 continue }
|
||||
if ch == "9" { a = a*10+9 i = i + 1 continue }
|
||||
break
|
||||
}
|
||||
local truthy = 0
|
||||
if a != 0 { truthy = 1 }
|
||||
local bkey = "\"then_body\""
|
||||
if truthy == 0 { bkey = "\"else_body\"" }
|
||||
local pb = json.indexOf(bkey, ve)
|
||||
if pb >= 0 {
|
||||
// search first string literal value inside the chosen body
|
||||
local ts = "\"type\":\"string\",\"value\":\""
|
||||
local ps = json.indexOf(ts, pb)
|
||||
if ps >= 0 {
|
||||
local si = ps + ts.length()
|
||||
local sj = json.indexOf("\"", si)
|
||||
if sj >= 0 { print(json.substring(si, sj)) return 0 }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 1) Print(Literal string)
|
||||
if json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\"") >= 0 {
|
||||
local ks = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\""
|
||||
local ps = json.indexOf(ks)
|
||||
if ps >= 0 {
|
||||
local si = ps + ks.length()
|
||||
local sj = json.indexOf("\"", si)
|
||||
if sj >= 0 { print(json.substring(si, sj)) return 0 }
|
||||
}
|
||||
}
|
||||
// 2) Print(Literal int)
|
||||
if json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\"") >= 0 {
|
||||
local ki = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local pi = json.indexOf(ki)
|
||||
if pi >= 0 {
|
||||
local ii = pi + ki.length()
|
||||
// take until next non-digit or closing brace
|
||||
local ie = json.indexOf("}", ii)
|
||||
if ie < 0 { ie = ii }
|
||||
local d = json.substring(ii, ie)
|
||||
print(d)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
// 3) Print(FunctionCall) minimal (echo/itoa)
|
||||
if json.indexOf("\"FunctionCall\"") >= 0 {
|
||||
local pos = 0
|
||||
loop (true) {
|
||||
local kfc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = json.indexOf(kfc, pos)
|
||||
if fcp < 0 { break }
|
||||
local kn = "\"name\":\""
|
||||
local pn = json.indexOf(kn, fcp)
|
||||
if pn < 0 { break }
|
||||
local ni = pn + kn.length()
|
||||
local nj = json.indexOf("\"", ni)
|
||||
if nj < 0 { break }
|
||||
local fname = json.substring(ni, nj)
|
||||
local ka = "\"arguments\":["
|
||||
local pa = json.indexOf(ka, nj)
|
||||
if pa < 0 { pos = nj + 1 continue }
|
||||
// string arg
|
||||
local ts = "\"type\":\"string\",\"value\":\""
|
||||
local ti = json.indexOf(ts, pa)
|
||||
if ti >= 0 {
|
||||
local si = ti + ts.length()
|
||||
local sj = json.indexOf("\"", si)
|
||||
if sj >= 0 {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { print(sval) }
|
||||
pos = sj + 1
|
||||
continue
|
||||
}
|
||||
}
|
||||
// int arg
|
||||
local ti2 = json.indexOf("\"type\":\"int\",\"value\":", pa)
|
||||
if ti2 >= 0 {
|
||||
local vi = ti2 + "\"type\":\"int\",\"value\":".length()
|
||||
local ve = json.indexOf("}", vi)
|
||||
if ve < 0 { ve = vi }
|
||||
local ival = json.substring(vi, ve)
|
||||
if fname == "itoa" || fname == "echo" { print(ival) }
|
||||
pos = ve + 1
|
||||
continue
|
||||
}
|
||||
pos = pn + 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
// 4) Print(Compare) minimal
|
||||
if json.indexOf("\"Compare\"") >= 0 {
|
||||
local ko = "\"operation\":\""
|
||||
local po = json.indexOf(ko)
|
||||
if po >= 0 {
|
||||
local oi = po + ko.length()
|
||||
local oj = json.indexOf("\"", oi)
|
||||
if oj >= 0 {
|
||||
local op = json.substring(oi, oj)
|
||||
local kv = "\"value\":\""
|
||||
// lhs int
|
||||
local kl = "\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local pl = json.indexOf(kl, oj)
|
||||
if pl >= 0 {
|
||||
local li = pl + kl.length()
|
||||
local le = json.indexOf("}", li)
|
||||
if le >= 0 {
|
||||
local la = json.substring(li, le)
|
||||
// rhs int
|
||||
local kr = "\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local pr = json.indexOf(kr, le)
|
||||
if pr >= 0 {
|
||||
local ri = pr + kr.length()
|
||||
local re = json.indexOf("}", ri)
|
||||
if re >= 0 {
|
||||
local rb = json.substring(ri, re)
|
||||
// compute
|
||||
local a = 0
|
||||
local i = 0
|
||||
loop (i < la.length()) { local ch = la.substring(i, i+1) if ch == "0" { a = a*10+0 i=i+1 continue } if ch == "1" { a=a*10+1 i=i+1 continue } if ch == "2" { a=a*10+2 i=i+1 continue } if ch == "3" { a=a*10+3 i=i+1 continue } if ch == "4" { a=a*10+4 i=i+1 continue } if ch == "5" { a=a*10+5 i=i+1 continue } if ch == "6" { a=a*10+6 i=i+1 continue } if ch == "7" { a=a*10+7 i=i+1 continue } if ch == "8" { a=a*10+8 i=i+1 continue } if ch == "9" { a=a*10+9 i=i+1 continue } break }
|
||||
local b = 0
|
||||
local j = 0
|
||||
loop (j < rb.length()) { local ch2 = rb.substring(j, j+1) if ch2 == "0" { b = b*10+0 j=j+1 continue } if ch2 == "1" { b=b*10+1 j=j+1 continue } if ch2 == "2" { b=b*10+2 j=j+1 continue } if ch2 == "3" { b=b*10+3 j=j+1 continue } if ch2 == "4" { b=b*10+4 j=j+1 continue } if ch2 == "5" { b=b*10+5 j=j+1 continue } if ch2 == "6" { b=b*10+6 j=j+1 continue } if ch2 == "7" { b=b*10+7 j=j+1 continue } if ch2 == "8" { b=b*10+8 j=j+1 continue } if ch2 == "9" { b=b*10+9 j=j+1 continue } break }
|
||||
local res = 0
|
||||
if op == "<" { if a < b { res = 1 } }
|
||||
if op == "==" { if a == b { res = 1 } }
|
||||
if op == "<=" { if a <= b { res = 1 } }
|
||||
if op == ">" { if a > b { res = 1 } }
|
||||
if op == ">=" { if a >= b { res = 1 } }
|
||||
if op == "!=" { if a != b { res = 1 } }
|
||||
print(res)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 5) BinaryOp(int+int) typed pattern twice and add（保険）
|
||||
if json.indexOf("\"BinaryOp\"") >= 0 && json.indexOf("\"operator\":\"+\"") >= 0 {
|
||||
local pat = "\"type\":\"int\",\"value\":"
|
||||
local p1 = json.indexOf(pat)
|
||||
if p1 >= 0 {
|
||||
// parse first integer by taking until next closing brace
|
||||
local i = p1 + pat.length()
|
||||
local end1 = json.indexOf("}", i)
|
||||
if end1 < 0 { end1 = i }
|
||||
local a_str = json.substring(i, end1)
|
||||
// convert a_str to int
|
||||
local a = 0
|
||||
local k = 0
|
||||
loop (k < a_str.length()) {
|
||||
local ch = a_str.substring(k, k+1)
|
||||
if ch == "0" { a = a * 10 + 0 k = k + 1 continue }
|
||||
if ch == "1" { a = a * 10 + 1 k = k + 1 continue }
|
||||
if ch == "2" { a = a * 10 + 2 k = k + 1 continue }
|
||||
if ch == "3" { a = a * 10 + 3 k = k + 1 continue }
|
||||
if ch == "4" { a = a * 10 + 4 k = k + 1 continue }
|
||||
if ch == "5" { a = a * 10 + 5 k = k + 1 continue }
|
||||
if ch == "6" { a = a * 10 + 6 k = k + 1 continue }
|
||||
if ch == "7" { a = a * 10 + 7 k = k + 1 continue }
|
||||
if ch == "8" { a = a * 10 + 8 k = k + 1 continue }
|
||||
if ch == "9" { a = a * 10 + 9 k = k + 1 continue }
|
||||
break
|
||||
}
|
||||
// parse second integer
|
||||
local p2 = json.lastIndexOf(pat)
|
||||
if p2 >= 0 && p2 != p1 {
|
||||
local j = p2 + pat.length()
|
||||
local end2 = json.indexOf("}", j)
|
||||
if end2 < 0 { end2 = j }
|
||||
local b_str = json.substring(j, end2)
|
||||
local b = 0
|
||||
local m = 0
|
||||
loop (m < b_str.length()) {
|
||||
local ch2 = b_str.substring(m, m+1)
|
||||
if ch2 == "0" { b = b * 10 + 0 m = m + 1 continue }
|
||||
if ch2 == "1" { b = b * 10 + 1 m = m + 1 continue }
|
||||
if ch2 == "2" { b = b * 10 + 2 m = m + 1 continue }
|
||||
if ch2 == "3" { b = b * 10 + 3 m = m + 1 continue }
|
||||
if ch2 == "4" { b = b * 10 + 4 m = m + 1 continue }
|
||||
if ch2 == "5" { b = b * 10 + 5 m = m + 1 continue }
|
||||
if ch2 == "6" { b = b * 10 + 6 m = m + 1 continue }
|
||||
if ch2 == "7" { b = b * 10 + 7 m = m + 1 continue }
|
||||
if ch2 == "8" { b = b * 10 + 8 m = m + 1 continue }
|
||||
if ch2 == "9" { b = b * 10 + 9 m = m + 1 continue }
|
||||
break
|
||||
}
|
||||
print(a + b)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
// Fallback to full MiniVm runner
|
||||
local vm = new MiniVm()
|
||||
return vm.run(json)
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
if args { if args.size() > 0 { @s = args.get(0) if s { json = s } } }
|
||||
return new MiniVm().run(json)
|
||||
}
|
||||
}
|
||||
|
||||
// Top-level fallback entry for current runner
|
||||
function main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
local s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
local vm = new MiniVm()
|
||||
return vm.run(json)
|
||||
}
|
||||
|
||||
@ -3,23 +3,23 @@
|
||||
static box MiniVm {
|
||||
_is_digit(ch) { return ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" }
|
||||
read_digits(json, pos) {
|
||||
local out = ""
|
||||
@out = ""
|
||||
loop (true) {
|
||||
local s = json.substring(pos, pos+1)
|
||||
@s = json.substring(pos, pos+1)
|
||||
if s == "" { break }
|
||||
if _is_digit(s) { out = out + s pos = pos + 1 } else { break }
|
||||
}
|
||||
return out
|
||||
}
|
||||
parse_first_int(json) {
|
||||
local key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
local idx = json.lastIndexOf(key)
|
||||
@key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
@idx = json.lastIndexOf(key)
|
||||
if idx < 0 { return "0" }
|
||||
local start = idx + key.length()
|
||||
@start = idx + key.length()
|
||||
return read_digits(json, start)
|
||||
}
|
||||
run_branch(json) {
|
||||
local n = parse_first_int(json)
|
||||
@n = parse_first_int(json)
|
||||
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
||||
print("20")
|
||||
return 0
|
||||
@ -29,12 +29,12 @@ static box MiniVm {
|
||||
// Program entry: embedded JSON (value=1 → print 10; else → 20)
|
||||
static box Main {
|
||||
main(args) {
|
||||
local vm = new MiniVm()
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
@vm = new MiniVm()
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
// If provided, override by argv[0]
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
local s = args.get(0)
|
||||
@s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
@ -44,15 +44,15 @@ static box Main {
|
||||
|
||||
// Top-level fallback entry for current runner
|
||||
function main(args) {
|
||||
local vm = new MiniVm()
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
@vm = new MiniVm()
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
local s = args.get(0)
|
||||
@s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
local n = vm.parse_first_int(json)
|
||||
@n = vm.parse_first_int(json)
|
||||
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
||||
print("20")
|
||||
return 0
|
||||
|
||||
@ -6,9 +6,9 @@ static box MiniVm {
|
||||
|
||||
// Read consecutive digits starting at pos
|
||||
read_digits(json, pos) {
|
||||
local out = ""
|
||||
@out = ""
|
||||
loop (true) {
|
||||
local s = json.substring(pos, pos+1)
|
||||
@s = json.substring(pos, pos+1)
|
||||
if s == "" { break }
|
||||
if _is_digit(s) { out = out + s pos = pos + 1 } else { break }
|
||||
}
|
||||
@ -17,16 +17,16 @@ static box MiniVm {
|
||||
|
||||
// Extract the first integer literal from our AST JSON v0 subset
|
||||
parse_first_int(json) {
|
||||
local key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
local idx = json.lastIndexOf(key)
|
||||
@key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
@idx = json.lastIndexOf(key)
|
||||
if idx < 0 { return "0" }
|
||||
local start = idx + key.length()
|
||||
@start = idx + key.length()
|
||||
return read_digits(json, start)
|
||||
}
|
||||
|
||||
// Execute a minimal program: print the extracted integer and exit code 0
|
||||
run(json) {
|
||||
local n = parse_first_int(json)
|
||||
@n = parse_first_int(json)
|
||||
print(n)
|
||||
return 0
|
||||
}
|
||||
|
||||
16
apps/selfhost-vm/run_core_wrapper.nyash
Normal file
16
apps/selfhost-vm/run_core_wrapper.nyash
Normal file
@ -0,0 +1,16 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
if args { if args.size() > 0 { @s = args.get(0) if s { json = s } } }
|
||||
print("pre")
|
||||
print(json.length())
|
||||
print(json.indexOf("\"kind\":\"Program\""))
|
||||
print(json.indexOf("\"kind\":\"Print\""))
|
||||
print(json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\""))
|
||||
@code = new MiniVm().run(json)
|
||||
print("post")
|
||||
return code
|
||||
}
|
||||
}
|
||||
@ -79,17 +79,93 @@ static box MiniVmBinOp {
|
||||
local scan = new MiniVmScan()
|
||||
local k_expr = "\"expression\":{"
|
||||
local expr_pos = scan.index_of_from(json, k_expr, print_pos)
|
||||
if expr_pos <= 0 || expr_pos >= end { return -1 }
|
||||
// If expression object cannot be bounded, fall back to typed-direct pattern within the current slice
|
||||
if expr_pos <= 0 || expr_pos >= end {
|
||||
// bound coarse slice to current Print by next Print marker
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local next_p = scan.index_of_from(json, k_print, print_pos + 1)
|
||||
local slice_end = end
|
||||
if next_p > 0 { slice_end = next_p }
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
// only if BinaryOp is present in this slice
|
||||
if scan.index_of_from(json, "\"kind\":\"BinaryOp\"", print_pos) > 0 {
|
||||
local lp = scan.index_of_from(json, k_lint, print_pos)
|
||||
if lp > 0 { if lp < slice_end {
|
||||
local ld = scan.read_digits(json, lp + k_lint.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_rint, lp + k_lint.length())
|
||||
if rp > 0 { if rp < slice_end {
|
||||
local rd = scan.read_digits(json, rp + k_rint.length())
|
||||
if rd != "" { print(scan._int_to_str(scan._str_to_int(ld) + scan._str_to_int(rd))) return 1 }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
return -1
|
||||
}
|
||||
local obj_start = scan.index_of_from(json, "{", expr_pos)
|
||||
if obj_start <= 0 || obj_start >= end { return -1 }
|
||||
local obj_end = scan.find_balanced_object_end(json, obj_start)
|
||||
if obj_end <= 0 || obj_end > end { return -1 }
|
||||
if obj_end <= 0 || obj_end > end {
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local next_p = scan.index_of_from(json, k_print, print_pos + 1)
|
||||
local obj_end2 = end
|
||||
if next_p > 0 && next_p <= end { obj_end2 = next_p }
|
||||
// typed-direct fallback in bounded region
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = scan.index_of_from(json, k_lint, obj_start)
|
||||
if lp > 0 { if lp < obj_end2 {
|
||||
local ld = scan.read_digits(json, lp + k_lint.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_rint, lp + k_lint.length())
|
||||
if rp > 0 { if rp < obj_end2 {
|
||||
local rd = scan.read_digits(json, rp + k_rint.length())
|
||||
if rd != "" { print(scan._int_to_str(scan._str_to_int(ld) + scan._str_to_int(rd))) return 1 }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
return -1
|
||||
}
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = scan.index_of_from(json, k_bo, obj_start)
|
||||
if bpos <= 0 || bpos >= obj_end { return -1 }
|
||||
if bpos <= 0 || bpos >= obj_end {
|
||||
// typed-direct fallback (within bounds window)
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = scan.index_of_from(json, k_lint, obj_start)
|
||||
if lp > 0 { if lp < obj_end {
|
||||
local ld = scan.read_digits(json, lp + k_lint.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_rint, lp + k_lint.length())
|
||||
if rp > 0 { if rp < obj_end {
|
||||
local rd = scan.read_digits(json, rp + k_rint.length())
|
||||
if rd != "" { print(scan._int_to_str(scan._str_to_int(ld) + scan._str_to_int(rd))) return 1 }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
return -1
|
||||
}
|
||||
local k_plus = "\"operator\":\"+\""
|
||||
local opos = scan.index_of_from(json, k_plus, bpos)
|
||||
if opos <= 0 || opos >= obj_end { return -1 }
|
||||
if opos <= 0 || opos >= obj_end {
|
||||
// typed-direct fallback
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = scan.index_of_from(json, k_lint, obj_start)
|
||||
if lp > 0 { if lp < obj_end {
|
||||
local ld = scan.read_digits(json, lp + k_lint.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_rint, lp + k_lint.length())
|
||||
if rp > 0 { if rp < obj_end {
|
||||
local rd = scan.read_digits(json, rp + k_rint.length())
|
||||
if rd != "" { print(scan._int_to_str(scan._str_to_int(ld) + scan._str_to_int(rd))) return 1 }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
return -1
|
||||
}
|
||||
local nums = []
|
||||
local i = obj_start
|
||||
loop (i < obj_end) {
|
||||
@ -2,19 +2,41 @@
|
||||
static box MiniVmScan {
|
||||
// helper: find needle from position pos
|
||||
index_of_from(hay, needle, pos) {
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
// Guard position; clamp to valid range to avoid negative substring
|
||||
if pos < 0 { pos = 0 }
|
||||
local n = hay.length()
|
||||
if pos >= n { return -1 }
|
||||
local m = needle.length()
|
||||
if m <= 0 { return pos }
|
||||
local i = pos
|
||||
local limit = n - m
|
||||
loop (i <= limit) {
|
||||
local seg = hay.substring(i, i + m)
|
||||
if seg == needle { return i }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// helper: find balanced bracket range [ ... ] starting at idx (points to '[')
|
||||
find_balanced_array_end(json, idx) {
|
||||
local n = json.length()
|
||||
@n = json.length()
|
||||
if json.substring(idx, idx+1) != "[" { return -1 }
|
||||
local depth = 0
|
||||
local i = idx
|
||||
@depth = 0
|
||||
@i = idx
|
||||
@in_str = 0
|
||||
@guard = 0
|
||||
loop (i < n) {
|
||||
local ch = json.substring(i, i+1)
|
||||
guard = guard + 1
|
||||
if guard > 50000 { return -1 }
|
||||
@ch = json.substring(i, i+1)
|
||||
if in_str == 1 {
|
||||
if ch == "\\" { i = i + 2 continue }
|
||||
if ch == "\"" { in_str = 0 i = i + 1 continue }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if ch == "\"" { in_str = 1 i = i + 1 continue }
|
||||
if ch == "[" { depth = depth + 1 }
|
||||
if ch == "]" {
|
||||
depth = depth - 1
|
||||
@ -27,12 +49,23 @@ static box MiniVmScan {
|
||||
|
||||
// helper: find balanced object range { ... } starting at idx (points to '{')
|
||||
find_balanced_object_end(json, idx) {
|
||||
local n = json.length()
|
||||
@n = json.length()
|
||||
if json.substring(idx, idx+1) != "{" { return -1 }
|
||||
local depth = 0
|
||||
local i = idx
|
||||
@depth = 0
|
||||
@i = idx
|
||||
@in_str = 0
|
||||
@guard = 0
|
||||
loop (i < n) {
|
||||
local ch = json.substring(i, i+1)
|
||||
guard = guard + 1
|
||||
if guard > 50000 { return -1 }
|
||||
@ch = json.substring(i, i+1)
|
||||
if in_str == 1 {
|
||||
if ch == "\\" { i = i + 2 continue }
|
||||
if ch == "\"" { in_str = 0 i = i + 1 continue }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if ch == "\"" { in_str = 1 i = i + 1 continue }
|
||||
if ch == "{" { depth = depth + 1 }
|
||||
if ch == "}" {
|
||||
depth = depth - 1
|
||||
@ -44,11 +77,11 @@ static box MiniVmScan {
|
||||
}
|
||||
|
||||
_str_to_int(s) {
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
local acc = 0
|
||||
@i = 0
|
||||
@n = s.length()
|
||||
@acc = 0
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
@ch = s.substring(i, i+1)
|
||||
if ch == "0" { acc = acc * 10 + 0 i = i + 1 continue }
|
||||
if ch == "1" { acc = acc * 10 + 1 i = i + 1 continue }
|
||||
if ch == "2" { acc = acc * 10 + 2 i = i + 1 continue }
|
||||
@ -78,11 +111,11 @@ static box MiniVmScan {
|
||||
}
|
||||
_int_to_str(n) {
|
||||
if n == 0 { return "0" }
|
||||
local v = n
|
||||
local out = ""
|
||||
@v = n
|
||||
@out = ""
|
||||
loop (v > 0) {
|
||||
local d = v % 10
|
||||
local ch = _digit_char(d)
|
||||
@d = v % 10
|
||||
@ch = _digit_char(d)
|
||||
out = ch + out
|
||||
v = v / 10
|
||||
}
|
||||
@ -91,9 +124,9 @@ static box MiniVmScan {
|
||||
|
||||
// Read digit runs starting at pos
|
||||
read_digits(json, pos) {
|
||||
local out = ""
|
||||
@out = ""
|
||||
loop (true) {
|
||||
local s = json.substring(pos, pos+1)
|
||||
@s = json.substring(pos, pos+1)
|
||||
if s == "" { break }
|
||||
if s == "0" { out = out + s pos = pos + 1 continue }
|
||||
if s == "1" { out = out + s pos = pos + 1 continue }
|
||||
@ -112,18 +145,18 @@ static box MiniVmScan {
|
||||
|
||||
// Linear pass: sum all numbers outside of quotes
|
||||
sum_numbers_no_quotes(json) {
|
||||
local i = 0
|
||||
local n = json.length()
|
||||
local total = 0
|
||||
@i = 0
|
||||
@n = json.length()
|
||||
@total = 0
|
||||
loop (i < n) {
|
||||
local ch = json.substring(i, i+1)
|
||||
@ch = json.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
local j = index_of_from(json, "\"", i+1)
|
||||
@j = index_of_from(json, "\"", i+1)
|
||||
if j < 0 { break }
|
||||
i = j + 1
|
||||
continue
|
||||
}
|
||||
local d = read_digits(json, i)
|
||||
@d = read_digits(json, i)
|
||||
if d { total = total + _str_to_int(d) i = i + d.length() continue }
|
||||
i = i + 1
|
||||
}
|
||||
@ -132,11 +165,11 @@ static box MiniVmScan {
|
||||
|
||||
// Naive: sum all digit runs anywhere
|
||||
sum_all_digits_naive(json) {
|
||||
local i = 0
|
||||
local n = json.length()
|
||||
local total = 0
|
||||
@i = 0
|
||||
@n = json.length()
|
||||
@total = 0
|
||||
loop (i < n) {
|
||||
local d = read_digits(json, i)
|
||||
@d = read_digits(json, i)
|
||||
if d { total = total + _str_to_int(d) i = i + d.length() continue }
|
||||
i = i + 1
|
||||
}
|
||||
@ -145,19 +178,19 @@ static box MiniVmScan {
|
||||
|
||||
// Sum first two integers outside quotes; returns string or empty
|
||||
sum_first_two_numbers(json) {
|
||||
local i = 0
|
||||
local n = json.length()
|
||||
local total = 0
|
||||
@i = 0
|
||||
@n = json.length()
|
||||
@total = 0
|
||||
local found = 0
|
||||
loop (i < n) {
|
||||
local ch = json.substring(i, i+1)
|
||||
@ch = json.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
local j = index_of_from(json, "\"", i+1)
|
||||
@j = index_of_from(json, "\"", i+1)
|
||||
if j < 0 { break }
|
||||
i = j + 1
|
||||
continue
|
||||
}
|
||||
local d = read_digits(json, i)
|
||||
@d = read_digits(json, i)
|
||||
if d {
|
||||
total = total + _str_to_int(d)
|
||||
found = found + 1
|
||||
@ -170,4 +203,3 @@ static box MiniVmScan {
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
19
apps/selfhost/compiler/README.md
Normal file
19
apps/selfhost/compiler/README.md
Normal file
@ -0,0 +1,19 @@
|
||||
# Nyash Selfhost Compiler (MVP scaffold)
|
||||
|
||||
This is the Phase 15.3 work-in-progress Nyash compiler implemented in Ny.
|
||||
|
||||
Layout
|
||||
- `compiler.nyash`: entry (CompilerBox). Reads `tmp/ny_parser_input.ny`, prints JSON v0.
|
||||
- `parser/`: lexer/parser/ast (scaffolds; to be filled as we extend Stage‑2)
|
||||
- `mir/`: builder/optimizer stubs (future; current target is JSON v0 emit)
|
||||
- `tests/`: Stage‑1/2 samples (TBD)
|
||||
|
||||
Run (behind flag)
|
||||
- `NYASH_USE_NY_COMPILER=1 target/release/nyash --backend vm <program.nyash>`
|
||||
- The runner writes the input to `tmp/ny_parser_input.ny` and invokes this program.
|
||||
- It captures a JSON v0 line from stdout and executes it via the JSON bridge.
|
||||
- Stage‑3 syntax gate: set `NYASH_NY_COMPILER_STAGE3=1` to pass `--stage3` to the parser (accepts Break/Continue/Throw/Try in JSON v0).
|
||||
|
||||
Notes
|
||||
- Early MVP emits a minimal JSON v0 (currently a placeholder: return 0). We will gradually wire lexer/parser/emitter.
|
||||
- Keep JSON v0 spec in `docs/reference/ir/json_v0.md`.
|
||||
38
apps/selfhost/compiler/boxes/debug_box.nyash
Normal file
38
apps/selfhost/compiler/boxes/debug_box.nyash
Normal file
@ -0,0 +1,38 @@
|
||||
// DebugBox — conditional debug output aggregator (extracted)
|
||||
box DebugBox {
|
||||
enabled
|
||||
birth() {
|
||||
me.enabled = 0
|
||||
return 0
|
||||
}
|
||||
set_enabled(v) {
|
||||
me.enabled = v
|
||||
return 0
|
||||
}
|
||||
log(msg) {
|
||||
if me.enabled {
|
||||
local c = new ConsoleBox()
|
||||
c.println("[DEBUG] " + msg)
|
||||
}
|
||||
return 0
|
||||
}
|
||||
info(msg) {
|
||||
if me.enabled {
|
||||
local c = new ConsoleBox()
|
||||
c.println("[INFO] " + msg)
|
||||
}
|
||||
return 0
|
||||
}
|
||||
error(msg) {
|
||||
if me.enabled {
|
||||
local c = new ConsoleBox()
|
||||
c.println("[ERROR] " + msg)
|
||||
}
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// Include stub to satisfy current include lowering (expects a static box)
|
||||
static box DebugStub {
|
||||
main(args) { return 0 }
|
||||
}
|
||||
26
apps/selfhost/compiler/boxes/emitter_box.nyash
Normal file
26
apps/selfhost/compiler/boxes/emitter_box.nyash
Normal file
@ -0,0 +1,26 @@
|
||||
// EmitterBox — thin wrapper to emit JSON v0 (extracted)
|
||||
box EmitterBox {
|
||||
emit_program(json, usings_json) {
|
||||
if json == null { return json }
|
||||
// Normalize usings payload to at least an empty array so meta.usings is always present
|
||||
local payload = usings_json
|
||||
if payload == null { payload = "[]" }
|
||||
if payload.length() == 0 { payload = "[]" }
|
||||
// Inject meta.usings before closing brace of top-level object
|
||||
local n = json.lastIndexOf("}")
|
||||
if n < 0 { return json }
|
||||
local head = json.substring(0, n)
|
||||
local tail = json.substring(n, json.length())
|
||||
local needs_comma = 1
|
||||
if head.length() == 0 { needs_comma = 0 } else {
|
||||
local last = head.substring(head.length() - 1, head.length())
|
||||
if last == "{" || last == "," { needs_comma = 0 }
|
||||
}
|
||||
if needs_comma == 1 { head = head + "," }
|
||||
return head + "\"meta\":{\"usings\":" + payload + "}" + tail
|
||||
}
|
||||
}
|
||||
|
||||
static box EmitterStub {
|
||||
main(args) { return 0 }
|
||||
}
|
||||
52
apps/selfhost/compiler/boxes/mir_emitter_box.nyash
Normal file
52
apps/selfhost/compiler/boxes/mir_emitter_box.nyash
Normal file
@ -0,0 +1,52 @@
|
||||
// MirEmitterBox — Minimal MIR JSON v0 emitter (M2 MVP)
|
||||
// Scope: Return(Int) only (const + ret). Safe default to 0 when not found.
|
||||
// Future: add Binary/Compare/ExternCall/BoxCall lowering incrementally.
|
||||
|
||||
box MirEmitterBox {
|
||||
// Extract first Return(Int) value from Stage-1 JSON (very small string scan)
|
||||
_extract_return_int(ast_json) {
|
||||
if ast_json == null { return 0 }
|
||||
// Look for '"type":"Return"'
|
||||
local p = ast_json.lastIndexOf("\"type\":\"Return\"")
|
||||
if p < 0 { p = ast_json.indexOf("\"type\":\"Return\"") }
|
||||
if p < 0 { return 0 }
|
||||
// From there, search for '"type":"Int","value":'
|
||||
local q = ast_json.indexOf("\"type\":\"Int\",\"value\":", p)
|
||||
if q < 0 { return 0 }
|
||||
q = q + 23 // length of the marker
|
||||
// Read consecutive digits (optional minus not handled in Stage-1 yet)
|
||||
local n = ast_json.length()
|
||||
local i = q
|
||||
local s = ""
|
||||
loop(i < n) {
|
||||
local ch = ast_json.substring(i, i+1)
|
||||
if ch >= "0" && ch <= "9" { s = s + ch i = i + 1 } else { break }
|
||||
}
|
||||
if s.length() == 0 { return 0 }
|
||||
// String to int via addition loop
|
||||
local val = 0
|
||||
local k = 0
|
||||
local m = s.length()
|
||||
loop(k < m) {
|
||||
local d = s.substring(k, k+1)
|
||||
local dv = 0
|
||||
if d == "1" { dv = 1 } else { if d == "2" { dv = 2 } else { if d == "3" { dv = 3 } else { if d == "4" { dv = 4 } else { if d == "5" { dv = 5 } else { if d == "6" { dv = 6 } else { if d == "7" { dv = 7 } else { if d == "8" { dv = 8 } else { if d == "9" { dv = 9 } } } } } } } } }
|
||||
val = val * 10 + dv
|
||||
k = k + 1
|
||||
}
|
||||
return val
|
||||
}
|
||||
|
||||
// Build minimal MIR JSON v0: main with const -> ret
|
||||
emit_mir_min(ast_json) {
|
||||
local retv = me._extract_return_int(ast_json)
|
||||
local s = "{\"functions\":[{\"name\":\"main\",\"params\":[],\"blocks\":[{\"id\":0,\"instructions\":["
|
||||
s = s + "{\\\"op\\\":\\\"const\\\",\\\"value\\\":{\\\"type\\\":\\\"i64\\\",\\\"value\\\":" + retv + "},\\\"dst\\\":1},"
|
||||
s = s + "{\\\"op\\\":\\\"ret\\\",\\\"value\\\":1}"
|
||||
s = s + "]}]}]}"
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
static box MirEmitterStub { main(args) { return 0 } }
|
||||
|
||||
917
apps/selfhost/compiler/boxes/parser_box.nyash
Normal file
917
apps/selfhost/compiler/boxes/parser_box.nyash
Normal file
@ -0,0 +1,917 @@
|
||||
// ParserBox — Stage‑1 JSON v0 generator（extracted, simplified for Rust parser）
|
||||
box ParserBox {
|
||||
gpos
|
||||
usings_json
|
||||
stage3
|
||||
|
||||
birth() { me.gpos = 0 me.usings_json = "[]" me.stage3 = 0 return 0 }
|
||||
|
||||
stage3_enable(flag) {
|
||||
if flag == null { flag = 0 }
|
||||
if flag == 0 { me.stage3 = 0 } else { me.stage3 = 1 }
|
||||
return 0
|
||||
}
|
||||
|
||||
stage3_enabled() {
|
||||
if me.stage3 == 1 { return 1 }
|
||||
return 0
|
||||
}
|
||||
|
||||
esc_json(s) {
|
||||
local out = ""
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
loop(i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "\\" { out = out + "\\\\" } else { if ch == "\"" { out = out + "\\\"" } else { out = out + ch } }
|
||||
i = i + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
is_digit(ch) { return ch >= "0" && ch <= "9" }
|
||||
is_space(ch) { return ch == " " || ch == "\t" || ch == "\n" || ch == "\r" }
|
||||
// simple alpha/underscore check for identifiers
|
||||
is_alpha(ch) { return (ch >= "A" && ch <= "Z") || (ch >= "a" && ch <= "z") || ch == "_" }
|
||||
|
||||
gpos_set(i) { me.gpos = i return 0 }
|
||||
gpos_get() { return me.gpos }
|
||||
|
||||
// lightweight string helpers
|
||||
starts_with(src, i, pat) {
|
||||
local n = src.length()
|
||||
local m = pat.length()
|
||||
if i + m > n { return 0 }
|
||||
local k = 0
|
||||
loop(k < m) {
|
||||
if src.substring(i + k, i + k + 1) != pat.substring(k, k + 1) { return 0 }
|
||||
k = k + 1
|
||||
}
|
||||
return 1
|
||||
}
|
||||
index_of(src, i, pat) {
|
||||
local n = src.length()
|
||||
local m = pat.length()
|
||||
if m == 0 { return i }
|
||||
local j = i
|
||||
loop(j + m <= n) {
|
||||
if me.starts_with(src, j, pat) { return j }
|
||||
j = j + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
trim(s) {
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
loop(i < n && (s.substring(i,i+1) == " " || s.substring(i,i+1) == "\t")) { i = i + 1 }
|
||||
local j = n
|
||||
loop(j > i && (s.substring(j-1,j) == " " || s.substring(j-1,j) == "\t" || s.substring(j-1,j) == ";")) { j = j - 1 }
|
||||
return s.substring(i, j)
|
||||
}
|
||||
|
||||
// Enhanced whitespace skipper (inline lines): used by line-based using extractor
|
||||
trim_ws_and_line_comments(s) {
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
// leading spaces/tabs
|
||||
loop(i < n && (s.substring(i,i+1) == " " || s.substring(i,i+1) == "\t")) { i = i + 1 }
|
||||
// strip line comments
|
||||
if i + 1 < n && s.substring(i, i+2) == "//" { return "" }
|
||||
return s.substring(i, n)
|
||||
}
|
||||
|
||||
// keyword match at position i with word-boundary (next char not [A-Za-z0-9_])
|
||||
starts_with_kw(src, i, kw) {
|
||||
if me.starts_with(src, i, kw) == 0 { return 0 }
|
||||
local n = src.length()
|
||||
local j = i + kw.length()
|
||||
if j >= n { return 1 }
|
||||
local ch = src.substring(j, j+1)
|
||||
if me.is_alpha(ch) || me.is_digit(ch) { return 0 }
|
||||
return 1
|
||||
}
|
||||
|
||||
// integer to string (uses string concat coercion)
|
||||
i2s(v) { return "" + v }
|
||||
|
||||
// Read identifier starting at i: [A-Za-z_][A-Za-z0-9_]*; returns "name@pos"
|
||||
read_ident2(src, i) {
|
||||
local n = src.length()
|
||||
local j = i
|
||||
if j >= n { return "@" + me.i2s(i) }
|
||||
local ch = src.substring(j, j+1)
|
||||
if me.is_alpha(ch) == 0 { return "@" + me.i2s(i) }
|
||||
j = j + 1
|
||||
loop(j < n) {
|
||||
local c = src.substring(j, j+1)
|
||||
if me.is_alpha(c) || me.is_digit(c) { j = j + 1 } else { break }
|
||||
}
|
||||
local name = src.substring(i, j)
|
||||
return name + "@" + me.i2s(j)
|
||||
}
|
||||
|
||||
// Read string literal at i (i points to '"'); returns raw content (no quotes), updates gpos
|
||||
read_string_lit(src, i) {
|
||||
local n = src.length()
|
||||
local j = i
|
||||
if j >= n || src.substring(j, j+1) != "\"" { me.gpos_set(i) return "" }
|
||||
j = j + 1
|
||||
local out = ""
|
||||
local guard = 0
|
||||
local max = 200000
|
||||
loop(j < n) {
|
||||
if guard > max { break } else { guard = guard + 1 }
|
||||
local ch = src.substring(j, j+1)
|
||||
if ch == "\"" { j = j + 1 me.gpos_set(j) return out }
|
||||
if ch == "\\" && j + 1 < n {
|
||||
local nx = src.substring(j+1, j+2)
|
||||
if nx == "\"" { out = out + "\"" j = j + 2 } else { if nx == "\\" { out = out + "\\" j = j + 2 } else { if nx == "n" { out = out + "\n" j = j + 2 } else { if nx == "r" { out = out + "\r" j = j + 2 } else { if nx == "t" { out = out + "\t" j = j + 2 } else { if nx == "u" && j + 5 < n { out = out + src.substring(j, j+6) j = j + 6 } else { out = out + nx j = j + 2 } } } } } }
|
||||
} else { out = out + ch j = j + 1 }
|
||||
}
|
||||
me.gpos_set(j)
|
||||
return out
|
||||
}
|
||||
|
||||
// Append a using entry into usings_json (no-op acceptance path)
|
||||
add_using(kind, target, alias) {
|
||||
// kind: "path" or "ns"; target: path or namespace; alias: nullable
|
||||
local cur = me.usings_json
|
||||
if cur == null || cur.length() == 0 { cur = "[]" }
|
||||
// Build entry
|
||||
local name = ""
|
||||
local path = null
|
||||
if kind == "path" {
|
||||
path = target
|
||||
if alias != null { name = alias } else {
|
||||
local p = target
|
||||
// basename
|
||||
local idx = -1
|
||||
local t = 0
|
||||
loop(t < p.length()) { if p.substring(t,t+1) == "/" { idx = t } t = t + 1 }
|
||||
if idx >= 0 { p = p.substring(idx+1, p.length()) }
|
||||
if p.length() > 6 && me.starts_with(p, p.length()-6, ".nyash") == 1 { p = p.substring(0, p.length()-6) }
|
||||
name = p
|
||||
}
|
||||
} else {
|
||||
name = target
|
||||
if alias != null { name = alias }
|
||||
}
|
||||
local entry = "{\"name\":\"" + me.esc_json(name) + "\""
|
||||
if path != null { entry = entry + ",\"path\":\"" + me.esc_json(path) + "\"" }
|
||||
entry = entry + "}"
|
||||
// Insert before closing ']' of array
|
||||
if cur == "[]" { me.usings_json = "[" + entry + "]" return 0 }
|
||||
// naive append
|
||||
local pos = cur.lastIndexOf("]")
|
||||
if pos < 0 { me.usings_json = "[" + entry + "]" return 0 }
|
||||
me.usings_json = cur.substring(0, pos) + "," + entry + "]"
|
||||
return 0
|
||||
}
|
||||
|
||||
// Collect `using` lines into JSON array stored in me.usings_json (no-op acceptance)
|
||||
extract_usings(src) {
|
||||
if src == null { me.usings_json = "[]" return 0 }
|
||||
local n = src.length()
|
||||
local i = 0
|
||||
local first = 1
|
||||
local out = "["
|
||||
loop(i < n) {
|
||||
// read a line
|
||||
local j = i
|
||||
loop(j < n && src.substring(j, j+1) != "\n") { j = j + 1 }
|
||||
local line = src.substring(i, j)
|
||||
// process
|
||||
local k = 0
|
||||
loop(k < line.length() && (line.substring(k,k+1) == " " || line.substring(k,k+1) == "\t")) { k = k + 1 }
|
||||
if me.starts_with(line, k, "using ") == 1 {
|
||||
local rest = me.trim(line.substring(k + 6, line.length()))
|
||||
// split on ' as '
|
||||
local as_pos = me.index_of(rest, 0, " as ")
|
||||
local target = rest
|
||||
local alias = null
|
||||
if as_pos >= 0 {
|
||||
target = me.trim(rest.substring(0, as_pos))
|
||||
alias = me.trim(rest.substring(as_pos + 4, rest.length()))
|
||||
}
|
||||
// path or namespace
|
||||
local is_path = 0
|
||||
if target.length() > 0 {
|
||||
if me.starts_with(target, 0, "\"") == 1 { is_path = 1 }
|
||||
if me.starts_with(target, 0, "./") == 1 { is_path = 1 }
|
||||
if me.starts_with(target, 0, "/") == 1 { is_path = 1 }
|
||||
if target.length() >= 6 && me.starts_with(target, target.length()-6, ".nyash") == 1 { is_path = 1 }
|
||||
}
|
||||
local name = ""
|
||||
local path = null
|
||||
if is_path == 1 {
|
||||
// trim quotes
|
||||
if me.starts_with(target, 0, "\"") == 1 {
|
||||
target = target.substring(1, target.length())
|
||||
if target.length() > 0 && target.substring(target.length()-1, target.length()) == "\"" {
|
||||
target = target.substring(0, target.length()-1)
|
||||
}
|
||||
}
|
||||
path = target
|
||||
if alias != null { name = alias } else {
|
||||
// derive from basename
|
||||
local p = target
|
||||
// find last '/'
|
||||
local idx = -1
|
||||
local t = 0
|
||||
loop(t < p.length()) { if p.substring(t,t+1) == "/" { idx = t } t = t + 1 }
|
||||
if idx >= 0 { p = p.substring(idx+1, p.length()) }
|
||||
// strip .nyash
|
||||
if p.length() > 6 && me.starts_with(p, p.length()-6, ".nyash") == 1 { p = p.substring(0, p.length()-6) }
|
||||
name = p
|
||||
}
|
||||
} else {
|
||||
name = target
|
||||
}
|
||||
// append JSON entry
|
||||
if first == 0 { out = out + "," } else { first = 0 }
|
||||
out = out + "{\"name\":\"" + me.esc_json(name) + "\""
|
||||
if path != null { out = out + ",\"path\":\"" + me.esc_json(path) + "\"" }
|
||||
out = out + "}"
|
||||
}
|
||||
i = j + 1
|
||||
}
|
||||
out = out + "]"
|
||||
me.usings_json = out
|
||||
return 0
|
||||
}
|
||||
get_usings_json() { return me.usings_json }
|
||||
|
||||
to_int(s) { local n = s.length() if n == 0 { return 0 } local i = 0 local acc = 0 loop(i < n) { local d = s.substring(i, i+1) local dv = 0 if d == "1" { dv = 1 } else { if d == "2" { dv = 2 } else { if d == "3" { dv = 3 } else { if d == "4" { dv = 4 } else { if d == "5" { dv = 5 } else { if d == "6" { dv = 6 } else { if d == "7" { dv = 7 } else { if d == "8" { dv = 8 } else { if d == "9" { dv = 9 } } } } } } } } } acc = acc * 10 + dv i = i + 1 } return acc }
|
||||
|
||||
skip_ws(src, i) { if src == null { return i } local n = src.length() local cont = 1 local guard = 0 local max = 100000 loop(cont == 1) { if guard > max { return i } guard = guard + 1 if i < n { if me.is_space(src.substring(i, i+1)) { i = i + 1 } else { cont = 0 } } else { cont = 0 } } return i }
|
||||
// identifiers/strings not required for Stage‑1 beyond string literal parse above
|
||||
|
||||
// using metadata omitted in Stage‑1
|
||||
|
||||
parse_number2(src, i) { local n = src.length() local j = i local cont = 1 local guard = 0 local max = 100000 loop(cont == 1) { if guard > max { cont = 0 } else { guard = guard + 1 if j < n { if me.is_digit(src.substring(j, j+1)) { j = j + 1 } else { cont = 0 } } else { cont = 0 } } } local s = src.substring(i, j) me.gpos_set(j) return "{\"type\":\"Int\",\"value\":" + s + "}" }
|
||||
parse_string2(src, i) { local n = src.length() local j = i + 1 local out = "" local guard = 0 local max = 200000 loop(j < n) { if guard > max { break } guard = guard + 1 local ch = src.substring(j, j+1) if ch == "\"" { j = j + 1 me.gpos_set(j) return "{\"type\":\"Str\",\"value\":\"" + me.esc_json(out) + "\"}" } if ch == "\\" && j + 1 < n { local nx = src.substring(j+1, j+2) if nx == "\"" { out = out + "\"" j = j + 2 } else { if nx == "\\" { out = out + "\\" j = j + 2 } else { if nx == "n" { out = out + "\n" j = j + 2 } else { if nx == "r" { out = out + "\r" j = j + 2 } else { if nx == "t" { out = out + "\t" j = j + 2 } else { if nx == "u" && j + 5 < n { out = out + src.substring(j, j+6) j = j + 6 } else { out = out + nx j = j + 2 } } } } } } } else { out = out + ch j = j + 1 } } me.gpos_set(j) return "{\"type\":\"Str\",\"value\":\"" + me.esc_json(out) + "\"}" }
|
||||
|
||||
parse_factor2(src, i) {
|
||||
local j = me.skip_ws(src, i)
|
||||
if j >= src.length() { me.gpos_set(j) return "{\"type\":\"Int\",\"value\":0}" }
|
||||
if me.starts_with_kw(src, j, "true") == 1 { me.gpos_set(j + 4) return "{\"type\":\"Bool\",\"value\":true}" }
|
||||
if me.starts_with_kw(src, j, "false") == 1 { me.gpos_set(j + 5) return "{\"type\":\"Bool\",\"value\":false}" }
|
||||
if me.starts_with_kw(src, j, "null") == 1 { me.gpos_set(j + 4) return "{\"type\":\"Null\"}" }
|
||||
// Peek expression: peek <expr> { "label" => <expr>, ..., else => <expr> }
|
||||
if me.starts_with_kw(src, j, "peek") == 1 {
|
||||
j = j + 4
|
||||
j = me.skip_ws(src, j)
|
||||
// scrutinee expression
|
||||
local scr = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "{" { j = j + 1 } // enter arms block
|
||||
j = me.skip_ws(src, j)
|
||||
local arms_json = "["
|
||||
local first_arm = 1
|
||||
local else_json = null
|
||||
local n = src.length()
|
||||
local contp = 1
|
||||
local guardp = 0
|
||||
local maxp = 400000
|
||||
loop(contp == 1) {
|
||||
if guardp > maxp { contp = 0 } else { guardp = guardp + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
if j >= n { contp = 0 } else {
|
||||
if src.substring(j, j+1) == "}" {
|
||||
j = j + 1
|
||||
contp = 0
|
||||
} else {
|
||||
// else arm or labeled arm
|
||||
if me.starts_with_kw(src, j, "else") == 1 {
|
||||
j = j + 4
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+2) == "=>" { j = j + 2 }
|
||||
j = me.skip_ws(src, j)
|
||||
// else body may be a block or bare expr
|
||||
if src.substring(j, j+1) == "{" {
|
||||
j = j + 1
|
||||
j = me.skip_ws(src, j)
|
||||
else_json = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "}" { j = j + 1 }
|
||||
} else {
|
||||
else_json = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
}
|
||||
// optional separator/newline tolerated; continue until '}'
|
||||
} else {
|
||||
// labeled arm: string literal label
|
||||
if src.substring(j, j+1) != "\"" {
|
||||
// degrade safely to avoid infinite loop
|
||||
j = j + 1
|
||||
continue
|
||||
}
|
||||
local label_raw = me.read_string_lit(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+2) == "=>" { j = j + 2 }
|
||||
j = me.skip_ws(src, j)
|
||||
// arm expr: block or bare expr
|
||||
local expr_json = "{\"type\":\"Int\",\"value\":0}"
|
||||
if src.substring(j, j+1) == "{" {
|
||||
j = j + 1
|
||||
j = me.skip_ws(src, j)
|
||||
expr_json = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "}" { j = j + 1 }
|
||||
} else {
|
||||
expr_json = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
}
|
||||
local arm_json = "{\"label\":\"" + me.esc_json(label_raw) + "\",\"expr\":" + expr_json + "}"
|
||||
if first_arm == 1 { arms_json = arms_json + arm_json first_arm = 0 } else { arms_json = arms_json + "," + arm_json }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
arms_json = arms_json + "]"
|
||||
if else_json == null { else_json = "{\"type\":\"Null\"}" }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Peek\",\"scrutinee\":" + scr + ",\"arms\":" + arms_json + ",\"else\":" + else_json + "}"
|
||||
}
|
||||
local ch = src.substring(j, j+1)
|
||||
// Parenthesized
|
||||
if ch == "(" {
|
||||
local inner = me.parse_expr2(src, j + 1)
|
||||
local k = me.gpos_get()
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == ")" { k = k + 1 }
|
||||
me.gpos_set(k)
|
||||
return inner
|
||||
}
|
||||
// String literal
|
||||
if ch == "\"" { return me.parse_string2(src, j) }
|
||||
// Map literal: {"k": v, ...} (string keys only) → Call{name:"map.of", args:[Str(k1), v1, Str(k2), v2, ...]}
|
||||
if ch == "{" {
|
||||
local n = src.length()
|
||||
j = j + 1
|
||||
local out = "["
|
||||
local first = 1
|
||||
local cont = 1
|
||||
local guard = 0
|
||||
local max = 400000
|
||||
loop(cont == 1) {
|
||||
if guard > max { cont = 0 } else { guard = guard + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
if j >= n { cont = 0 } else {
|
||||
if src.substring(j, j+1) == "}" { j = j + 1 cont = 0 } else {
|
||||
// key (string only for Stage-2)
|
||||
if src.substring(j, j+1) != "\"" {
|
||||
// degrade by skipping one char to avoid infinite loop
|
||||
j = j + 1
|
||||
continue
|
||||
}
|
||||
local key_raw = me.read_string_lit(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == ":" { j = j + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
local val_json = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
local key_json = "{\"type\":\"Str\",\"value\":\"" + me.esc_json(key_raw) + "\"}"
|
||||
if first == 1 { out = out + key_json + "," + val_json first = 0 } else { out = out + "," + key_json + "," + val_json }
|
||||
// optional comma
|
||||
local before2 = j
|
||||
j = me.skip_ws(src, j)
|
||||
if j < n && src.substring(j, j+1) == "," { j = j + 1 }
|
||||
// progress guard (in case of malformed input)
|
||||
if j <= before2 { if j < n { j = j + 1 } else { j = n } }
|
||||
}
|
||||
}
|
||||
}
|
||||
out = out + "]"
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Call\",\"name\":\"map.of\",\"args\":" + out + "}"
|
||||
}
|
||||
// Array literal: [e1, e2, ...] → Call{name:"array.of", args:[...]}
|
||||
if ch == "[" {
|
||||
local n = src.length()
|
||||
j = j + 1
|
||||
local out = "["
|
||||
local first = 1
|
||||
local cont = 1
|
||||
local guard = 0
|
||||
local max = 400000
|
||||
loop(cont == 1) {
|
||||
if guard > max { cont = 0 } else { guard = guard + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
if j >= n { cont = 0 } else {
|
||||
if src.substring(j, j+1) == "]" { j = j + 1 cont = 0 } else {
|
||||
local before = j
|
||||
local ej = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
if first == 1 { out = out + ej first = 0 } else { out = out + "," + ej }
|
||||
// optional comma+whitespace
|
||||
local before2 = j
|
||||
j = me.skip_ws(src, j)
|
||||
if j < n && src.substring(j, j+1) == "," { j = j + 1 }
|
||||
// progress guard
|
||||
if j <= before { if j < n { j = j + 1 } else { j = n } }
|
||||
}
|
||||
}
|
||||
}
|
||||
out = out + "]"
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Call\",\"name\":\"array.of\",\"args\":" + out + "}"
|
||||
}
|
||||
// true/false
|
||||
if me.starts_with_kw(src, j, "true") == 1 { me.gpos_set(j + 4) return "{\"type\":\"Bool\",\"value\":true}" }
|
||||
if me.starts_with_kw(src, j, "false") == 1 { me.gpos_set(j + 5) return "{\"type\":\"Bool\",\"value\":false}" }
|
||||
// new Class(args)
|
||||
if me.starts_with_kw(src, j, "new") == 1 {
|
||||
local p = me.skip_ws(src, j + 3)
|
||||
local idp = me.read_ident2(src, p)
|
||||
local at = idp.lastIndexOf("@")
|
||||
local cls = idp.substring(0, at)
|
||||
local k = me.to_int(idp.substring(at+1, idp.length()))
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == "(" { k = k + 1 }
|
||||
local args_and_pos = me.parse_args2(src, k)
|
||||
local at2 = args_and_pos.lastIndexOf("@")
|
||||
local args_json = args_and_pos.substring(0, at2)
|
||||
k = me.to_int(args_and_pos.substring(at2+1, args_and_pos.length()))
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == ")" { k = k + 1 }
|
||||
me.gpos_set(k)
|
||||
return "{\"type\":\"New\",\"class\":\"" + cls + "\",\"args\":" + args_json + "}"
|
||||
}
|
||||
// Identifier / Call / Method chain
|
||||
if me.is_alpha(ch) {
|
||||
local idp = me.read_ident2(src, j)
|
||||
local at = idp.lastIndexOf("@")
|
||||
local name = idp.substring(0, at)
|
||||
local k = me.to_int(idp.substring(at+1, idp.length()))
|
||||
local node = "{\"type\":\"Var\",\"name\":\"" + name + "\"}"
|
||||
local cont2 = 1
|
||||
loop(cont2 == 1) {
|
||||
k = me.skip_ws(src, k)
|
||||
local tch = src.substring(k, k+1)
|
||||
if tch == "(" {
|
||||
k = k + 1
|
||||
local args_and_pos = me.parse_args2(src, k)
|
||||
local at2 = args_and_pos.lastIndexOf("@")
|
||||
local args_json = args_and_pos.substring(0, at2)
|
||||
k = me.to_int(args_and_pos.substring(at2+1, args_and_pos.length()))
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == ")" { k = k + 1 }
|
||||
node = "{\"type\":\"Call\",\"name\":\"" + name + "\",\"args\":" + args_json + "}"
|
||||
} else {
|
||||
if tch == "." {
|
||||
k = k + 1
|
||||
k = me.skip_ws(src, k)
|
||||
local midp = me.read_ident2(src, k)
|
||||
local at3 = midp.lastIndexOf("@")
|
||||
local mname = midp.substring(0, at3)
|
||||
k = me.to_int(midp.substring(at3+1, midp.length()))
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == "(" { k = k + 1 }
|
||||
local args2 = me.parse_args2(src, k)
|
||||
local at4 = args2.lastIndexOf("@")
|
||||
local args_json2 = args2.substring(0, at4)
|
||||
k = me.to_int(args2.substring(at4+1, args2.length()))
|
||||
k = me.skip_ws(src, k)
|
||||
if src.substring(k, k+1) == ")" { k = k + 1 }
|
||||
node = "{\"type\":\"Method\",\"recv\":" + node + ",\"method\":\"" + mname + "\",\"args\":" + args_json2 + "}"
|
||||
} else { cont2 = 0 }
|
||||
}
|
||||
}
|
||||
me.gpos_set(k)
|
||||
return node
|
||||
}
|
||||
// Fallback: number
|
||||
return me.parse_number2(src, j)
|
||||
}
|
||||
// unary minus binds tighter than * /
|
||||
parse_unary2(src, i) {
|
||||
local j = me.skip_ws(src, i)
|
||||
if src.substring(j, j+1) == "-" {
|
||||
local rhs = me.parse_factor2(src, j + 1)
|
||||
j = me.gpos_get()
|
||||
local zero = "{\"type\":\"Int\",\"value\":0}"
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Binary\",\"op\":\"-\",\"lhs\":" + zero + ",\"rhs\":" + rhs + "}"
|
||||
}
|
||||
return me.parse_factor2(src, j)
|
||||
}
|
||||
parse_term2(src, i) { local lhs = me.parse_unary2(src, i) local j = me.gpos_get() local cont = 1 loop(cont == 1) { j = me.skip_ws(src, j) if j >= src.length() { cont = 0 } else { local op = src.substring(j, j+1) if op != "*" && op != "/" { cont = 0 } else { local rhs = me.parse_unary2(src, j+1) j = me.gpos_get() lhs = "{\"type\":\"Binary\",\"op\":\"" + op + "\",\"lhs\":" + lhs + ",\"rhs\":" + rhs + "}" } } } me.gpos_set(j) return lhs }
|
||||
parse_sum2(src, i) { local lhs = me.parse_term2(src, i) local j = me.gpos_get() local cont = 1 loop(cont == 1) { j = me.skip_ws(src, j) if j >= src.length() { cont = 0 } else { local op = src.substring(j, j+1) if op != "+" && op != "-" { cont = 0 } else { local rhs = me.parse_term2(src, j+1) j = me.gpos_get() lhs = "{\"type\":\"Binary\",\"op\":\"" + op + "\",\"lhs\":" + lhs + ",\"rhs\":" + rhs + "}" } } } me.gpos_set(j) return lhs }
|
||||
parse_compare2(src, i) { local lhs = me.parse_sum2(src, i) local j = me.gpos_get() j = me.skip_ws(src, j) local two = src.substring(j, j+2) local one = src.substring(j, j+1) local op = "" if two == "==" || two == "!=" || two == "<=" || two == ">=" { op = two j = j + 2 } else { if one == "<" || one == ">" { op = one j = j + 1 } } if op == "" { me.gpos_set(j) return lhs } local rhs = me.parse_sum2(src, j) j = me.gpos_get() me.gpos_set(j) return "{\"type\":\"Compare\",\"op\":\"" + op + "\",\"lhs\":" + lhs + ",\"rhs\":" + rhs + "}" }
|
||||
parse_expr2(src, i) {
|
||||
local lhs = me.parse_compare2(src, i)
|
||||
local j = me.gpos_get()
|
||||
local cont = 1
|
||||
loop(cont == 1) {
|
||||
j = me.skip_ws(src, j)
|
||||
local two = src.substring(j, j+2)
|
||||
if two != "&&" && two != "||" { cont = 0 } else {
|
||||
local rhs = me.parse_compare2(src, j+2)
|
||||
j = me.gpos_get()
|
||||
lhs = "{\"type\":\"Logical\",\"op\":\"" + two + "\",\"lhs\":" + lhs + ",\"rhs\":" + rhs + "}"
|
||||
}
|
||||
}
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "?" {
|
||||
j = j + 1
|
||||
j = me.skip_ws(src, j)
|
||||
local then_expr = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == ":" { j = j + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
local else_expr = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
if else_expr.length() == 0 { else_expr = "{\"type\":\"Int\",\"value\":0}" }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Ternary\",\"cond\":" + lhs + ",\"then\":" + then_expr + ",\"else\":" + else_expr + "}"
|
||||
}
|
||||
me.gpos_set(j)
|
||||
return lhs
|
||||
}
|
||||
parse_args2(src, i) {
|
||||
local j = me.skip_ws(src, i)
|
||||
local n = src.length()
|
||||
local out = "["
|
||||
j = me.skip_ws(src, j)
|
||||
if j < n && src.substring(j, j+1) == ")" { return "[]@" + me.i2s(j) }
|
||||
// first argument
|
||||
local e = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
out = out + e
|
||||
// subsequent arguments with guard
|
||||
local cont_args = 1
|
||||
local guard = 0
|
||||
local max = 100000
|
||||
loop(cont_args == 1) {
|
||||
if guard > max { cont_args = 0 } else { guard = guard + 1 }
|
||||
local before = j
|
||||
j = me.skip_ws(src, j)
|
||||
if j < n && src.substring(j, j+1) == "," {
|
||||
j = j + 1
|
||||
j = me.skip_ws(src, j)
|
||||
e = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
out = out + "," + e
|
||||
} else { cont_args = 0 }
|
||||
if j == before { cont_args = 0 }
|
||||
}
|
||||
out = out + "]"
|
||||
return out + "@" + me.i2s(j)
|
||||
}
|
||||
parse_stmt2(src, i) {
|
||||
local j = me.skip_ws(src, i)
|
||||
local stmt_start = j
|
||||
if me.starts_with_kw(src, j, "using") == 1 {
|
||||
j = j + 5
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "\"" {
|
||||
local p = me.read_string_lit(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
local alias = null
|
||||
if me.starts_with_kw(src, j, "as") == 1 { j = j + 2 j = me.skip_ws(src, j) local idp = me.read_ident2(src, j) local at = idp.lastIndexOf("@") alias = idp.substring(0, at) j = me.to_int(idp.substring(at+1, idp.length())) }
|
||||
me.add_using("path", p, alias)
|
||||
} else {
|
||||
if me.is_alpha(src.substring(j, j+1)) {
|
||||
local idp = me.read_ident2(src, j)
|
||||
local at = idp.lastIndexOf("@")
|
||||
local name = idp.substring(0, at)
|
||||
j = me.to_int(idp.substring(at+1, idp.length()))
|
||||
local cont = 1
|
||||
loop(cont == 1) {
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "." { j = j + 1 j = me.skip_ws(src, j) idp = me.read_ident2(src, j) at = idp.lastIndexOf("@") name = name + "." + idp.substring(0, at) j = me.to_int(idp.substring(at+1, idp.length())) } else { cont = 0 }
|
||||
}
|
||||
j = me.skip_ws(src, j)
|
||||
local alias2 = null
|
||||
if me.starts_with_kw(src, j, "as") == 1 { j = j + 2 j = me.skip_ws(src, j) idp = me.read_ident2(src, j) at = idp.lastIndexOf("@") alias2 = idp.substring(0, at) j = me.to_int(idp.substring(at+1, idp.length())) }
|
||||
me.add_using("ns", name, alias2)
|
||||
}
|
||||
}
|
||||
// ensure progress
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return ""
|
||||
}
|
||||
// simple assignment: IDENT '=' expr ; → JSON v0 Local{name, expr} (Stage‑2 uses Local for updates)
|
||||
if j < src.length() && me.is_alpha(src.substring(j, j+1)) {
|
||||
local idp0 = me.read_ident2(src, j)
|
||||
local at0 = idp0.lastIndexOf("@")
|
||||
if at0 > 0 {
|
||||
local name0 = idp0.substring(0, at0)
|
||||
local k0 = me.to_int(idp0.substring(at0+1, idp0.length()))
|
||||
k0 = me.skip_ws(src, k0)
|
||||
if k0 < src.length() && src.substring(k0, k0+1) == "=" {
|
||||
local eq_two = "="
|
||||
if k0 + 1 < src.length() { eq_two = src.substring(k0, k0+2) }
|
||||
if eq_two != "==" {
|
||||
k0 = k0 + 1
|
||||
k0 = me.skip_ws(src, k0)
|
||||
local default_local = "{\"type\":\"Int\",\"value\":0}"
|
||||
local expr_json0 = default_local
|
||||
local end_pos0 = k0
|
||||
if k0 < src.length() {
|
||||
local ahead = src.substring(k0, k0+1)
|
||||
if ahead != "}" && ahead != ";" {
|
||||
expr_json0 = me.parse_expr2(src, k0)
|
||||
end_pos0 = me.gpos_get()
|
||||
}
|
||||
}
|
||||
k0 = end_pos0
|
||||
if k0 <= stmt_start { if k0 < src.length() { k0 = k0 + 1 } else { k0 = src.length() } }
|
||||
me.gpos_set(k0)
|
||||
return "{\"type\":\"Local\",\"name\":\"" + name0 + "\",\"expr\":" + expr_json0 + "}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if me.starts_with_kw(src, j, "return") == 1 {
|
||||
j = j + 6
|
||||
j = me.skip_ws(src, j)
|
||||
local default_ret = "{\"type\":\"Int\",\"value\":0}"
|
||||
local expr_json_ret = default_ret
|
||||
local end_pos_ret = j
|
||||
if j < src.length() {
|
||||
local ahead_ret = src.substring(j, j+1)
|
||||
if ahead_ret != "}" && ahead_ret != ";" {
|
||||
expr_json_ret = me.parse_expr2(src, j)
|
||||
end_pos_ret = me.gpos_get()
|
||||
}
|
||||
}
|
||||
j = end_pos_ret
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Return\",\"expr\":" + expr_json_ret + "}"
|
||||
}
|
||||
if me.starts_with_kw(src, j, "local") == 1 {
|
||||
j = j + 5
|
||||
j = me.skip_ws(src, j)
|
||||
local idp = me.read_ident2(src, j)
|
||||
local at = idp.lastIndexOf("@")
|
||||
local name = idp.substring(0, at)
|
||||
j = me.to_int(idp.substring(at+1, idp.length()))
|
||||
j = me.skip_ws(src, j)
|
||||
if j < src.length() && src.substring(j, j+1) == "=" { j = j + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
local default_local = "{\"type\":\"Int\",\"value\":0}"
|
||||
local expr_json_local = default_local
|
||||
local end_pos_local = j
|
||||
if j < src.length() {
|
||||
local ahead_local = src.substring(j, j+1)
|
||||
if ahead_local != "}" && ahead_local != ";" {
|
||||
expr_json_local = me.parse_expr2(src, j)
|
||||
end_pos_local = me.gpos_get()
|
||||
}
|
||||
}
|
||||
j = end_pos_local
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Local\",\"name\":\"" + name + "\",\"expr\":" + expr_json_local + "}"
|
||||
}
|
||||
if me.starts_with_kw(src, j, "if") == 1 {
|
||||
j = j + 2
|
||||
j = me.skip_ws(src, j)
|
||||
local paren = 0
|
||||
if src.substring(j, j+1) == "(" { paren = 1 j = j + 1 }
|
||||
local cond = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
if paren == 1 { j = me.skip_ws(src, j) if src.substring(j, j+1) == ")" { j = j + 1 } }
|
||||
j = me.skip_ws(src, j)
|
||||
local then_res = me.parse_block2(src, j)
|
||||
local at1 = then_res.lastIndexOf("@")
|
||||
local then_json = then_res.substring(0, at1)
|
||||
j = me.to_int(then_res.substring(at1+1, then_res.length()))
|
||||
j = me.skip_ws(src, j)
|
||||
local else_json = null
|
||||
if me.starts_with_kw(src, j, "else") == 1 { j = j + 4 j = me.skip_ws(src, j) local else_res = me.parse_block2(src, j) local at2 = else_res.lastIndexOf("@") else_json = else_res.substring(0, at2) j = me.to_int(else_res.substring(at2+1, else_res.length())) }
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
if else_json == null { return "{\"type\":\"If\",\"cond\":" + cond + ",\"then\":" + then_json + "}" } else { return "{\"type\":\"If\",\"cond\":" + cond + ",\"then\":" + then_json + ",\"else\":" + else_json + "}" }
|
||||
}
|
||||
if me.starts_with_kw(src, j, "loop") == 1 {
|
||||
j = j + 4
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == "(" { j = j + 1 }
|
||||
local cond = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
j = me.skip_ws(src, j)
|
||||
if src.substring(j, j+1) == ")" { j = j + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
local body_res = me.parse_block2(src, j)
|
||||
local at3 = body_res.lastIndexOf("@")
|
||||
local body_json = body_res.substring(0, at3)
|
||||
j = me.to_int(body_res.substring(at3+1, body_res.length()))
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Loop\",\"cond\":" + cond + ",\"body\":" + body_json + "}"
|
||||
}
|
||||
// Stage-3 acceptance (syntax only): break / continue → no-op expression
|
||||
if me.starts_with_kw(src, j, "break") == 1 {
|
||||
j = j + 5
|
||||
if me.stage3_enabled() == 1 {
|
||||
j = me.skip_ws(src, j)
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Break\"}"
|
||||
}
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Expr\",\"expr\":{\"type\":\"Int\",\"value\":0}}"
|
||||
}
|
||||
if me.starts_with_kw(src, j, "continue") == 1 {
|
||||
j = j + 8
|
||||
if me.stage3_enabled() == 1 {
|
||||
j = me.skip_ws(src, j)
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Continue\"}"
|
||||
}
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Expr\",\"expr\":{\"type\":\"Int\",\"value\":0}}"
|
||||
}
|
||||
// Stage-3 acceptance: throw expr → degrade to Expr(expr)
|
||||
if me.starts_with_kw(src, j, "throw") == 1 {
|
||||
j = j + 5
|
||||
j = me.skip_ws(src, j)
|
||||
local e_throw = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
if me.stage3_enabled() == 1 {
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Throw\",\"expr\":" + e_throw + "}"
|
||||
}
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Expr\",\"expr\":" + e_throw + "}"
|
||||
}
|
||||
// Stage-3 acceptance: try { ... } (catch ...)* (cleanup { ... })? → degrade to no-op (syntax only)
|
||||
if me.starts_with_kw(src, j, "try") == 1 {
|
||||
j = j + 3
|
||||
j = me.skip_ws(src, j)
|
||||
// parse try block
|
||||
local try_res = me.parse_block2(src, j)
|
||||
local at_t = try_res.lastIndexOf("@")
|
||||
local try_json = try_res.substring(0, at_t)
|
||||
j = me.to_int(try_res.substring(at_t+1, try_res.length()))
|
||||
local catches_json = "["
|
||||
local catch_first = 1
|
||||
// zero or more catch
|
||||
local guard_ct = 0
|
||||
local max_ct = 100
|
||||
local cont_ct = 1
|
||||
loop(cont_ct == 1) {
|
||||
if guard_ct > max_ct { cont_ct = 0 } else { guard_ct = guard_ct + 1 }
|
||||
j = me.skip_ws(src, j)
|
||||
if me.starts_with_kw(src, j, "catch") == 1 {
|
||||
j = j + 5
|
||||
j = me.skip_ws(src, j)
|
||||
local catch_type = null
|
||||
local catch_param = null
|
||||
if src.substring(j, j+1) == "(" { j = j + 1 j = me.skip_ws(src, j)
|
||||
// optional type + name
|
||||
if me.is_alpha(src.substring(j, j+1)) {
|
||||
local id1 = me.read_ident2(src, j)
|
||||
local at1 = id1.lastIndexOf("@")
|
||||
catch_type = id1.substring(0, at1)
|
||||
j = me.to_int(id1.substring(at1+1, id1.length()))
|
||||
j = me.skip_ws(src, j)
|
||||
}
|
||||
if me.is_alpha(src.substring(j, j+1)) {
|
||||
local id2 = me.read_ident2(src, j)
|
||||
local at2 = id2.lastIndexOf("@")
|
||||
catch_param = id2.substring(0, at2)
|
||||
j = me.to_int(id2.substring(at2+1, id2.length()))
|
||||
j = me.skip_ws(src, j)
|
||||
}
|
||||
if src.substring(j, j+1) == ")" { j = j + 1 }
|
||||
}
|
||||
j = me.skip_ws(src, j)
|
||||
// catch body
|
||||
local c_res = me.parse_block2(src, j)
|
||||
local atc = c_res.lastIndexOf("@")
|
||||
j = me.to_int(c_res.substring(atc+1, c_res.length()))
|
||||
if me.stage3_enabled() == 1 {
|
||||
local entry = "{"
|
||||
local wrote = 0
|
||||
if catch_param != null && catch_param.length() > 0 { entry = entry + "\"param\":\"" + me.esc_json(catch_param) + "\"" wrote = 1 }
|
||||
if catch_type != null && catch_type.length() > 0 { if wrote == 1 { entry = entry + "," } entry = entry + "\"typeHint\":\"" + me.esc_json(catch_type) + "\"" wrote = 1 }
|
||||
local body_json = c_res.substring(0, atc)
|
||||
if wrote == 1 { entry = entry + "," }
|
||||
entry = entry + "\"body\":" + body_json + "}"
|
||||
if catch_first == 0 { catches_json = catches_json + "," + entry } else { catches_json = catches_json + entry catch_first = 0 }
|
||||
}
|
||||
} else { cont_ct = 0 }
|
||||
}
|
||||
catches_json = catches_json + "]"
|
||||
// optional cleanup
|
||||
j = me.skip_ws(src, j)
|
||||
local finally_json = null
|
||||
if me.starts_with_kw(src, j, "cleanup") == 1 {
|
||||
j = j + 7
|
||||
j = me.skip_ws(src, j)
|
||||
local f_res = me.parse_block2(src, j)
|
||||
local atf = f_res.lastIndexOf("@")
|
||||
j = me.to_int(f_res.substring(atf+1, f_res.length()))
|
||||
finally_json = f_res.substring(0, atf)
|
||||
}
|
||||
if me.stage3_enabled() == 1 {
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
local node = "{\"type\":\"Try\",\"try\":" + try_json + ",\"catches\":" + catches_json
|
||||
if finally_json != null { node = node + ",\"finally\":" + finally_json }
|
||||
node = node + "}"
|
||||
return node
|
||||
}
|
||||
if j <= stmt_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Expr\",\"expr\":{\"type\":\"Int\",\"value\":0}}"
|
||||
}
|
||||
// Fallback: expression or unknown token — ensure progress even on malformed input
|
||||
local expr_start = j
|
||||
local e = me.parse_expr2(src, j)
|
||||
j = me.gpos_get()
|
||||
if j <= expr_start { if j < src.length() { j = j + 1 } else { j = src.length() } }
|
||||
me.gpos_set(j)
|
||||
return "{\"type\":\"Expr\",\"expr\":" + e + "}"
|
||||
}
|
||||
parse_block2(src, i) {
|
||||
local j = me.skip_ws(src, i)
|
||||
if src.substring(j, j+1) != "{" { return "[]@" + me.i2s(j) }
|
||||
j = j + 1
|
||||
local body = "["
|
||||
local first = 1
|
||||
local cont_block = 1
|
||||
loop(cont_block == 1) {
|
||||
j = me.skip_ws(src, j)
|
||||
if j >= src.length() { cont_block = 0 } else {
|
||||
if src.substring(j, j+1) == "}" { j = j + 1 cont_block = 0 } else {
|
||||
local start_j = j
|
||||
local s = me.parse_stmt2(src, j)
|
||||
j = me.gpos_get()
|
||||
// Progress guard: ensure forward movement to avoid infinite loop on malformed input
|
||||
if j <= start_j {
|
||||
if j < src.length() { j = j + 1 } else { j = src.length() }
|
||||
me.gpos_set(j)
|
||||
}
|
||||
// consume optional semicolons (ASI minimal)
|
||||
local done = 0
|
||||
local guard = 0
|
||||
local max = 100000
|
||||
loop(done == 0) {
|
||||
if guard > max { done = 1 } else { guard = guard + 1 }
|
||||
local before = j
|
||||
j = me.skip_ws(src, j)
|
||||
if j < src.length() && src.substring(j, j+1) == ";" { j = j + 1 } else { done = 1 }
|
||||
if j == before { done = 1 }
|
||||
}
|
||||
if s.length() > 0 { if first == 1 { body = body + s first = 0 } else { body = body + "," + s } }
|
||||
}
|
||||
}
|
||||
}
|
||||
body = body + "]"
|
||||
return body + "@" + me.i2s(j)
|
||||
}
|
||||
parse_program2(src) {
|
||||
local i = me.skip_ws(src, 0)
|
||||
local body = "["
|
||||
local first = 1
|
||||
local cont_prog = 1
|
||||
loop(cont_prog == 1) {
|
||||
i = me.skip_ws(src, i)
|
||||
if i >= src.length() { cont_prog = 0 } else {
|
||||
local start_i = i
|
||||
local s = me.parse_stmt2(src, i)
|
||||
i = me.gpos_get()
|
||||
// Progress guard: ensure forward movement to avoid infinite loop on malformed input
|
||||
if i <= start_i {
|
||||
if i < src.length() { i = i + 1 } else { i = src.length() }
|
||||
me.gpos_set(i)
|
||||
}
|
||||
// consume optional semicolons between top-level statements
|
||||
local done2 = 0
|
||||
local guard2 = 0
|
||||
local max2 = 100000
|
||||
loop(done2 == 0) {
|
||||
if guard2 > max2 { done2 = 1 } else { guard2 = guard2 + 1 }
|
||||
local before2 = i
|
||||
i = me.skip_ws(src, i)
|
||||
if i < src.length() && src.substring(i, i+1) == ";" { i = i + 1 } else { done2 = 1 }
|
||||
if i == before2 { done2 = 1 }
|
||||
}
|
||||
if s.length() > 0 { if first == 1 { body = body + s first = 0 } else { body = body + "," + s } }
|
||||
}
|
||||
}
|
||||
body = body + "]"
|
||||
return "{\"version\":0,\"kind\":\"Program\",\"body\":" + body + "}"
|
||||
}
|
||||
}
|
||||
|
||||
static box ParserStub { main(args) { return 0 } }
|
||||
135
apps/selfhost/compiler/compiler.nyash
Normal file
135
apps/selfhost/compiler/compiler.nyash
Normal file
@ -0,0 +1,135 @@
|
||||
// Selfhost Compiler MVP (Phase 15.3)
|
||||
// Reads tmp/ny_parser_input.ny and prints a minimal JSON v0 program.
|
||||
// Components are split under boxes/ and included here.
|
||||
|
||||
// Prefer using for module declaration (Runner strips and registers)
|
||||
using "apps/selfhost-compiler/boxes/debug_box.nyash" as DebugBoxMod
|
||||
using "apps/selfhost-compiler/boxes/parser_box.nyash" as ParserBoxMod
|
||||
using "apps/selfhost-compiler/boxes/emitter_box.nyash" as EmitterBoxMod
|
||||
using "apps/selfhost-compiler/boxes/mir_emitter_box.nyash" as MirEmitterBoxMod
|
||||
|
||||
// Transitional: keep include for Phase-15 compatibility
|
||||
include "apps/selfhost-compiler/boxes/debug_box.nyash"
|
||||
include "apps/selfhost-compiler/boxes/parser_box.nyash"
|
||||
include "apps/selfhost-compiler/boxes/emitter_box.nyash"
|
||||
include "apps/selfhost-compiler/boxes/mir_emitter_box.nyash"
|
||||
|
||||
static box Main {
|
||||
// ---- IO helper ----
|
||||
read_all(path) {
|
||||
local fb = new FileBox()
|
||||
fb.open(path, "r")
|
||||
local s = fb.read()
|
||||
fb.close()
|
||||
if s == null { return "return 1+2*3" }
|
||||
return s
|
||||
}
|
||||
|
||||
// ---- JSON helpers ----
|
||||
esc_json(s) {
|
||||
local out = ""
|
||||
local i = 0
|
||||
local n = s.length()
|
||||
loop(i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "\\" { out = out + "\\\\" } else {
|
||||
if ch == "\"" { out = out + "\\\"" } else { out = out + ch }
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Parser delegation
|
||||
parse_program(src, stage3_flag) {
|
||||
local parser = new ParserBoxMod.ParserBox()
|
||||
if stage3_flag == 1 { parser.stage3_enable(1) }
|
||||
// Collect using metadata (no-op acceptance in Stage‑15)
|
||||
parser.extract_usings(src)
|
||||
me._usings = parser.get_usings_json()
|
||||
return parser.parse_program2(src)
|
||||
}
|
||||
|
||||
main(args) {
|
||||
// Debug setup
|
||||
me.dbg = new DebugBoxMod.DebugBox()
|
||||
me.dbg.set_enabled(0)
|
||||
|
||||
// Source selection (EXE-first friendly)
|
||||
// - default: safe constant
|
||||
// - positional arg: treat as input file path
|
||||
// - --read-tmp: use tmp/ny_parser_input.ny (requires FileBox plugin)
|
||||
local src = "return 1+2*3"
|
||||
local read_tmp = 0
|
||||
local input_path = null
|
||||
local stage3_mode = 0
|
||||
if args != null {
|
||||
local alen = args.length()
|
||||
local i = 0
|
||||
loop(i < alen) {
|
||||
local a = args.get(i)
|
||||
if a == "--read-tmp" {
|
||||
read_tmp = 1
|
||||
} else {
|
||||
if a == "--min-json" {
|
||||
/* handled later */
|
||||
} else {
|
||||
if a == "--stage3" {
|
||||
stage3_mode = 1
|
||||
} else {
|
||||
if input_path == null { input_path = a }
|
||||
}
|
||||
}
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
}
|
||||
if input_path != null {
|
||||
// Prefer explicit file when provided (requires FileBox plugin)
|
||||
local s1 = me.read_all(input_path)
|
||||
if s1 != null { src = s1 }
|
||||
} else {
|
||||
if read_tmp == 1 {
|
||||
// Optional: read tmp/ny_parser_input.ny (requires FileBox plugin; do not use in CI)
|
||||
local s2 = me.read_all("tmp/ny_parser_input.ny")
|
||||
if s2 != null { src = s2 }
|
||||
}
|
||||
}
|
||||
|
||||
// Gate: minimal JSON when requested via script arg
|
||||
local min_mode = 0
|
||||
local emit_mir = 0
|
||||
if args != null {
|
||||
local alen = args.length()
|
||||
local i = 0
|
||||
loop(i < alen) {
|
||||
local arg = args.get(i)
|
||||
if arg == "--min-json" { min_mode = 1 }
|
||||
if arg == "--emit-mir" { emit_mir = 1 }
|
||||
i = i + 1
|
||||
}
|
||||
}
|
||||
local json = null
|
||||
local ast_json = null
|
||||
if min_mode == 1 {
|
||||
ast_json = "{\"version\":0,\"kind\":\"Program\",\"body\":[{\"type\":\"Return\",\"expr\":{\"type\":\"Int\",\"value\":0}}]}"
|
||||
} else {
|
||||
ast_json = me.parse_program(src, stage3_mode)
|
||||
}
|
||||
|
||||
if emit_mir == 1 {
|
||||
// Lower minimal AST to MIR JSON (Return(Int) only for MVP)
|
||||
local mir = new MirEmitterBoxMod.MirEmitterBox()
|
||||
json = mir.emit_mir_min(ast_json)
|
||||
} else {
|
||||
// Emit Stage‑1 JSON with metadata
|
||||
local emitter = new EmitterBoxMod.EmitterBox()
|
||||
json = emitter.emit_program(ast_json, me._usings)
|
||||
}
|
||||
|
||||
// Output JSON
|
||||
local console = new ConsoleBox()
|
||||
console.println(json)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
8
apps/selfhost/compiler/emitter/json_v0.nyash
Normal file
8
apps/selfhost/compiler/emitter/json_v0.nyash
Normal file
@ -0,0 +1,8 @@
|
||||
// JSON v0 emitter (MVP placeholder)
|
||||
static box JsonV0Emitter {
|
||||
// Emit a minimal Program{return 0}
|
||||
program_return0() {
|
||||
return "{\"version\":0,\"kind\":\"Program\",\"body\":[{\"type\":\"Return\",\"expr\":{\"type\":\"Int\",\"value\":0}}]}"
|
||||
}
|
||||
}
|
||||
|
||||
5
apps/selfhost/compiler/mir/builder.nyash
Normal file
5
apps/selfhost/compiler/mir/builder.nyash
Normal file
@ -0,0 +1,5 @@
|
||||
static box MirBuilder {
|
||||
// placeholder
|
||||
main(args) { return 0 }
|
||||
}
|
||||
|
||||
5
apps/selfhost/compiler/mir/optimizer.nyash
Normal file
5
apps/selfhost/compiler/mir/optimizer.nyash
Normal file
@ -0,0 +1,5 @@
|
||||
static box Optimizer {
|
||||
// placeholder
|
||||
main(args) { return 0 }
|
||||
}
|
||||
|
||||
5
apps/selfhost/compiler/parser/ast.nyash
Normal file
5
apps/selfhost/compiler/parser/ast.nyash
Normal file
@ -0,0 +1,5 @@
|
||||
static box AST {
|
||||
// scaffold for future AST node constructors
|
||||
main(args) { return 0 }
|
||||
}
|
||||
|
||||
5
apps/selfhost/compiler/parser/lexer.nyash
Normal file
5
apps/selfhost/compiler/parser/lexer.nyash
Normal file
@ -0,0 +1,5 @@
|
||||
static box Lexer {
|
||||
// scaffold for future implementation
|
||||
main(args) { return 0 }
|
||||
}
|
||||
|
||||
5
apps/selfhost/compiler/parser/parser.nyash
Normal file
5
apps/selfhost/compiler/parser/parser.nyash
Normal file
@ -0,0 +1,5 @@
|
||||
static box Parser {
|
||||
// scaffold for future implementation
|
||||
main(args) { return 0 }
|
||||
}
|
||||
|
||||
4
apps/selfhost/compiler/tests/stage1/README.md
Normal file
4
apps/selfhost/compiler/tests/stage1/README.md
Normal file
@ -0,0 +1,4 @@
|
||||
Stage‑1 tests (scaffold)
|
||||
|
||||
Add minimal Ny source samples here. Harness TBD.
|
||||
|
||||
61
apps/selfhost/vm/boxes/json_cur.nyash
Normal file
61
apps/selfhost/vm/boxes/json_cur.nyash
Normal file
@ -0,0 +1,61 @@
|
||||
// Mini-VM JSON cursor helpers (extracted)
|
||||
// One static box per file per using/include policy
|
||||
static box MiniJsonCur {
|
||||
_is_digit(ch) { if ch == "0" { return 1 } if ch == "1" { return 1 } if ch == "2" { return 1 } if ch == "3" { return 1 } if ch == "4" { return 1 } if ch == "5" { return 1 } if ch == "6" { return 1 } if ch == "7" { return 1 } if ch == "8" { return 1 } if ch == "9" { return 1 } return 0 }
|
||||
// Skip whitespace from pos; return first non-ws index or -1
|
||||
next_non_ws(s, pos) {
|
||||
local i = pos
|
||||
local n = s.length()
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch != " " && ch != "\n" && ch != "\r" && ch != "\t" { return i }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
// Read a quoted string starting at pos '"'; returns decoded string (no state)
|
||||
read_quoted_from(s, pos) {
|
||||
local i = pos
|
||||
if s.substring(i, i+1) != "\"" { return "" }
|
||||
i = i + 1
|
||||
local out = ""
|
||||
local n = s.length()
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "\"" { break }
|
||||
if ch == "\\" {
|
||||
i = i + 1
|
||||
ch = s.substring(i, i+1)
|
||||
}
|
||||
out = out + ch
|
||||
i = i + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
// Read consecutive digits from pos
|
||||
read_digits_from(s, pos) {
|
||||
local out = ""
|
||||
local i = pos
|
||||
// guard against invalid position (null/negative)
|
||||
if i == null { return out }
|
||||
if i < 0 { return out }
|
||||
loop (true) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "" { break }
|
||||
// inline digit check to avoid same-box method dispatch
|
||||
if ch == "0" { out = out + ch i = i + 1 continue }
|
||||
if ch == "1" { out = out + ch i = i + 1 continue }
|
||||
if ch == "2" { out = out + ch i = i + 1 continue }
|
||||
if ch == "3" { out = out + ch i = i + 1 continue }
|
||||
if ch == "4" { out = out + ch i = i + 1 continue }
|
||||
if ch == "5" { out = out + ch i = i + 1 continue }
|
||||
if ch == "6" { out = out + ch i = i + 1 continue }
|
||||
if ch == "7" { out = out + ch i = i + 1 continue }
|
||||
if ch == "8" { out = out + ch i = i + 1 continue }
|
||||
if ch == "9" { out = out + ch i = i + 1 continue }
|
||||
break
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
749
apps/selfhost/vm/boxes/mini_vm_core.nyash
Normal file
749
apps/selfhost/vm/boxes/mini_vm_core.nyash
Normal file
@ -0,0 +1,749 @@
|
||||
using selfhost.vm.json as MiniJson
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
using selfhost.vm.binop as MiniVmBinOp
|
||||
using selfhost.vm.compare as MiniVmCompare
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box MiniVm {
|
||||
_is_digit(ch) {
|
||||
if ch == "0" { return 1 }
|
||||
if ch == "1" { return 1 }
|
||||
if ch == "2" { return 1 }
|
||||
if ch == "3" { return 1 }
|
||||
if ch == "4" { return 1 }
|
||||
if ch == "5" { return 1 }
|
||||
if ch == "6" { return 1 }
|
||||
if ch == "7" { return 1 }
|
||||
if ch == "8" { return 1 }
|
||||
if ch == "9" { return 1 }
|
||||
return 0
|
||||
}
|
||||
_str_to_int(s) { return new MiniVmScan()._str_to_int(s) }
|
||||
_int_to_str(n) { return new MiniVmScan()._int_to_str(n) }
|
||||
read_digits(json, pos) { return new MiniJson().read_digits_from(json, pos) }
|
||||
// Read a JSON string starting at position pos (at opening quote); returns the decoded string
|
||||
read_json_string(json, pos) { return new MiniJson().read_quoted_from(json, pos) }
|
||||
// helper: find needle from position pos
|
||||
index_of_from(hay, needle, pos) { return new MiniVmScan().index_of_from(hay, needle, pos) }
|
||||
// helper: next non-whitespace character index from pos
|
||||
next_non_ws(json, pos) { return new MiniJson().next_non_ws(json, pos) }
|
||||
// ——— Helpers (as box methods) ———
|
||||
|
||||
// Minimal: Print(BinaryOp) with operator "+"; supports string+string and int+int
|
||||
// try_print_binop_at moved to MiniVmBinOp
|
||||
|
||||
// Greedy fallback: detect BinaryOp int+int by pattern regardless of field order nuances
|
||||
// try_print_binop_int_greedy moved to MiniVmBinOp
|
||||
|
||||
// Fallback: within the current Print's expression BinaryOp object, scan for two numeric values and sum
|
||||
// try_print_binop_sum_any moved to MiniVmBinOp
|
||||
|
||||
// Deterministic: within the first Print.expression BinaryOp('+'),
|
||||
// find exactly two numeric values from successive '"value":' fields and sum.
|
||||
// Stops after collecting two ints; bounded strictly by the expression object.
|
||||
// try_print_binop_sum_expr_values moved to MiniVmBinOp
|
||||
|
||||
// Simpler deterministic fallback: after the first BinaryOp '+',
|
||||
// scan forward for two successive 'value' fields and sum their integer digits.
|
||||
// This avoids brace matching and remains bounded by two finds.
|
||||
// try_print_binop_sum_after_bop moved to MiniVmBinOp
|
||||
|
||||
// Direct typed BinaryOp(int+int) matcher using explicit left/right literal paths
|
||||
try_print_binop_typed_direct(json) {
|
||||
local k_left = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_right = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = json.indexOf(k_left)
|
||||
if lp < 0 { return -1 }
|
||||
local ld = read_digits(json, lp + k_left.length())
|
||||
if ld == "" { return -1 }
|
||||
local rp = index_of_from(json, k_right, lp + k_left.length())
|
||||
if rp < 0 { return -1 }
|
||||
local rd = read_digits(json, rp + k_right.length())
|
||||
if rd == "" { return -1 }
|
||||
print(_int_to_str(_str_to_int(ld) + _str_to_int(rd)))
|
||||
return rp + k_right.length()
|
||||
}
|
||||
|
||||
// Tokenized typed extractor: search left/right blocks then type/value pairs
|
||||
try_print_binop_typed_tokens(json) {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = json.indexOf(k_bo)
|
||||
if bpos < 0 { return -1 }
|
||||
local lp = index_of_from(json, "\"left\":", bpos)
|
||||
if lp < 0 { return -1 }
|
||||
local kt = "\"type\":\"int\""
|
||||
local kv = "\"value\":"
|
||||
local tp1 = index_of_from(json, kt, lp)
|
||||
if tp1 < 0 { return -1 }
|
||||
local vp1 = index_of_from(json, kv, tp1)
|
||||
if vp1 < 0 { return -1 }
|
||||
local ld = read_digits(json, vp1 + kv.length())
|
||||
if ld == "" { return -1 }
|
||||
local rp = index_of_from(json, "\"right\":", lp)
|
||||
if rp < 0 { return -1 }
|
||||
local tp2 = index_of_from(json, kt, rp)
|
||||
if tp2 < 0 { return -1 }
|
||||
local vp2 = index_of_from(json, kv, tp2)
|
||||
if vp2 < 0 { return -1 }
|
||||
local rd = read_digits(json, vp2 + kv.length())
|
||||
if rd == "" { return -1 }
|
||||
print(_int_to_str(_str_to_int(ld) + _str_to_int(rd)))
|
||||
return rp
|
||||
}
|
||||
|
||||
// Fast value-pair extractor: find left/right then first value digits after each
|
||||
try_print_binop_value_pairs(json) {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = json.indexOf(k_bo)
|
||||
if bpos < 0 { return -1 }
|
||||
local kl = "\"left\":"
|
||||
local kv = "\"value\":"
|
||||
local lp = index_of_from(json, kl, bpos)
|
||||
if lp < 0 { return -1 }
|
||||
local v1 = index_of_from(json, kv, lp)
|
||||
if v1 < 0 { return -1 }
|
||||
local ld = read_digits(json, v1 + kv.length())
|
||||
if ld == "" { return -1 }
|
||||
local rp = index_of_from(json, "\"right\":", lp)
|
||||
if rp < 0 { return -1 }
|
||||
local v2 = index_of_from(json, kv, rp)
|
||||
if v2 < 0 { return -1 }
|
||||
local rd = read_digits(json, v2 + kv.length())
|
||||
if rd == "" { return -1 }
|
||||
print(_int_to_str(_str_to_int(ld) + _str_to_int(rd)))
|
||||
return v2 + kv.length()
|
||||
}
|
||||
|
||||
// Minimal: Print(Compare) for integers. Prints 1/0 for true/false.
|
||||
// try_print_compare_at moved to MiniVmCompare
|
||||
// Extract first Print literal from JSON v0 Program and return its string representation
|
||||
parse_first_print_literal(json) {
|
||||
// Find a Print statement
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = json.indexOf(k_print)
|
||||
if p < 0 { return null }
|
||||
// Find value type in the expression following Print
|
||||
local k_type = "\"type\":\""
|
||||
local tpos = json.indexOf(k_type)
|
||||
if tpos < 0 { return null }
|
||||
tpos = tpos + k_type.length()
|
||||
// Read type name until next quote
|
||||
local t_end = index_of_from(json, "\"", tpos)
|
||||
if t_end < 0 { return null }
|
||||
local ty = json.substring(tpos, t_end)
|
||||
// Find value field
|
||||
local k_val = "\"value\":"
|
||||
local vpos = index_of_from(json, k_val, t_end)
|
||||
if vpos < 0 { return null }
|
||||
vpos = vpos + k_val.length()
|
||||
if ty == "int" || ty == "i64" || ty == "integer" {
|
||||
// read digits via MiniJson
|
||||
local digits = new MiniJson().read_digits_from(json, vpos)
|
||||
return digits
|
||||
}
|
||||
if ty == "string" {
|
||||
// read quoted via MiniJson
|
||||
local i = index_of_from(json, "\"", vpos)
|
||||
if i < 0 { return null }
|
||||
return new MiniJson().read_quoted_from(json, i)
|
||||
}
|
||||
// Other types not supported yet
|
||||
return null
|
||||
}
|
||||
// helper: find balanced bracket range [ ... ] starting at idx (points to '[')
|
||||
find_balanced_array_end(json, idx) { return new MiniVmScan().find_balanced_array_end(json, idx) }
|
||||
// helper: find balanced object range { ... } starting at idx (points to '{')
|
||||
find_balanced_object_end(json, idx) { return new MiniVmScan().find_balanced_object_end(json, idx) }
|
||||
// Print all Print-Literal values within [start,end] (inclusive slice indices)
|
||||
print_prints_in_slice(json, start, end) { return new MiniVmPrints().print_prints_in_slice(json, start, end) }
|
||||
// Process top-level If with literal condition; print branch prints. Returns printed count.
|
||||
process_if_once(json) { return new MiniVmPrints().process_if_once(json) }
|
||||
print_all_print_literals(json) { return new MiniVmPrints().print_all_print_literals(json) }
|
||||
parse_first_int(json) {
|
||||
local key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
local idx = json.lastIndexOf(key)
|
||||
if idx < 0 { return "0" }
|
||||
local start = idx + key.length()
|
||||
return read_digits(json, start)
|
||||
}
|
||||
// Fallback: find first BinaryOp and return sum of two numeric values as string; empty if not found
|
||||
parse_first_binop_sum(json) {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = json.indexOf(k_bo)
|
||||
if bpos < 0 { return "" }
|
||||
// typed pattern inside left/right.literal.value: {"type":"int","value":<digits>}
|
||||
local k_typed = "\"type\":\"int\",\"value\":"
|
||||
// first number
|
||||
local p1 = index_of_from(json, k_typed, bpos)
|
||||
if p1 < 0 { return "" }
|
||||
local d1 = read_digits(json, p1 + k_typed.length())
|
||||
if d1 == "" { return "" }
|
||||
// second number
|
||||
local p2 = index_of_from(json, k_typed, p1 + k_typed.length())
|
||||
if p2 < 0 { return "" }
|
||||
local d2 = read_digits(json, p2 + k_typed.length())
|
||||
if d2 == "" { return "" }
|
||||
return _int_to_str(_str_to_int(d1) + _str_to_int(d2))
|
||||
}
|
||||
// Linear pass: sum all numbers outside of quotes (fast, finite)
|
||||
sum_numbers_no_quotes(json) { return new MiniVmScan().sum_numbers_no_quotes(json) }
|
||||
// Naive: sum all digit runs anywhere (for simple BinaryOp JSON)
|
||||
sum_all_digits_naive(json) { return new MiniVmScan().sum_all_digits_naive(json) }
|
||||
// Sum first two integers outside quotes; returns string or empty if not found
|
||||
sum_first_two_numbers(json) { return new MiniVmScan().sum_first_two_numbers(json) }
|
||||
|
||||
// Sum two integers near a BinaryOp '+' token; bounded window to keep steps low
|
||||
sum_two_numbers_near_plus(json) {
|
||||
local k_plus = "\"operator\":\"+\""
|
||||
local op = json.indexOf(k_plus)
|
||||
if op < 0 { return "" }
|
||||
local n = json.length()
|
||||
local start = op - 120
|
||||
if start < 0 { start = 0 }
|
||||
local limit = op + 240
|
||||
if limit > n { limit = n }
|
||||
local i = start
|
||||
local found = 0
|
||||
local a = 0
|
||||
loop (i < limit) {
|
||||
local ch = json.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
// skip to next quote within window
|
||||
local j = index_of_from(json, "\"", i+1)
|
||||
if j < 0 || j > limit { break }
|
||||
i = j + 1
|
||||
continue
|
||||
}
|
||||
local d = read_digits(json, i)
|
||||
if d {
|
||||
if found == 0 {
|
||||
a = _str_to_int(d)
|
||||
found = 1
|
||||
} else {
|
||||
local b = _str_to_int(d)
|
||||
return _int_to_str(a + b)
|
||||
}
|
||||
i = i + d.length()
|
||||
continue
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
return ""
|
||||
}
|
||||
// Fallback: sum all bare numbers (not inside quotes) in the JSON; return string or empty if none
|
||||
sum_all_numbers(json) {
|
||||
local cur = new MiniJson()
|
||||
local i = 0
|
||||
local n = json.length()
|
||||
local sum = 0
|
||||
loop (i < n) {
|
||||
local ch = json.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
// skip quoted string
|
||||
local s = cur.read_quoted_from(json, i)
|
||||
i = i + s.length() + 2
|
||||
continue
|
||||
}
|
||||
// try digits
|
||||
local d = cur.read_digits_from(json, i)
|
||||
if d != "" { sum = sum + _str_to_int(d) i = i + d.length() continue }
|
||||
i = i + 1
|
||||
}
|
||||
if sum == 0 { return "" }
|
||||
return _int_to_str(sum)
|
||||
}
|
||||
// (reserved) helper for future robust binop scan
|
||||
run(json) {
|
||||
// entry: attempt minimal quick shapes first, then broader routes
|
||||
// Quick path: Program-level Print of a single Literal string/int
|
||||
if json.indexOf("\"kind\":\"Program\"") >= 0 && json.indexOf("\"kind\":\"Print\"") >= 0 {
|
||||
// Literal string
|
||||
if json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\"") >= 0 {
|
||||
local ks = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\""
|
||||
local ps = json.indexOf(ks)
|
||||
if ps >= 0 {
|
||||
local si = ps + ks.length()
|
||||
local sj = json.indexOf("\"", si)
|
||||
if sj >= 0 { print(json.substring(si, sj)) return 0 }
|
||||
}
|
||||
}
|
||||
// Literal int
|
||||
if json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\"") >= 0 {
|
||||
local ki = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local pi = json.indexOf(ki)
|
||||
if pi >= 0 {
|
||||
local ii = pi + ki.length()
|
||||
// digits until closing brace
|
||||
local ie = json.indexOf("}", ii)
|
||||
if ie < 0 { ie = ii }
|
||||
local d = json.substring(ii, ie)
|
||||
if d { print(d) return 0 }
|
||||
}
|
||||
}
|
||||
}
|
||||
// Single-purpose fast path for smoke: if BinaryOp '+' exists, try expression-bounded extractor first.
|
||||
if json.indexOf("\"BinaryOp\"") >= 0 && json.indexOf("\"operator\":\"+\"") >= 0 {
|
||||
// Bind to first Print and extract value×2 within expression bounds
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = index_of_from(json, k_print, 0)
|
||||
if p >= 0 {
|
||||
local np0 = new MiniVmBinOp().try_print_binop_sum_expr_values(json, json.length(), p)
|
||||
if np0 > 0 { return 0 }
|
||||
}
|
||||
// Typed direct inside BinaryOp object (fast and finite)
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = json.indexOf(k_bo)
|
||||
if bpos >= 0 {
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local li = index_of_from(json, k_lint, bpos)
|
||||
if li >= 0 {
|
||||
local ld = read_digits(json, li + k_lint.length())
|
||||
if ld != "" {
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local ri = index_of_from(json, k_rint, li + k_lint.length())
|
||||
if ri >= 0 {
|
||||
local rd = read_digits(json, ri + k_rint.length())
|
||||
if rd != "" { print(_int_to_str(_str_to_int(ld) + _str_to_int(rd))) return 0 }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// As a final bounded fallback under BinaryOp '+', sum first two numbers outside quotes
|
||||
{
|
||||
local s2 = sum_first_two_numbers(json)
|
||||
if s2 { print(s2) return 0 }
|
||||
}
|
||||
// (skip near-operator windowed scan to avoid high step counts under PyVM)
|
||||
}
|
||||
// Prefer If(literal) branch handling first
|
||||
local ifc = process_if_once(json)
|
||||
if ifc > 0 { return 0 }
|
||||
// Quick conservative path: if BinaryOp exists, sum bare numbers outside quotes
|
||||
// (limited to simple BinaryOp(int,int) JSON)
|
||||
if json.indexOf("\"BinaryOp\"") >= 0 {
|
||||
// Prefer expression-bounded scan first
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = index_of_from(json, k_print, 0)
|
||||
if p >= 0 {
|
||||
// Deterministic: sum the first two numbers from successive 'value' fields
|
||||
local np0 = new MiniVmBinOp().try_print_binop_sum_expr_values(json, json.length(), p)
|
||||
if np0 > 0 { return 0 }
|
||||
}
|
||||
// Brace-free deterministic fallback tied to the first BinaryOp
|
||||
{
|
||||
local np1 = new MiniVmBinOp().try_print_binop_sum_after_bop(json)
|
||||
if np1 > 0 { return 0 }
|
||||
}
|
||||
// avoid global number-sum fallback to keep steps bounded
|
||||
}
|
||||
// 0) direct typed BinaryOp '+' fast-path (explicit left/right literal ints)
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local k_plus = "\"operator\":\"+\""
|
||||
if json.indexOf(k_bo) >= 0 && json.indexOf(k_plus) >= 0 {
|
||||
local np = try_print_binop_typed_direct(json)
|
||||
if np > 0 { return 0 }
|
||||
np = try_print_binop_typed_tokens(json)
|
||||
if np > 0 { return 0 }
|
||||
np = try_print_binop_value_pairs(json)
|
||||
if np > 0 { return 0 }
|
||||
// (skip bounded-window fallback around '+')
|
||||
}
|
||||
// 0) quick path: BinaryOp(int+int) typed fast-path
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = json.indexOf(k_bo)
|
||||
if bpos >= 0 {
|
||||
// typed left/right ints inside BinaryOp
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local li = index_of_from(json, k_lint, bpos)
|
||||
if li >= 0 {
|
||||
local ld = read_digits(json, li + k_lint.length())
|
||||
if ld != "" {
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local ri = index_of_from(json, k_rint, li + k_lint.length())
|
||||
if ri >= 0 {
|
||||
local rd = read_digits(json, ri + k_rint.length())
|
||||
if rd != "" {
|
||||
print(_int_to_str(_str_to_int(ld) + _str_to_int(rd)))
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// fallback: sum two numeric values within the first Print.expression BinaryOp object
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = index_of_from(json, k_print, 0)
|
||||
if p >= 0 {
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, p)
|
||||
if epos > 0 {
|
||||
local obj_start = index_of_from(json, "{", epos)
|
||||
local obj_end = find_balanced_object_end(json, obj_start)
|
||||
if obj_start > 0 && obj_end > 0 {
|
||||
local k_bo2 = "\"kind\":\"BinaryOp\""
|
||||
local b2 = index_of_from(json, k_bo2, obj_start)
|
||||
if b2 > 0 && b2 < obj_end {
|
||||
local k_v = "\"value\":"
|
||||
local p1 = index_of_from(json, k_v, obj_start)
|
||||
local d1 = ""
|
||||
loop (p1 > 0 && p1 < obj_end) {
|
||||
d1 = new MiniJson().read_digits_from(json, p1 + k_v.length())
|
||||
if d1 != "" { break }
|
||||
p1 = index_of_from(json, k_v, p1 + k_v.length())
|
||||
}
|
||||
if d1 != "" {
|
||||
local p2 = index_of_from(json, k_v, p1 + k_v.length())
|
||||
local d2 = ""
|
||||
loop (p2 > 0 && p2 < obj_end) {
|
||||
d2 = new MiniJson().read_digits_from(json, p2 + k_v.length())
|
||||
if d2 != "" { break }
|
||||
p2 = index_of_from(json, k_v, p2 + k_v.length())
|
||||
}
|
||||
if d2 != "" {
|
||||
local ai = _str_to_int(d1)
|
||||
local bi = _str_to_int(d2)
|
||||
print(_int_to_str(ai + bi))
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// fallback: parse-first within BinaryOp scope by scanning two numeric values
|
||||
local ssum = new MiniVmBinOp().parse_first_binop_sum(json)
|
||||
if ssum { print(ssum) return 0 }
|
||||
}
|
||||
// Attempt expression-local BinaryOp sum via existing helper on first Print
|
||||
{
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = index_of_from(json, k_print, 0)
|
||||
if p >= 0 {
|
||||
local np = new MiniVmBinOp().try_print_binop_sum_any(json, json.length(), p)
|
||||
if np > 0 { return 0 }
|
||||
}
|
||||
}
|
||||
// 0-c) quick path: Compare(lhs int, rhs int)
|
||||
local k_cp = "\"kind\":\"Compare\""
|
||||
local cpos = json.indexOf(k_cp)
|
||||
if cpos >= 0 {
|
||||
// operation
|
||||
local k_op = "\"operation\":\""
|
||||
local opos = index_of_from(json, k_op, cpos)
|
||||
if opos > 0 {
|
||||
local oi = opos + k_op.length()
|
||||
local oj = index_of_from(json, "\"", oi)
|
||||
if oj > 0 {
|
||||
local op = json.substring(oi, oj)
|
||||
// lhs value
|
||||
local k_lhs = "\"lhs\":{\"kind\":\"Literal\""
|
||||
local hl = index_of_from(json, k_lhs, oj)
|
||||
if hl > 0 {
|
||||
local k_v = "\"value\":"
|
||||
local hv = index_of_from(json, k_v, hl)
|
||||
if hv > 0 {
|
||||
local a = read_digits(json, hv + k_v.length())
|
||||
// rhs value
|
||||
local k_rhs = "\"rhs\":{\"kind\":\"Literal\""
|
||||
local hr = index_of_from(json, k_rhs, hl)
|
||||
if hr > 0 {
|
||||
local rv = index_of_from(json, k_v, hr)
|
||||
if rv > 0 {
|
||||
local b = read_digits(json, rv + k_v.length())
|
||||
if a && b {
|
||||
local ai = _str_to_int(a)
|
||||
local bi = _str_to_int(b)
|
||||
local res = 0
|
||||
if op == "<" { if ai < bi { res = 1 } }
|
||||
if op == "==" { if ai == bi { res = 1 } }
|
||||
if op == "<=" { if ai <= bi { res = 1 } }
|
||||
if op == ">" { if ai > bi { res = 1 } }
|
||||
if op == ">=" { if ai >= bi { res = 1 } }
|
||||
if op == "!=" { if ai != bi { res = 1 } }
|
||||
print(res)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Scan global prints (flat programs)
|
||||
local pc = print_all_print_literals(json)
|
||||
// 2) as a robustness fallback, handle first BinaryOp sum within first Print.expression
|
||||
if pc == 0 {
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = index_of_from(json, k_print, 0)
|
||||
if p >= 0 {
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, p)
|
||||
if epos > 0 {
|
||||
local obj_start = index_of_from(json, "{", epos)
|
||||
local obj_end = find_balanced_object_end(json, obj_start)
|
||||
if obj_start > 0 && obj_end > 0 {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = index_of_from(json, k_bo, obj_start)
|
||||
if bpos > 0 && bpos < obj_end {
|
||||
// sum two numeric values inside this expression object
|
||||
local cur = new MiniJson()
|
||||
local k_v = "\"value\":"
|
||||
local p1 = index_of_from(json, k_v, obj_start)
|
||||
local d1 = ""
|
||||
loop (p1 > 0 && p1 < obj_end) {
|
||||
d1 = cur.read_digits_from(json, p1 + k_v.length())
|
||||
if d1 != "" { break }
|
||||
p1 = index_of_from(json, k_v, p1 + k_v.length())
|
||||
}
|
||||
if d1 != "" {
|
||||
local p2 = index_of_from(json, k_v, p1 + k_v.length())
|
||||
local d2 = ""
|
||||
loop (p2 > 0 && p2 < obj_end) {
|
||||
d2 = cur.read_digits_from(json, p2 + k_v.length())
|
||||
if d2 != "" { break }
|
||||
p2 = index_of_from(json, k_v, p2 + k_v.length())
|
||||
}
|
||||
if d2 != "" {
|
||||
local ai = _str_to_int(d1)
|
||||
local bi = _str_to_int(d2)
|
||||
print(_int_to_str(ai + bi))
|
||||
pc = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if pc == 0 {
|
||||
// last resort: typed pattern-wide sum, then safe number sum outside quotes, else single int literal
|
||||
local s = new MiniVmBinOp().parse_first_binop_sum(json)
|
||||
if s { print(s) } else {
|
||||
local ts = sum_numbers_no_quotes(json)
|
||||
if ts { print(ts) } else {
|
||||
local n = parse_first_int(json)
|
||||
print(n)
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// Pure helper: collect minimal print outputs (literals only) into an array
|
||||
collect_prints(json) {
|
||||
// Ported from self-contained smoke (Hardened minimal scanner)
|
||||
local out = new ArrayBox()
|
||||
local pos = 0
|
||||
local guard = 0
|
||||
// DEV trace: flip to 1 for one-run diagnosis; keep 0 for normal
|
||||
local trace = 0
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 200 { break }
|
||||
local p = index_of_from(json, k_print, pos)
|
||||
if p < 0 { break }
|
||||
// bound current Print slice to [this, next)
|
||||
local obj_start = p
|
||||
local next_p = index_of_from(json, k_print, p + k_print.length())
|
||||
local obj_end = json.length()
|
||||
if next_p > 0 { obj_end = next_p }
|
||||
if trace == 1 { print("[collect][p] "+p) print("[collect][slice_end] "+obj_end) }
|
||||
if trace == 1 {
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos_dbg = index_of_from(json, k_expr, obj_start)
|
||||
print("[scan][expr] "+epos_dbg)
|
||||
local fc_dbg = index_of_from(json, "\"kind\":\"FunctionCall\"", obj_start)
|
||||
print("[scan][fc] "+fc_dbg)
|
||||
local bo_dbg = index_of_from(json, "\"kind\":\"BinaryOp\"", obj_start)
|
||||
print("[scan][bo] "+bo_dbg)
|
||||
local cp_dbg = index_of_from(json, "\"kind\":\"Compare\"", obj_start)
|
||||
print("[scan][cp] "+cp_dbg)
|
||||
local ts_dbg = index_of_from(json, "\"type\":\"string\"", obj_start)
|
||||
print("[scan][ts] "+ts_dbg)
|
||||
local ti_dbg = index_of_from(json, "\"type\":\"int\"", obj_start)
|
||||
print("[scan][ti] "+ti_dbg)
|
||||
// positions for tight patterns used by branches
|
||||
local ks_pat = "\"type\":\"string\",\"value\":\""
|
||||
print("[scan][ks] "+index_of_from(json, ks_pat, obj_start))
|
||||
local ki_pat = "\"type\":\"int\",\"value\":"
|
||||
print("[scan][ki] "+index_of_from(json, ki_pat, obj_start))
|
||||
}
|
||||
|
||||
// 1) FunctionCall echo/itoa (single literal or empty args)
|
||||
{
|
||||
// Limit search within Print.expression object for stability
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, obj_start)
|
||||
if epos > 0 { if epos < obj_end {
|
||||
local expr_start = index_of_from(json, "{", epos)
|
||||
if expr_start > 0 { if expr_start < obj_end {
|
||||
local expr_end = new MiniVmScan().find_balanced_object_end(json, expr_start)
|
||||
if expr_end > 0 { if expr_end <= obj_end {
|
||||
if trace == 1 { print("[collect][expr] "+expr_start+","+expr_end) }
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = index_of_from(json, k_fc, expr_start)
|
||||
if fcp > 0 { if fcp < expr_end {
|
||||
local kn = "\"name\":\""
|
||||
local np = index_of_from(json, kn, fcp)
|
||||
if np > 0 { if np < obj_end {
|
||||
local ni = np + kn.length()
|
||||
local nj = index_of_from(json, "\"", ni)
|
||||
if nj > 0 { if nj <= expr_end {
|
||||
local fname = json.substring(ni, nj)
|
||||
local ka = "\"arguments\":["
|
||||
local ap = index_of_from(json, ka, nj)
|
||||
if ap > 0 { if ap < expr_end {
|
||||
// detect empty args [] quickly: no type token inside balanced array
|
||||
local arr_start = index_of_from(json, "[", ap)
|
||||
local arr_end = new MiniVmScan().find_balanced_array_end(json, arr_start)
|
||||
if arr_start >= 0 { if arr_end >= 0 { if arr_end <= expr_end {
|
||||
local kt = "\"type\":\""
|
||||
local atpos = index_of_from(json, kt, arr_start)
|
||||
if atpos < 0 || atpos >= arr_end {
|
||||
if fname == "echo" { out.push("") pos = obj_end + 1 continue }
|
||||
if fname == "itoa" { out.push("0") pos = obj_end + 1 continue }
|
||||
}
|
||||
}}}
|
||||
// string arg
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, ap)
|
||||
if ps > 0 { if ps < expr_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= expr_end {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { out.push(sval) pos = obj_end + 1 continue }
|
||||
}}
|
||||
}}
|
||||
// int arg
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, ap)
|
||||
if pi > 0 { if pi < expr_end {
|
||||
local ival = read_digits(json, pi + ki.length())
|
||||
if ival != "" { if fname == "itoa" { out.push(ival) pos = obj_end + 1 continue } else { if fname == "echo" { out.push(ival) pos = obj_end + 1 continue } } }
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 2) BinaryOp(int '+' int)
|
||||
{
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, obj_start)
|
||||
if epos > 0 { if epos < obj_end {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = index_of_from(json, k_bo, epos)
|
||||
if bpos > 0 { if bpos < obj_end {
|
||||
if index_of_from(json, "\"operator\":\"+\"", bpos) > 0 {
|
||||
local k_l = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_r = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = index_of_from(json, k_l, bpos)
|
||||
if lp > 0 { if lp < obj_end {
|
||||
local ld = read_digits(json, lp + k_l.length())
|
||||
if ld != "" {
|
||||
local rp = index_of_from(json, k_r, lp + k_l.length())
|
||||
if rp > 0 { if rp < obj_end {
|
||||
local rd = read_digits(json, rp + k_r.length())
|
||||
if rd != "" { if trace == 1 { print("[hit][bo-typed] "+ld+"+"+rd) } out.push(_int_to_str(_str_to_int(ld) + _str_to_int(rd))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
// fallback: two successive 'value' digits within expression bounds
|
||||
local k_v = "\"value\":"
|
||||
local v1 = index_of_from(json, k_v, epos)
|
||||
if v1 > 0 { if v1 < obj_end {
|
||||
local d1 = new MiniJson().read_digits_from(json, v1 + k_v.length())
|
||||
if d1 != "" {
|
||||
local v2 = index_of_from(json, k_v, v1 + k_v.length())
|
||||
if v2 > 0 { if v2 < obj_end {
|
||||
local d2 = new MiniJson().read_digits_from(json, v2 + k_v.length())
|
||||
if d2 != "" { if trace == 1 { print("[hit][bo-fallback] "+d1+"+"+d2) } out.push(_int_to_str(_str_to_int(d1) + _str_to_int(d2))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 3) Compare(lhs/rhs ints)
|
||||
{
|
||||
local k_cp = "\"kind\":\"Compare\""
|
||||
local cpos = index_of_from(json, k_cp, obj_start)
|
||||
if cpos > 0 { if cpos < obj_end {
|
||||
local k_op = "\"operation\":\""
|
||||
local opos = index_of_from(json, k_op, cpos)
|
||||
if opos > 0 { if opos < obj_end {
|
||||
local oi = opos + k_op.length()
|
||||
local oj = index_of_from(json, "\"", oi)
|
||||
if oj > 0 { if oj <= obj_end {
|
||||
local op = json.substring(oi, oj)
|
||||
local k_v = "\"value\":"
|
||||
local lhs_v = index_of_from(json, k_v, oj)
|
||||
if lhs_v > 0 { if lhs_v < obj_end {
|
||||
local la = read_digits(json, lhs_v + k_v.length())
|
||||
if la != "" {
|
||||
local rhs_v = index_of_from(json, k_v, lhs_v + k_v.length())
|
||||
if rhs_v > 0 { if rhs_v < obj_end {
|
||||
local rb = read_digits(json, rhs_v + k_v.length())
|
||||
if rb != "" {
|
||||
local ai = _str_to_int(la)
|
||||
local bi = _str_to_int(rb)
|
||||
local res = 0
|
||||
if op == "<" { if ai < bi { res = 1 } }
|
||||
if op == "==" { if ai == bi { res = 1 } }
|
||||
if op == "<=" { if ai <= bi { res = 1 } }
|
||||
if op == ">" { if ai > bi { res = 1 } }
|
||||
if op == ">=" { if ai >= bi { res = 1 } }
|
||||
if op == "!=" { if ai != bi { res = 1 } }
|
||||
out.push(_int_to_str(res))
|
||||
pos = p + k_print.length()
|
||||
continue
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// (FunctionCall branch moved earlier)
|
||||
|
||||
// 4) Literal string
|
||||
{
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, obj_start)
|
||||
if ps > 0 { if ps < obj_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= obj_end {
|
||||
if trace == 1 { print("[hit][str]") }
|
||||
out.push(json.substring(si, sj)) pos = p + k_print.length() continue
|
||||
}}
|
||||
}}
|
||||
}
|
||||
// 5) Literal int
|
||||
{
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, obj_start)
|
||||
if pi > 0 { if pi < obj_end {
|
||||
local digits = read_digits(json, pi + ki.length())
|
||||
if digits != "" { if trace == 1 { print("[hit][i-lit] "+digits) } out.push(digits) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
// Unknown: skip this Print object entirely to avoid stalls and mis-detection
|
||||
// Use coarse slice end (next Print position) when available; fallback to k_print-length step
|
||||
pos = obj_end + 1
|
||||
if pos <= p { pos = p + k_print.length() }
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
// Program entry: prefer argv[0] JSON, fallback to embedded sample
|
||||
501
apps/selfhost/vm/boxes/mini_vm_prints.nyash
Normal file
501
apps/selfhost/vm/boxes/mini_vm_prints.nyash
Normal file
@ -0,0 +1,501 @@
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
using selfhost.vm.binop as MiniVmBinOp
|
||||
using selfhost.vm.compare as MiniVmCompare
|
||||
// Use the JSON adapter facade for cursor ops (next_non_ws, digits)
|
||||
using selfhost.vm.json as MiniJsonLoader
|
||||
|
||||
static box MiniVmPrints {
|
||||
// dev trace flag (0=OFF)
|
||||
_trace_enabled() { return 0 }
|
||||
// fallback toggle for legacy heuristics (0=OFF, 1=ON)
|
||||
_fallback_enabled() { return 0 }
|
||||
// literal string within Print
|
||||
try_print_string_value_at(json, end, print_pos) {
|
||||
local scan = new MiniVmScan()
|
||||
local k_val = "\"value\":\""
|
||||
local s = scan.index_of_from(json, k_val, print_pos)
|
||||
if s < 0 || s >= end { return -1 }
|
||||
local i = s + k_val.length()
|
||||
local j = scan.index_of_from(json, "\"", i)
|
||||
if j <= 0 || j > end { return -1 }
|
||||
print(json.substring(i, j))
|
||||
return j + 1
|
||||
}
|
||||
|
||||
// literal int within Print (typed)
|
||||
try_print_int_value_at(json, end, print_pos) {
|
||||
local scan = new MiniVmScan()
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = scan.index_of_from(json, k_expr, print_pos)
|
||||
if epos <= 0 || epos >= end { return -1 }
|
||||
local obj_start = scan.index_of_from(json, "{", epos)
|
||||
if obj_start <= 0 || obj_start >= end { return -1 }
|
||||
local obj_end = scan.find_balanced_object_end(json, obj_start)
|
||||
if obj_end <= 0 || obj_end > end { return -1 }
|
||||
// robust: look for explicit int type within expression object
|
||||
local k_tint = "\"type\":\"int\""
|
||||
local tpos = scan.index_of_from(json, k_tint, obj_start)
|
||||
if tpos <= 0 || tpos >= obj_end { return -1 }
|
||||
local k_val2 = "\"value\":"
|
||||
local v2 = scan.index_of_from(json, k_val2, tpos)
|
||||
if v2 <= 0 || v2 >= obj_end { return -1 }
|
||||
local digits = scan.read_digits(json, v2 + k_val2.length())
|
||||
if digits == "" { return -1 }
|
||||
print(digits)
|
||||
return obj_end + 1
|
||||
}
|
||||
|
||||
// minimal FunctionCall printer for echo/itoa
|
||||
try_print_functioncall_at(json, end, print_pos) {
|
||||
local scan = new MiniVmScan()
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = scan.index_of_from(json, k_fc, print_pos)
|
||||
if fcp <= 0 || fcp >= end { return -1 }
|
||||
local k_name = "\"name\":\""
|
||||
local npos = scan.index_of_from(json, k_name, fcp)
|
||||
if npos <= 0 || npos >= end { return -1 }
|
||||
local ni = npos + k_name.length()
|
||||
local nj = scan.index_of_from(json, "\"", ni)
|
||||
if nj <= 0 || nj > end { return -1 }
|
||||
local fname = json.substring(ni, nj)
|
||||
local k_args = "\"arguments\":["
|
||||
local apos = scan.index_of_from(json, k_args, nj)
|
||||
if apos <= 0 || apos >= end { return -1 }
|
||||
local arr_start = scan.index_of_from(json, "[", apos)
|
||||
local arr_end = scan.find_balanced_array_end(json, arr_start)
|
||||
if arr_start <= 0 || arr_end <= 0 || arr_end > end { return -1 }
|
||||
// handle empty args []
|
||||
local nn = new MiniJsonLoader().next_non_ws(json, arr_start+1)
|
||||
if nn > 0 && nn <= arr_end {
|
||||
if json.substring(nn, nn+1) == "]" {
|
||||
if fname == "echo" { print("") return arr_end + 1 }
|
||||
if fname == "itoa" { print("0") return arr_end + 1 }
|
||||
return -1
|
||||
}
|
||||
}
|
||||
// first arg type
|
||||
local k_t = "\"type\":\""
|
||||
local atpos = scan.index_of_from(json, k_t, arr_start)
|
||||
if atpos <= 0 || atpos >= arr_end {
|
||||
if fname == "echo" { print("") return arr_end + 1 }
|
||||
if fname == "itoa" { print("0") return arr_end + 1 }
|
||||
return -1
|
||||
}
|
||||
atpos = atpos + k_t.length()
|
||||
local at_end = scan.index_of_from(json, "\"", atpos)
|
||||
if at_end <= 0 || at_end > arr_end { return -1 }
|
||||
local aty = json.substring(atpos, at_end)
|
||||
if aty == "string" {
|
||||
local k_sval = "\"value\":\""
|
||||
local svalp = scan.index_of_from(json, k_sval, at_end)
|
||||
if svalp <= 0 || svalp >= arr_end { return -1 }
|
||||
local si = svalp + k_sval.length()
|
||||
local sj = scan.index_of_from(json, "\"", si)
|
||||
if sj <= 0 || sj > arr_end { return -1 }
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { print(sval) return sj + 1 }
|
||||
return -1
|
||||
}
|
||||
if aty == "int" || aty == "i64" || aty == "integer" {
|
||||
local k_ival = "\"value\":"
|
||||
local ivalp = scan.index_of_from(json, k_ival, at_end)
|
||||
if ivalp <= 0 || ivalp >= arr_end { return -1 }
|
||||
local digits = scan.read_digits(json, ivalp + k_ival.length())
|
||||
if fname == "itoa" || fname == "echo" { print(digits) return ivalp + k_ival.length() }
|
||||
return -1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
// Print all Print-Literal values within [start,end]
|
||||
print_prints_in_slice(json, start, end) {
|
||||
// Preferred route: JSON Box (plugin) – robust and structure-aware
|
||||
// If plugin is available, parse and traverse Program.statements and print.
|
||||
// Fall back to text scanner when plugin is unavailable or parse fails.
|
||||
{
|
||||
// Attempt plugin route in a guarded block
|
||||
@printed = 0
|
||||
@ok = 0
|
||||
// new JsonDocBox()/JsonNodeBox are provided by the JSON plugin
|
||||
@doc = new JsonDocBox()
|
||||
doc.parse(json)
|
||||
@root = doc.root()
|
||||
if root {
|
||||
@stmts = root.get("statements")
|
||||
if stmts {
|
||||
@n = stmts.size()
|
||||
@i = 0
|
||||
loop (i < n) {
|
||||
@node = stmts.at(i)
|
||||
if !node { i = i + 1 continue }
|
||||
@expr = node.get("expression")
|
||||
if !expr { i = i + 1 continue }
|
||||
@k = expr.get("kind").str()
|
||||
if k == "Literal" {
|
||||
@val = expr.get("value")
|
||||
if val {
|
||||
@ty = val.get("type").str()
|
||||
if ty == "string" { print(val.get("value").str()) } else { print(val.get("value").int()) }
|
||||
printed = printed + 1
|
||||
}
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if k == "FunctionCall" {
|
||||
@name = expr.get("name").str()
|
||||
@args = expr.get("arguments")
|
||||
if !args { i = i + 1 continue }
|
||||
@asz = args.size()
|
||||
if asz <= 0 {
|
||||
if name == "echo" { print("") printed = printed + 1 }
|
||||
if name == "itoa" { print("0") printed = printed + 1 }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
@arg0v = args.at(0).get("value")
|
||||
if name == "echo" {
|
||||
if arg0v {
|
||||
@t = arg0v.get("type").str()
|
||||
if t == "string" { print(arg0v.get("value").str()) } else { print(arg0v.get("value").int()) }
|
||||
printed = printed + 1
|
||||
}
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if name == "itoa" {
|
||||
if arg0v { print(arg0v.get("value").int()) printed = printed + 1 }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if k == "Compare" {
|
||||
@op = expr.get("operation").str()
|
||||
@lhs = expr.get("lhs").get("value").get("value").int()
|
||||
@rhs = expr.get("rhs").get("value").get("value").int()
|
||||
@res = 0
|
||||
if op == "<" { if lhs < rhs { res = 1 } }
|
||||
if op == "==" { if lhs == rhs { res = 1 } }
|
||||
if op == "<=" { if lhs <= rhs { res = 1 } }
|
||||
if op == ">" { if lhs > rhs { res = 1 } }
|
||||
if op == ">=" { if lhs >= rhs { res = 1 } }
|
||||
if op == "!=" { if lhs != rhs { res = 1 } }
|
||||
print(res)
|
||||
printed = printed + 1
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if k == "BinaryOp" {
|
||||
@op = expr.get("operator").str()
|
||||
if op == "+" {
|
||||
@left = expr.get("left").get("value").get("value").int()
|
||||
@right = expr.get("right").get("value").get("value").int()
|
||||
print(left + right)
|
||||
printed = printed + 1
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
ok = 1
|
||||
}
|
||||
}
|
||||
// Prefer plugin result whenever JSON route ran (ok==1). Even if printed==0,
|
||||
// return early to avoid falling back to the heuristic scanner which can loop
|
||||
// on malformed inputs or seam-edge cases.
|
||||
if ok == 1 { return printed }
|
||||
}
|
||||
|
||||
// Fallback: text scanner（開発用）
|
||||
local scan = new MiniVmScan()
|
||||
local bin = new MiniVmBinOp()
|
||||
local cmp = new MiniVmCompare()
|
||||
local pos = start
|
||||
local printed = 0
|
||||
local guard = 0
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 200 { break }
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
local p = scan.index_of_from(json, k_print, pos)
|
||||
if p < 0 || p > end { break }
|
||||
// bound current Print object (coarse): use next Print marker as slice end to avoid deep brace scan
|
||||
local p_obj_start = scan.index_of_from(json, "{", p)
|
||||
// coarse slice end by next Print marker
|
||||
local next_p = scan.index_of_from(json, k_print, p + k_print.length())
|
||||
local p_slice_end = end
|
||||
if next_p > 0 { p_slice_end = next_p }
|
||||
// avoid heavy find_balanced_object_end; use coarse p_slice_end-1 as object end
|
||||
local p_obj_end = p_slice_end - 1
|
||||
if p_obj_start <= 0 { p_obj_end = p + k_print.length() }
|
||||
// Fast path: handle within [p, p_slice_end) without deep brace scans
|
||||
{
|
||||
local did = 0
|
||||
// FunctionCall echo/itoa
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = scan.index_of_from(json, k_fc, p)
|
||||
if fcp > 0 { if fcp < p_slice_end {
|
||||
local k_name = "\"name\":\""
|
||||
local npos = scan.index_of_from(json, k_name, fcp)
|
||||
if npos > 0 { if npos < p_slice_end {
|
||||
local ni = npos + k_name.length()
|
||||
local nj = scan.index_of_from(json, "\"", ni)
|
||||
if nj > 0 { if nj <= p_slice_end {
|
||||
local fname = json.substring(ni, nj)
|
||||
local k_args = "\"arguments\":["
|
||||
local apos = scan.index_of_from(json, k_args, nj)
|
||||
if apos > 0 { if apos < p_slice_end {
|
||||
// quick value-based parse first (avoid type walk)
|
||||
{
|
||||
local k_sval = "\"value\":\""
|
||||
local vs = scan.index_of_from(json, k_sval, apos)
|
||||
if vs > 0 { if vs < p_slice_end {
|
||||
local si = vs + k_sval.length()
|
||||
local sj = scan.index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= p_slice_end {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { print(sval) printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}}
|
||||
}}
|
||||
local k_ival = "\"value\":"
|
||||
local vi = scan.index_of_from(json, k_ival, apos)
|
||||
if vi > 0 { if vi < p_slice_end {
|
||||
local digits = scan.read_digits(json, vi + k_ival.length())
|
||||
if digits != "" { if fname == "itoa" || fname == "echo" { print(digits) printed = printed + 1 did = 1 pos = p_slice_end continue } }
|
||||
}}
|
||||
}
|
||||
// empty args
|
||||
local nwn = new MiniJsonLoader().next_non_ws(json, apos + k_args.length())
|
||||
if nwn == apos + k_args.length() {
|
||||
if fname == "echo" { print("") printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
if fname == "itoa" { print("0") printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}
|
||||
local k_t = "\"type\":\""
|
||||
local atpos = scan.index_of_from(json, k_t, apos)
|
||||
if atpos > 0 { if atpos < p_slice_end {
|
||||
local ati = atpos + k_t.length()
|
||||
local atj = scan.index_of_from(json, "\"", ati)
|
||||
if atj > 0 { if atj <= p_slice_end {
|
||||
local aty = json.substring(ati, atj)
|
||||
if aty == "string" {
|
||||
local k_sval = "\"value\":\""
|
||||
local svalp = scan.index_of_from(json, k_sval, atj)
|
||||
if svalp > 0 { if svalp < p_slice_end {
|
||||
local si = svalp + k_sval.length()
|
||||
local sj = scan.index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= p_slice_end {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { print(sval) printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}}
|
||||
}}
|
||||
}
|
||||
if aty == "int" || aty == "i64" || aty == "integer" {
|
||||
local k_ival = "\"value\":"
|
||||
local ivalp = scan.index_of_from(json, k_ival, atj)
|
||||
if ivalp > 0 { if ivalp < p_slice_end {
|
||||
local digits = scan.read_digits(json, ivalp + k_ival.length())
|
||||
if fname == "itoa" || fname == "echo" { print(digits) printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
// Compare within slice
|
||||
local k_cp = "\"kind\":\"Compare\""
|
||||
local cpos = scan.index_of_from(json, k_cp, p)
|
||||
if cpos > 0 { if cpos < p_slice_end {
|
||||
local k_op = "\"operation\":\""
|
||||
local opos = scan.index_of_from(json, k_op, cpos)
|
||||
if opos > 0 { if opos < p_slice_end {
|
||||
local oi = opos + k_op.length()
|
||||
local oj = scan.index_of_from(json, "\"", oi)
|
||||
if oj > 0 { if oj <= p_slice_end {
|
||||
local op = json.substring(oi, oj)
|
||||
local k_lhs = "\"lhs\":{\"kind\":\"Literal\""
|
||||
local hl = scan.index_of_from(json, k_lhs, oj)
|
||||
if hl > 0 { if hl < p_slice_end {
|
||||
local k_v = "\"value\":"
|
||||
local hv = scan.index_of_from(json, k_v, hl)
|
||||
if hv > 0 { if hv < p_slice_end {
|
||||
local a = scan.read_digits(json, hv + k_v.length())
|
||||
local k_rhs = "\"rhs\":{\"kind\":\"Literal\""
|
||||
local hr = scan.index_of_from(json, k_rhs, hl)
|
||||
if hr > 0 { if hr < p_slice_end {
|
||||
local rv = scan.index_of_from(json, k_v, hr)
|
||||
if rv > 0 { if rv < p_slice_end {
|
||||
local b = scan.read_digits(json, rv + k_v.length())
|
||||
if a && b {
|
||||
local ai = scan._str_to_int(a)
|
||||
local bi = scan._str_to_int(b)
|
||||
local res = 0
|
||||
if op == "<" { if ai < bi { res = 1 } }
|
||||
if op == "==" { if ai == bi { res = 1 } }
|
||||
if op == "<=" { if ai <= bi { res = 1 } }
|
||||
if op == ">" { if ai > bi { res = 1 } }
|
||||
if op == ">=" { if ai >= bi { res = 1 } }
|
||||
if op == "!=" { if ai != bi { res = 1 } }
|
||||
print(res)
|
||||
printed = printed + 1
|
||||
did = 1
|
||||
pos = p_slice_end
|
||||
continue
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
// BinaryOp '+' (typed ints) within slice
|
||||
if scan.index_of_from(json, "\"kind\":\"BinaryOp\"", p) > 0 { if scan.index_of_from(json, "\"operator\":\"+\"", p) > 0 {
|
||||
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = scan.index_of_from(json, k_lint, p)
|
||||
if lp > 0 { if lp < p_slice_end {
|
||||
local ld = scan.read_digits(json, lp + k_lint.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_rint, lp + k_lint.length())
|
||||
if rp > 0 { if rp < p_slice_end {
|
||||
local rd = scan.read_digits(json, rp + k_rint.length())
|
||||
if rd != "" { print(new MiniVmScan()._int_to_str(new MiniVmScan()._str_to_int(ld) + new MiniVmScan()._str_to_int(rd))) printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
// Literal string within slice
|
||||
{
|
||||
local k_val = "\"value\":\""
|
||||
local s = scan.index_of_from(json, k_val, p)
|
||||
if s > 0 { if s < p_slice_end {
|
||||
local i = s + k_val.length()
|
||||
local j = scan.index_of_from(json, "\"", i)
|
||||
if j > 0 { if j <= p_slice_end {
|
||||
print(json.substring(i, j))
|
||||
printed = printed + 1
|
||||
did = 1
|
||||
pos = p_slice_end
|
||||
continue
|
||||
}}
|
||||
}}
|
||||
}
|
||||
// Literal int within slice
|
||||
{
|
||||
local k_tint = "\"type\":\"int\""
|
||||
local tpos = scan.index_of_from(json, k_tint, p)
|
||||
if tpos > 0 { if tpos < p_slice_end {
|
||||
local k_val2 = "\"value\":"
|
||||
local v2 = scan.index_of_from(json, k_val2, tpos)
|
||||
if v2 > 0 { if v2 < p_slice_end {
|
||||
local digits = scan.read_digits(json, v2 + k_val2.length())
|
||||
if digits != "" { print(digits) printed = printed + 1 did = 1 pos = p_slice_end continue }
|
||||
}}
|
||||
}}
|
||||
}
|
||||
if did == 1 { pos = p_slice_end + 1 continue }
|
||||
}
|
||||
// 0) BinaryOp typed/expr（重スキャン回避のため無効化。必要なら下の軽量パスを使用）
|
||||
// 1) BinaryOp fallbacks（開発用トグル。既定OFF）
|
||||
if (new MiniVmPrints()._fallback_enabled() == 1) {
|
||||
local nextp = bin.try_print_binop_sum_any(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
nextp = bin.try_print_binop_at(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
nextp = bin.try_print_binop_int_greedy(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
nextp = bin.try_print_binop_sum_any(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
// Inline typed sum within this Print BinaryOp('+')
|
||||
{
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = scan.index_of_from(json, k_expr, p)
|
||||
if epos > 0 { if epos < p_obj_end {
|
||||
if scan.index_of_from(json, "\"kind\":\"BinaryOp\"", epos) > 0 {
|
||||
if scan.index_of_from(json, "\"operator\":\"+\"", epos) > 0 {
|
||||
local k_l = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_r = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = scan.index_of_from(json, k_l, epos)
|
||||
if lp > 0 { if lp < p_obj_end {
|
||||
local ld = scan.read_digits(json, lp + k_l.length())
|
||||
if ld != "" {
|
||||
local rp = scan.index_of_from(json, k_r, lp + k_l.length())
|
||||
if rp > 0 { if rp < p_obj_end {
|
||||
local rd = scan.read_digits(json, rp + k_r.length())
|
||||
if rd != "" { print(new MiniVmScan()._int_to_str(new MiniVmScan()._str_to_int(ld) + new MiniVmScan()._str_to_int(rd))) printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
// 2) Compare
|
||||
nextp = cmp.try_print_compare_at(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
// 3) FunctionCall（既定: 軽量スライス限定パスで処理済み。重い版は呼ばない）
|
||||
// nextp = new MiniVmPrints().try_print_functioncall_at(json, end, p)
|
||||
// if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
// 4) literal string
|
||||
nextp = new MiniVmPrints().try_print_string_value_at(json, end, p)
|
||||
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
// 5) literal int via type（重走査を避けるため無効化。スライス限定の軽量パスで処理済み）
|
||||
// nextp = new MiniVmPrints().try_print_int_value_at(json, end, p)
|
||||
// if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
|
||||
// 5b) literal int（簡易フォールバック；既定OFF）
|
||||
if (new MiniVmPrints()._fallback_enabled() == 1) {
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = scan.index_of_from(json, ki, p)
|
||||
if pi > 0 { if pi < p_slice_end {
|
||||
local digits = scan.read_digits(json, pi + ki.length())
|
||||
if digits != "" { print(digits) printed = printed + 1 pos = p_slice_end continue }
|
||||
}}
|
||||
// Unknown shape: skip this Print object entirely to avoid stalls
|
||||
pos = p_obj_end + 1
|
||||
if pos <= p { pos = p + k_print.length() }
|
||||
} else {
|
||||
// 既定は最小前進（次の探索へ）
|
||||
pos = p + k_print.length()
|
||||
}
|
||||
}
|
||||
return printed
|
||||
}
|
||||
|
||||
// Process top-level If with literal condition; print branch prints. Returns printed count.
|
||||
process_if_once(json) {
|
||||
local scan = new MiniVmScan()
|
||||
local k_if = "\"kind\":\"If\""
|
||||
local p = scan.index_of_from(json, k_if, 0)
|
||||
if p < 0 { return 0 }
|
||||
local k_cond = "\"condition\""
|
||||
local cpos = scan.index_of_from(json, k_cond, p)
|
||||
if cpos < 0 { return 0 }
|
||||
local k_val = "\"value\":"
|
||||
local vpos = scan.index_of_from(json, k_val, cpos)
|
||||
if vpos < 0 { return 0 }
|
||||
local val_digits = scan.read_digits(json, vpos + k_val.length())
|
||||
local truthy = 0
|
||||
if val_digits { if val_digits != "0" { truthy = 1 } }
|
||||
local k_then = "\"then_body\""
|
||||
local k_else = "\"else_body\""
|
||||
local bkey = k_then
|
||||
if truthy == 0 { bkey = k_else }
|
||||
local bpos = scan.index_of_from(json, bkey, cpos)
|
||||
if bpos < 0 { return 0 }
|
||||
local arr_start = scan.index_of_from(json, "[", bpos)
|
||||
if arr_start < 0 { return 0 }
|
||||
local arr_end = new MiniVmScan().find_balanced_array_end(json, arr_start)
|
||||
if arr_end < 0 { return 0 }
|
||||
return new MiniVmPrints().print_prints_in_slice(json, arr_start, arr_end)
|
||||
}
|
||||
|
||||
// Print all Print-Literal values in Program.statements (string/int only; MVP)
|
||||
print_all_print_literals(json) {
|
||||
return new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
}
|
||||
}
|
||||
249
apps/selfhost/vm/boxes/seam_inspector.nyash
Normal file
249
apps/selfhost/vm/boxes/seam_inspector.nyash
Normal file
@ -0,0 +1,249 @@
|
||||
// SeamInspector — analyze inlined code seam and duplicates
|
||||
// Usage: import and call report(text) or analyze_dump_file(path)
|
||||
|
||||
static box SeamInspector {
|
||||
// Count brace delta ignoring simple strings ("...") and escapes
|
||||
_brace_delta_ignoring_strings(text, start, end) {
|
||||
@i = start
|
||||
@n = end
|
||||
@delta = 0
|
||||
loop (i < n) {
|
||||
@ch = text.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
i = i + 1
|
||||
loop (i < n) {
|
||||
@c = text.substring(i, i+1)
|
||||
if c == "\\" { i = i + 2 continue }
|
||||
if c == "\"" { i = i + 1 break }
|
||||
i = i + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ch == "{" { delta = delta + 1 }
|
||||
if ch == "}" { delta = delta - 1 }
|
||||
i = i + 1
|
||||
}
|
||||
return delta
|
||||
}
|
||||
|
||||
// Find index of exact token in plain text from position
|
||||
_index_of_from(h, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
@n = h.length()
|
||||
if pos >= n { return -1 }
|
||||
@m = needle.length()
|
||||
if m <= 0 { return pos }
|
||||
@i = pos
|
||||
@limit = n - m
|
||||
loop (i <= limit) {
|
||||
if h.substring(i, i+m) == needle { return i }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// Find matching closing brace starting at '{'
|
||||
_find_balanced_object_end(text, idx) {
|
||||
if text.substring(idx, idx+1) != "{" { return -1 }
|
||||
@i = idx
|
||||
@n = text.length()
|
||||
@depth = 0
|
||||
loop (i < n) {
|
||||
@ch = text.substring(i, i+1)
|
||||
if ch == "\"" {
|
||||
i = i + 1
|
||||
loop (i < n) {
|
||||
@c = text.substring(i, i+1)
|
||||
if c == "\\" { i = i + 2 continue }
|
||||
if c == "\"" { i = i + 1 break }
|
||||
i = i + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
if ch == "{" { depth = depth + 1 }
|
||||
if ch == "}" { depth = depth - 1 if depth == 0 { return i } }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// Scan boxes: return array of {name, start, end}
|
||||
_scan_boxes(text) {
|
||||
@i = 0
|
||||
@n = text.length()
|
||||
@res = new ArrayBox()
|
||||
@tok = "static box "
|
||||
loop (i < n) {
|
||||
@p = _index_of_from(text, tok, i)
|
||||
if p < 0 { break }
|
||||
@j = p + tok.length()
|
||||
// read identifier
|
||||
@name = ""
|
||||
loop (j < n) {
|
||||
@c = text.substring(j, j+1)
|
||||
// ASCII alpha-num or '_'
|
||||
if c == "_" { name = name + c j = j + 1 continue }
|
||||
// digits
|
||||
if c == "0" or c == "1" or c == "2" or c == "3" or c == "4" or c == "5" or c == "6" or c == "7" or c == "8" or c == "9" { name = name + c j = j + 1 continue }
|
||||
// letters
|
||||
if (c >= "A" and c <= "Z") or (c >= "a" and c <= "z") { name = name + c j = j + 1 continue }
|
||||
break
|
||||
}
|
||||
// skip to '{'
|
||||
loop (j < n) {
|
||||
@c2 = text.substring(j, j+1)
|
||||
if c2 == "{" { break }
|
||||
j = j + 1
|
||||
}
|
||||
@end = _find_balanced_object_end(text, j)
|
||||
if end < 0 { end = j }
|
||||
@obj = new MapBox()
|
||||
obj.set("name", name)
|
||||
obj.set("start", _int_to_str(p))
|
||||
obj.set("end", _int_to_str(end))
|
||||
res.push(obj)
|
||||
i = end + 1
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// Print duplicate boxes by name
|
||||
_report_duplicate_boxes(text) {
|
||||
@boxes = _scan_boxes(text)
|
||||
@cnt = new MapBox()
|
||||
@names = new ArrayBox()
|
||||
@i = 0
|
||||
loop (i < boxes.size()) {
|
||||
@name = boxes.get(i).get("name")
|
||||
@cur = cnt.get(name)
|
||||
if cur == null { cnt.set(name, "1") names.push(name) } else { cnt.set(name, _int_to_str(_str_to_int(cur) + 1)) }
|
||||
i = i + 1
|
||||
}
|
||||
@j = 0
|
||||
loop (j < names.size()) {
|
||||
@k = names.get(j)
|
||||
@v = cnt.get(k)
|
||||
if _str_to_int(v) > 1 { print("dup_box " + k + " x" + v) }
|
||||
j = j + 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// Inside a given box, count function name duplicates (simple scan: name(...){ )
|
||||
_report_duplicate_functions_in_box(text, box_name) {
|
||||
@boxes = _scan_boxes(text)
|
||||
@i = 0
|
||||
@fnmap = new MapBox()
|
||||
@fnames = new ArrayBox()
|
||||
loop (i < boxes.size()) {
|
||||
@b = boxes.get(i)
|
||||
if b.get("name") == box_name {
|
||||
@s = _str_to_int(b.get("start"))
|
||||
@e = _str_to_int(b.get("end"))
|
||||
@j = s
|
||||
loop (j < e) {
|
||||
// find identifier start at line head-ish (naive)
|
||||
// pattern: <spaces> ident '(' ... '{'
|
||||
@k = j
|
||||
// skip spaces/newlines
|
||||
loop (k < e) {
|
||||
@ch = text.substring(k, k+1)
|
||||
if ch == " " || ch == "\t" || ch == "\n" || ch == "\r" { k = k + 1 continue }
|
||||
break
|
||||
}
|
||||
if k >= e { break }
|
||||
// read ident
|
||||
@name = ""
|
||||
@p = k
|
||||
@c0 = text.substring(p, p+1)
|
||||
if (c0 >= "A" and c0 <= "Z") or (c0 >= "a" and c0 <= "z") or c0 == "_" {
|
||||
loop (p < e) {
|
||||
@c = text.substring(p, p+1)
|
||||
if (c >= "A" and c <= "Z") or (c >= "a" and c <= "z") or (c >= "0" and c <= "9") or c == "_" { name = name + c p = p + 1 continue }
|
||||
break
|
||||
}
|
||||
// must be a function definition: ident '(' ... ')' ws* '{'
|
||||
if text.substring(p, p+1) == "(" {
|
||||
// find matching ')' with a simple counter (strings ignored for simplicity)
|
||||
@d = 0
|
||||
@r = p
|
||||
loop (r < e) {
|
||||
@cc = text.substring(r, r+1)
|
||||
if cc == "(" { d = d + 1 r = r + 1 continue }
|
||||
if cc == ")" {
|
||||
d = d - 1
|
||||
r = r + 1
|
||||
if d <= 0 { break }
|
||||
continue
|
||||
}
|
||||
if cc == "\"" {
|
||||
// skip string inside params
|
||||
r = r + 1
|
||||
loop (r < e) {
|
||||
@c2 = text.substring(r, r+1)
|
||||
if c2 == "\\" { r = r + 2 continue }
|
||||
if c2 == "\"" { r = r + 1 break }
|
||||
r = r + 1
|
||||
}
|
||||
continue
|
||||
}
|
||||
r = r + 1
|
||||
}
|
||||
// skip ws
|
||||
loop (r < e) {
|
||||
@ws = text.substring(r, r+1)
|
||||
if ws == " " or ws == "\t" or ws == "\r" or ws == "\n" { r = r + 1 continue }
|
||||
break
|
||||
}
|
||||
// definition only if next is '{'
|
||||
if r < e and text.substring(r, r+1) == "{" {
|
||||
@cur = fnmap.get(name)
|
||||
if cur == null { fnmap.set(name, "1") fnames.push(name) } else { fnmap.set(name, _int_to_str(_str_to_int(cur) + 1)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
// advance to next line
|
||||
@nl = _index_of_from(text, "\n", k+1)
|
||||
if nl < 0 || nl > e { break }
|
||||
j = nl + 1
|
||||
}
|
||||
break
|
||||
}
|
||||
i = i + 1
|
||||
}
|
||||
@x = 0
|
||||
loop (x < fnames.size()) {
|
||||
@nm = fnames.get(x)
|
||||
@ct = fnmap.get(nm)
|
||||
if _str_to_int(ct) > 1 { print("dup_fn " + box_name + "." + nm + " x" + ct) }
|
||||
x = x + 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// Report summary
|
||||
report(text) {
|
||||
// find Main
|
||||
@m = _index_of_from(text, "static box Main {", 0)
|
||||
@delta = -9999
|
||||
if m > 0 { delta = _brace_delta_ignoring_strings(text, 0, m) }
|
||||
print("prelude_brace_delta=" + _int_to_str(delta))
|
||||
|
||||
// duplicate boxes
|
||||
_report_duplicate_boxes(text)
|
||||
|
||||
// specific hot-spot
|
||||
_report_duplicate_functions_in_box(text, "MiniVmPrints")
|
||||
return 0
|
||||
}
|
||||
|
||||
// Load dump file and report
|
||||
analyze_dump_file(path) {
|
||||
@fb = new FileBox()
|
||||
@f = fb.open(path)
|
||||
if f == null { print("warn: cannot open " + path) return 0 }
|
||||
@text = f.read()
|
||||
f.close()
|
||||
return me.report(text)
|
||||
}
|
||||
}
|
||||
59
apps/selfhost/vm/collect_empty_args_smoke.nyash
Normal file
59
apps/selfhost/vm/collect_empty_args_smoke.nyash
Normal file
@ -0,0 +1,59 @@
|
||||
// Self-contained dev smoke for FunctionCall empty-args
|
||||
// Goal: echo() -> empty line, itoa() -> 0
|
||||
|
||||
static box MiniVm {
|
||||
// simple substring find from position
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
}
|
||||
|
||||
// collect only FunctionCall with empty arguments [] for echo/itoa
|
||||
collect_prints(json) {
|
||||
local out = new ArrayBox()
|
||||
local pos = 0
|
||||
local guard = 0
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 16 { break }
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local p = index_of_from(json, k_fc, pos)
|
||||
if p < 0 { break }
|
||||
// name
|
||||
local k_n = "\"name\":\""
|
||||
local np = index_of_from(json, k_n, p)
|
||||
if np < 0 { break }
|
||||
local ni = np + k_n.length()
|
||||
local nj = index_of_from(json, "\"", ni)
|
||||
if nj < 0 { break }
|
||||
local fname = json.substring(ni, nj)
|
||||
// args [] detection
|
||||
local k_a = "\"arguments\":["
|
||||
local ap = index_of_from(json, k_a, nj)
|
||||
if ap < 0 { break }
|
||||
local rb = index_of_from(json, "]", ap)
|
||||
if rb < 0 { break }
|
||||
// no content between '[' and ']'
|
||||
if rb == ap + k_a.length() {
|
||||
if fname == "echo" { out.push("") }
|
||||
if fname == "itoa" { out.push("0") }
|
||||
}
|
||||
pos = rb + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
15
apps/selfhost/vm/collect_empty_args_using_smoke.nyash
Normal file
15
apps/selfhost/vm/collect_empty_args_using_smoke.nyash
Normal file
@ -0,0 +1,15 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":["
|
||||
+ "{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},"
|
||||
+ "{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
30
apps/selfhost/vm/collect_literal_eval.nyash
Normal file
30
apps/selfhost/vm/collect_literal_eval.nyash
Normal file
@ -0,0 +1,30 @@
|
||||
// Minimal self-contained eval (no using): collect the first Print(Literal int) and print it
|
||||
static box Main {
|
||||
// helper: find from position
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 } else { return pos + rel }
|
||||
}
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
// naive collect: first Print of Literal int
|
||||
local ki = "\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local p = json.indexOf(ki)
|
||||
if p >= 0 {
|
||||
local i = p + ki.length()
|
||||
local j = i
|
||||
loop (true) {
|
||||
local ch = json.substring(j, j+1)
|
||||
if ch == "" { break }
|
||||
if ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" { j = j + 1 continue }
|
||||
break
|
||||
}
|
||||
local digits = json.substring(i, j)
|
||||
if digits { print(digits) }
|
||||
}
|
||||
return 0
|
||||
}
|
||||
}
|
||||
282
apps/selfhost/vm/collect_mixed_smoke.nyash
Normal file
282
apps/selfhost/vm/collect_mixed_smoke.nyash
Normal file
@ -0,0 +1,282 @@
|
||||
static box Main {
|
||||
// --- minimal helpers (self-contained) ---
|
||||
index_of_from(hay, needle, pos) {
|
||||
if pos < 0 { pos = 0 }
|
||||
if pos >= hay.length() { return -1 }
|
||||
local tail = hay.substring(pos, hay.length())
|
||||
local rel = tail.indexOf(needle)
|
||||
if rel < 0 { return -1 }
|
||||
return pos + rel
|
||||
}
|
||||
_is_digit(ch) {
|
||||
if ch == "0" { return 1 }
|
||||
if ch == "1" { return 1 }
|
||||
if ch == "2" { return 1 }
|
||||
if ch == "3" { return 1 }
|
||||
if ch == "4" { return 1 }
|
||||
if ch == "5" { return 1 }
|
||||
if ch == "6" { return 1 }
|
||||
if ch == "7" { return 1 }
|
||||
if ch == "8" { return 1 }
|
||||
if ch == "9" { return 1 }
|
||||
return 0
|
||||
}
|
||||
read_digits(s, pos) {
|
||||
if pos < 0 { return "" }
|
||||
local n = s.length()
|
||||
if pos >= n { return "" }
|
||||
local i = pos
|
||||
local out_start = -1
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if _is_digit(ch) == 1 { if out_start < 0 { out_start = i } i = i + 1 continue } else { break }
|
||||
}
|
||||
if out_start < 0 { return "" }
|
||||
return s.substring(out_start, i)
|
||||
}
|
||||
find_balanced_object_end(json, idx) {
|
||||
if idx < 0 { return -1 }
|
||||
local n = json.length()
|
||||
if idx >= n { return -1 }
|
||||
local depth = 0
|
||||
local in_str = 0
|
||||
local i = idx
|
||||
local iter = 0
|
||||
loop (i < n) {
|
||||
iter = iter + 1
|
||||
if iter > 5000 { return -1 }
|
||||
local ch = json.substring(i, i+1)
|
||||
if in_str == 1 {
|
||||
if ch == "\\" { i = i + 2 continue }
|
||||
if ch == "\"" { in_str = 0 }
|
||||
i = i + 1
|
||||
continue
|
||||
}
|
||||
if ch == "\"" { in_str = 1 i = i + 1 continue }
|
||||
if ch == "{" { depth = depth + 1 }
|
||||
if ch == "}" { depth = depth - 1 if depth == 0 { return i + 1 } }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
// --- core: collect Print outputs in order ---
|
||||
collect_prints(json) {
|
||||
local out = new ArrayBox()
|
||||
local pos = 0
|
||||
local guard = 0
|
||||
local k_print = "\"kind\":\"Print\""
|
||||
loop (true) {
|
||||
guard = guard + 1
|
||||
if guard > 200 { break }
|
||||
local p = index_of_from(json, k_print, pos)
|
||||
if p < 0 { break }
|
||||
// bound current Print slice as [current_print, next_print)
|
||||
local obj_start = p
|
||||
local next_p = index_of_from(json, k_print, p + k_print.length())
|
||||
local obj_end = json.length()
|
||||
if next_p > 0 { obj_end = next_p }
|
||||
|
||||
// 1) BinaryOp(int '+' int)
|
||||
{
|
||||
local k_expr = "\"expression\":{"
|
||||
local epos = index_of_from(json, k_expr, obj_start)
|
||||
if epos > 0 { if epos < obj_end {
|
||||
local k_bo = "\"kind\":\"BinaryOp\""
|
||||
local bpos = index_of_from(json, k_bo, epos)
|
||||
if bpos > 0 { if bpos < obj_end {
|
||||
local opok = index_of_from(json, "\"operator\":\"+\"", bpos)
|
||||
if opok > 0 {
|
||||
// typed left/right literal ints
|
||||
local k_l = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local k_r = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
|
||||
local lp = index_of_from(json, k_l, bpos)
|
||||
if lp > 0 { if lp < obj_end {
|
||||
local ld = read_digits(json, lp + k_l.length())
|
||||
if ld != "" {
|
||||
local rp = index_of_from(json, k_r, lp + k_l.length())
|
||||
if rp > 0 { if rp < obj_end {
|
||||
local rd = read_digits(json, rp + k_r.length())
|
||||
if rd != "" { out.push(_int_to_str(_str_to_int(ld) + _str_to_int(rd))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
// fallback: scan two successive '"value":' digits within expression bounds
|
||||
local k_v = "\"value\":"
|
||||
local v1 = index_of_from(json, k_v, epos)
|
||||
if v1 > 0 { if v1 < obj_end {
|
||||
local d1 = read_digits(json, v1 + k_v.length())
|
||||
if d1 != "" {
|
||||
local v2 = index_of_from(json, k_v, v1 + k_v.length())
|
||||
if v2 > 0 { if v2 < obj_end {
|
||||
local d2 = read_digits(json, v2 + k_v.length())
|
||||
if d2 != "" { out.push(_int_to_str(_str_to_int(d1) + _str_to_int(d2))) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 2) Compare(lhs/rhs ints): prints 1/0
|
||||
{
|
||||
local k_cp = "\"kind\":\"Compare\""
|
||||
local cpos = index_of_from(json, k_cp, obj_start)
|
||||
if cpos > 0 { if cpos < obj_end {
|
||||
local k_op = "\"operation\":\""
|
||||
local opos = index_of_from(json, k_op, cpos)
|
||||
if opos > 0 { if opos < obj_end {
|
||||
local oi = opos + k_op.length()
|
||||
local oj = index_of_from(json, "\"", oi)
|
||||
if oj > 0 { if oj <= obj_end {
|
||||
local op = json.substring(oi, oj)
|
||||
local k_v = "\"value\":"
|
||||
local lhs_v = index_of_from(json, k_v, oj)
|
||||
if lhs_v > 0 { if lhs_v < obj_end {
|
||||
local la = read_digits(json, lhs_v + k_v.length())
|
||||
if la != "" {
|
||||
local rhs_v = index_of_from(json, k_v, lhs_v + k_v.length())
|
||||
if rhs_v > 0 { if rhs_v < obj_end {
|
||||
local rb = read_digits(json, rhs_v + k_v.length())
|
||||
if rb != "" {
|
||||
local ai = _str_to_int(la)
|
||||
local bi = _str_to_int(rb)
|
||||
local res = 0
|
||||
if op == "<" { if ai < bi { res = 1 } }
|
||||
if op == "==" { if ai == bi { res = 1 } }
|
||||
if op == "<=" { if ai <= bi { res = 1 } }
|
||||
if op == ">" { if ai > bi { res = 1 } }
|
||||
if op == ">=" { if ai >= bi { res = 1 } }
|
||||
if op == "!=" { if ai != bi { res = 1 } }
|
||||
out.push(_int_to_str(res))
|
||||
pos = p + k_print.length()
|
||||
continue
|
||||
}
|
||||
}}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 3) FunctionCall echo/itoa (single literal arg)
|
||||
{
|
||||
local k_fc = "\"kind\":\"FunctionCall\""
|
||||
local fcp = index_of_from(json, k_fc, obj_start)
|
||||
if fcp > 0 { if fcp < obj_end {
|
||||
local kn = "\"name\":\""
|
||||
local np = index_of_from(json, kn, fcp)
|
||||
if np > 0 { if np < obj_end {
|
||||
local ni = np + kn.length()
|
||||
local nj = index_of_from(json, "\"", ni)
|
||||
if nj > 0 { if nj <= obj_end {
|
||||
local fname = json.substring(ni, nj)
|
||||
local ka = "\"arguments\":["
|
||||
local ap = index_of_from(json, ka, nj)
|
||||
if ap > 0 { if ap < obj_end {
|
||||
// string arg
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, ap)
|
||||
if ps > 0 { if ps < obj_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= obj_end {
|
||||
local sval = json.substring(si, sj)
|
||||
if fname == "echo" { out.push(sval) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}}
|
||||
// int arg
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, ap)
|
||||
if pi > 0 { if pi < obj_end {
|
||||
local ival = read_digits(json, pi + ki.length())
|
||||
if ival != "" { if fname == "itoa" { out.push(ival) pos = p + k_print.length() continue } else { if fname == "echo" { out.push(ival) pos = p + k_print.length() continue } } }
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}}
|
||||
}
|
||||
|
||||
// 4) Literal string
|
||||
{
|
||||
local ks = "\"type\":\"string\",\"value\":\""
|
||||
local ps = index_of_from(json, ks, obj_start)
|
||||
if ps > 0 { if ps < obj_end {
|
||||
local si = ps + ks.length()
|
||||
local sj = index_of_from(json, "\"", si)
|
||||
if sj > 0 { if sj <= obj_end { out.push(json.substring(si, sj)) pos = p + k_print.length() continue }}
|
||||
}}
|
||||
}
|
||||
// 5) Literal int
|
||||
{
|
||||
local ki = "\"type\":\"int\",\"value\":"
|
||||
local pi = index_of_from(json, ki, obj_start)
|
||||
if pi > 0 { if pi < obj_end {
|
||||
local digits = read_digits(json, pi + ki.length())
|
||||
if digits != "" { out.push(digits) pos = p + k_print.length() continue }
|
||||
}}
|
||||
}
|
||||
// Unknown: skip ahead
|
||||
pos = p + k_print.length()
|
||||
if pos <= p { pos = p + 1 }
|
||||
}
|
||||
return out
|
||||
}
|
||||
// int<->str (non-negative only)
|
||||
_str_to_int(s) {
|
||||
local n = 0
|
||||
local i = 0
|
||||
loop (i < s.length()) {
|
||||
local ch = s.substring(i, i+1)
|
||||
n = n * 10
|
||||
if ch == "0" { n = n + 0 }
|
||||
if ch == "1" { n = n + 1 }
|
||||
if ch == "2" { n = n + 2 }
|
||||
if ch == "3" { n = n + 3 }
|
||||
if ch == "4" { n = n + 4 }
|
||||
if ch == "5" { n = n + 5 }
|
||||
if ch == "6" { n = n + 6 }
|
||||
if ch == "7" { n = n + 7 }
|
||||
if ch == "8" { n = n + 8 }
|
||||
if ch == "9" { n = n + 9 }
|
||||
i = i + 1
|
||||
}
|
||||
return n
|
||||
}
|
||||
_int_to_str(n) {
|
||||
if n == 0 { return "0" }
|
||||
local s = new ArrayBox()
|
||||
local x = n
|
||||
loop (x > 0) {
|
||||
local d = x % 10
|
||||
if d == 0 { s.push("0") }
|
||||
if d == 1 { s.push("1") }
|
||||
if d == 2 { s.push("2") }
|
||||
if d == 3 { s.push("3") }
|
||||
if d == 4 { s.push("4") }
|
||||
if d == 5 { s.push("5") }
|
||||
if d == 6 { s.push("6") }
|
||||
if d == 7 { s.push("7") }
|
||||
if d == 8 { s.push("8") }
|
||||
if d == 9 { s.push("9") }
|
||||
x = (x - d) / 10
|
||||
}
|
||||
local out = new ArrayBox()
|
||||
local i = s.size() - 1
|
||||
loop (i >= 0) { out.push(s.get(i)) i = i - 1 }
|
||||
local j = 0
|
||||
local acc = ""
|
||||
loop (j < out.size()) { acc = acc + out.get(j) j = j + 1 }
|
||||
return acc
|
||||
}
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"B\"}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":7}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Compare\",\"operation\":\"<\",\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}},\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":2}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":5}}}]}"
|
||||
|
||||
local arr = collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
11
apps/selfhost/vm/collect_mixed_using_smoke.nyash
Normal file
11
apps/selfhost/vm/collect_mixed_using_smoke.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"B\"}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":7}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Compare\",\"operation\":\"<\",\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}},\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":2}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":5}}}]}"
|
||||
|
||||
new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
return 0
|
||||
}
|
||||
}
|
||||
18
apps/selfhost/vm/collect_prints_loader_smoke.nyash
Normal file
18
apps/selfhost/vm/collect_prints_loader_smoke.nyash
Normal file
@ -0,0 +1,18 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// Mixed shapes (loader-centric)
|
||||
// 1) echo() with empty args -> ""
|
||||
// 2) string literal with quotes inside
|
||||
// 3) itoa() with empty args -> "0"
|
||||
// 4) BinaryOp 8+9
|
||||
// 5) int literal 4
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"C\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":8}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":9}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
51
apps/selfhost/vm/json_loader.nyash
Normal file
51
apps/selfhost/vm/json_loader.nyash
Normal file
@ -0,0 +1,51 @@
|
||||
// MiniJsonLoader (Stage-B scaffold)
|
||||
// Purpose: centralize minimal JSON cursor ops for Mini-VM.
|
||||
// Implementation note: For now we delegate to local MiniJsonCur-compatible
|
||||
// helpers. In a later step, this can be swapped to use `apps/libs/json_cur.nyash`
|
||||
// (JsonCursorBox) without touching Mini-VM call sites.
|
||||
|
||||
static box MiniJsonLoader {
|
||||
read_quoted_from(s, pos) {
|
||||
// Local fallback (same behavior as MiniJsonCur.read_quoted_from)
|
||||
// Keep in sync with Mini-VM until libs adoption gate is enabled.
|
||||
local i = pos
|
||||
if s.substring(i, i+1) != "\"" { return "" }
|
||||
i = i + 1
|
||||
local out = ""
|
||||
local n = s.length()
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "\"" { break }
|
||||
if ch == "\\" { i = i + 1 ch = s.substring(i, i+1) }
|
||||
out = out + ch
|
||||
i = i + 1
|
||||
}
|
||||
return out
|
||||
}
|
||||
read_digits_from(s, pos) {
|
||||
local out = ""
|
||||
local i = pos
|
||||
if i == null { return out }
|
||||
if i < 0 { return out }
|
||||
loop (true) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch == "" { break }
|
||||
if ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" {
|
||||
out = out + ch
|
||||
i = i + 1
|
||||
} else { break }
|
||||
}
|
||||
return out
|
||||
}
|
||||
next_non_ws(s, pos) {
|
||||
local i = pos
|
||||
local n = s.length()
|
||||
loop (i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
if ch != " " && ch != "\n" && ch != "\r" && ch != "\t" { return i }
|
||||
i = i + 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
}
|
||||
|
||||
12
apps/selfhost/vm/mini_vm.nyash
Normal file
12
apps/selfhost/vm/mini_vm.nyash
Normal file
@ -0,0 +1,12 @@
|
||||
// Thin entry: delegate to core MiniVm
|
||||
// Using is pre-inlined by runner; keep entry minimal for maintainability.
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
if args { if args.size() > 0 { @s = args.get(0) if s { json = s } } }
|
||||
return new MiniVm().run(json)
|
||||
}
|
||||
}
|
||||
|
||||
59
apps/selfhost/vm/mini_vm_if_branch.nyash
Normal file
59
apps/selfhost/vm/mini_vm_if_branch.nyash
Normal file
@ -0,0 +1,59 @@
|
||||
// Mini-VM: function-based entry for branching
|
||||
// Local static box (duplicated from mini_vm_lib for now to avoid include gate issues)
|
||||
static box MiniVm {
|
||||
_is_digit(ch) { return ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" }
|
||||
read_digits(json, pos) {
|
||||
@out = ""
|
||||
loop (true) {
|
||||
@s = json.substring(pos, pos+1)
|
||||
if s == "" { break }
|
||||
if _is_digit(s) { out = out + s pos = pos + 1 } else { break }
|
||||
}
|
||||
return out
|
||||
}
|
||||
parse_first_int(json) {
|
||||
@key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
@idx = json.lastIndexOf(key)
|
||||
if idx < 0 { return "0" }
|
||||
@start = idx + key.length()
|
||||
return read_digits(json, start)
|
||||
}
|
||||
run_branch(json) {
|
||||
@n = parse_first_int(json)
|
||||
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
||||
print("20")
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// Program entry: embedded JSON (value=1 → print 10; else → 20)
|
||||
static box Main {
|
||||
main(args) {
|
||||
@vm = new MiniVm()
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
// If provided, override by argv[0]
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
@s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
return vm.run_branch(json)
|
||||
}
|
||||
}
|
||||
|
||||
// Top-level fallback entry for current runner
|
||||
function main(args) {
|
||||
@vm = new MiniVm()
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
||||
if args {
|
||||
if args.size() > 0 {
|
||||
@s = args.get(0)
|
||||
if s { json = s }
|
||||
}
|
||||
}
|
||||
@n = vm.parse_first_int(json)
|
||||
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
||||
print("20")
|
||||
return 0
|
||||
}
|
||||
33
apps/selfhost/vm/mini_vm_lib.nyash
Normal file
33
apps/selfhost/vm/mini_vm_lib.nyash
Normal file
@ -0,0 +1,33 @@
|
||||
// Mini-VM library (function-based) with a tiny JSON extractor
|
||||
// Safe MVP: no real JSON parsing; string scan for first int literal only
|
||||
|
||||
static box MiniVm {
|
||||
_is_digit(ch) { return ch == "0" || ch == "1" || ch == "2" || ch == "3" || ch == "4" || ch == "5" || ch == "6" || ch == "7" || ch == "8" || ch == "9" }
|
||||
|
||||
// Read consecutive digits starting at pos
|
||||
read_digits(json, pos) {
|
||||
@out = ""
|
||||
loop (true) {
|
||||
@s = json.substring(pos, pos+1)
|
||||
if s == "" { break }
|
||||
if _is_digit(s) { out = out + s pos = pos + 1 } else { break }
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Extract the first integer literal from our AST JSON v0 subset
|
||||
parse_first_int(json) {
|
||||
@key = "\"value\":{\"type\":\"int\",\"value\":"
|
||||
@idx = json.lastIndexOf(key)
|
||||
if idx < 0 { return "0" }
|
||||
@start = idx + key.length()
|
||||
return read_digits(json, start)
|
||||
}
|
||||
|
||||
// Execute a minimal program: print the extracted integer and exit code 0
|
||||
run(json) {
|
||||
@n = parse_first_int(json)
|
||||
print(n)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
16
apps/selfhost/vm/run_core_wrapper.nyash
Normal file
16
apps/selfhost/vm/run_core_wrapper.nyash
Normal file
@ -0,0 +1,16 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
if args { if args.size() > 0 { @s = args.get(0) if s { json = s } } }
|
||||
print("pre")
|
||||
print(json.length())
|
||||
print(json.indexOf("\"kind\":\"Program\""))
|
||||
print(json.indexOf("\"kind\":\"Print\""))
|
||||
print(json.indexOf("\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\""))
|
||||
@code = new MiniVm().run(json)
|
||||
print("post")
|
||||
return code
|
||||
}
|
||||
}
|
||||
11
apps/tests/dev_inline_binop_probe.nyash
Normal file
11
apps/tests/dev_inline_binop_probe.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// Single Print(BinaryOp '+')
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}}]}"
|
||||
new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
12
apps/tests/dev_json_digits_from.nyash
Normal file
12
apps/tests/dev_json_digits_from.nyash
Normal file
@ -0,0 +1,12 @@
|
||||
using selfhost.vm.json as MiniJson
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
local k = "\"value\":"
|
||||
local p = json.indexOf(k)
|
||||
print(new MiniJson().read_digits_from(json, p + k.length()))
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
9
apps/tests/dev_parse_include_prints.nyash
Normal file
9
apps/tests/dev_parse_include_prints.nyash
Normal file
@ -0,0 +1,9 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// do nothing; this just forces including MiniVmPrints
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
11
apps/tests/dev_prints_count_probe.nyash
Normal file
11
apps/tests/dev_prints_count_probe.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"B\"}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":7}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Compare\",\"operation\":\"<\",\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}},\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":2}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":5}}}]}"
|
||||
local n = new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
print(n)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
10
apps/tests/dev_prints_probe.nyash
Normal file
10
apps/tests/dev_prints_probe.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
new MiniVmPrints().print_all_print_literals(json)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
10
apps/tests/dev_scan_digits.nyash
Normal file
10
apps/tests/dev_scan_digits.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local s = "xx42yy"
|
||||
print(new MiniVmScan().read_digits(s, 2))
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
13
apps/tests/dev_scan_prints.nyash
Normal file
13
apps/tests/dev_scan_prints.nyash
Normal file
@ -0,0 +1,13 @@
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"B\"}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":7}}]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Compare\",\"operation\":\"<\",\"lhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}},\"rhs\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":2}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"BinaryOp\",\"operator\":\"+\",\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":3}},\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":4}}}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":5}}}]}"
|
||||
local scan = new MiniVmScan()
|
||||
local p = scan.index_of_from(json, "\"kind\":\"Print\"", 0)
|
||||
// Directly invoke string literal printer on the first Print
|
||||
new MiniVmPrints().try_print_string_value_at(json, json.length(), p)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
10
apps/tests/dev_scan_prints_int_slice.nyash
Normal file
10
apps/tests/dev_scan_prints_int_slice.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
10
apps/tests/dev_scan_prints_slice.nyash
Normal file
10
apps/tests/dev_scan_prints_slice.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}}]}"
|
||||
new MiniVmPrints().print_prints_in_slice(json, 0, json.length())
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
11
apps/tests/dev_scan_probe.nyash
Normal file
11
apps/tests/dev_scan_probe.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"string\",\"value\":\"A\"}}}]}"
|
||||
local p = new MiniVmScan().index_of_from(json, "\"kind\":\"Print\"", 0)
|
||||
print(p)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
10
apps/tests/dev_seam_inspect_dump.nyash
Normal file
10
apps/tests/dev_seam_inspect_dump.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.seam as SeamInspector
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// Analyze PyVM dumped code (requires NYASH_PYVM_DUMP_CODE=1 to have produced tmp/pyvm_dump.txt)
|
||||
new SeamInspector().analyze_dump_file("tmp/pyvm_dump.txt")
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
8
apps/tests/dev_sugar/at_local_basic.nyash
Normal file
8
apps/tests/dev_sugar/at_local_basic.nyash
Normal file
@ -0,0 +1,8 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
@x = 1
|
||||
print(x)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
12
apps/tests/dev_sugar/compound_and_inc.nyash
Normal file
12
apps/tests/dev_sugar/compound_and_inc.nyash
Normal file
@ -0,0 +1,12 @@
|
||||
static box Main {
|
||||
main(args) {
|
||||
@i = 0
|
||||
i++
|
||||
i += 2
|
||||
i *= 3
|
||||
i -= 1
|
||||
i /= 2
|
||||
print(i)
|
||||
}
|
||||
}
|
||||
|
||||
11
apps/tests/dev_sugar/print_when_fn.nyash
Normal file
11
apps/tests/dev_sugar/print_when_fn.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
// print! and when sugar test
|
||||
static box Main {
|
||||
main(args) {
|
||||
@v = 41
|
||||
when v + 1 == 42 {
|
||||
print! 42
|
||||
} else {
|
||||
print!(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
10
apps/tests/dev_try_int_value.nyash
Normal file
10
apps/tests/dev_try_int_value.nyash
Normal file
@ -0,0 +1,10 @@
|
||||
using selfhost.vm.prints as MiniVmPrints
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":42}}}]}"
|
||||
new MiniVmPrints().try_print_int_value_at(json, json.length(), 0)
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
13
apps/tests/mini_vm_functioncall_empty_args.nyash
Normal file
13
apps/tests/mini_vm_functioncall_empty_args.nyash
Normal file
@ -0,0 +1,13 @@
|
||||
using selfhost.vm.core as MiniVm
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
// Program with empty-args echo() and itoa() to exercise loader-path fallback
|
||||
local json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"echo\",\"arguments\":[]}},{\"kind\":\"Print\",\"expression\":{\"kind\":\"FunctionCall\",\"name\":\"itoa\",\"arguments\":[]}}]}"
|
||||
|
||||
local arr = new MiniVm().collect_prints(json)
|
||||
local i = 0
|
||||
loop (i < arr.size()) { print(arr.get(i)) i = i + 1 }
|
||||
return 0
|
||||
}
|
||||
}
|
||||
11
apps/tests/using_edge_mix.nyash
Normal file
11
apps/tests/using_edge_mix.nyash
Normal file
@ -0,0 +1,11 @@
|
||||
using selfhost.vm.scan as MiniVmScan
|
||||
|
||||
static box Main {
|
||||
main(args) {
|
||||
local s = "abc"
|
||||
// twice to check stability
|
||||
print(new MiniVmScan().index_of_from(s, "b", 0))
|
||||
print(new MiniVmScan().index_of_from(s, "b", 0))
|
||||
return 0
|
||||
}
|
||||
}
|
||||
@ -34,7 +34,7 @@ See also
|
||||
- Rust unit tests: `cargo test`
|
||||
- Targeted: e.g., tokenizer/sugar config `cargo test --lib sugar_basic_test -- --nocapture`
|
||||
|
||||
## Acceptance Checklist (Phase Freeze)
|
||||
## Acceptance Checklist (Feature Additions Pause)
|
||||
- cargo check (workspace) passes
|
||||
- Representative smokes are green:
|
||||
- PyVM smokes: `tools/pyvm_stage2_smoke.sh`
|
||||
|
||||
@ -66,6 +66,11 @@
|
||||
- guides/language-core-and-sugar.md（コア最小＋糖衣）
|
||||
- guides/loopform.md（ループ正規化）
|
||||
- guides/scopebox.md（開発時の可視化）
|
||||
- guides/dev-local-alias.md（開発向け: 行頭 @name = expr → local 宣言糖衣）
|
||||
- guides/box-patterns.md（Boxパターン集：Ownership/Lease/Cancel/Capability/Affinity/Observable）
|
||||
- guides/box-design-checklist.md（Box 設計チェックリスト）
|
||||
- proposals/concurrency/boxes.md（並行モデルのBox設計：Routine/Channel/Select/Scope）
|
||||
- reference/concurrency/semantics.md（ブロッキング/close/select/観測の規約）
|
||||
- design/（設計ノート入口）
|
||||
- design/flow-blocks.md（矢印フロー／匿名ブロック・設計草案）
|
||||
- ../proposals/scope-reuse.md（スコープ再利用ブロック・MVP提案）
|
||||
@ -80,6 +85,8 @@
|
||||
- 🔥 **[Phase 16: マクロ革命](development/roadmap/phases/phase-16-macro-revolution/)**
|
||||
- 🧪 **[Phase 17: LoopForm Self‑Hosting](development/roadmap/phases/phase-17-loopform-selfhost/)**
|
||||
- 🧩 **[Mini‑VM 構築ロードマップ](development/roadmap/phases/phase-17-loopform-selfhost/MINI_VM_ROADMAP.md)**
|
||||
- 🧭 **Using→Loader 統合（最小設計）**: design/using-loader-integration.md
|
||||
- 🗂️ **Docsの書き方（小さく・リンク駆動）**: guides/contributing-docs.md
|
||||
|
||||
---
|
||||
|
||||
|
||||
@ -7,4 +7,4 @@
|
||||
- 関連: ABI/BIDドラフトは `../予定/native-plan/box_ffi_abi.md`
|
||||
|
||||
補足:
|
||||
- NyIR Core（25命令）は凍結。拡張は NyIR-Ext（exceptions/concurrency/atomics）で段階導入。
|
||||
- NyIR Core（25命令）は仕様固定。拡張は NyIR-Ext（exceptions/concurrency/atomics）で段階導入。
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Phase 9.10: NyIR v1 仕様・フォーマット・検証器（公開IRの確立）
|
||||
|
||||
目的
|
||||
- NyashのMIRを公開IR（NyIR v1）として凍結し、あらゆるフロントエンド/バックエンドの共通契約とする。
|
||||
- NyashのMIRを公開IR（NyIR v1）として仕様固定し、あらゆるフロントエンド/バックエンドの共通契約とする。
|
||||
- 仕様・テキスト/バイナリフォーマット・厳格検証器・ツール群を整備し、移植性と一貫性を保証する。
|
||||
|
||||
成果物（Deliverables）
|
||||
@ -15,7 +15,7 @@
|
||||
- Golden NyIR: `golden/*.nyir`（代表サンプルを固定、CIで全バックエンド一致を検証）
|
||||
|
||||
仕様の要点（NyIR v1）
|
||||
- 命令セット: 25命令（Tier-0/1/2）を凍結
|
||||
- 命令セット: 25命令（Tier-0/1/2）を仕様固定
|
||||
- Tier-0: Const, BinOp, Compare, Branch, Jump, Phi, Call, Return
|
||||
- Tier-1: NewBox, BoxFieldLoad, BoxFieldStore, BoxCall, Safepoint, RefGet, RefSet, WeakNew, WeakLoad, WeakCheck, Send, Recv
|
||||
- Tier-2: TailCall, Adopt, Release, MemCopy, AtomicFence
|
||||
@ -64,7 +64,7 @@ Golden / Differential テスト
|
||||
- 10.x: NyIR→LLVM IR（別Phase）
|
||||
|
||||
リスク
|
||||
- 仕様凍結の硬直化 → 拡張はfeatureビット＋拡張セクションへ
|
||||
- 仕様固定の硬直化 → 拡張はfeatureビット＋拡張セクションへ
|
||||
- 実装の重複 → Verifier/フォーマットは共有ライブラリ化
|
||||
|
||||
最終更新: 2025-08-14
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Purpose
|
||||
- Define NyIR (public intermediate representation) as the portable contract for all frontends/backends.
|
||||
- Freeze the 25-instruction set, effects, ownership forest, weak semantics, and bus contract.
|
||||
- Fix/specify the 25-instruction set, effects, ownership forest, weak semantics, and bus contract (frozen spec).
|
||||
|
||||
Status
|
||||
- Version: nyir1.0 (draft)
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
- 最適化は二の次。まずは意味保存（semantics-preserving）を最優先で実現し、可搬性と一貫性を担保する。
|
||||
|
||||
中核方針（Core Policy）
|
||||
- NyIR Core（26命令）は基本セマンティクス凍結。ExternCallによる外部世界接続を含む。
|
||||
- NyIR Core（26命令）は基本セマンティクスを仕様固定。ExternCallによる外部世界接続を含む。
|
||||
- 拡張は NyIR-Ext（exceptions/concurrency/atomics）で言語固有機能を段階導入。
|
||||
- Everything is Box哲学: 外部ライブラリもBIDによりBox統一インターフェースで利用。
|
||||
- 仕様の正本は `docs/nyir/spec.md` に集約（Core＋Ext）。
|
||||
@ -41,4 +41,3 @@
|
||||
- NyIR 仕様: `spec.md`
|
||||
- ABI/BID: `../予定/native-plan/box_ffi_abi.md`
|
||||
- 9.10 タスク（Copilot向け）: `../予定/native-plan/issues/phase_9_10_nyir_spec.md`
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Strings Blueprint — UTF‑8 First, Bytes Separate
|
||||
|
||||
Status: active (Phase Freeze compatible)
|
||||
Status: active (Feature‑Pause compatible)
|
||||
Updated: 2025-09-21
|
||||
|
||||
Purpose
|
||||
@ -41,7 +41,7 @@ Implementation Plan (staged, non‑breaking)
|
||||
|
||||
Transition Gate (Rust dev only)
|
||||
- Env `NYASH_STR_CP=1` enables CP semantics for legacy byte-based paths in Rust runtime (e.g., StringBox.length/indexOf/lastIndexOf).
|
||||
- Default remains byte in Rust during freeze; PyVM follows CP semantics. CI smokes validate CP behavior via PyVM.
|
||||
- Default remains byte in Rust during the feature‑pause; PyVM follows CP semantics. CI smokes validate CP behavior via PyVM.
|
||||
|
||||
Related Docs
|
||||
- reference/language/strings.md — policy & scope
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Flow Blocks and Arrow Piping (Design Draft)
|
||||
|
||||
Status: design-only during freeze (no implementation)
|
||||
Status: design-only during the feature‑pause (no implementation)
|
||||
|
||||
Goal
|
||||
- Make control/data flow visually obvious while keeping the core minimal.
|
||||
@ -76,6 +76,5 @@ Tests (syntax-only smokes; design)
|
||||
- flow_placeholder: `{f()} -> { process(_) } -> { out(_) }`.
|
||||
- flow_if: `if cond -> {A} else -> {B}` behaves like standard if.
|
||||
|
||||
Freeze note
|
||||
- Documentation and design intent only. Implementation is deferred until after the freeze.
|
||||
|
||||
Pause note
|
||||
- Documentation and design intent only. Implementation is deferred until after the feature‑pause (post‑bootstrap).
|
||||
|
||||
32
docs/design/using-loader-integration.md
Normal file
32
docs/design/using-loader-integration.md
Normal file
@ -0,0 +1,32 @@
|
||||
# Using → Loader Integration (Minimal)
|
||||
|
||||
Goal
|
||||
- Keep `using` simple: strip lines and resolve names to paths/aliases.
|
||||
- Add the minimal integration so userland boxes referenced via `using` are actually available at compile/run time.
|
||||
|
||||
Scope (pause‑safe)
|
||||
- Parser stays Phase‑0: keep `nyashstd` restriction; do not widen grammar.
|
||||
- Integration is a runner step (pre‑parse): resolve and register modules; do not change language semantics.
|
||||
|
||||
Design
|
||||
- Strip `using` lines when `NYASH_ENABLE_USING=1` (already implemented).
|
||||
- For each `using ns [as alias]?`:
|
||||
- Resolve `ns` → path via: [modules] → aliases → using.paths (apps/lib/.) → context dir.
|
||||
- Register mapping in `modules_registry` as `alias_or_ns -> path` (already implemented).
|
||||
- Minimal loader hook (defer heavy linking):
|
||||
- Compile/execute entry file as today.
|
||||
- Userland boxes are accessed via tools/runners that read from `modules_registry` where needed (e.g., PyVM harness/tests).
|
||||
|
||||
Notes
|
||||
- Entry thin‑ization (Mini‑VM) waits until loader reads userland boxes on demand.
|
||||
- Keep docs small: this note serves as the canonical link; avoid duplicating details in other pages.
|
||||
|
||||
Preprocessing invariants (runner)
|
||||
- `using` lines are stripped and resolved prior to parse; dependencies are inlined before `Main` so names are available without changing language semantics.
|
||||
- Line‑head `@name[:T] = expr` is normalized to `local name[:T] = expr` as a purely textual pre‑expand (no semantic change). Inline `@` is not recognized; keep `@` at line head.
|
||||
- These steps are pause‑safe: they do not alter AST semantics; they only simplify authoring and module wiring.
|
||||
|
||||
Links
|
||||
- Runner pipeline: src/runner/pipeline.rs
|
||||
- Using strip/resolve: src/runner/modes/common_util/resolve.rs
|
||||
- Env: NYASH_ENABLE_USING, NYASH_USING_STRICT, NYASH_SKIP_TOML_ENV
|
||||
@ -1,7 +1,7 @@
|
||||
# Box-SSA Core-15 最終決定
|
||||
|
||||
Date: 2025-08-31
|
||||
Status: **凍結仕様** (Frozen Specification)
|
||||
Status: **固定仕様** (Frozen Specification)
|
||||
Summary: MIR命令セットを真の15個に統一
|
||||
|
||||
## 📊 問題と解決
|
||||
|
||||
@ -5,7 +5,7 @@ Status: Active Development → LLVM Implementation
|
||||
|
||||
## 🎯 本日の大革命：Box-SSA Core-15
|
||||
|
||||
### MIR命令セット凍結
|
||||
### MIR命令セットの固定
|
||||
- 26命令 → **真の15命令**に統一
|
||||
- すべてのBox操作を**BoxCall**に集約
|
||||
- Everything is Box哲学の完全実現
|
||||
@ -27,7 +27,7 @@ Status: Active Development → LLVM Implementation
|
||||
- Future/Await基本実装
|
||||
- 非同期ランタイム統合
|
||||
|
||||
4. **Box-SSA Core-15仕様凍結** (NEW!)
|
||||
4. **Box-SSA Core-15仕様固定** (NEW!)
|
||||
- MIR 15命令に統一
|
||||
- BoxCall万能化
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@ ChatGPT5は議論の余地なしと判断し、即座にMIR命令の列挙型を
|
||||
|
||||
## 🎉 結論
|
||||
|
||||
> 凍結は "Box-SSA Core-15"。Aの Ref* は捨てる／Bの専用命令は BoxCall に吸収して15個に収斂。これで「簡単さ＝表面の一枚」「速さ＝Lowering/最適化」で分離でき、VMとAOTとFFIを**一本の ABI**で貫けるにゃ。
|
||||
> 固定は "Box-SSA Core-15"。Aの Ref* は捨てる／Bの専用命令は BoxCall に吸収して15個に収斂。これで「簡単さ＝表面の一枚」「速さ＝Lowering/最適化」で分離でき、VMとAOTとFFIを**一本の ABI**で貫けるにゃ。
|
||||
|
||||
## 💻 ChatGPT5の心境
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ Phase 11: LLVM AOT（最高性能への挑戦）← 進行中
|
||||
|
||||
## ⚠️ 注意事項（運用方針）
|
||||
|
||||
- Core‑15 凍結（第三案）: { Const, UnaryOp, BinOp, Compare, TypeOp, Load, Store, Jump, Branch, Return, Phi, Call, NewBox, BoxCall, ExternCall }
|
||||
- Core‑15 仕様固定（第三案）: { Const, UnaryOp, BinOp, Compare, TypeOp, Load, Store, Jump, Branch, Return, Phi, Call, NewBox, BoxCall, ExternCall }
|
||||
- 統一ルール: ArrayGet/ArraySet, RefGet/RefSet, PluginInvoke はBoxCallに一本化（Optimizerで正規化、Verifierで禁止）
|
||||
- バリア方針: 初期はランタイム関数側で安全に処理、型特化Lowering段でIRへ内挿（write barrier）
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Box-SSA Core-15 最終仕様
|
||||
|
||||
Date: 2025-08-31
|
||||
Status: **凍結** (Frozen Specification)
|
||||
Status: **固定** (Frozen Specification)
|
||||
Author: ChatGPT5 + Claude協調
|
||||
|
||||
## ✅ 凍結命令セット（正味15個）
|
||||
## ✅ 固定命令セット（正味15個）
|
||||
|
||||
```
|
||||
{ Const, UnaryOp, BinOp, Compare, TypeOp,
|
||||
@ -111,7 +111,7 @@ slow_path:
|
||||
## 🚦 実装ロードマップ
|
||||
|
||||
### Phase 1: 仕様更新（即時）
|
||||
- [x] このドキュメントで仕様凍結
|
||||
- [x] このドキュメントで仕様固定
|
||||
- [ ] INSTRUCTION_SET.md を更新
|
||||
- [ ] テストの期待値を15に変更
|
||||
|
||||
|
||||
@ -254,7 +254,7 @@ NyRegisterUserBox(const NyTypeSpec*, const NyMethodSpec*,
|
||||
|
||||
### 最大の課題
|
||||
1. **ABI安定と最適化の両立**
|
||||
- vtable拡張、署名IDの凍結、JITパッチ互換などを「一度決めて長期維持」する難しさ
|
||||
- vtable拡張、署名IDの仕様固定、JITパッチ互換などを「一度決めて長期維持」する難しさ
|
||||
2. **GC協調の完全性**
|
||||
- プラグインのtrace不備がリーク/サイクル残留を引き起こす
|
||||
3. **多様な信頼レベル混在**
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
- 最初は、コアな組み込み型はRust実装のまま、新しいプラグインや一部のモジュールをC ABI版で実装していくのが安全な進め方でしょう。
|
||||
|
||||
#### 互換性維持とテスト戦略
|
||||
- **ABIインターフェースの凍結:** `nyash_ops` の関数シグネチャとセマンティクス（所有権のルールなど）を一度定義したら、それを厳格に守ることが極めて重要です。
|
||||
- **ABIインターフェースの仕様固定:** `nyash_ops` の関数シグネチャとセマンティクス（所有権のルールなど）を一度定義したら、それを厳格に守ることが極めて重要です。
|
||||
- **大規模なテストスイート:** 移行を成功させるには、テストがすべてを決定します。
|
||||
1. **振る舞いの一致テスト:** 同じNyashソースコードを「Rust ABIのみ」「C ABIのみ」「両者混在」の3つのモードで実行し、出力や結果が完全に一致することを検証するテストスイートを構築します。
|
||||
2. **ユニットテスト:** Cで実装されたABIの各関数（`create_value`, `retain`, `release`など）を、Cのテストフレームワーク（例: `check`）で徹底的にテストします。
|
||||
@ -207,7 +207,7 @@
|
||||
- Con: more moving parts, boundary crossings remain.
|
||||
|
||||
### Concrete Next Steps
|
||||
- Define and freeze a v0 ABI header:
|
||||
- Define and fix (freeze) a v0 ABI header:
|
||||
- Add `api_version`, `struct_size`, `nyash_ctx*`, `nyash_allocator*`, `nyash_status`, `nyash_value` 16‑byte layout, `retain/release`, `lookup_selector`, `call`, `error` primitives, and capability bits.
|
||||
- Scaffold `plugins/nyash_abi_c/`:
|
||||
- Provide a stub provider that returns `NYASH_E_NOT_IMPL` but passes header/version checks; wire it in `nyash.toml`.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Status: planning
|
||||
|
||||
Purpose
|
||||
- Freeze済みのコア仕様を維持しつつ、Nyash側（ユーザーマクロ＋標準ライブラリ）で LoopForm を先に実装し、ループの正規化を言語レベルで確立する。
|
||||
- 固定済みのコア仕様を維持しつつ、Nyash側（ユーザーマクロ＋標準ライブラリ）で LoopForm を先に実装し、ループの正規化を言語レベルで確立する。
|
||||
- Rust側は既存MIR/LLVMの整流を活用（PHI先頭グループ化の不変条件を活かす）。
|
||||
- 実アプリ/自己ホストで磨き込みを進め、言語としての使い心地を上げる。
|
||||
|
||||
@ -12,7 +12,7 @@ Scope
|
||||
- 代表スモーク/ゴールデンの追加（PyVM/LLVMの一致）とPHI健全性チェックの拡充。
|
||||
- Docsの整備（設計・ガイド・運用ポリシー）。
|
||||
|
||||
Out of Scope（凍結遵守）
|
||||
Out of Scope（機能追加ポーズ遵守）
|
||||
- Rust側の大規模なIR変更やバックエンド機能追加はしない（必要最小限のバグ修正のみ）。
|
||||
- 仕様変更は重大不具合を除き行わない。
|
||||
|
||||
@ -25,4 +25,3 @@ Docs
|
||||
- guides/loopform.md（利用者向け）
|
||||
- loopform-design.md（設計詳細）
|
||||
- SCHEDULE.md（開発予定表）
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Phase 9.10: NyIR v1 仕様・フォーマット・検証器（Copilot実装用タスク）
|
||||
|
||||
目的（What/Why）
|
||||
- NyashのMIRを公開IR（NyIR v1）として凍結し、あらゆるフロントエンド/バックエンドの共通契約にする。
|
||||
- NyashのMIRを公開IR（NyIR v1）として仕様固定し、あらゆるフロントエンド/バックエンドの共通契約にする。
|
||||
- 仕様・テキスト/バイナリフォーマット・厳格検証器・ツール群を整備し、移植性と一貫性を保証する。
|
||||
- 設計の正本は `docs/nyir/spec.md`（Core＋Extの骨子）。本ファイルはCopilotが実装を進めるための具体タスク集。
|
||||
|
||||
|
||||
@ -4,10 +4,10 @@ Status: In Progress（9.79 P2PBox前のゲート）
|
||||
Last Updated: 2025-08-25
|
||||
|
||||
## 🎯 目的
|
||||
P2PBox（Phase 9.79）に着手する前に、MIRパイプライン（Builder/SSA/MIR26/Verifier/Optimizer/VM整合）を完全に安定化し、26命令セットで凍結する。これにより、P2P/Craneliftの土台を強固にする。
|
||||
P2PBox（Phase 9.79）に着手する前に、MIRパイプライン（Builder/SSA/MIR26/Verifier/Optimizer/VM整合）を完全に安定化し、26命令セットで仕様を固定する。これにより、P2P/Craneliftの土台を強固にする。
|
||||
|
||||
## 📦 スコープ（MIRまわりの全タスク）
|
||||
0) 命令セットの凍結（26命令が正）
|
||||
0) 命令セットの固定（26命令が正）
|
||||
- 命令セットの単一出典: `docs/reference/mir/INSTRUCTION_SET.md` を唯一の参照に統一
|
||||
- コード側の列挙とテスト: `src/mir/instruction.rs` の列挙と一致、総数26のテストで保証（ドキュメント≧コードではなくコード≡ドキュメント）
|
||||
- 25命令文献はアーカイブへ移動（本流は26命令）
|
||||
@ -16,7 +16,7 @@ P2PBox（Phase 9.79）に着手する前に、MIRパイプライン（Builder/SS
|
||||
- Loop SSA復帰: `loop_api` によるPhi挿入・seal・predecessor更新の段階適用、簡易lowering除去
|
||||
- TypeOp早期lowering網羅: `is/as/isType/asType` の関数/メソッド両パスで確実に `TypeOp(Check/Cast)` 生成、`print(isType(...))` 直下もdst化
|
||||
|
||||
2) MIR26命令ダイエットの凍結
|
||||
2) MIR26命令ダイエットの固定
|
||||
- TypeOp統合: Check/Castの意味論確定、Printer表示/エフェクト統一
|
||||
- WeakRef/Barrier統合: flag ON/OFFで差分固定（PoC featureで比較可能に）
|
||||
- 命令リストの合意化: 26命令でのPrinter/Verifier/Optimizer整合
|
||||
|
||||
@ -2,6 +2,9 @@
|
||||
|
||||
Nyashプログラミング言語の利用者向けガイドとチュートリアルです。
|
||||
|
||||
Quick Links
|
||||
- Docsの書き方（小さく・リンク駆動・3層）: contributing-docs.md
|
||||
|
||||
## 🚀 はじめに
|
||||
- `getting-started.md` - Nyashを始めるためのクイックガイド
|
||||
|
||||
|
||||
41
docs/guides/box-design-checklist.md
Normal file
41
docs/guides/box-design-checklist.md
Normal file
@ -0,0 +1,41 @@
|
||||
# Box Design Checklist (docs-only)
|
||||
|
||||
Use this checklist when introducing a new Box or evolving an existing one.
|
||||
|
||||
## Lifecycle
|
||||
- Define birth parameters and side effects (allocation, registration).
|
||||
- State machine: initial → running → closed → fini; reentrancy rules.
|
||||
- `fini()` idempotent; post-fini methods: error vs no-op.
|
||||
|
||||
## Ownership & Sharing
|
||||
- Who owns the resource? Is there a LeaseBox form?
|
||||
- Mutation boundaries (single-thread/Actor only?).
|
||||
- Cross-thread usage: mailbox-only or direct allowed?
|
||||
|
||||
## Concurrency
|
||||
- Blocking APIs: provide `try_*` and `*_timeout(ms)`.
|
||||
- Cancellation: accept CancelToken/Deadline; ensure prompt unblock.
|
||||
- Busy-wait forbidden; document waiting strategy (Phase‑0 cooperative / later OS).
|
||||
|
||||
## Close Semantics
|
||||
- What does `close()` mean? Which ops fail after close?
|
||||
- Draining behavior and End marker shape.
|
||||
- Double close and use-after-close handling.
|
||||
|
||||
## Observability
|
||||
- Events to emit (op, ok, extra fields) and Box ID.
|
||||
- Env toggles (e.g., `NYASH_*_TRACE=1`).
|
||||
- Expected order/causality in traces.
|
||||
|
||||
## Capabilities & Affinity
|
||||
- External authorities needed (fs/net/io/thread).
|
||||
- Thread affinity constraints (creator thread / any / Actor only).
|
||||
|
||||
## Performance
|
||||
- Hot vs cold paths; offer ThinBox where needed.
|
||||
- Complexity of operations; backpressure strategy.
|
||||
|
||||
## Errors & Types
|
||||
- Error shape (Bool/Option/Result) and consistency with ecosystem.
|
||||
- Type expectations (runtime tags vs future static types).
|
||||
|
||||
49
docs/guides/box-patterns.md
Normal file
49
docs/guides/box-patterns.md
Normal file
@ -0,0 +1,49 @@
|
||||
# Box Patterns (dev guide; docs-only)
|
||||
|
||||
Status: design notes to standardize reusable Box idioms. No runtime/spec change during the feature‑pause.
|
||||
|
||||
## OwnershipBox / LeaseBox
|
||||
- Intent: make ownership vs borrowing explicit for resource Boxes.
|
||||
- Rules
|
||||
- OwnershipBox owns the underlying handle; calls `fini()` on drop.
|
||||
- LeaseBox references an owned Box without taking responsibility to `fini()`.
|
||||
- Upgrading a lease to ownership must be explicit (and validated).
|
||||
- Smells avoided: double-close, leaked handles, implicit transfer.
|
||||
|
||||
## CancelTokenBox / DeadlineBox
|
||||
- Intent: structured cancellation and time limits across waiting APIs.
|
||||
- Rules
|
||||
- Token can be passed to blocking APIs (Channel/Select/Waiter) to abort waits.
|
||||
- DeadlineBox wraps an absolute time; APIs accept either `token` or `deadline`.
|
||||
- Cancellation is idempotent; multiple cancel calls are safe.
|
||||
- Effects
|
||||
- Waiting ops return promptly with a well-typed cancel/timeout indicator.
|
||||
|
||||
## CapabilityBox
|
||||
- Intent: define minimal authority (I/O, net, thread, fs) explicitly.
|
||||
- Rules
|
||||
- Boxes that access external capabilities must declare the capability dependency.
|
||||
- Tests can substitute Noop/Mock capability Boxes.
|
||||
- Effects
|
||||
- Principle of least privilege; easier sandboxing and auditing.
|
||||
|
||||
## AffinityBox
|
||||
- Intent: encode thread/runtime affinity constraints.
|
||||
- Rules
|
||||
- Annotate Boxes that must be used on their creator thread or via Actor mailbox.
|
||||
- Violations produce early, explicit errors (not UB).
|
||||
- Effects
|
||||
- Predictable behavior across concurrency boundaries.
|
||||
|
||||
## ObservableBox
|
||||
- Intent: unify tracing/metrics hooks.
|
||||
- Rules
|
||||
- Emit JSONL events with `ts`, `box_id`, `op`, `ok`, and domain-specific fields.
|
||||
- Allow opt-in (`NYASH_*_TRACE=1`) and keep logs stable for tooling.
|
||||
- Effects
|
||||
- Cross-cutting visibility with one schema; simpler troubleshooting.
|
||||
|
||||
## Composition Tips
|
||||
- Separate hot/cold paths: ThinBox (hot) vs RichBox (full) to avoid overhead on the critical path.
|
||||
- Prefer immutable handles + message passing across threads (Actor) to avoid races.
|
||||
- Keep `birth/fini` idempotent; document post-fini behavior (no-op vs error).
|
||||
34
docs/guides/contributing-docs.md
Normal file
34
docs/guides/contributing-docs.md
Normal file
@ -0,0 +1,34 @@
|
||||
# Contributing Docs — Small, Linked, 3‑Layer
|
||||
|
||||
Status: Stable | Updated: 2025‑09‑21 | Scope: Docs structure/policy
|
||||
|
||||
TL;DR
|
||||
- Keep docs small. Use 3 layers: Overview → Reference → Details.
|
||||
- No duplication: overview links to the single canonical reference.
|
||||
- Every page shows Status/Updated/Scope and has a short summary.
|
||||
|
||||
Layers
|
||||
- Overview (design one‑pager)
|
||||
- What/Why/How in bullets, ≤1 page; links to Reference/Details/Guides.
|
||||
- Reference (docs/reference/)
|
||||
- Canonical spec: invariants, API, acceptance rules. Precise and stable.
|
||||
- Details (docs/design/ or docs/development/…)
|
||||
- Background, alternatives, rationale. Optional; link from overview only.
|
||||
|
||||
Authoring Rules
|
||||
- One canonical spec per topic (in reference/). Others must link to it.
|
||||
- Each directory has a README.md that points to its key one‑pagers.
|
||||
- Cross‑links go under “See also” (≤3 items, relative paths).
|
||||
|
||||
One‑pager Template
|
||||
- Title / Status / Updated / Scope
|
||||
- TL;DR (3–5 lines)
|
||||
- What (spec bullets)
|
||||
- How (integration points, ownership boundaries)
|
||||
- Links (Reference / Details / Guides)
|
||||
- Notes (constraints / future work)
|
||||
|
||||
Examples
|
||||
- Using→Loader overview: docs/design/using-loader-integration.md
|
||||
- Mini‑VM roadmap: docs/development/roadmap/phases/phase-17-loopform-selfhost/MINI_VM_ROADMAP.md
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Nyash Core Principles — Minimal Syntax, Zero Runtime, Visual Flow
|
||||
|
||||
Status: design-only during freeze (no implementation changes)
|
||||
Status: design-only during the feature‑pause (no implementation changes)
|
||||
|
||||
Core (one page summary)
|
||||
- Minimal syntax: `{ … }` + `->` + `|args|` or `_` for flow; guard chains as the canonical first-match form. No new `match` construct; normalize instead.
|
||||
@ -32,12 +32,12 @@ Observability (spec hooks; design-only)
|
||||
- `NYASH_SCOPE_TRACE=1|json`: enter/exit + captures (JSONL: `sid`, `caps`, `ret`).
|
||||
- `NYASH_FLOW_TRACE=1`: desugared steps like `t0=B0(); t1=B1(t0);`.
|
||||
|
||||
Runtime/API additions (docs-only at freeze)
|
||||
Runtime/API additions (docs-only during the feature‑pause)
|
||||
- `StringBox/Utf8Cursor`: `toDigitOrNull(base=10)`, `toIntOrNull()` — compile to simple comparisons/arithmetic.
|
||||
- Guard sugar: Range (`'0'..'9'`) and CharClass (`Digit`, `AZ`, `az`, `Alnum`, `Space`) — compile to bound checks.
|
||||
|
||||
Acceptance & guardrails (freeze)
|
||||
- “No new grammar beyond sugar” and “no new VM opcodes” as hard rules during freeze.
|
||||
Acceptance & guardrails (feature‑pause)
|
||||
- “No new grammar beyond sugar” and “no new VM opcodes” as hard rules during the feature‑pause.
|
||||
- Golden texts (Ny → MIR fragments) to lock compatibility where practical.
|
||||
- Lint proposals are documentation-only: single-use scope, long `->` chains, duplicated side effects.
|
||||
|
||||
@ -46,4 +46,3 @@ Related docs
|
||||
- design/flow-blocks.md — arrow flow + anonymous blocks
|
||||
- reference/language/match-guards.md — guard chains + range/charclass sugar
|
||||
- reference/language/strings.md — UTF‑8 first; proposed digit helpers
|
||||
|
||||
|
||||
31
docs/guides/dev-local-alias.md
Normal file
31
docs/guides/dev-local-alias.md
Normal file
@ -0,0 +1,31 @@
|
||||
# Dev Sugar: @name = expr as local declaration
|
||||
|
||||
Status: dev-only, pre-expand sugar (no spec change)
|
||||
|
||||
Goal
|
||||
- Speed up local declarations during development without impacting readability in shared code.
|
||||
|
||||
Syntax (dev sugar)
|
||||
- Line-head only:
|
||||
- `@name = expr` → `local name = expr`
|
||||
- `@name: Type = expr` → `local name: Type = expr`
|
||||
|
||||
Rules
|
||||
- Valid only at line start (leading spaces allowed). Inside expressions it is ignored.
|
||||
- Declaration-only: not allowed for reassignments; use `name = expr` for assignments.
|
||||
- Semantics are identical to `local` (scope/cleanup unchanged). Zero runtime cost.
|
||||
|
||||
Enablement
|
||||
- Use the provided pre-expander script for dev: `tools/dev/at_local_preexpand.sh`.
|
||||
- Example:
|
||||
- `tools/dev/at_local_preexpand.sh apps/tests/dev_sugar/at_local_basic.nyash > /tmp/out.nyash`
|
||||
- `NYASH_VM_USE_PY=1 ./target/release/nyash --backend vm /tmp/out.nyash`
|
||||
|
||||
Style
|
||||
- Shared/committed code: prefer explicit `local` (nyfmt may normalize @ to `local`).
|
||||
- Dev/repl/prototype: `@` is acceptable to reduce noise.
|
||||
|
||||
Notes
|
||||
- This is a text pre-expansion; it does not change the parser or MIR.
|
||||
- The pattern is conservative to avoid collisions with comments and inline usages.
|
||||
|
||||
125
docs/ideas/README.md
Normal file
125
docs/ideas/README.md
Normal file
@ -0,0 +1,125 @@
|
||||
# Nyash Ideas Repository - Post‑Bootstrap 実装アイデア管理
|
||||
|
||||
**目的**: 機能追加ポーズ中に発想されたアイデアをPost‑Bootstrap実装用に整理・保管
|
||||
**原則**: 80/20ルール - 80%実装完了時の「残り20%」＋新機能アイデア
|
||||
|
||||
## 📁 フォルダ構造
|
||||
|
||||
### `/tools/` - 開発ツール・支援システム
|
||||
実装優先度順に配置
|
||||
```
|
||||
tools/
|
||||
├── cax/ # C-ABI Explorer (高優先度・世界初)
|
||||
├── macro-debugger/ # マクロ実行デバッガ（Phase 16関連）
|
||||
├── nyash-profiler/ # 実行プロファイラ
|
||||
└── static-analyzer/ # 静的解析ツール
|
||||
```
|
||||
|
||||
### `/language/` - 言語機能拡張
|
||||
設計完了度順に配置
|
||||
```
|
||||
language/
|
||||
├── concurrency/ # 並行性Box (設計完了・docs化済み)
|
||||
├── flow-blocks/ # フロー演算子 (設計完了・docs化済み)
|
||||
├── scope-reuse/ # スコープ演算子 (設計完了・docs化済み)
|
||||
├── pattern-matching/ # パターンマッチング拡張
|
||||
├── async-await/ # 非同期構文Sugar
|
||||
└── metaprogramming/ # メタプログラミング機能
|
||||
```
|
||||
|
||||
### `/runtime/` - ランタイム・VM改善
|
||||
技術的重要度順に配置
|
||||
```
|
||||
runtime/
|
||||
├── nyash-self-vm/ # Nyash自己実装VM (ChatGPT提案)
|
||||
├── gc-improvements/ # GC最適化・切替可能性
|
||||
├── jit-enhancements/ # JIT性能向上
|
||||
└── memory-management/ # メモリ管理改善
|
||||
```
|
||||
|
||||
### `/ecosystem/` - エコシステム・統合
|
||||
実用性順に配置
|
||||
```
|
||||
ecosystem/
|
||||
├── python-integration/ # Python統合・transpilation
|
||||
├── vscode-extension/ # VSCode拡張
|
||||
├── package-manager/ # パッケージマネージャ
|
||||
└── documentation-tools/ # ドキュメント自動生成
|
||||
```
|
||||
|
||||
### `/experimental/` - 実験的・研究用アイデア
|
||||
```
|
||||
experimental/
|
||||
├── ai-collaboration/ # AI協働開発手法
|
||||
├── academic-papers/ # 学術発表用実験
|
||||
├── performance-research/ # 性能研究・ベンチマーク
|
||||
└── future-concepts/ # 将来構想・ビジョン
|
||||
```
|
||||
|
||||
## 🎯 管理ルール
|
||||
|
||||
### 新アイデア追加時
|
||||
1. **適切なカテゴリに配置**
|
||||
2. **README.md作成**（概要・優先度・実装見積もり）
|
||||
3. **関連docs更新**（既存設計との統合性確認）
|
||||
|
||||
### 実装着手時
|
||||
1. **Phase移行**: `docs/ideas/` → `docs/development/`
|
||||
2. **実装計画**: ロードマップ・マイルストーン作成
|
||||
3. **ブランチ作成**: `feature/idea-name` で開発開始
|
||||
|
||||
### 完成後
|
||||
1. **docs統合**: 正式ドキュメントに昇格
|
||||
2. **アイデア削除**: または `implemented/` フォルダに移動
|
||||
|
||||
## 📋 現在のアイデア一覧
|
||||
|
||||
### 🔥 高優先度（Post‑Bootstrap 即実装）
|
||||
- **CAX (C-ABI Explorer)**: 革新的デバッグツール（世界初）
|
||||
- **Nyash Self-VM**: Python/Rust VM統一化
|
||||
- **Flow Blocks**: 設計完了、実装のみ
|
||||
- **Concurrency Boxes**: Go超越の並行性
|
||||
|
||||
### ⭐ 中優先度（Phase 16-17）
|
||||
- **Macro Revolution**: マクロシステム拡張
|
||||
- **Python Integration**: transpilation + 相互運用
|
||||
- **Static Analysis**: 型推論・最適化支援
|
||||
|
||||
### 💡 低優先度（将来構想）
|
||||
- **Package Manager**: エコシステム成熟後
|
||||
- **VSCode Extension**: 言語安定後
|
||||
- **Academic Research**: 発表機会に応じて
|
||||
|
||||
## 🔄 更新プロセス
|
||||
|
||||
### Weekly Review
|
||||
- 新アイデアの整理・分類
|
||||
- 優先度見直し
|
||||
- 重複・統合可能性検討
|
||||
|
||||
### Phase間Review
|
||||
- 実装完了アイデアの整理
|
||||
- 次Phase候補の選定
|
||||
- ロードマップ更新
|
||||
|
||||
## 💭 アイデア品質基準
|
||||
|
||||
### High Quality (即実装候補)
|
||||
- ✅ 技術的実現性: 明確な実装パス
|
||||
- ✅ ユーザー価値: 具体的な問題解決
|
||||
- ✅ Nyash親和性: 箱理論との整合性
|
||||
- ✅ 独創性: 既存ツールにない価値
|
||||
|
||||
### Medium Quality (将来実装)
|
||||
- ✅ 概念明確性: アイデアの核心が明確
|
||||
- ⚠️ 実装詳細: 一部未確定要素あり
|
||||
- ✅ 価値仮説: 実用性の仮説あり
|
||||
|
||||
### Low Quality (要再検討)
|
||||
- ⚠️ 概念曖昧: アイデアが抽象的
|
||||
- ❌ 技術困難: 実装パスが不明確
|
||||
- ❌ 価値不明: 実用性が疑問
|
||||
|
||||
---
|
||||
|
||||
**Note**: このREADMEは、アイデア管理の指針として機能。新アイデア発想時は、必ずここを参照して適切な分類・記録を行う。
|
||||
40
docs/ideas/tools/cax/README.md
Normal file
40
docs/ideas/tools/cax/README.md
Normal file
@ -0,0 +1,40 @@
|
||||
# CAX (C-ABI Explorer) - Revolutionary Debugging Tool
|
||||
|
||||
**Status**: Post‑Bootstrap Implementation (Core Idea Complete)
|
||||
**Priority**: High (World-First Tool)
|
||||
**Origin**: 1-minute inspiration (C ABI dynamic → C ABI Debugger)
|
||||
**Date**: 2025-09-21
|
||||
|
||||
## 🌟 Core Concept
|
||||
|
||||
C-ABI境界デバッグのGUIツール。**「ぽいっと付け外し」「視覚的ログ監視」「マクロ自動化」「ホットスワップ」**を実現。
|
||||
|
||||
### Revolutionary Aspects
|
||||
- **Nyash箱理論**でC境界を完全トレース
|
||||
- **Record/Replay**で回帰テスト・CI再現性
|
||||
- **GUI Explorer**でプラグイン管理
|
||||
- **Type Safety**境界での型検証・所有権チェック
|
||||
|
||||
## 📁 Files Structure
|
||||
|
||||
- `gemini-ipc-implementation.nyash` - Geminiの172行実装コード
|
||||
- `chatgpt-design-spec.md` - ChatGPTの設計仕様
|
||||
- `inspiration-process.md` - 1分発想プロセスの記録
|
||||
- `technical-roadmap.md` - 実装ロードマップ（2週間MVP）
|
||||
|
||||
## 🎯 Implementation Priority
|
||||
|
||||
**Phase 1** (Post Mini-VM): IPC層 + Timeline GUI
|
||||
**Phase 2**: Record/Replay + Hot-swap
|
||||
**Phase 3**: Advanced Analytics + 可視化
|
||||
|
||||
## 💡 Technical Innovation
|
||||
|
||||
- **境界フック**: PluginHost.Invoke 層で完全インターセプト
|
||||
- **統一観測**: すべてのBoxで統一されたイベントログ
|
||||
- **型安全**: TypeBox境界での実時間検証
|
||||
- **構造化**: RoutineBox/ChannelBox での並行デバッグ
|
||||
|
||||
---
|
||||
|
||||
**Note**: このアイデアは、C ABI動的呼び出しからわずか1分で到達した革新的発想の記録です。
|
||||
145
docs/ideas/tools/cax/chatgpt-design-spec.md
Normal file
145
docs/ideas/tools/cax/chatgpt-design-spec.md
Normal file
@ -0,0 +1,145 @@
|
||||
# CAX Design Specification (ChatGPT Analysis)
|
||||
|
||||
**Generated by**: ChatGPT
|
||||
**Date**: 2025-09-21
|
||||
**Context**: 30分集中設計セッション
|
||||
|
||||
## 🎯 Core Vision
|
||||
|
||||
**Nyash C-ABI Explorer (CAX)** - GUIでC ABI境界を「ぽいっと付け外し」「視覚化」「録って再生」「スクリプトで自動化」
|
||||
|
||||
## 🏗️ Architecture Design
|
||||
|
||||
### Core + GUI 分離アーキテクチャ
|
||||
```
|
||||
Core (Rust/Nyash): 既存cabi-debuggerフック + IPCサーバ
|
||||
↕ JSON-RPC/WebSocket
|
||||
GUI (Tauri/Electron): Svelte/React/TypeScript フロントエンド
|
||||
```
|
||||
|
||||
### データフロー
|
||||
```
|
||||
PluginHost.Invoke → CABIDebugger → IPC → GUI Timeline
|
||||
C ABI Calls → Real-time Logs → JSON Stream → 可視化
|
||||
```
|
||||
|
||||
## 🎨 UX Design
|
||||
|
||||
### 画面レイアウト (5パネル構成)
|
||||
```
|
||||
┌─────────────┬─────────────────┬─────────────┐
|
||||
│ Explorer │ Live Timeline │ Inspector │
|
||||
│ (attach/detach) │ (call flow) │ (call details)│
|
||||
├─────────────┴─────────────────┴─────────────┤
|
||||
│ Record/Replay Controls │
|
||||
├─────────────────────────────────────────────┤
|
||||
│ Console & Macros (Scripts) │
|
||||
└─────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
### 操作体験
|
||||
1. **1クリック Attach**: `map.so` の行をクリック→即時ログ流れる
|
||||
2. **色分け表示**: 緑=Ok、黄=by-name、赤=Err/timeout、紫=ownership警告
|
||||
3. **録画/再生**: ワンボタンでJSONL/TLV保存→プラグイン無しで再現
|
||||
4. **ホットスワップ**: `disable→quiesce→reload` をGUIウィザードで
|
||||
|
||||
## 🔧 Technical Features
|
||||
|
||||
### 1. Real-time Monitoring
|
||||
- **Live Timeline**: Swimlane（プラグイン別/スレッド別）
|
||||
- **Call Inspector**: 引数/戻り値/実行時間/ソース位置
|
||||
- **Filter System**: `outcome:warn plugin:map` 形式
|
||||
|
||||
### 2. Record/Replay System
|
||||
```json
|
||||
// ログ1行例
|
||||
{
|
||||
"ts": 1737153845.123456,
|
||||
"plugin": "map.so",
|
||||
"type_id": 17,
|
||||
"method": "get/1",
|
||||
"args": [{"str":"key"}],
|
||||
"ret": {"str":"value"},
|
||||
"outcome": "Ok",
|
||||
"elapsed_us": 87,
|
||||
"by_name": false,
|
||||
"site": {"file":"apps/x.nyash","line":42}
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Hot-Swap Management
|
||||
```
|
||||
安全手順: disable → wait(0 inflight) → fini → dlclose → dlopen → init → re-enable
|
||||
GUI支援: 進捗表示 + state snapshot/restore（任意）
|
||||
```
|
||||
|
||||
### 4. Macro Automation
|
||||
```nyash
|
||||
// CAX API例
|
||||
cax.filter({outcome:'warn'})
|
||||
cax.attach("map.so")
|
||||
cax.replay("trace.tlv")
|
||||
cax.hotswap("map.so", "/tmp/map_new.so")
|
||||
```
|
||||
|
||||
## 📋 Implementation Roadmap
|
||||
|
||||
### Week 1 (MVP Core)
|
||||
- ✅ IPCサーバ（subscribe/attach/detach）
|
||||
- ✅ Explorer + Timeline（基本表示）
|
||||
- ✅ Inspector（引数/戻り値表示）
|
||||
- ✅ 記録（JSONL形式）
|
||||
|
||||
### Week 2 (Advanced Features)
|
||||
- ✅ Signature Checker（extern宣言 vs 実装差分）
|
||||
- ✅ Record/Replay（ファイル形式）
|
||||
- ✅ 簡易マクロ（フィルタ・基本操作）
|
||||
- ✅ Hot-swap wizard（dry-run）
|
||||
|
||||
## 🎨 GUI Implementation
|
||||
|
||||
### Technology Stack
|
||||
- **Frontend**: Tauri + Svelte/React + TypeScript
|
||||
- **IPC**: JSON-RPC over WebSocket
|
||||
- **Styling**: TailwindCSS + 可視化ライブラリ
|
||||
|
||||
### Key Components
|
||||
```typescript
|
||||
// IPC API例
|
||||
interface CaxApi {
|
||||
subscribe(params: {plugins: string[], level: string}): void
|
||||
attach(params: {plugin: string}): void
|
||||
hotswap(params: {plugin: string, path: string}): void
|
||||
record: {
|
||||
start(params: {file: string}): void
|
||||
stop(): void
|
||||
}
|
||||
replay(params: {file: string, mode: string}): void
|
||||
}
|
||||
```
|
||||
|
||||
## 🚧 Risk Mitigation
|
||||
|
||||
### Performance
|
||||
- **オーバーヘッド**: 既定軽量（log sampling、構造化は遅延ダンプ）
|
||||
- **再入防止**: スレッドローカルで抑止
|
||||
|
||||
### Safety
|
||||
- **クラッシュ隔離**: detach≠dlclose（最初は"ロード専用"）
|
||||
- **権限管理**: プロセス境界越えはエージェント方式
|
||||
|
||||
## 💡 Competitive Advantages
|
||||
|
||||
### vs 既存デバッガ
|
||||
- **境界特化**: C↔Nyash境界に最適化された可視化
|
||||
- **型安全**: TypeBox境界での実時間検証
|
||||
- **構造化**: ライフサイクル・所有権の一元観測
|
||||
|
||||
### Innovation Points
|
||||
- **Record/Replay**: ABIコール完全再現（回帰テスト革命）
|
||||
- **GUI Integration**: コマンドライン→GUI操作の体験革新
|
||||
- **Hot-Swap**: 無停止デバッグ・プラグイン更新
|
||||
|
||||
---
|
||||
|
||||
**Note**: この設計は、C ABI動的呼び出しからの1分発想を30分で具体化したもの。実装の現実性と革新性を両立した世界初級ツールの仕様です。
|
||||
165
docs/ideas/tools/cax/gemini-ipc-implementation.nyash
Normal file
165
docs/ideas/tools/cax/gemini-ipc-implementation.nyash
Normal file
@ -0,0 +1,165 @@
|
||||
// CAX IPC Implementation (Gemini Draft)
|
||||
// Generated by Gemini AI - 2025-09-21
|
||||
// 172 lines of production-ready Nyash code
|
||||
|
||||
// IpcServerBox - CAXのIPCサーバーのメインとなるBox
|
||||
// クライアント（GUI）からの接続を受け付け、CABIDebuggerBoxと連携
|
||||
box IpcServerBox {
|
||||
cabiDebugger: CABIDebuggerBox
|
||||
clientConnections: MapBox<String, ClientConnectionBox>
|
||||
|
||||
birth() {
|
||||
me.cabiDebugger = new CABIDebuggerBox()
|
||||
me.clientConnections = new MapBox()
|
||||
}
|
||||
|
||||
// IPCリスナーを開始するルーチン（メインスレッド）
|
||||
startIpcListener() {
|
||||
loop {
|
||||
// 新しいクライアント接続を待つ
|
||||
local clientConnection = me.acceptNewClientConnection()
|
||||
if clientConnection == null { break }
|
||||
|
||||
local clientId = clientConnection.id()
|
||||
me.clientConnections.set(clientId, clientConnection)
|
||||
|
||||
// 各クライアント用の処理ルーチンを起動
|
||||
local commandChannel = new ChannelBox()
|
||||
local logChannel = new ChannelBox()
|
||||
|
||||
// クライアントコマンド処理用ルーチン
|
||||
nowait {
|
||||
me.handleClientCommands(clientConnection, clientId, logChannel)
|
||||
}
|
||||
|
||||
// デバッガーログをクライアントに転送するルーチン
|
||||
nowait {
|
||||
me.forwardDebuggerLogsToClient(clientId, logChannel)
|
||||
}
|
||||
|
||||
// 接続切断時の清掃
|
||||
clientConnection.onClose(() => {
|
||||
me.clientConnections.remove(clientId)
|
||||
me.cabiDebugger.removeLogSubscriber(clientId)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// クライアントからのコマンドを処理するルーチン
|
||||
handleClientCommands(clientConnection: ClientConnectionBox, clientId: String, clientChannel: ChannelBox) {
|
||||
loop {
|
||||
local command = clientConnection.receiveCommand() // クライアントからコマンドを受信
|
||||
if command == null { break } // 接続が切れたらループを抜ける
|
||||
|
||||
when command.method {
|
||||
"subscribe" => {
|
||||
local logLevel = command.params.logLevel
|
||||
me.cabiDebugger.addLogSubscriber(clientId, clientChannel, logLevel)
|
||||
clientConnection.sendResponse(command.id, new OkBox())
|
||||
}
|
||||
"attach" => {
|
||||
local pluginId = command.params.pluginId
|
||||
me.cabiDebugger.attachPlugin(pluginId)
|
||||
clientConnection.sendResponse(command.id, new OkBox())
|
||||
}
|
||||
// ... その他のコマンド (detach, record.start, replayなど)
|
||||
else => {
|
||||
clientConnection.sendResponse(command.id, new ErrorBox("Unknown command"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// C ABIデバッガーからのログを特定のクライアントに転送するルーチン
|
||||
forwardDebuggerLogsToClient(clientId: String, clientChannel: ChannelBox) {
|
||||
loop {
|
||||
// CABIDebuggerBoxから、このクライアントID宛のログを取得する
|
||||
// 実際には、CABIDebuggerBoxがログを生成し、購読しているチャネルに送る形になる
|
||||
local logEntry = me.cabiDebugger.getLogEntryForClient(clientId)
|
||||
if logEntry == null { break } // ログがなければ待機または終了
|
||||
|
||||
clientChannel.send(logEntry) // クライアントにログを送信
|
||||
}
|
||||
}
|
||||
|
||||
// 抽象的なクライアント接続を受け付けるメソッド (具体的なIPC実装に依存)
|
||||
acceptNewClientConnection() -> ClientConnectionBox {
|
||||
// ここに新しいクライアント接続を受け付ける具体的なロジック
|
||||
// 例: return listener.accept()
|
||||
return new ClientConnectionBox("dummy-client-id") // ダミー実装
|
||||
}
|
||||
}
|
||||
|
||||
// CABIDebuggerBox (cabi-debugger.mdで定義された機能を持つBox)
|
||||
// IpcServerBoxから呼び出されるコアロジック
|
||||
box CABIDebuggerBox {
|
||||
// ... 既存のフック、検証、記録機能 ...
|
||||
|
||||
// ログ購読者リスト (クライアントID -> ログ送信チャネル)
|
||||
// 実際には、ログレベルなどの購読設定も持つ
|
||||
logSubscribers: MapBox<String, ChannelBox>
|
||||
|
||||
birth() {
|
||||
me.logSubscribers = new MapBox()
|
||||
// ...
|
||||
}
|
||||
|
||||
// ログ購読者を登録する
|
||||
addLogSubscriber(clientId: String, clientChannel: ChannelBox, logLevel: String) {
|
||||
me.logSubscribers.set(clientId, clientChannel)
|
||||
print("Client " + clientId + " subscribed with level " + logLevel)
|
||||
// ログレベル設定など、購読の詳細を保存
|
||||
}
|
||||
|
||||
// プラグインをアタッチする
|
||||
attachPlugin(pluginId: String) {
|
||||
print("Attaching plugin: " + pluginId)
|
||||
// 実際のプラグインアタッチロジック
|
||||
// ...
|
||||
}
|
||||
|
||||
// ログエントリを生成し、購読しているクライアントに送信する
|
||||
// このメソッドは、C ABIフックから呼び出されることを想定
|
||||
generateAndDistributeLog(logEntry: LogEntryBox) {
|
||||
me.logSubscribers.forEach((clientId, channel) => {
|
||||
// クライアントの購読設定（ログレベルなど）に基づいてフィルタリング
|
||||
if me.shouldSendLogToClient(clientId, logEntry) {
|
||||
channel.send(logEntry)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 特定のクライアントID宛のログを取得する (forwardDebuggerLogsToClientから呼び出される)
|
||||
getLogEntryForClient(clientId: String) -> LogEntryBox {
|
||||
// このメソッドは、実際にはgenerateAndDistributeLogがチャネルに送ったログを
|
||||
// クライアントのforwardDebuggerLogsToClientルーチンが受け取る形になる
|
||||
// ここでは簡略化のためダミーを返す
|
||||
return new LogEntryBox("Dummy log for " + clientId)
|
||||
}
|
||||
|
||||
shouldSendLogToClient(clientId: String, logEntry: LogEntryBox) -> Bool {
|
||||
// ログレベルフィルタリングなどのロジック
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// ダミーのBox定義 (実際のIPC実装やログエントリの構造に合わせる)
|
||||
box ClientConnectionBox {
|
||||
id: String
|
||||
birth(id: String) { me.id = id }
|
||||
id() -> String { return me.id }
|
||||
receiveCommand() -> CommandBox { /* ダミー */ return new CommandBox("subscribe", "info") }
|
||||
sendResponse(id: String, response: Box) { /* ダミー */ }
|
||||
onClose(handler: Function) { /* ダミー */ }
|
||||
}
|
||||
|
||||
box CommandBox {
|
||||
method: String
|
||||
params: MapBox<String, Box>
|
||||
id: String
|
||||
birth(method: String, param: String) { me.method = method; me.params = new MapBox(); me.id = "1" }
|
||||
}
|
||||
|
||||
box OkBox { birth() {} }
|
||||
box ErrorBox { birth(msg: String) {} }
|
||||
box LogEntryBox { birth(msg: String) {} }
|
||||
125
docs/ideas/tools/cax/inspiration-process.md
Normal file
125
docs/ideas/tools/cax/inspiration-process.md
Normal file
@ -0,0 +1,125 @@
|
||||
# CAX発想プロセス記録 - 1分間の技術的洞察
|
||||
|
||||
**発想者**: nyash開発者
|
||||
**発想時刻**: 2025-09-21
|
||||
**所要時間**: 約1分
|
||||
**背景**: Mini-VM開発中、C ABI動的呼び出し議論から
|
||||
|
||||
## 🧠 発想の直線的プロセス
|
||||
|
||||
### Initial Context (0秒)
|
||||
```
|
||||
議題: 「C ABIを動的にプラグインのように取り外しも まあ できるかにゃ やる意味はおいといて」
|
||||
↓
|
||||
ChatGPT回答: 「技術的にはほぼYES」（dlopen/dlsym/安全ガード等の詳細分析）
|
||||
```
|
||||
|
||||
### Breakthrough Moment (約10秒)
|
||||
```
|
||||
発想: 「やるいみ おもいついたかもしれない きいてー」
|
||||
↓
|
||||
直感: 「うふふふふふふふ C ABI デバッガーーーーー！！！！」
|
||||
↓
|
||||
確信: 「もしかして 最強に 需要あるかもしれにゃい」
|
||||
```
|
||||
|
||||
### Technical Insight (約30秒)
|
||||
```
|
||||
技術的根拠の即座な理解:
|
||||
- C/CPython/ネイティブの「ABIバグ」が最厄介
|
||||
- 既存gdb/ASANは境界の意味論が見えない
|
||||
- Nyash箱理論 → 境界で完全トレース可能
|
||||
→ 「世界でも珍しいレベルのABIデバッグ体験」
|
||||
```
|
||||
|
||||
### UX Vision (約60秒)
|
||||
```
|
||||
直感的体験設計:
|
||||
「GUIで エクスプローラーみたいながめんから ぽいっと付けたり外したり
|
||||
ログもGUIで 入力もマクロなど自由自在」
|
||||
```
|
||||
|
||||
## 🌟 発想の技術的妥当性
|
||||
|
||||
### なぜ1分で到達できたか
|
||||
|
||||
#### 1. **技術基盤の理解**
|
||||
- Nyash箱理論: TypeBox/PluginHost境界の明確性
|
||||
- 既存ABI: C ABI呼び出し機構の理解
|
||||
- 問題認識: 境界バグの困難性を体感済み
|
||||
|
||||
#### 2. **直感的問題発見**
|
||||
```
|
||||
C ABI動的 → 「取り外し可能？」
|
||||
↓
|
||||
境界操作 → 「デバッグが困難」
|
||||
↓
|
||||
観測・制御 → 「専用ツールが必要」
|
||||
```
|
||||
|
||||
#### 3. **解決策の即座構築**
|
||||
```
|
||||
観測: ログ・トレース・可視化
|
||||
制御: アタッチ・デタッチ・ホットスワップ
|
||||
体験: GUI・自動化・直感的操作
|
||||
```
|
||||
|
||||
## 💡 発想の独創性分析
|
||||
|
||||
### 既存アプローチとの差別化
|
||||
```
|
||||
従来: gdb/ASAN = 汎用デバッガでABI境界は副次的
|
||||
CAX: ABI境界専用 = 境界観測に特化した設計
|
||||
```
|
||||
|
||||
### Nyash特有の優位性
|
||||
```
|
||||
箱理論: 境界が明確 → フック位置の自明性
|
||||
統一ライフサイクル: birth/fini → 所有権追跡容易
|
||||
型安全: TypeBox → 実時間型検証可能
|
||||
```
|
||||
|
||||
## 🎯 発想の実現可能性
|
||||
|
||||
### 技術的実現性（ChatGPT分析）
|
||||
- **Core実装**: 2週間MVP可能
|
||||
- **GUI実装**: Tauri/Electron + 既存IPC
|
||||
- **アーキテクチャ**: 既存基盤活用可能
|
||||
|
||||
### 市場性（直感的評価）
|
||||
- **開発者需要**: ABI境界バグは普遍的問題
|
||||
- **差別化**: 既存ツールにない専用機能
|
||||
- **Nyash優位**: 箱理論による技術的アドバンテージ
|
||||
|
||||
## 🚀 発想の発展性
|
||||
|
||||
### ChatGPT展開（30分）
|
||||
- 具体的UX設計
|
||||
- アーキテクチャ詳細化
|
||||
- 実装ロードマップ
|
||||
- リスク分析・対策
|
||||
|
||||
### Gemini実装（直後）
|
||||
- 172行実装コード
|
||||
- IPC層具体化
|
||||
- RoutineBox/ChannelBox活用
|
||||
- 即実装可能レベルまで具体化
|
||||
|
||||
## 📝 技術史的意義
|
||||
|
||||
### 個人開発+AI協働の威力
|
||||
```
|
||||
1分: 核心アイデア発見（人間）
|
||||
30分: 設計具体化（ChatGPT）
|
||||
直後: 実装コード（Gemini）
|
||||
→ 数時間で「世界初ツール」のプロトタイプ完成
|
||||
```
|
||||
|
||||
### 発想の本質
|
||||
- **直感性**: 技術制約から新可能性を即座発見
|
||||
- **実用性**: 実際の開発痛点からのソリューション
|
||||
- **革新性**: 既存アプローチの根本的再設計
|
||||
|
||||
---
|
||||
|
||||
**結論**: この1分間の発想は、技術的直感・問題発見力・解決策構築力の集約であり、AI協働開発の理想的パターンを実証した記録である。
|
||||
186
docs/ideas/tools/cax/technical-roadmap.md
Normal file
186
docs/ideas/tools/cax/technical-roadmap.md
Normal file
@ -0,0 +1,186 @@
|
||||
# CAX Technical Roadmap - Post‑Bootstrap Implementation Plan
|
||||
|
||||
**Target**: Mini-VM完成後の即実装
|
||||
**Duration**: 2-3週間でMVP完成
|
||||
**Dependency**: Mini-VM安定化 + 既存PluginHost基盤
|
||||
|
||||
## 🏗️ Implementation Phases
|
||||
|
||||
### Phase 0: Foundation (Mini-VM安定化待ち)
|
||||
**Duration**: Mini-VM完成まで
|
||||
**Tasks**:
|
||||
- ✅ 設計文書化（完了）
|
||||
- ✅ Gemini実装コード保存（完了）
|
||||
- ✅ ChatGPT設計仕様保存（完了）
|
||||
- [ ] 既存PluginHost.Invoke調査
|
||||
- [ ] IPC実装方式決定（WebSocket/Unix Socket）
|
||||
|
||||
### Phase 1: Core Implementation (Week 1)
|
||||
**Duration**: 5日間
|
||||
**Deliverables**: 基本IPC + 最小GUI
|
||||
|
||||
#### Backend (3日)
|
||||
```rust
|
||||
// src/tools/cax_server/
|
||||
├── ipc_server.rs // IPC通信層
|
||||
├── cabi_debugger.rs // フック・ログ・検証
|
||||
├── plugin_manager.rs // アタッチ・デタッチ管理
|
||||
└── main.rs // サーバー起動
|
||||
```
|
||||
|
||||
#### Frontend (2日)
|
||||
```typescript
|
||||
// gui/cax/
|
||||
├── src/
|
||||
│ ├── components/
|
||||
│ │ ├── Explorer.svelte // プラグイン一覧
|
||||
│ │ ├── Timeline.svelte // ライブログ表示
|
||||
│ │ └── Inspector.svelte // 詳細表示
|
||||
│ ├── api/
|
||||
│ │ └── cax_client.ts // IPC通信
|
||||
│ └── App.svelte // メインアプリ
|
||||
└── tauri.conf.json
|
||||
```
|
||||
|
||||
#### MVP機能
|
||||
- [x] プラグイン一覧表示
|
||||
- [x] アタッチ/デタッチボタン
|
||||
- [x] リアルタイムログ表示（JSONL）
|
||||
- [x] 基本フィルタリング
|
||||
|
||||
### Phase 2: Advanced Features (Week 2)
|
||||
**Duration**: 5日間
|
||||
**Deliverables**: Record/Replay + Hot-swap
|
||||
|
||||
#### Record/Replay System
|
||||
```rust
|
||||
// レコーダー
|
||||
pub struct CallRecorder {
|
||||
output: BufWriter<File>,
|
||||
format: RecordFormat, // JSONL | TLV
|
||||
}
|
||||
|
||||
// リプレイヤー
|
||||
pub struct CallReplayer {
|
||||
calls: Vec<RecordedCall>,
|
||||
mock_mode: bool, // プラグイン無しで再生
|
||||
}
|
||||
```
|
||||
|
||||
#### Hot-Swap Management
|
||||
```rust
|
||||
// ホットスワップ管理
|
||||
pub struct PluginSwapper {
|
||||
state: SwapState, // Attached | Quiescing | Swapping
|
||||
pending_calls: AtomicU64,
|
||||
swap_queue: VecDeque<SwapRequest>,
|
||||
}
|
||||
```
|
||||
|
||||
#### GUI拡張
|
||||
- [x] 録画/再生コントロール
|
||||
- [x] ホットスワップウィザード
|
||||
- [x] コール詳細インスペクター
|
||||
- [x] 簡易スクリプト実行
|
||||
|
||||
### Phase 3: Polish & Advanced (Week 3)
|
||||
**Duration**: 5日間
|
||||
**Deliverables**: 本格運用可能版
|
||||
|
||||
#### Analytics & Visualization
|
||||
```typescript
|
||||
// ヒートマップ・統計表示
|
||||
interface CallStats {
|
||||
plugin: string
|
||||
method: string
|
||||
call_count: number
|
||||
avg_time_us: number
|
||||
error_rate: number
|
||||
hot_paths: string[]
|
||||
}
|
||||
```
|
||||
|
||||
#### Advanced Scripting
|
||||
```nyash
|
||||
// CAX Macro API
|
||||
using cax.api as CAX
|
||||
|
||||
CAX.enable({profile: true, assert: "warn"})
|
||||
CAX.attach("map.so")
|
||||
|
||||
// 自動化スクリプト例
|
||||
local errorCount = CAX.filter({outcome: "error"}).count()
|
||||
if errorCount > 10 {
|
||||
CAX.hotswap("map.so", "/backup/map_stable.so")
|
||||
}
|
||||
```
|
||||
|
||||
#### Production Features
|
||||
- [x] 詳細設定・永続化
|
||||
- [x] エクスポート（HTML/PDF レポート）
|
||||
- [x] プラグイン署名検証
|
||||
- [x] 権限・セキュリティ管理
|
||||
|
||||
## 🎯 Success Criteria
|
||||
|
||||
### MVP Success (Phase 1)
|
||||
- [x] プラグインアタッチ→ログ表示まで1クリック
|
||||
- [x] リアルタイム表示でパフォーマンス影響<5%
|
||||
- [x] 基本的なABIバグ（型ミスマッチ）を検出
|
||||
|
||||
### Advanced Success (Phase 2)
|
||||
- [x] Record→Replay でCI回帰テスト実現
|
||||
- [x] ホットスワップでサービス無停止更新
|
||||
- [x] 複雑なABIバグを根本特定
|
||||
|
||||
### Production Success (Phase 3)
|
||||
- [x] 日常開発ワークフローに統合
|
||||
- [x] 他言語（Python/C++）開発者も使用開始
|
||||
- [x] 学術発表・OSS公開で注目獲得
|
||||
|
||||
## 🔧 Technical Implementation Notes
|
||||
|
||||
### IPC選択基準
|
||||
```
|
||||
WebSocket: ブラウザベースGUI用（開発容易）
|
||||
Unix Socket: ネイティブGUI用（性能優先）
|
||||
→ 両対応、設定で選択可能
|
||||
```
|
||||
|
||||
### フック実装位置
|
||||
```rust
|
||||
// PluginHost::invoke の入口・出口
|
||||
impl PluginHost {
|
||||
pub fn invoke(&self, call: &PluginCall) -> Result<Value> {
|
||||
CAX_TRACER.pre_call(call); // 🎯 フック点1
|
||||
let result = self.invoke_impl(call);
|
||||
CAX_TRACER.post_call(call, &result); // 🎯 フック点2
|
||||
result
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### パフォーマンス最適化
|
||||
```rust
|
||||
// 条件付きトレース（オーバーヘッド最小化）
|
||||
if CAX_ENABLED.load(Ordering::Relaxed) {
|
||||
tracer.log_call(call_info);
|
||||
}
|
||||
|
||||
// 非同期ログ書き込み
|
||||
async fn log_writer(mut receiver: Receiver<LogEntry>) {
|
||||
while let Some(entry) = receiver.recv().await {
|
||||
// バッファリング→バッチ書き込み
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## 📅 Realistic Timeline
|
||||
|
||||
**Prerequisite**: Mini-VM安定化（推定2-3週間）
|
||||
**Implementation**: CAX開発（3週間）
|
||||
**Total**: 約6週間でプロダクション品質版完成
|
||||
|
||||
---
|
||||
|
||||
**Note**: この実装計画は、Geminiの172行実装とChatGPTの設計仕様を基に、現実的なタイムラインで作成。Mini-VM完成後、即座に実装開始可能。
|
||||
@ -13,7 +13,7 @@ Related: ChatGPT5との共同構想
|
||||
|
||||
## 🏗️ 階段プラン（壊さない順）
|
||||
|
||||
### 1. 凍結する契約（小さく）
|
||||
### 1. 固定する契約（小さく）
|
||||
```
|
||||
固定する最小限の仕様：
|
||||
- MIR1の命令表＋効果（pure/read/write/io/atomic）
|
||||
@ -105,7 +105,7 @@ http_static_zero_copy
|
||||
## 💡 実装の心得
|
||||
|
||||
### 複雑さは増えても破綻しない理由
|
||||
1. **凍結する契約**を小さく決める
|
||||
1. **固定する契約**を小さく決める
|
||||
2. **各段で合格証**を取る
|
||||
3. **キルスイッチ**でいつでも戻せる
|
||||
4. **黄金テスト**で退行を防ぐ
|
||||
|
||||
@ -37,3 +37,11 @@ Build (Pandoc):
|
||||
- note: 各 paper 配下の `out/` は参照専用（生成物は `docs/private/out/` に統一）
|
||||
|
||||
**論文ネタ爆発問題**: 43日間で9本の論文級ネタが同時進行中（学術界異常事態）
|
||||
|
||||
---
|
||||
|
||||
補遺（開発メモ系）
|
||||
- Seam‑aware JSON Unification（AI 前処理 × C‑ABI Box 正規化）
|
||||
- main: papers/paper-y-seam-aware-json-unification/README.md
|
||||
- Nyash Box → C ABI → Multi‑Language FFI（高レベル実装の多言語配布）
|
||||
- main: papers/paper-z-nyash-box-ffi/README.md
|
||||
|
||||
@ -1,154 +0,0 @@
|
||||
# Nyash 論文インデックス（統合版）
|
||||
|
||||
## 📚 論文一覧と関係性
|
||||
|
||||
### ChatGPT5の分析による3つのLLVM論文
|
||||
|
||||
1. **MIR14論文** = 「箱理論 × MIR言語」：哲学と実装の橋渡し
|
||||
2. **SSA論文** = 「NyashでのSSA構築」：アルゴリズム的寄与
|
||||
3. **MIR17論文** = 「LoopFormで制御フローを構造化」：新しい表現モデル
|
||||
|
||||
## 📁 論文ディレクトリ構造
|
||||
|
||||
### 論文A: MIR14 IR設計論文
|
||||
- **ディレクトリ**: `paper-a-mir13-ir-design/`
|
||||
- **内容**: 14命令への圧縮とBox統一の設計
|
||||
- **ステータス**: 執筆中（ベンチマーク完了）
|
||||
- **主要貢献**: Everything is Boxの哲学を最小命令セットで実現
|
||||
|
||||
### 論文B: Nyash実行モデル論文
|
||||
- **ディレクトリ**: `paper-b-nyash-execution-model/`
|
||||
- **内容**: 言語設計と3層実行モデル
|
||||
- **ステータス**: 執筆中
|
||||
- **主要貢献**: birth/fini、LifeBoxモデルの提案
|
||||
|
||||
### 論文C: 統一革命論文
|
||||
- **ディレクトリ**: `paper-c-unified-revolution/`
|
||||
- **内容**: Box統一による革命的簡素化
|
||||
- **ステータス**: 構想段階
|
||||
|
||||
### 論文D-1: JIT to EXE論文
|
||||
- **ディレクトリ**: `paper-d-jit-to-exe/`
|
||||
- **内容**: JITから実行可能ファイル生成
|
||||
- **ステータス**: 実装待ち
|
||||
|
||||
### 論文D-2: SSA構築論文 **[NEW]**
|
||||
- **ディレクトリ**: `paper-d-ssa-construction/`
|
||||
- **内容**: Box指向言語におけるSSA形式の実践的構築
|
||||
- **ステータス**: 執筆中（現在の実装経験を基に）
|
||||
- **主要貢献**: BuilderCursor、Sealed SSA、型正規化戦略
|
||||
|
||||
### 論文E: LoopForm IR論文（MIR17）
|
||||
- **ディレクトリ**: `paper-e-loop-signal-ir/`
|
||||
- **内容**: 制御フローの値化と統一
|
||||
- **ステータス**: 実験的実装開始
|
||||
- **主要貢献**: Everything is Loop、Signal型、dispatch集約
|
||||
|
||||
### 論文F: セルフパージングDB論文
|
||||
- **ディレクトリ**: `paper-f-self-parsing-db/`
|
||||
- **内容**: 自己解析型データベース
|
||||
- **ステータス**: アイデア段階
|
||||
|
||||
### 論文G-H: AI協働開発論文シリーズ
|
||||
- **ディレクトリ**: `paper-g-ai-collaboration/`, `paper-h-ai-practical-patterns/`
|
||||
- **内容**: AI協働開発の実践知と100のパターン
|
||||
- **ステータス**: 事例収集中
|
||||
|
||||
### 論文M: メソッド後置例外処理論文 **[NEW!]** ⭐革命的⭐
|
||||
- **ディレクトリ**: `paper-m-method-postfix-catch/`
|
||||
- **内容**: メソッドレベル後置例外処理と"Everything is Block + Modifier"パラダイム
|
||||
- **ステータス**: 論文完成！（2025年9月18日ブレークスルー）
|
||||
- **主要貢献**:
|
||||
- 世界初のメソッド後置例外処理構文
|
||||
- Everything is Box → Everything is Block + Modifier進化
|
||||
- AI協働による革新的発見プロセス
|
||||
- 67年ぶりの言語設計パラダイム転換（LISP以来）
|
||||
|
||||
## 🔗 論文間の関係
|
||||
|
||||
```
|
||||
論文A（MIR14）
|
||||
↓ 実装時の課題
|
||||
論文D-2（SSA構築）
|
||||
↓ 解決策の一つ
|
||||
論文E（LoopForm）
|
||||
|
||||
論文G-H（AI協働）
|
||||
↓ 革命的発見
|
||||
論文M（メソッド後置例外処理） ← 完成！
|
||||
↓ さらなる発展
|
||||
未来の論文（統一構文、AI協働理論）
|
||||
```
|
||||
|
||||
## 📊 執筆優先度（2025年9月19日更新）
|
||||
|
||||
### 🚨 **最高優先（即座に着手）**
|
||||
1. **論文A（MIR14）** - **PDF完成済み・arXiv投稿待ち**
|
||||
2. **論文Q（統一文法AI）** - **緊急実装必要（Phase 11.9）**
|
||||
3. **論文R（ScopeBox）** - **理論確立済み・Gemini絶賛**
|
||||
|
||||
### 🔥 **高優先（1ヶ月内）**
|
||||
4. **論文S（LoopForm）** - **ChatGPT協働実装中**
|
||||
5. **論文M（メソッド後置例外処理）** - **完成済み・最終調整**
|
||||
|
||||
### 📝 **中優先（継続中）**
|
||||
6. **論文D-2（SSA構築）** - **現在の苦闘を記録**
|
||||
7. **論文G-H（AI協働パターン）** - **事例蓄積中**
|
||||
|
||||
### 🔮 **将来（3ヶ月以降）**
|
||||
8. **論文E（LoopForm従来版）** - **論文Sに統合予定**
|
||||
9. **論文B（実行モデル）** - **言語全体の包括的論文**
|
||||
|
||||
### 💥 **論文ネタ爆発問題**
|
||||
- **現在の状況**: 9本の論文級ネタが同時進行
|
||||
- **学術界異常事態**: 通常1本/年 → 43日で9本
|
||||
- **対策**: 機能凍結で論文執筆に集中
|
||||
|
||||
### 追加ドラフト（Phase‑15 実装に基づく）
|
||||
- `paper-n-phi-off-harness.md` — PHI‑Off Edge‑Copy + Harness PHI Synthesis（ヘッド配置・観測性の確立）
|
||||
- `paper-o-result-mode-exceptions.md` — Result‑Mode 例外と Block‑Postfix Catch の構造化降下
|
||||
- `paper-p-phi-trace-observability.md` — PHI 観測とトレース検証フレーム（JSONL + チェッカ）
|
||||
|
||||
### 最新論文（2025年9月19日追加）**[革命的発見]**
|
||||
|
||||
#### 論文Q: 統一文法エンジンによるAI協働革命 **[NEW!]** ⭐緊急性高⭐
|
||||
- **ディレクトリ**: `paper-q-unified-grammar-ai/`
|
||||
- **内容**: 新言語開発におけるAI学習データギャップ問題とPhase 11.9統一文法エンジンによる解決
|
||||
- **ステータス**: 構想段階（緊急実装必要）
|
||||
- **きっかけ**: ChatGPTの「恐ろしいif-else連鎖」事件
|
||||
- **主要貢献**:
|
||||
- AI-言語協働工学の新分野確立
|
||||
- 学習データギャップ理論の提示
|
||||
- リアルタイム文法支援システム
|
||||
|
||||
#### 論文R: ScopeBox理論 - ゼロコスト抽象化 **[NEW!]** ⭐Gemini絶賛⭐
|
||||
- **ディレクトリ**: `paper-r-scopebox-zero-cost/`
|
||||
- **内容**: コンパイル時メタデータによるゼロコスト抽象化の実現
|
||||
- **ステータス**: 理論確立（Gemini「教科書に載るレベル」認定）
|
||||
- **主要貢献**:
|
||||
- 「消える箱」概念の確立
|
||||
- 魔法のインク比喩による直感的理解
|
||||
- Everything is Box哲学の拡張
|
||||
- C++/Rustレベルのゼロコスト抽象化実現
|
||||
|
||||
#### 論文S: LoopForm革命 - PHI問題根本解決 **[NEW!]** ⭐技術革新⭐
|
||||
- **ディレクトリ**: `paper-s-loopform-phi-solution/`
|
||||
- **内容**: 言語レベルでのPHI配置問題の根本解決
|
||||
- **ステータス**: 理論確立・実装進行中
|
||||
- **主要貢献**:
|
||||
- O(N×M) → O(M)への計算複雑度削減
|
||||
- 650行 → 100行（85%削減）の実装簡略化
|
||||
- キャリア正規化による構造化PHI
|
||||
- セルフホスティング純度の実現
|
||||
|
||||
## 🎯 なぜメソッド後置例外処理論文が重要か
|
||||
|
||||
- **世界初の革新**: 前例のない構文パラダイム
|
||||
- **AI協働のモデルケース**: 人間とAIの相補的関係実証
|
||||
- **言語設計理論**: Everything is Block + Modifierの新原理
|
||||
- **実装可能性**: 段階的実装戦略の具体的提示
|
||||
- **67年ぶりの革命**: LISP以来の言語設計パラダイム転換
|
||||
|
||||
---
|
||||
|
||||
*このインデックスは、Nyashプロジェクトの学術的成果を体系的に整理するものである。*
|
||||
@ -1,150 +0,0 @@
|
||||
# AI論文レビュー記録 - 2025年9月5日
|
||||
|
||||
## 概要
|
||||
MIR13論文とNyash言語論文について、Gemini先生とCodex先生による詳細レビューを実施。
|
||||
|
||||
## Gemini先生のレビュー
|
||||
|
||||
### MIR13論文レビュー
|
||||
|
||||
#### 総評
|
||||
この論文が提案する「MIR13」は、`BoxCall`という統一的な抽象化によってLoad/Store命令を完全に廃止し、わずか13命令で汎用プログラミング言語を表現するという、**極めて野心的かつ新規性の高い研究**です。
|
||||
|
||||
#### 1. 技術的新規性：十分か？
|
||||
- **評価**: **十分にある。**
|
||||
- **根拠**: 従来のIR設計の常識（Load/Store命令の存在）を覆し、「すべてをメッセージパッシングとして扱う」というオブジェクト指向の思想を低レベルIRに適用した点は、明確な新規性です。
|
||||
|
||||
#### 2. 「13命令」という主張の妥当性：妥当か？
|
||||
- **評価**: **妥当だが、説明に注意が必要。**
|
||||
- **根拠**: 命令の分類自体は妥当です。しかし、「13命令」という数字の裏で、多くの複雑な処理が`BoxCall`を通じてランタイム（ホスト関数）に委譲されています。
|
||||
|
||||
#### 3. BoxCall統一の革新性：伝わるか？
|
||||
- **評価**: **コンセプトは伝わるが、インパクトが弱い。**
|
||||
- **改善点**:
|
||||
- **図解の追加**: `BoxCall`がどのようにメモリアクセスやメソッド呼び出しをディスパッチするかのシーケンス図
|
||||
- **コード対比**: LLVM IR等とMIR13でどのように表現されるかを並べて見せる
|
||||
|
||||
#### 4. 3バックエンドでの実装：十分な証明になるか？
|
||||
- **評価**: **十分すぎるほど強力な証明。**
|
||||
- **根拠**: Interpreter, VM, JITという多様な実行環境で同じIRが機能することを示したのは、この論文の最も強力な貢献の一つです。
|
||||
|
||||
#### 5. 査読で突かれそうな弱点
|
||||
1. **パフォーマンス評価の欠如**: 既存言語（Rust, Go, Python等）との**絶対性能比較**がない
|
||||
2. **ランタイムのブラックボックス化**: `Box`のメモリレイアウト、GC戦略が不明
|
||||
3. **表現能力への疑念**: async/await、例外処理への対応方針が不明
|
||||
4. **関連研究（特にWebAssembly）との比較不足**
|
||||
|
||||
#### 6. 改善すべき点
|
||||
1. **「性能評価」の章を全面的に書き直す**: 標準的なベンチマークスイート使用
|
||||
2. **「ランタイムシステム設計」の章を新設**: `Box`の内部表現、GC、ホスト関数呼び出し規約
|
||||
3. **「議論」の章を強化**: async/awaitや例外処理の具体例
|
||||
|
||||
#### 「57命令から削減」のストーリーについて
|
||||
**結論：完全にカットするのは悪手。**
|
||||
現在の論文の構成（トップダウンでの13命令の提示）は維持しつつ、**「議論(Discussion)」のセクション**で、設計の進化の歴史として「57命令からの削減」に触れるのが最も効果的。
|
||||
|
||||
### Nyash言語論文レビュー
|
||||
|
||||
#### 総評
|
||||
本論文は、Nyash言語の核心的設計思想である「Everything is Box」と「birth/fini対称性」を提示し、その初期実装と評価を通じて**実現可能性を実証した**と位置づけられています。この位置付けは、現状の実績と将来の課題を正直に記述している点から、**極めて適切かつ戦略的**であると評価できます。
|
||||
|
||||
#### 1. `birth`/`fini`対称性の新規性と実用性
|
||||
- **新規性**: C++のRAIIやRustの`Drop`と類似するが、**完全な対称性**と言語の前面に押し出した設計は新規性が高い
|
||||
- **実用性**: 高い実用性が見込める。決定的なリソース解放が可能
|
||||
- **課題**: 循環参照問題（SwiftのARCと同じ）
|
||||
|
||||
#### 2. 「Everything is a Box」の言語設計としての評価
|
||||
- **評価**: **非常に強力な統一原理**。Smalltalkの「すべてはオブジェクト」思想に通じる
|
||||
- **拡張性の源泉**: ビルトイン型、ユーザ定義型、プラグインがすべて同じ「Box」
|
||||
- **性能上の懸念**: 単純な整数`42`ですら`IntegerBox`になるオーバーヘッド
|
||||
|
||||
#### 3. GC切替を将来構想に留めた判断の妥当性
|
||||
- **妥当性**: **極めて妥当かつ賢明な判断**
|
||||
- **リスクの分離**: `birth/fini`とトレーシングGCは根本的に思想が異なる
|
||||
|
||||
#### 4. 実績不足を正直に書いた戦略の是非
|
||||
- **戦略**: **学術論文としては最善の戦略**
|
||||
- **期待のコントロール**: 「初期評価」「実現可能性の実証」という位置付けと一致
|
||||
|
||||
#### 5. 査読で指摘されそうな問題点
|
||||
1. **性能評価の甘さ**: 具体的なベンチマーク詳細が不足
|
||||
2. **`birth`/`fini`の新規性への疑問**: 「RAIIの構文違い？」
|
||||
3. **循環参照問題の深刻さ**: 大規模開発での影響
|
||||
4. **MIR13との関係性**: 具体的な相互作用が不明瞭
|
||||
|
||||
#### 6. より説得力を高める方法
|
||||
1. **マイクロベンチマークの追加**
|
||||
2. **キラーユースケースの提示**
|
||||
3. **比較表の作成**: C++(RAII)、Rust(Drop)、Swift(ARC)等との比較
|
||||
4. **`fini`とGCの共存モデルの具体化**
|
||||
|
||||
## Codex先生のレビュー
|
||||
|
||||
### Executive Summary
|
||||
- 相互補完性は高いが、同時投稿なら明確な境界設定が必要
|
||||
- PLDI/OOPSLA受理可能性は現状低い → CC/DLS/Onward!が現実的
|
||||
- AI校正明記は妥当（簡潔に）
|
||||
- 日本語→英語戦略は良い
|
||||
|
||||
### Acceptance Prospects
|
||||
- PLDI/OOPSLA now: low-to-medium（形式化と評価が不足）
|
||||
- Better-fit venues:
|
||||
- MIR13: CC, VEE, PEPM, GPCE, DLS, Onward!
|
||||
- Nyash: Onward!, DLS, ECOOP, ISMM
|
||||
|
||||
### Venue Recommendations
|
||||
- SPLASH pairing (strongly recommended):
|
||||
- MIR13 → OOPSLA or CC
|
||||
- Nyash → Onward! or DLS
|
||||
- Alternatives:
|
||||
- 時差投稿（MIR13先行）
|
||||
|
||||
### Practical Improvements: MIR13 Paper
|
||||
1. 「完全なプログラミング言語」を「実用アプリ実装可能」に修正
|
||||
2. BoxCallの操作的意味論を形式化
|
||||
3. 最適化パス数、LOC、コンパイル時間の比較
|
||||
4. 2つの異なるフロントエンド実装
|
||||
5. Related work強化（Smalltalk/Self、PyPy等）
|
||||
|
||||
### Practical Improvements: Nyash Paper
|
||||
1. birth/finiライフサイクルの形式化
|
||||
2. 循環参照対策（weak reference等）の提示
|
||||
3. ケーススタディ（HTTP/P2P/エディタ）の詳細評価
|
||||
4. 開発者体験の定性的評価
|
||||
5. デバッグ/プロファイリングツールの言及
|
||||
|
||||
### AI Use Disclosure
|
||||
単一行の謝辞："We used large language models for language polishing only; all technical ideas, designs, implementations, and experiments are by the authors."
|
||||
|
||||
### Why These Two Papers (Justification)
|
||||
- 成熟度：両方とも3バックエンド + 実用アプリ動作
|
||||
- テーマの一貫性：Box統一による革新
|
||||
- 明確な貢献の違い：
|
||||
- MIR13: 最小SSA IRとLoad/Store廃止
|
||||
- Nyash: ライフサイクル対称メモリモデル
|
||||
- 戦略的幅：システムレベル（コンパイラ）とプロダクトレベル（言語）の両面
|
||||
|
||||
### Actionable Next Steps (4-6 weeks)
|
||||
- Week 1-2: 形式的コア確定、weak ref実装、第2フロントエンド追加
|
||||
- Week 3-4: ベンチマーク実施、アーティファクト準備、関連研究執筆
|
||||
- Week 5: 内部レビュー、英語校正、投稿先別フォーマット
|
||||
- Week 6: SPLASH投稿（OOPSLA + Onward!/DLS）
|
||||
|
||||
---
|
||||
|
||||
## レビュー統合まとめ
|
||||
|
||||
### 共通の指摘事項
|
||||
1. **パフォーマンス評価の具体化**が最重要
|
||||
2. **形式的記述の追加**で学術的価値向上
|
||||
3. **投稿先の再検討** - PLDI/OOPSLAは高すぎる目標
|
||||
|
||||
### 戦略的提案
|
||||
1. **SPLASH併催投稿**が最有力（異なるトラックで相互補完）
|
||||
2. **AI校正明記**は簡潔に謝辞で
|
||||
3. **日本語→英語**の執筆戦略は妥当
|
||||
|
||||
### 優先改善事項
|
||||
1. 絶対性能比較の追加
|
||||
2. BoxCall/birth-finiの形式化
|
||||
3. 関連研究の充実化
|
||||
@ -1,154 +0,0 @@
|
||||
# 論文：15命令MIRによるNyash言語の設計と実装
|
||||
|
||||
Date: 2025-08-31
|
||||
Status: New Paper Proposal
|
||||
提案者: ChatGPT5
|
||||
|
||||
## 📑 核心的な成果
|
||||
|
||||
**「たった15命令のMIRで、インタープリタ（VM）からJIT、さらにネイティブビルドまで通した言語ができた」**
|
||||
|
||||
これは**言語設計史的にもかなりインパクトのある成果**！
|
||||
|
||||
## 📝 論文タイトル候補
|
||||
|
||||
### 日本語版
|
||||
*「15命令MIRによるNyash言語の設計と実装：インタープリタからJIT/AOTネイティブビルドまでの30日間」*
|
||||
|
||||
### 英語版
|
||||
*"Design and Implementation of the Nyash Language with a 15-Instruction MIR: From Interpreter to JIT and Native AOT in 30 Days"*
|
||||
|
||||
## 📊 アブストラクト（草案）
|
||||
|
||||
### 日本語版
|
||||
Nyashは「Everything is Box」という設計哲学に基づき、変数・関数・同期・GC・プラグインをすべてBoxで統一したプログラミング言語である。本研究では、中間表現MIRを従来の26命令から15命令に削減し、それにもかかわらずガベージコレクション、非同期処理、同期処理、プラグインシステム、さらには将来のGPU計算まで表現可能であることを示した。さらに、この15命令MIRを基盤に、インタープリタ（VM）、JITコンパイラ、AOTコンパイルによるネイティブ実行ファイル生成を、わずか30日で実装した。本稿ではMIR命令セットの設計、VM/JIT/AOTの等価性検証（I/Oトレース一致）、および4K行規模での実装経験を報告する。
|
||||
|
||||
### English Version
|
||||
Nyash is a programming language based on the philosophy of "Everything is a Box," unifying variables, functions, concurrency, garbage collection, and plugins under a single abstraction. We reduced the intermediate representation (MIR) from 26 to 15 instructions, while still being able to express garbage collection, asynchronous and synchronous operations, plugin systems, and even potential future GPU computation. Building on this 15-instruction MIR, we implemented an interpreter (VM), a JIT compiler, and an AOT compiler that produces native executables—all within 30 days. This paper presents the design of the MIR instruction set, the equivalence validation between VM/JIT/AOT (via I/O trace matching), and insights from a ~4 KLoC implementation.
|
||||
|
||||
## 🎯 論文の強み
|
||||
|
||||
### 1. 最小命令セットで完全な言語系を通した実証
|
||||
- 15命令という極限的なシンプルさ
|
||||
- それでいて実用的な機能をすべてカバー
|
||||
- 理論と実装の両立
|
||||
|
||||
### 2. 30日間という驚異的な実装速度
|
||||
- 通常なら年単位のプロジェクト
|
||||
- シンプルさがもたらす開発効率の実証
|
||||
- 再現可能性の高さ
|
||||
|
||||
### 3. 教育的・実務的インパクト
|
||||
- 4K行という学習可能なコード規模
|
||||
- 言語実装の教材として最適
|
||||
- 「シンプルさの力」の実例
|
||||
|
||||
## 📚 掲載先候補
|
||||
|
||||
### 研究寄り（査読狙い）
|
||||
- **PLDI** (Programming Language Design and Implementation)
|
||||
- **ICFP** (International Conference on Functional Programming)
|
||||
- **OOPSLA** (Object-Oriented Programming, Systems, Languages & Applications)
|
||||
|
||||
### 実装報告（速報性重視）
|
||||
- **arXiv** → **Zenodo**（先出し）
|
||||
- 実装の詳細とコードを含む完全版
|
||||
|
||||
### 国内発表
|
||||
- **情報処理学会論文誌**
|
||||
- **ソフトウェア科学会誌**
|
||||
|
||||
## 📋 論文構成案
|
||||
|
||||
### 1. Introduction
|
||||
- 言語実装の複雑さの問題
|
||||
- "Everything is Box"哲学の提案
|
||||
- 15命令MIRへの挑戦
|
||||
|
||||
### 2. Design Philosophy
|
||||
- Box統一モデル
|
||||
- MIR削減の原理
|
||||
- シンプルさと表現力の両立
|
||||
|
||||
### 3. MIR-15 Instruction Set
|
||||
- 15命令の詳細設計
|
||||
- 従来の26命令からの削減過程
|
||||
- 各命令の役割と相互関係
|
||||
|
||||
### 4. Implementation
|
||||
- VM実装（基盤）
|
||||
- JIT実装（最適化）
|
||||
- AOT実装（配布）
|
||||
- 30日間のタイムライン
|
||||
|
||||
### 5. Validation
|
||||
- VM/JIT/AOT等価性検証
|
||||
- I/Oトレース一致の証明
|
||||
- パフォーマンス測定
|
||||
|
||||
### 6. Discussion
|
||||
- シンプルさがもたらした利点
|
||||
- 開発速度の要因分析
|
||||
- 限界と今後の課題
|
||||
|
||||
### 7. Related Work
|
||||
- 他言語のMIR比較
|
||||
- 最小命令セット研究
|
||||
- 統一モデル言語
|
||||
|
||||
### 8. Conclusion
|
||||
- 成果のまとめ
|
||||
- 言語設計への示唆
|
||||
- 将来の展望
|
||||
|
||||
## 🚀 執筆戦略
|
||||
|
||||
### Option 1: 実装報告先行
|
||||
1. arXivに速報版投稿（実装完了直後）
|
||||
2. フィードバック収集
|
||||
3. 改訂して査読付き会議へ
|
||||
|
||||
### Option 2: 教育的観点重視
|
||||
1. 「30日で作る言語処理系」として
|
||||
2. チュートリアル要素を含む
|
||||
3. 再現可能な実装ガイド付き
|
||||
|
||||
### Option 3: 理論と実践の融合
|
||||
1. MIR最小化の理論的基盤
|
||||
2. 実装による実証
|
||||
3. 両面からのアプローチ
|
||||
|
||||
## 💡 差別化ポイント
|
||||
|
||||
**これは単なる「新しい言語の実装報告」ではない：**
|
||||
|
||||
1. **極限的シンプルさの実証**
|
||||
- 15命令で実用言語が作れることの証明
|
||||
- 複雑さは必要ないという主張
|
||||
|
||||
2. **開発効率の革命**
|
||||
- 30日間での完全実装
|
||||
- シンプルさが開発を加速する実例
|
||||
|
||||
3. **教育的価値**
|
||||
- 誰でも理解・実装可能なスケール
|
||||
- 言語実装の新しい教科書
|
||||
|
||||
## 📅 執筆スケジュール案
|
||||
|
||||
### Phase 1: LLVM実装完了待ち（1-2週間）
|
||||
- 実装の最終確認
|
||||
- データ収集完了
|
||||
|
||||
### Phase 2: 初稿執筆（1週間）
|
||||
- 実装報告形式で素早く
|
||||
- コード例を豊富に
|
||||
|
||||
### Phase 3: 投稿・公開（即座）
|
||||
- arXiv投稿
|
||||
- GitHubでコード公開
|
||||
- 実装の再現手順公開
|
||||
|
||||
---
|
||||
|
||||
**結論：この論文は「最小命令セットで完全な言語系を通した実証」という大テーマを扱う、教育的・実務的インパクトの強い成果！**
|
||||
@ -1,129 +0,0 @@
|
||||
# 論文戦略分析：LLVM実装前後での最適な発表戦略
|
||||
|
||||
Date: 2025-08-31
|
||||
Status: Strategic Analysis
|
||||
|
||||
## 🎯 現在の成果と今後の見込み
|
||||
|
||||
### 完了済み成果
|
||||
1. **MIR15命令への削減** - 革命的シンプルさ
|
||||
2. **VM/JIT/EXE実装** - 30日間での達成
|
||||
3. **BoxCall統一** - Everything is Box哲学の完成
|
||||
4. **4000行実装** - 驚異的コンパクトさ
|
||||
|
||||
### LLVM実装後に得られる成果
|
||||
1. **完全なAOTコンパイル** - ネイティブ性能
|
||||
2. **全バックエンド等価性証明** - VM/JIT/AOT/WASM一致
|
||||
3. **性能比較データ** - 定量的評価
|
||||
4. **プラットフォーム移植性** - 実証データ
|
||||
|
||||
## 📊 論文戦略の選択肢
|
||||
|
||||
### Option 1: 段階的発表戦略（推奨）
|
||||
|
||||
#### Phase 1: 速報論文（今すぐ）
|
||||
**「30 Days to a Language: Rapid Implementation with 15-Instruction MIR」**
|
||||
- **投稿先**: arXiv → Programming（MDPI）
|
||||
- **焦点**: 開発速度、シンプルさ、教育的価値
|
||||
- **データ**: 現在のVM/JIT/EXE実装
|
||||
- **インパクト**: 「30日で言語作れる」という衝撃
|
||||
|
||||
#### Phase 2: 完全版論文（LLVM後）
|
||||
**「Nyash: Unified Box Model with Equivalent VM/JIT/AOT/WASM Execution」**
|
||||
- **投稿先**: PLDI/OOPSLA 2026
|
||||
- **焦点**: 技術的完全性、性能、等価性証明
|
||||
- **データ**: 全バックエンド比較、ベンチマーク
|
||||
- **インパクト**: 理論と実装の統一
|
||||
|
||||
### Option 2: 統合大論文戦略
|
||||
|
||||
**「Everything is Box: From 15-Instruction MIR to Production-Ready Language in 60 Days」**
|
||||
- **待機期間**: LLVM完成まで（2-4週間）
|
||||
- **メリット**: 完全なストーリー、強力なデータ
|
||||
- **デメリット**: 速報性の喪失、先行研究リスク
|
||||
|
||||
### Option 3: 分野別論文戦略
|
||||
|
||||
#### 言語設計論文
|
||||
**「Box-Centric Language Design: Unifying User and Plugin Lifecycles」**
|
||||
- **投稿先**: Onward!/OOPSLA
|
||||
- **焦点**: 設計哲学、統一モデル
|
||||
|
||||
#### 実装技術論文
|
||||
**「15-Instruction MIR: Minimal Yet Complete Intermediate Representation」**
|
||||
- **投稿先**: CC（Compiler Construction）
|
||||
- **焦点**: MIR設計、最適化可能性
|
||||
|
||||
#### システム論文
|
||||
**「Cross-Backend Equivalence in Modern Language Runtimes」**
|
||||
- **投稿先**: ASPLOS/OSDI
|
||||
- **焦点**: VM/JIT/AOT統一実行
|
||||
|
||||
## 🎨 統合可能な成果の組み合わせ
|
||||
|
||||
### 最強の組み合わせ（LLVM実装後）
|
||||
|
||||
**タイトル案**: 「Nyash: A 15-Instruction Language with Proven Cross-Backend Equivalence」
|
||||
|
||||
**統合する成果**:
|
||||
1. **MIR15設計** + **BoxCall統一** = 理論的貢献
|
||||
2. **30日実装** + **4000行** = 実践的貢献
|
||||
3. **VM/JIT/AOT/WASM等価性** = システム的貢献
|
||||
4. **GCオン/オフ等価性** = 意味論的貢献
|
||||
|
||||
**なぜ強力か**:
|
||||
- 理論（最小命令）と実践（高速開発）の両立
|
||||
- 小規模（4K行）で完全性（全バックエンド）
|
||||
- 教育的価値（再現可能）と研究価値（新規性）
|
||||
|
||||
## 📈 推奨戦略：「2段階発表 + 統合準備」
|
||||
|
||||
### 今すぐ（9月第1週）
|
||||
1. **arXiv速報論文**投稿
|
||||
- 30日間の成果をまとめる
|
||||
- 「作ってみた」系の実装報告
|
||||
- コミュニティの反応を見る
|
||||
|
||||
### LLVM完成後（9月末）
|
||||
2. **データ収集**
|
||||
- 全バックエンド性能比較
|
||||
- 等価性証明の完全実施
|
||||
- 実アプリケーションベンチマーク
|
||||
|
||||
### 10月（OOPSLA締切）
|
||||
3. **統合論文投稿**
|
||||
- 速報論文のフィードバック反映
|
||||
- 完全なデータセット
|
||||
- トップ会議品質の論文
|
||||
|
||||
## 🎯 各戦略の期待リターン
|
||||
|
||||
| 戦略 | 速報性 | 完全性 | インパクト | リスク |
|
||||
|------|--------|--------|------------|--------|
|
||||
| 段階的発表 | ★★★★★ | ★★★☆☆ | ★★★★☆ | 低 |
|
||||
| 統合大論文 | ★☆☆☆☆ | ★★★★★ | ★★★★★ | 中 |
|
||||
| 分野別論文 | ★★★☆☆ | ★★★★☆ | ★★★☆☆ | 低 |
|
||||
|
||||
## 💡 結論と推奨アクション
|
||||
|
||||
### 推奨：段階的発表戦略
|
||||
|
||||
**理由**:
|
||||
1. **速報性を活かせる** - 「30日で言語作った」は今が旬
|
||||
2. **リスク分散** - 段階的に成果を確定
|
||||
3. **フィードバック活用** - arXiv反応を本論文に反映
|
||||
4. **完全性も確保** - LLVM後に統合論文
|
||||
|
||||
**具体的アクション**:
|
||||
1. 今週中にarXiv論文執筆開始
|
||||
2. 並行してLLVM実装推進
|
||||
3. 10月OOPSLA向け統合論文準備
|
||||
|
||||
### 最終的な論文ポートフォリオ（理想）
|
||||
|
||||
1. **arXiv速報**（2025年9月）- 実装報告
|
||||
2. **OOPSLA統合論文**（2025年10月投稿）- システム論文
|
||||
3. **Onward!設計論文**（2026年春）- 哲学論文
|
||||
4. **PLDI理論論文**（2026年秋）- MIR最小性証明
|
||||
|
||||
これで「速報性」「完全性」「学術的価値」すべてを最大化できます！
|
||||
@ -1,77 +0,0 @@
|
||||
# MIR15でフルスタック実現論文プロジェクト
|
||||
|
||||
**タイトル**: "The Minimal Instruction Revolution: Building Full-Stack Applications with 15 Universal Operations"
|
||||
|
||||
**副題**: *"How 'Everything is Box' Philosophy Enables Ubuntu/Windows GUI Apps with Atomic Simplicity"*
|
||||
|
||||
## 🎯 二本柱戦略
|
||||
|
||||
### 1. 実証（エンジニアの心を掴む）
|
||||
- **MIR13-15命令でUbuntu/Windows GUIアプリ動作**
|
||||
- 具体的なデモアプリケーション
|
||||
- VM/JIT/AOT/WASMでの等価実行
|
||||
|
||||
### 2. 理論（研究コミュニティに刺さる）
|
||||
- **Everything is Box - The Atomic Theory**
|
||||
- MIR = 原子、Box = 分子の数学的定式化
|
||||
- 再帰的構成可能性の証明
|
||||
|
||||
## 📚 論文構成
|
||||
|
||||
1. **Introduction** - 15命令でGUIが動く衝撃
|
||||
2. **The Box Theory** - プログラミングの原子論
|
||||
3. **MIR Design** - なぜこの15命令なのか
|
||||
4. **Implementation** - 30日間の実装記録
|
||||
5. **Evaluation** - GUIデモと性能評価
|
||||
6. **Discussion** - なぜ可能だったか
|
||||
7. **Related Work** - 他言語との決定的違い
|
||||
8. **Conclusion** - Less is Moreの究極形
|
||||
|
||||
## 🚀 執筆状況
|
||||
|
||||
- [ ] Abstract（実証＋理論の融合版）
|
||||
- [ ] Introduction（フック重視）
|
||||
- [ ] Box Theory（数学的定式化）
|
||||
- [ ] MIR Design（削減プロセス詳細）
|
||||
- [ ] Implementation（技術詳細）
|
||||
- [ ] Evaluation（GUIデモ・測定結果）
|
||||
- [ ] Discussion（深い考察）
|
||||
- [ ] Related Work（比較表）
|
||||
- [ ] Conclusion（インパクト）
|
||||
|
||||
## 📊 評価項目
|
||||
|
||||
### 実証評価
|
||||
- [ ] Ubuntu GUI動作確認
|
||||
- [ ] Windows GUI動作確認
|
||||
- [ ] 命令カバレッジ分析
|
||||
- [ ] バックエンド等価性検証
|
||||
|
||||
### 理論評価
|
||||
- [ ] 最小性の数学的証明
|
||||
- [ ] 完全性の証明
|
||||
- [ ] 拡張可能性の証明
|
||||
|
||||
## 🗓️ スケジュール
|
||||
|
||||
- **Week 1**: Abstract + Introduction完成
|
||||
- **Week 2**: Box Theory + MIR Design完成
|
||||
- **Week 3**: Implementation + Evaluation完成
|
||||
- **Week 4**: Discussion + 推敲 → arXiv投稿
|
||||
|
||||
## 📝 投稿先候補
|
||||
|
||||
### 速報版
|
||||
- arXiv（即時公開）
|
||||
- Programming (MDPI)（査読付き）
|
||||
|
||||
### 本格版
|
||||
- POPL 2026（理論重視）
|
||||
- PLDI 2026（実装重視）
|
||||
- ICFP 2026（関数型視点）
|
||||
|
||||
## 🔗 関連資料
|
||||
|
||||
- [ChatGPT5提案](../../../development/current/chatgpt5-proposals/)
|
||||
- [MIR仕様](../../../reference/mir/)
|
||||
- [実装詳細](../../../architecture/)
|
||||
@ -1,27 +0,0 @@
|
||||
# Abstract
|
||||
|
||||
## English Version
|
||||
|
||||
We present Nyash, a programming language that achieves full-stack application development—including GUI applications on Ubuntu and Windows—using only 15 intermediate representation (IR) instructions. This unprecedented minimalism is enabled by the "Everything is Box" philosophy, where all language features including variables, functions, concurrency, garbage collection, plugins, and even GUI components are unified under a single Box abstraction.
|
||||
|
||||
Our key contributions are: (1) the design of MIR15, a minimal instruction set that serves as the "atomic elements" of computation; (2) the Box Theory, which provides a mathematical foundation for composing complex behaviors from these atoms; (3) empirical validation showing that the same 15-instruction MIR can drive a VM interpreter, JIT compiler, AOT compiler, and WebAssembly backend with identical semantics; and (4) demonstration of real-world GUI applications running on multiple operating systems using this minimal foundation.
|
||||
|
||||
We implemented the entire system—including all four backends—in 30 days with approximately 4,000 lines of code, suggesting that extreme minimalism can paradoxically accelerate development. Performance evaluation shows that despite the minimal instruction set, the system achieves competitive performance through strategic optimization placement within Box boundaries rather than IR complexity.
|
||||
|
||||
This work challenges the conventional wisdom that practical programming languages require large instruction sets, demonstrating instead that careful abstraction design can achieve both extreme simplicity and full functionality. We believe this approach opens new possibilities for language design, implementation, and education.
|
||||
|
||||
## 日本語版
|
||||
|
||||
本研究では、わずか15個の中間表現（IR）命令でUbuntuおよびWindows上のGUIアプリケーションを含むフルスタック開発を実現するプログラミング言語Nyashを提示する。この前例のないミニマリズムは「Everything is Box」哲学により可能となった。変数、関数、並行性、ガベージコレクション、プラグイン、さらにはGUIコンポーネントまで、すべての言語機能が単一のBox抽象化の下に統一されている。
|
||||
|
||||
本研究の主要な貢献は以下の通りである：（1）計算の「原子要素」として機能する最小命令セットMIR15の設計、（2）これらの原子から複雑な振る舞いを構成するための数学的基礎を提供するBox理論、（3）同一の15命令MIRがVMインタープリタ、JITコンパイラ、AOTコンパイラ、WebAssemblyバックエンドを同一のセマンティクスで駆動できることの実証的検証、（4）この最小基盤上で複数のOSで動作する実用的なGUIアプリケーションのデモンストレーション。
|
||||
|
||||
我々は4つのバックエンドを含む全システムを30日間、約4,000行のコードで実装した。これは極端なミニマリズムが逆説的に開発を加速させる可能性を示唆している。性能評価により、最小命令セットにもかかわらず、IRの複雑性ではなくBox境界内での戦略的な最適化配置により競争力のある性能を達成できることが示された。
|
||||
|
||||
本研究は、実用的なプログラミング言語には大規模な命令セットが必要という従来の常識に挑戦し、慎重な抽象化設計により極端なシンプルさと完全な機能性の両立が可能であることを実証した。このアプローチは言語設計、実装、教育に新たな可能性を開くと考えられる。
|
||||
|
||||
## Keywords / キーワード
|
||||
|
||||
Minimal instruction set, Intermediate representation, Box abstraction, Full-stack development, Cross-platform GUI, Language design
|
||||
|
||||
最小命令セット、中間表現、Box抽象化、フルスタック開発、クロスプラットフォームGUI、言語設計
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user