tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pyvm: split op handlers into ops_core/ops_box/ops_ctrl; add ops_flow + intrinsic; delegate vm.py without behavior change

Browse Source 
net-plugin: modularize constants (consts.rs) and sockets (sockets.rs); remove legacy commented socket code; fix unused imports
mir: move instruction unit tests to tests/mir_instruction_unit.rs (file lean-up); no semantic changes
runner/pyvm: ensure using pre-strip; misc docs updates

Build: cargo build ok; legacy cfg warnings remain as before
This commit is contained in:
Selfhosting Dev
2025-09-21 08:53:00 +09:00
parent ee17cfd979
commit c8063c9e41
247 changed files with 10187 additions and 23124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/selfhost-vm/boxes/json_adapter.nyash Normal file
View File

@ -0,0 +1,19 @@
// Adapter for JSON cursor operations (extracted)
// Wraps MiniJsonCur and exposes a stable facade
using selfhost.vm.json_cur as MiniJsonCur
static box MiniJson {
read_quoted_from(s, pos) {
local cur = new MiniJsonCur()
return cur.read_quoted_from(s, pos)
}
read_digits_from(s, pos) {
local cur = new MiniJsonCur()
return cur.read_digits_from(s, pos)
}
next_non_ws(s, pos) {
local cur = new MiniJsonCur()
return cur.next_non_ws(s, pos)
}
}

61
apps/selfhost-vm/boxes/json_cur.nyash Normal file
View 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
}
}

201
apps/selfhost-vm/boxes/mini_vm_binop.nyash Normal file
View File

@ -0,0 +1,201 @@
using selfhost.vm.json as MiniJson
using selfhost.vm.scan as MiniVmScan
static box MiniVmBinOp {
// Minimal: Print(BinaryOp) with operator "+"; supports string+string and int+int
try_print_binop_at(json, end, print_pos) {
local scan = new MiniVmScan()
local k_bo = "\"kind\":\"BinaryOp\""
local bpos = scan.index_of_from(json, k_bo, print_pos)
if bpos <= 0 || bpos >= end { return -1 }
// bound BinaryOp object (prefer expression object)
local k_expr = "\"expression\":{"
local expr_pos = scan.index_of_from(json, k_expr, print_pos)
local obj_start = -1
if expr_pos > 0 && expr_pos < end {
obj_start = scan.index_of_from(json, "{", expr_pos)
} else {
obj_start = scan.index_of_from(json, "{", bpos)
}
local obj_end = scan.find_balanced_object_end(json, obj_start)
if obj_start <= 0 || obj_end <= 0 || obj_end > end { return -1 }
// operator must be '+'
local k_op = "\"operator\":\"+\""
local opos = scan.index_of_from(json, k_op, bpos)
if opos <= 0 || opos >= obj_end { return -1 }
// string + string fast-path
local cur = new MiniJson()
local k_left_lit = "\"left\":{\"kind\":\"Literal\""
local lhdr = scan.index_of_from(json, k_left_lit, opos)
if lhdr > 0 && lhdr < obj_end {
local k_sval = "\"value\":\""
local lvp = scan.index_of_from(json, k_sval, lhdr)
if lvp > 0 && lvp < obj_end {
local li = lvp + k_sval.length()
local lval = cur.read_quoted_from(json, li)
if lval {
local k_right_lit = "\"right\":{\"kind\":\"Literal\""
local rhdr = scan.index_of_from(json, k_right_lit, li + lval.length())
if rhdr > 0 && rhdr < obj_end {
local rvp = scan.index_of_from(json, k_sval, rhdr)
if rvp > 0 && rvp < obj_end {
local ri = rvp + k_sval.length()
local rval = cur.read_quoted_from(json, ri)
if rval { print(lval + rval) return ri + rval.length() + 1 }
}
}
}
}
}
// int + int typed pattern
local k_l = "\"left\":{\"kind\":\"Literal\""
local lpos = scan.index_of_from(json, k_l, opos)
if lpos <= 0 || lpos >= obj_end { return -1 }
local k_lint = "\"left\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
local li2 = scan.index_of_from(json, k_lint, opos)
if li2 <= 0 || li2 >= obj_end { return -1 }
local ldigits = scan.read_digits(json, li2 + k_lint.length())
if ldigits == "" { return -1 }
local k_r = "\"right\":{\"kind\":\"Literal\""
local rpos = scan.index_of_from(json, k_r, lpos)
if rpos <= 0 || rpos >= obj_end { return -1 }
local k_rint = "\"right\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":"
local ri2 = scan.index_of_from(json, k_rint, lpos)
if ri2 <= 0 || ri2 >= obj_end { return -1 }
local rdigits = scan.read_digits(json, ri2 + k_rint.length())
if rdigits == "" { return -1 }
local ai = scan._str_to_int(ldigits)
local bi = scan._str_to_int(rdigits)
print(scan._int_to_str(ai + bi))
return obj_end + 1
}
// Greedy disabled (kept for parity)
try_print_binop_int_greedy(json, end, print_pos) { return -1 }
// Fallback: within the current Print's expression BinaryOp object, scan for two numeric values and sum
try_print_binop_sum_any(json, end, print_pos) {
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 }
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 }
local k_bo = "\"kind\":\"BinaryOp\""
local bpos = scan.index_of_from(json, k_bo, obj_start)
if bpos <= 0 || bpos >= obj_end { return -1 }
local k_plus = "\"operator\":\"+\""
local opos = scan.index_of_from(json, k_plus, bpos)
if opos <= 0 || opos >= obj_end { return -1 }
local nums = []
local i = obj_start
loop (i < obj_end) {
if json.substring(i, i+1) == "\"" {
local j = scan.index_of_from(json, "\"", i+1)
if j < 0 || j >= obj_end { break }
i = j + 1
continue
}
local d = scan.read_digits(json, i)
if d { nums.push(d) i = i + d.length() continue }
i = i + 1
}
local nsz = nums.size()
if nsz < 2 { return -1 }
local a = scan._str_to_int(nums.get(nsz-2))
local b = scan._str_to_int(nums.get(nsz-1))
print(scan._int_to_str(a + b))
return obj_end + 1
}
// Deterministic: within Print.expression BinaryOp('+'), pick two successive 'value' fields and sum
try_print_binop_sum_expr_values(json, end, print_pos) {
local scan = new MiniVmScan()
local cur = new MiniJson()
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 }
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 }
local k_bo = "\"kind\":\"BinaryOp\""
local bpos = scan.index_of_from(json, k_bo, obj_start)
if bpos <= 0 || bpos >= obj_end { return -1 }
local k_plus = "\"operator\":\"+\""
local opos = scan.index_of_from(json, k_plus, bpos)
if opos <= 0 || opos >= obj_end { return -1 }
local k_v = "\"value\":"
local found = 0
local a = 0
local pos = scan.index_of_from(json, k_v, obj_start)
loop (pos > 0 && pos < obj_end) {
local di = cur.read_digits_from(json, pos + k_v.length())
if di != "" {
if found == 0 { a = scan._str_to_int(di) found = 1 } else {
local b = scan._str_to_int(di)
print(scan._int_to_str(a + b))
return obj_end + 1
}
}
pos = scan.index_of_from(json, k_v, pos + k_v.length())
if pos <= 0 || pos >= obj_end { break }
}
return -1
}
// Simpler: after operator '+', scan two successive 'value' fields and sum
try_print_binop_sum_after_bop(json) {
local scan = new MiniVmScan()
local k_bo = "\"kind\":\"BinaryOp\""
local bpos = json.indexOf(k_bo)
if bpos < 0 { return -1 }
local k_plus = "\"operator\":\"+\""
local opos = scan.index_of_from(json, k_plus, bpos)
if opos < 0 { return -1 }
local k_v = "\"value\":"
local p = opos
p = scan.index_of_from(json, k_v, p)
if p < 0 { return -1 }
p = scan.index_of_from(json, k_v, p + k_v.length())
if p < 0 { return -1 }
local end1 = scan.index_of_from(json, "}", p)
if end1 < 0 { return -1 }
local d1 = scan.read_digits(json, p + k_v.length())
if d1 == "" { return -1 }
p = scan.index_of_from(json, k_v, end1)
if p < 0 { return -1 }
p = scan.index_of_from(json, k_v, p + k_v.length())
if p < 0 { return -1 }
local end2 = scan.index_of_from(json, "}", p)
if end2 < 0 { return -1 }
local d2 = scan.read_digits(json, p + k_v.length())
if d2 == "" { return -1 }
local ai = scan._str_to_int(d1)
local bi = scan._str_to_int(d2)
print(scan._int_to_str(ai + bi))
return 0
}
// Fallback: find first BinaryOp and return sum of two numeric values as string
parse_first_binop_sum(json) {
local scan = new MiniVmScan()
local k_bo = "\"kind\":\"BinaryOp\""
local bpos = json.indexOf(k_bo)
if bpos < 0 { return "" }
local k_typed = "\"type\":\"int\",\"value\":"
local p1 = scan.index_of_from(json, k_typed, bpos)
if p1 < 0 { return "" }
local d1 = scan.read_digits(json, p1 + k_typed.length())
if d1 == "" { return "" }
local p2 = scan.index_of_from(json, k_typed, p1 + k_typed.length())
if p2 < 0 { return "" }
local d2 = scan.read_digits(json, p2 + k_typed.length())
if d2 == "" { return "" }
return scan._int_to_str(scan._str_to_int(d1) + scan._str_to_int(d2))
}
}

47
apps/selfhost-vm/boxes/mini_vm_compare.nyash Normal file
View File

@ -0,0 +1,47 @@
using selfhost.vm.scan as MiniVmScan
static box MiniVmCompare {
// Compare(lhs int, rhs int) minimal: prints 0/1 and returns next pos or -1
try_print_compare_at(json, end, print_pos) {
local scan = new MiniVmScan()
local k_cp = "\"kind\":\"Compare\""
local cpos = scan.index_of_from(json, k_cp, print_pos)
if cpos <= 0 || cpos >= end { return -1 }
local k_op = "\"operation\":\""
local opos = scan.index_of_from(json, k_op, cpos)
if opos <= 0 || opos >= end { return -1 }
local oi = opos + k_op.length()
local oj = scan.index_of_from(json, "\"", oi)
if oj <= 0 || oj > end { return -1 }
local op = json.substring(oi, oj)
// lhs value
local k_lhs = "\"lhs\":{\"kind\":\"Literal\""
local hl = scan.index_of_from(json, k_lhs, oj)
if hl <= 0 || hl >= end { return -1 }
local k_v = "\"value\":"
local hv = scan.index_of_from(json, k_v, hl)
if hv <= 0 || hv >= end { return -1 }
local a = scan.read_digits(json, hv + k_v.length())
// rhs value
local k_rhs = "\"rhs\":{\"kind\":\"Literal\""
local hr = scan.index_of_from(json, k_rhs, hl)
if hr <= 0 || hr >= end { return -1 }
local rv = scan.index_of_from(json, k_v, hr)
if rv <= 0 || rv >= end { return -1 }
local b = scan.read_digits(json, rv + k_v.length())
if !a || !b { return -1 }
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)
// advance after rhs object (coarsely)
return rv + 1
}
}

539
apps/selfhost-vm/boxes/mini_vm_core.nyash Normal file
View File

@ -0,0 +1,539 @@
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 MiniVmScan().read_digits(json, pos) }
// Read a JSON string starting at position pos (at opening quote); returns the decoded string
read_json_string(json, pos) {
// Expect opening quote
local i = pos
local out = ""
local n = json.length()
if json.substring(i, i+1) == "\"" { i = i + 1 } else { return "" }
loop (i < n) {
local ch = json.substring(i, i+1)
if ch == "\"" { i = i + 1 break }
if ch == "\\" {
// handle simple escapes for \ and "
local nx = json.substring(i+1, i+2)
if nx == "\"" { out = out + "\"" i = i + 2 continue }
if nx == "\\" { out = out + "\\" i = i + 2 continue }
// Unknown escape: skip backslash and take next as-is
i = i + 1
continue
}
out = out + ch
i = i + 1
}
return out
}
// 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) {
local i = pos
local n = json.length()
loop (i < n) {
local ch = json.substring(i, i+1)
if ch != " " && ch != "\n" && ch != "\r" && ch != "\t" { return i }
i = i + 1
}
return -1
}
// ——— 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 directly
local digits = read_digits(json, vpos)
return digits
}
if ty == "string" {
// Find opening and closing quotes (no escape handling in MVP)
local i = index_of_from(json, "\"", vpos)
if i < 0 { return null }
local j = index_of_from(json, "\"", i+1)
if j < 0 { return null }
return json.substring(i+1, j)
}
// 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) {
// 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
}
}
// Program entry: prefer argv[0] JSON, fallback to embedded sample

188
apps/selfhost-vm/boxes/mini_vm_prints.nyash Normal file
View File

@ -0,0 +1,188 @@
using selfhost.vm.scan as MiniVmScan
using selfhost.vm.binop as MiniVmBinOp
using selfhost.vm.compare as MiniVmCompare
static box MiniVmPrints {
// 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 }
local k_kind = "\"kind\":\"Literal\""
local kpos = scan.index_of_from(json, k_kind, obj_start)
if kpos <= 0 || kpos >= obj_end { return -1 }
local k_type = "\"type\":\""
local tpos = scan.index_of_from(json, k_type, kpos)
if tpos <= 0 || tpos >= obj_end { return -1 }
tpos = tpos + k_type.length()
local t_end = scan.index_of_from(json, "\"", tpos)
if t_end <= 0 || t_end > obj_end { return -1 }
local ty = json.substring(tpos, t_end)
if (ty != "int" && ty != "i64" && ty != "integer") { return -1 }
local k_val2 = "\"value\":"
local v2 = scan.index_of_from(json, k_val2, t_end)
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 MiniJson().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) {
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
local p_obj_start = scan.index_of_from(json, "{", p)
local p_obj_end = scan.find_balanced_object_end(json, p_obj_start)
if p_obj_start <= 0 || p_obj_end <= 0 { p_obj_end = p + k_print.length() }
// 1) BinaryOp
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 }
// 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 minimal
nextp = self.try_print_functioncall_at(json, end, p)
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
// 4) literal string
nextp = self.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 = self.try_print_int_value_at(json, end, p)
if nextp > 0 { printed = printed + 1 pos = p_obj_end + 1 continue }
// Unknown shape: skip forward
pos = p + k_print.length()
if pos <= p { pos = p + 1 }
}
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 self.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 self.print_prints_in_slice(json, 0, json.length())
}
}

173
apps/selfhost-vm/boxes/mini_vm_scan.nyash Normal file
View File

@ -0,0 +1,173 @@
// Mini-VM scanning and numeric helpers
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 }
}
// helper: find balanced bracket range [ ... ] starting at idx (points to '[')
find_balanced_array_end(json, idx) {
local n = json.length()
if json.substring(idx, idx+1) != "[" { return -1 }
local depth = 0
local i = idx
loop (i < n) {
local ch = json.substring(i, i+1)
if ch == "[" { depth = depth + 1 }
if ch == "]" {
depth = depth - 1
if depth == 0 { return i }
}
i = i + 1
}
return -1
}
// helper: find balanced object range { ... } starting at idx (points to '{')
find_balanced_object_end(json, idx) {
local n = json.length()
if json.substring(idx, idx+1) != "{" { return -1 }
local depth = 0
local i = idx
loop (i < n) {
local ch = json.substring(i, i+1)
if ch == "{" { depth = depth + 1 }
if ch == "}" {
depth = depth - 1
if depth == 0 { return i }
}
i = i + 1
}
return -1
}
_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
}
_digit_char(d) {
if d == 0 { return "0" }
if d == 1 { return "1" }
if d == 2 { return "2" }
if d == 3 { return "3" }
if d == 4 { return "4" }
if d == 5 { return "5" }
if d == 6 { return "6" }
if d == 7 { return "7" }
if d == 8 { return "8" }
if d == 9 { return "9" }
return "0"
}
_int_to_str(n) {
if n == 0 { return "0" }
local v = n
local out = ""
loop (v > 0) {
local d = v % 10
local ch = _digit_char(d)
out = ch + out
v = v / 10
}
return out
}
// Read digit runs starting at pos
read_digits(json, pos) {
local out = ""
loop (true) {
local 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 }
if s == "2" { out = out + s pos = pos + 1 continue }
if s == "3" { out = out + s pos = pos + 1 continue }
if s == "4" { out = out + s pos = pos + 1 continue }
if s == "5" { out = out + s pos = pos + 1 continue }
if s == "6" { out = out + s pos = pos + 1 continue }
if s == "7" { out = out + s pos = pos + 1 continue }
if s == "8" { out = out + s pos = pos + 1 continue }
if s == "9" { out = out + s pos = pos + 1 continue }
break
}
return out
}
// Linear pass: sum all numbers outside of quotes
sum_numbers_no_quotes(json) {
local i = 0
local n = json.length()
local total = 0
loop (i < n) {
local ch = json.substring(i, i+1)
if ch == "\"" {
local j = index_of_from(json, "\"", i+1)
if j < 0 { break }
i = j + 1
continue
}
local d = read_digits(json, i)
if d { total = total + _str_to_int(d) i = i + d.length() continue }
i = i + 1
}
return _int_to_str(total)
}
// Naive: sum all digit runs anywhere
sum_all_digits_naive(json) {
local i = 0
local n = json.length()
local total = 0
loop (i < n) {
local d = read_digits(json, i)
if d { total = total + _str_to_int(d) i = i + d.length() continue }
i = i + 1
}
return _int_to_str(total)
}
// 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
local found = 0
loop (i < n) {
local ch = json.substring(i, i+1)
if ch == "\"" {
local j = index_of_from(json, "\"", i+1)
if j < 0 { break }
i = j + 1
continue
}
local d = read_digits(json, i)
if d {
total = total + _str_to_int(d)
found = found + 1
i = i + d.length()
if found >= 2 { return _int_to_str(total) }
continue
}
i = i + 1
}
return ""
}
}

51
apps/selfhost-vm/json_loader.nyash Normal file
View 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
}
}

1205
apps/selfhost-vm/mini_vm.nyash
View File

File diff suppressed because it is too large Load Diff

59
apps/selfhost-vm/mini_vm_if_branch.nyash Normal file
View 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) {
local out = ""
loop (true) {
local 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)
if idx < 0 { return "0" }
local start = idx + key.length()
return read_digits(json, start)
}
run_branch(json) {
local 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) {
local vm = new MiniVm()
local 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)
if s { json = s }
}
}
return vm.run_branch(json)
}
}
// 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}}}]}"
if args {
if args.size() > 0 {
local s = args.get(0)
if s { json = s }
}
}
local 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
View 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) {
local out = ""
loop (true) {
local 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) {
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)
}
// Execute a minimal program: print the extracted integer and exit code 0
run(json) {
local n = parse_first_int(json)
print(n)
return 0
}
}