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

fix(mir): PHI検証panic修正 - update_cfg()を検証前に呼び出し

Browse Source 
A案実装: debug_verify_phi_inputs呼び出し前にCFG predecessorを更新

修正箇所（7箇所）:
- src/mir/builder/phi.rs:50, 73, 132, 143
- src/mir/builder/ops.rs:273, 328, 351

根本原因:
- Branch/Jump命令でsuccessorは即座に更新
- predecessorはupdate_cfg()で遅延再構築
- PHI検証が先に実行されてpredecessor未更新でpanic

解決策:
- 各debug_verify_phi_inputs呼び出し前に
  if let Some(func) = self.current_function.as_mut() {
      func.update_cfg();
  }
  を挿入してCFGを同期

影響: if/else文、論理演算子(&&/||)のPHI生成が正常動作
This commit is contained in:
nyash-codex
2025-11-01 13:28:56 +09:00
parent 149ec61d4d
commit 6a452b2dca
174 changed files with 2432 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lang/src/vm/hakorune-vm/archive/const_handler.legacy.hako
View File

@ -14,7 +14,7 @@ static box ConstHandlerBoxLegacy {
local key_i64 = "\"value\":{\"type\":\"i64\",\"value\":"
local val_i64_start = inst_json.indexOf(key_i64)
if val_i64_start >= 0 {
val_i64_start = val_i64_start + key_i64.size()
val_i64_start = val_i64_start + key_i64.length()
local digits = StringHelpers.read_digits(inst_json, val_i64_start)
if digits == "" { return Result.Err("const: invalid i64 value") }
local value = StringHelpers.to_i64(digits)
@ -24,7 +24,7 @@ static box ConstHandlerBoxLegacy {
local key_int = "\"value\":{\"Integer\":"
local val_int_start = inst_json.indexOf(key_int)
if val_int_start >= 0 {
val_int_start = val_int_start + key_int.size()
val_int_start = val_int_start + key_int.length()
local digits = StringHelpers.read_digits(inst_json, val_int_start)
if digits == "" { return Result.Err("const: invalid Integer value") }
local value = StringHelpers.to_i64(digits)
@ -34,7 +34,7 @@ static box ConstHandlerBoxLegacy {
local key_str = "\"value\":{\"String\":\""
local val_str_start = inst_json.indexOf(key_str)
if val_str_start >= 0 {
val_str_start = val_str_start + key_str.size()
val_str_start = val_str_start + key_str.length()
local val_str_end = StringOps.index_of_from(inst_json, "\"}", val_str_start)
if val_str_end < 0 { return Result.Err("const: invalid String value") }
local str_value = inst_json.substring(val_str_start, val_str_end)
@ -45,7 +45,7 @@ static box ConstHandlerBoxLegacy {
local key_s2 = "\"value\":{\"type\":\"string\",\"value\":\""
local p2 = inst_json.indexOf(key_s2)
if p2 >= 0 {
p2 = p2 + key_s2.size()
p2 = p2 + key_s2.length()
local end2 = StringOps.index_of_from(inst_json, "\"}", p2)
if end2 < 0 { return Result.Err("const: invalid string (type string)") }
local s2 = inst_json.substring(p2, end2)

26
lang/src/vm/hakorune-vm/args_extractor.hako
View File

@ -21,7 +21,7 @@ static box ArgsExtractorBox {
// No args field, return empty array
return args_array
}
args_start = args_start + args_key.size()
args_start = args_start + args_key.length()
// Find array end
local args_end = StringOps.index_of_from(mir_call_json, "]", args_start)
@ -34,13 +34,13 @@ static box ArgsExtractorBox {
local args_content = mir_call_json.substring(args_start, args_end)
// If empty array, return immediately
if args_content.size() == 0 {
if args_content.length() == 0 {
return args_array
}
// Parse comma-separated ValueIds
local pos = 0
local content_len = args_content.size()
local content_len = args_content.length()
loop(pos < content_len) {
// Skip whitespace
@ -97,7 +97,7 @@ static box ArgsExtractorBox {
if args_start < 0 {
return 0
}
args_start = args_start + args_key.size()
args_start = args_start + args_key.length()
// Find array end
local args_end = StringOps.index_of_from(mir_call_json, "]", args_start)
@ -107,14 +107,14 @@ static box ArgsExtractorBox {
// Extract args array content
local args_content = mir_call_json.substring(args_start, args_end)
if args_content.size() == 0 {
if args_content.length() == 0 {
return 0
}
// Count commas + 1
local count = 1
local pos = 0
loop(pos < args_content.size()) {
loop(pos < args_content.length()) {
local ch = args_content.substring(pos, pos + 1)
if ch == "," {
count = count + 1
@ -131,23 +131,23 @@ static box ArgsExtractorBox {
local args_key = "\"args\":["
local args_start = mir_call_json.indexOf(args_key)
if args_start < 0 { return ids }
args_start = args_start + args_key.size()
args_start = args_start + args_key.length()
local args_end = StringOps.index_of_from(mir_call_json, "]", args_start)
if args_end < 0 { return ids }
local content = mir_call_json.substring(args_start, args_end)
if content.size() == 0 { return ids }
if content.length() == 0 { return ids }
local pos = 0
loop(pos < content.size()) {
loop(pos < content.size()) {
loop(pos < content.length()) {
loop(pos < content.length()) {
local ch = content.substring(pos, pos+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { pos = pos + 1 continue }
break
}
if pos >= content.size() { break }
if pos >= content.length() { break }
local comma = StringOps.index_of_from(content, ",", pos)
local end = comma < 0 ? content.size() : comma
local end = comma < 0 ? content.length() : comma
local token = content.substring(pos, end)
if token.size() > 0 {
if token.length() > 0 {
ids.push(StringHelpers.to_i64(token))
}
if comma < 0 { break }

2
lang/src/vm/hakorune-vm/args_guard.hako
View File

@ -8,7 +8,7 @@ static box ArgsGuardBox {
// Returns Ok(args_array) or Err with first offending index
ensure_no_nulls(args_array, method_sig) {
if args_array == null { return Result.Ok(new ArrayBox()) }
local n = args_array.size()
local n = args_array.length()
local i = 0
loop(i < n) {
if args_array.get(i) == null {

2
lang/src/vm/hakorune-vm/backward_object_scanner.hako
View File

@ -6,7 +6,7 @@ using "lang/src/vm/boxes/result_box.hako" as Result
static box BackwardObjectScannerBox {
// Returns Ok(obj_string) or Err(label)
scan_last_object(seg, budget) {
local n = seg.size()
local n = seg.length()
local steps = 0
// trim trailing spaces/commas
local e = n - 1

2
lang/src/vm/hakorune-vm/block_iterator.hako
View File

@ -8,7 +8,7 @@ using "lang/src/vm/hakorune-vm/json_scan_guard.hako" as JsonScanGuardBox
static box BlockIteratorBox {
// Returns Ok({ obj: <string>, next_pos: <int> }) or Err when malformed
next(blocks_content, pos) {
local n = blocks_content.size()
local n = blocks_content.length()
local i = pos
loop(i < n) {
local ch = blocks_content.substring(i, i+1)

18
lang/src/vm/hakorune-vm/block_mapper.hako
View File

@ -29,7 +29,7 @@ static box BlockMapperBox {
// blocks_content から連続するオブジェクト { ... } を走査
local pos = 0
local n = blocks_content.size()
local n = blocks_content.length()
loop(pos < n) {
// 空白/カンマをスキップ
local ch = blocks_content.substring(pos, pos+1)
@ -44,9 +44,9 @@ static box BlockMapperBox {
local key_id = "\"id\":"
local id_start = block_json.indexOf(key_id)
if id_start < 0 { return Result.Err("block id not found") }
id_start = id_start + key_id.size()
id_start = id_start + key_id.length()
// 空白スキップ
loop(id_start < block_json.size()) {
loop(id_start < block_json.length()) {
local c2 = block_json.substring(id_start, id_start+1)
if c2 == " " || c2 == "\n" || c2 == "\r" || c2 == "\t" { id_start = id_start + 1 continue }
break
@ -76,14 +76,14 @@ static box BlockMapperBox {
// blocks 配列位置へ
local key_pos = JsonCursorBox.find_key_dual(func_json, "\"blocks\"", "\\\"blocks\\\"", 0)
if key_pos < 0 { return Result.Err("blocks key not found") }
local i = key_pos + "\"blocks\"".size()
loop(i < func_json.size()) {
local i = key_pos + "\"blocks\"".length()
loop(i < func_json.length()) {
local ch = func_json.substring(i, i+1)
if ch == ":" { i = i + 1 break }
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { i = i + 1 continue }
return Result.Err("invalid blocks key format")
}
loop(i < func_json.size()) {
loop(i < func_json.length()) {
local ch = func_json.substring(i, i+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { i = i + 1 continue }
if ch == "[" { break }
@ -96,7 +96,7 @@ static box BlockMapperBox {
// 各ブロックを解析
local pos = 0
local len = blocks_json.size()
local len = blocks_json.length()
loop(pos < len) {
// 空白とカンマをスキップ
@ -121,10 +121,10 @@ static box BlockMapperBox {
if id_start < 0 {
return Result.Err("block id not found")
}
id_start = id_start + key_id.size()
id_start = id_start + key_id.length()
// 数字直前の空白スキップ
loop(id_start < block_json.size()) {
loop(id_start < block_json.length()) {
local ch2 = block_json.substring(id_start, id_start+1)
if ch2 == " " || ch2 == "\n" || ch2 == "\r" || ch2 == "\t" { id_start = id_start + 1 continue }
break

6
lang/src/vm/hakorune-vm/blocks_locator.hako
View File

@ -11,14 +11,14 @@ static box BlocksLocatorBox {
local kpos = JsonCursorBox.index_of_from(func_json, r#""blocks""#, 0)
if kpos < 0 { return Result.Err("blocks key not found") }
// find ':' then '['
local i = kpos + r#""blocks""#.size()
loop(i < func_json.size()) {
local i = kpos + r#""blocks""#.length()
loop(i < func_json.length()) {
local ch = func_json.substring(i, i+1)
if ch == ":" { i = i + 1 break }
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { i = i + 1 continue }
return Result.Err("blocks key format invalid")
}
loop(i < func_json.size()) {
loop(i < func_json.length()) {
local ch = func_json.substring(i, i+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { i = i + 1 continue }
if ch == "[" { break }

16
lang/src/vm/hakorune-vm/boxcall_handler.hako
View File

@ -50,7 +50,7 @@ static box BoxCallHandlerBox {
// Guard arguments (no nulls)
local _g = ArgsGuardBox.ensure_no_nulls(args_array, method_name + "/" + args_array.size())
local _g = ArgsGuardBox.ensure_no_nulls(args_array, method_name + "/" + args_array.length())
if _g.is_Err() { return _g }
// Extract destination register
@ -63,7 +63,7 @@ static box BoxCallHandlerBox {
}
// Prepare method signature for dispatch
local arg_count = args_array.size()
local arg_count = args_array.length()
local method_sig = method_name + "/" + arg_count
// Known methods dispatch table
@ -75,9 +75,9 @@ static box BoxCallHandlerBox {
} else if method_sig == "lower/0" {
result_val = receiver.to_lower()
} else if method_sig == "size/0" {
result_val = receiver.size()
result_val = receiver.length()
} else if method_sig == "length/0" {
result_val = receiver.size()
result_val = receiver.length()
} else if method_sig == "isEmpty/0" {
result_val = receiver.isEmpty()
} else if method_sig == "substring/2" {
@ -96,9 +96,9 @@ static box BoxCallHandlerBox {
} else if method_sig == "set/2" {
result_val = receiver.set(args_array.get(0), args_array.get(1))
} else if method_sig == "length/0" {
result_val = receiver.size()
result_val = receiver.length()
} else if method_sig == "size/0" {
result_val = receiver.size()
result_val = receiver.length()
} else if method_sig == "isEmpty/0" {
result_val = receiver.isEmpty()
}
@ -111,7 +111,7 @@ static box BoxCallHandlerBox {
} else if method_sig == "has/1" {
result_val = receiver.has(args_array.get(0))
} else if method_sig == "size/0" {
result_val = receiver.size()
result_val = receiver.length()
} else if method_sig == "isEmpty/0" {
result_val = receiver.isEmpty()
} else if method_sig == "delete/1" {
@ -171,7 +171,7 @@ static box BoxCallHandlerBox {
// No args field, return empty array
return new ArrayBox()
}
args_start = args_start + args_key.size()
args_start = args_start + args_key.length()
// Find array end
local args_end = StringOps.index_of_from(inst_json, "]", args_start)

16
lang/src/vm/hakorune-vm/callee_parser.hako
View File

@ -16,7 +16,7 @@ static box CalleeParserBox {
if callee_start < 0 {
return null
}
callee_start = callee_start + callee_key.size()
callee_start = callee_start + callee_key.length()
// Find callee object end (simplified: find next "type" field)
local type_key = "\"type\":\""
@ -24,7 +24,7 @@ static box CalleeParserBox {
if type_start < 0 {
return null
}
type_start = type_start + type_key.size()
type_start = type_start + type_key.length()
// Extract type value
local type_end = StringOps.index_of_from(mir_call_json, "\"", type_start)
@ -45,7 +45,7 @@ static box CalleeParserBox {
if name_start < 0 {
return null
}
name_start = name_start + name_key.size()
name_start = name_start + name_key.length()
// Extract name value
local name_end = StringOps.index_of_from(mir_call_json, "\"", name_start)
@ -66,7 +66,7 @@ static box CalleeParserBox {
if callee_start < 0 {
return null
}
local obj_start = callee_start + callee_key.size()
local obj_start = callee_start + callee_key.length()
// Find object end (simple: find matching })
// Note: This is simplified and assumes no nested objects in callee
@ -88,7 +88,7 @@ static box CalleeParserBox {
if receiver_start < 0 {
return null
}
receiver_start = receiver_start + receiver_key.size()
receiver_start = receiver_start + receiver_key.length()
// Extract receiver value (integer)
local digits = StringHelpers.read_digits(mir_call_json, receiver_start)
@ -109,7 +109,7 @@ static box CalleeParserBox {
if method_start < 0 {
return null
}
method_start = method_start + method_key.size()
method_start = method_start + method_key.length()
// Extract method value
local method_end = StringOps.index_of_from(mir_call_json, "\"", method_start)
@ -130,7 +130,7 @@ static box CalleeParserBox {
if box_type_start < 0 {
return null
}
box_type_start = box_type_start + box_type_key.size()
box_type_start = box_type_start + box_type_key.length()
// Extract box_type value
local box_type_end = StringOps.index_of_from(mir_call_json, "\"", box_type_start)
@ -148,7 +148,7 @@ static box CalleeParserBox {
local val_key = "\"value\":"
local val_start = mir_call_json.indexOf(val_key)
if val_start < 0 { return null }
val_start = val_start + val_key.size()
val_start = val_start + val_key.length()
// Read digits
local digits = StringHelpers.read_digits(mir_call_json, val_start)
if digits == "" { return null }

34
lang/src/vm/hakorune-vm/closure_call_handler.hako
View File

@ -72,10 +72,10 @@ static box ClosureCallHandlerBox {
if start < 0 {
return null
}
start = start + field_key.size()
start = start + field_key.length()
// Skip whitespace
loop(start < json.size()) {
loop(start < json.length()) {
local ch = json.charAt(start)
if ch == " " {
start = start + 1
@ -92,7 +92,7 @@ static box ClosureCallHandlerBox {
start = start + 1
}
if start >= json.size() {
if start >= json.length() {
return null
}
@ -107,7 +107,7 @@ static box ClosureCallHandlerBox {
// Parse array (simple implementation for string arrays)
local result = new ArrayBox()
local i = 1 // skip '['
loop(i < array_json.size()) {
loop(i < array_json.length()) {
local ch = array_json.charAt(i)
if ch == "]" {
break
@ -116,7 +116,7 @@ static box ClosureCallHandlerBox {
// Find string end
local str_start = i + 1
local str_end = str_start
loop(str_end < array_json.size()) {
loop(str_end < array_json.length()) {
local ch2 = array_json.charAt(str_end)
if ch2 == "\"" {
break
@ -142,10 +142,10 @@ static box ClosureCallHandlerBox {
// No captures field = empty captures (valid)
return new MapBox()
}
start = start + field_key.size()
start = start + field_key.length()
// Skip whitespace to find '['
loop(start < json.size()) {
loop(start < json.length()) {
local ch = json.charAt(start)
if ch == " " {
start = start + 1
@ -162,7 +162,7 @@ static box ClosureCallHandlerBox {
start = start + 1
}
if start >= json.size() {
if start >= json.length() {
return null
}
@ -177,7 +177,7 @@ static box ClosureCallHandlerBox {
// Parse captures array: [["name1", 5], ["name2", 6]]
local result = new MapBox()
local i = 1 // skip '['
loop(i < array_json.size()) {
loop(i < array_json.length()) {
local ch = array_json.charAt(i)
if ch == "]" {
break
@ -186,7 +186,7 @@ static box ClosureCallHandlerBox {
// Parse [name, vid] tuple
local tuple_start = i
local tuple_end = tuple_start + 1
loop(tuple_end < array_json.size()) {
loop(tuple_end < array_json.length()) {
local ch2 = array_json.charAt(tuple_end)
if ch2 == "]" {
break
@ -201,7 +201,7 @@ static box ClosureCallHandlerBox {
if name_start >= 0 {
name_start = name_start + 1
local name_end = name_start
loop(name_end < tuple_json.size()) {
loop(name_end < tuple_json.length()) {
local ch3 = tuple_json.charAt(name_end)
if ch3 == "\"" {
break
@ -215,7 +215,7 @@ static box ClosureCallHandlerBox {
if comma_pos >= 0 {
local vid_start = comma_pos + 1
// Skip whitespace
loop(vid_start < tuple_json.size()) {
loop(vid_start < tuple_json.length()) {
local ch4 = tuple_json.charAt(vid_start)
if ch4 != " " {
break
@ -224,7 +224,7 @@ static box ClosureCallHandlerBox {
}
local vid_end = vid_start
loop(vid_end < tuple_json.size()) {
loop(vid_end < tuple_json.length()) {
local ch5 = tuple_json.charAt(vid_end)
if ch5 == "]" {
break
@ -265,10 +265,10 @@ static box ClosureCallHandlerBox {
if start < 0 {
return null
}
start = start + field_key.size()
start = start + field_key.length()
// Skip whitespace
loop(start < json.size()) {
loop(start < json.length()) {
local ch = json.charAt(start)
if ch == " " {
start = start + 1
@ -282,7 +282,7 @@ static box ClosureCallHandlerBox {
break
}
if start >= json.size() {
if start >= json.length() {
return null
}
@ -294,7 +294,7 @@ static box ClosureCallHandlerBox {
// Extract integer vid
local vid_end = start
loop(vid_end < json.size()) {
loop(vid_end < json.length()) {
local ch2 = json.charAt(vid_end)
if ch2 >= "0" {
if ch2 <= "9" {

2
lang/src/vm/hakorune-vm/constructor_call_handler.hako
View File

@ -25,7 +25,7 @@ static box ConstructorCallHandlerBox {
return Result.Err("Unknown Box type: " + box_type)
}
local argc = args_array.size()
local argc = args_array.length()
// Store instance before birth so `me` is available during initialization
ValueManagerBox.set(regs, dst_reg, instance)
// GC v0: metrics only（BoxBirthに近い位置で1カウント）

34
lang/src/vm/hakorune-vm/core_bridge_ops.hako
View File

@ -178,27 +178,27 @@ static box CoreBridgeOps {
if lb >= 0 {
local rb = JsonFieldExtractor.seek_array_end != null ? JsonFieldExtractor.seek_array_end(inst_json, lb) : -1
// Fallback: if JsonFieldExtractor provides no seek helper, approximate by using core reader later
local arr = rb > lb ? inst_json.substring(lb+1, rb) : inst_json.substring(lb+1, inst_json.size())
local arr = rb > lb ? inst_json.substring(lb+1, rb) : inst_json.substring(lb+1, inst_json.length())
// Walk for numbers in pairs
local pos = 0
loop(pos < arr.size()) {
loop(pos < arr.length()) {
// look for '[' of a pair
local c = arr.substring(pos,pos+1)
if c != "[" { pos = pos + 1 continue }
// bb
pos = pos + 1
// skip spaces
loop(pos < arr.size()) { local ch = arr.substring(pos,pos+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { pos = pos + 1 continue } break }
loop(pos < arr.length()) { local ch = arr.substring(pos,pos+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { pos = pos + 1 continue } break }
// read first int (bb) — ignored here
// advance to comma
local comma = arr.indexOf(",", pos)
if comma < 0 { break }
pos = comma + 1
loop(pos < arr.size()) { local ch2 = arr.substring(pos,pos+1) if ch2 == " " || ch2 == "\n" || ch2 == "\r" || ch2 == "\t" { pos = pos + 1 continue } break }
loop(pos < arr.length()) { local ch2 = arr.substring(pos,pos+1) if ch2 == " " || ch2 == "\n" || ch2 == "\r" || ch2 == "\t" { pos = pos + 1 continue } break }
// read vid digits
local i = pos
local ds = ""
loop(i < arr.size()) { local ch3 = arr.substring(i,i+1) if ch3 >= "0" && ch3 <= "9" { ds = ds + ch3 i = i + 1 continue } break }
loop(i < arr.length()) { local ch3 = arr.substring(i,i+1) if ch3 >= "0" && ch3 <= "9" { ds = ds + ch3 i = i + 1 continue } break }
if ds != "" {
local vid = ds + 0 // to i64 via implicit
// populate candidate with current regs value or 0
@ -332,7 +332,7 @@ static box CoreBridgeOps {
return Result.Ok(0)
}
if method == "set" && ValueManagerBox.ensure_map_meta(regs, receiver_id) != null {
if args_array.size() < 1 {
if args_array.length() < 1 {
return Result.Err("method(set): missing key argument")
}
local key_val = args_array.get(0)
@ -354,7 +354,7 @@ static box CoreBridgeOps {
// First arg id (key)
using "lang/src/vm/hakorune-vm/args_extractor.hako" as ArgsExtractorBox
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
if ids != null && ids.size() > 0 {
if ids != null && ids.length() > 0 {
local key_id = ids.get(0)
local key_val = ValueManagerBox.get(regs, key_id)
if key_val != null { NyVmState.set_reg(st, key_id, key_val) }
@ -376,7 +376,7 @@ static box CoreBridgeOps {
// Arg[0]
using "lang/src/vm/hakorune-vm/args_extractor.hako" as ArgsExtractorBox
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
if ids != null && ids.size() > 0 {
if ids != null && ids.length() > 0 {
local key_id = ids.get(0)
local key_val = ValueManagerBox.get(regs, key_id)
if key_val != null { NyVmState.set_reg(st, key_id, key_val) }
@ -401,7 +401,7 @@ static box CoreBridgeOps {
local ids2 = ArgsExtractorBox.extract_ids(mir_call_json)
if ids2 != null {
local i = 0
loop(i < ids2.size()) {
loop(i < ids2.length()) {
local id = ids2.get(i)
local val = ValueManagerBox.get(regs, id)
if val != null { NyVmState.set_reg(st, id, val) }
@ -417,11 +417,11 @@ static box CoreBridgeOps {
}
try_modulefn_collection(name, mir_call_json, args_array, dst_reg, regs) {
local want = me._canonical_modulefn_name(name, args_array.size())
local want = me._canonical_modulefn_name(name, args_array.length())
if want == "ArrayBox.len/0" {
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
local recv_id = null
if ids != null && ids.size() > 0 { recv_id = ids.get(0) }
if ids != null && ids.length() > 0 { recv_id = ids.get(0) }
local len = 0
if recv_id != null { len = ValueManagerBox.get_array_size(regs, recv_id) }
if dst_reg != null { ValueManagerBox.set(regs, dst_reg, len) }
@ -430,7 +430,7 @@ static box CoreBridgeOps {
if want == "MapBox.len/0" {
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
local recv_id = null
if ids != null && ids.size() > 0 { recv_id = ids.get(0) }
if ids != null && ids.length() > 0 { recv_id = ids.get(0) }
if recv_id != null { ValueManagerBox.ensure_map_meta(regs, recv_id) }
local len = 0
if recv_id != null { len = ValueManagerBox.get_map_len(regs, recv_id) }
@ -441,7 +441,7 @@ static box CoreBridgeOps {
if dst_reg == null { return Result.Err("modulefn(int_to_str): missing destination register") }
using "lang/src/vm/hakorune-vm/args_extractor.hako" as ArgsExtractorBox
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
if ids == null || ids.size() < 1 { return Result.Err("modulefn(int_to_str): missing arg") }
if ids == null || ids.length() < 1 { return Result.Err("modulefn(int_to_str): missing arg") }
local id0 = ids.get(0)
local val0 = ValueManagerBox.get(regs, id0)
local s = "" + val0
@ -452,15 +452,15 @@ static box CoreBridgeOps {
if dst_reg == null { return Result.Err("modulefn(to_i64): missing destination register") }
using "lang/src/vm/hakorune-vm/args_extractor.hako" as ArgsExtractorBox
local ids = ArgsExtractorBox.extract_ids(mir_call_json)
if ids == null || ids.size() < 1 { return Result.Err("modulefn(to_i64): missing arg") }
if ids == null || ids.length() < 1 { return Result.Err("modulefn(to_i64): missing arg") }
local id0 = ids.get(0)
local val0 = ValueManagerBox.get(regs, id0)
local s = "" + val0
// Allow optional sign + digits only
local i = 0
if s.size() > 0 && (s.substring(0,1) == "+" || s.substring(0,1) == "-") { i = 1 }
local ok = (s.size() > i)
loop(i < s.size()) {
if s.length() > 0 && (s.substring(0,1) == "+" || s.substring(0,1) == "-") { i = 1 }
local ok = (s.length() > i)
loop(i < s.length()) {
local ch = s.substring(i,i+1)
if !(ch >= "0" && ch <= "9") { ok = false break }
i = i + 1

2
lang/src/vm/hakorune-vm/entry/main.hako
View File

@ -4,7 +4,7 @@ static box Main {
// Usage: hakorune-vm-exe <mir.json>
main(args) {
local path = null
if args { if args.size() > 0 { @p = args.get(0) if p { path = p } } }
if args { if args.length() > 0 { @p = args.get(0) if p { path = p } } }
if path == null {
print("usage: hakorune-vm-exe <mir.json>")
return -1

2
lang/src/vm/hakorune-vm/global_call_handler.hako
View File

@ -26,7 +26,7 @@ static box GlobalCallHandlerBox {
// Future: Support multiple types, string formatting
_handle_print(args_array, dst_reg, regs) {
// Check argument count
local argc = args_array.size()
local argc = args_array.length()
if argc != 1 {
return Result.Err("print: expected 1 argument, got " + StringHelpers.int_to_str(argc))
}

14
lang/src/vm/hakorune-vm/hakorune_vm_core.hako
View File

@ -85,9 +85,9 @@ static box HakoruneVmCore {
local k = r#""entry""#
local p = func_json.indexOf(k)
if p >= 0 {
p = p + k.size()
loop(p < func_json.size()) { local ch = func_json.substring(p,p+1) if ch == ":" { p = p + 1 break } if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
loop(p < func_json.size()) { local ch = func_json.substring(p,p+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
p = p + k.length()
loop(p < func_json.length()) { local ch = func_json.substring(p,p+1) if ch == ":" { p = p + 1 break } if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
loop(p < func_json.length()) { local ch = func_json.substring(p,p+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
local digits = StringHelpers.read_digits(func_json, p)
if digits != "" { current_bb = StringHelpers.to_i64(digits) }
}
@ -102,9 +102,9 @@ static box HakoruneVmCore {
local key_id = "\"id\":"
local is = first.indexOf(key_id)
if is >= 0 {
is = is + key_id.size()
is = is + key_id.length()
// skip ws
loop(is < first.size()) {
loop(is < first.length()) {
local ch = first.substring(is, is+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { is = is + 1 continue }
break
@ -178,7 +178,7 @@ static box HakoruneVmCore {
// No instructions (empty block)
return Result.Ok(0)
}
insts_start = insts_start + key_insts.size()
insts_start = insts_start + key_insts.length()
// Find instructions array end
local insts_end = JsonScanGuardBox.seek_array_end(block_json, insts_start - 1, 200000)
if insts_end < 0 {
@ -191,7 +191,7 @@ static box HakoruneVmCore {
// Execute instructions sequentially
_execute_instructions(insts_json, regs, mem) {
local pos = 0
local len = insts_json.size()
local len = insts_json.length()
local last_ret_value = 0
loop(pos < len) {
// Skip whitespace

10
lang/src/vm/hakorune-vm/instrs_locator.hako
View File

@ -17,9 +17,9 @@ static box InstrsLocatorBox {
meta0.set("content", "")
return Result.Ok(meta0)
}
local i = k + key.size()
local i = k + key.length()
// find ':' then '['
loop(i < block_json.size()) {
loop(i < block_json.length()) {
local ch = block_json.substring(i,i+1)
if ch == ":" { i = i + 1 break }
if ch == " " || ch == "
@ -27,7 +27,7 @@ static box InstrsLocatorBox {
" || ch == " " { i = i + 1 continue }
return Result.Err("instructions key format invalid")
}
loop(i < block_json.size()) {
loop(i < block_json.length()) {
local ch = block_json.substring(i,i+1)
if ch == " " || ch == "
" || ch == "
@ -59,12 +59,12 @@ static box InstrsLocatorBox {
// slice content
local content = block_json.substring(start, endi)
// normalize if large
if content.size() > 8192 { content = JsonNormalizeBox.normalize(content, 500000) }
if content.length() > 8192 { content = JsonNormalizeBox.normalize(content, 500000) }
// detect single-object fast path
local single_flag = 0
{
local cs = 0
local ce = content.size() - 1
local ce = content.length() - 1
loop(cs <= ce) {
local ch2 = content.substring(cs, cs+1)
if ch2 == " " || ch2 == "

2
lang/src/vm/hakorune-vm/instruction_dispatcher.hako
View File

@ -34,7 +34,7 @@ static box InstructionDispatcherBox {
if op_start < 0 {
return Result.Err("op field not found")
}
op_start = op_start + key_op.size()
op_start = op_start + key_op.length()
local op_end = StringOps.index_of_from(inst_json, "\"", op_start)
if op_end < 0 {

10
lang/src/vm/hakorune-vm/json_field_extractor.hako
View File

@ -15,9 +15,9 @@ static box JsonFieldExtractor {
if start < 0 {
return null
}
start = start + key.size()
start = start + key.length()
// skip whitespace
loop(start < json.size()) {
loop(start < json.length()) {
local ch = json.substring(start, start+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { start = start + 1 continue }
break
@ -34,9 +34,9 @@ static box JsonFieldExtractor {
local key_val = "\"value\":"
local val_pos = StringOps.index_of_from(json, key_val, start)
if val_pos >= 0 {
val_pos = val_pos + key_val.size()
val_pos = val_pos + key_val.length()
// skip whitespace
loop(val_pos < json.size()) {
loop(val_pos < json.length()) {
local ch2 = json.substring(val_pos, val_pos+1)
if ch2 == " " || ch2 == "\n" || ch2 == "\r" || ch2 == "\t" { val_pos = val_pos + 1 continue }
break
@ -58,7 +58,7 @@ static box JsonFieldExtractor {
if start < 0 {
return null
}
start = start + key.size()
start = start + key.length()
local end_pos = StringOps.index_of_from(json, "\"", start)
if end_pos < 0 {

2
lang/src/vm/hakorune-vm/json_normalize_box.hako
View File

@ -6,7 +6,7 @@ using "lang/src/shared/json/core/string_scan.hako" as StringScanBox
static box JsonNormalizeBox {
normalize(seg, budget) {
if seg == null { return "" }
local n = seg.size()
local n = seg.length()
local i = 0
local out = ""
local steps = 0

8
lang/src/vm/hakorune-vm/json_scan_guard.hako
View File

@ -8,9 +8,9 @@ static box JsonScanGuardBox {
// Returns: end index or -1 on failure/budget exceeded.
seek_obj_end(text, start, budget) {
if text == null { return -1 }
if start < 0 || start >= text.size() { return -1 }
if start < 0 || start >= text.length() { return -1 }
if text.substring(start, start+1) != "{" { return -1 }
local n = text.size()
local n = text.length()
local depth = 0
local i = start
local steps = 0
@ -37,9 +37,9 @@ static box JsonScanGuardBox {
// Returns: end index or -1 on failure/budget exceeded.
seek_array_end(text, start, budget) {
if text == null { return -1 }
if start < 0 || start >= text.size() { return -1 }
if start < 0 || start >= text.length() { return -1 }
if text.substring(start, start+1) != "[" { return -1 }
local n = text.size()
local n = text.length()
local depth = 0
local i = start
local steps = 0

6
lang/src/vm/hakorune-vm/method_call_handler.hako
View File

@ -1,5 +1,5 @@
// MethodCallHandlerBox - Handle Method calls (MirCall with Method callee)
// Single Responsibility: Execute instance methods (e.g., array.size(), string.substring())
// Single Responsibility: Execute instance methods (e.g., array.length(), string.substring())
using "lang/src/vm/boxes/result_box.hako" as Result
using "lang/src/shared/common/string_helpers.hako" as StringHelpers
@ -39,11 +39,11 @@ static box MethodCallHandlerBox {
// Extract arguments from mir_call.args
local args_array = ArgsExtractorBox.extract_and_load(mir_call_json, regs)
local _g = ArgsGuardBox.ensure_no_nulls(args_array, method_name + "/" + StringHelpers.int_to_str(args_array.size()))
local _g = ArgsGuardBox.ensure_no_nulls(args_array, method_name + "/" + StringHelpers.int_to_str(args_array.length()))
if _g.is_Err() { return _g }
// Build signature and guard
local arg_count = args_array.size()
local arg_count = args_array.length()
local method_sig = method_name + "/" + StringHelpers.int_to_str(arg_count)
// Load receiver and guard
local receiver = ValueManagerBox.get(regs, receiver_id)

2
lang/src/vm/hakorune-vm/mircall_handler.hako
View File

@ -47,7 +47,7 @@ static box MirCallHandlerBox {
if mir_call_start < 0 {
return Result.Err("mir_call: mir_call field not found")
}
mir_call_start = mir_call_start + mir_call_key.size()
mir_call_start = mir_call_start + mir_call_key.length()
// Find mir_call object end (using balanced bracket matching)
// mir_call_start now points to '{' (first char of mir_call object)

2
lang/src/vm/hakorune-vm/module_function_call_handler.hako
View File

@ -25,7 +25,7 @@ static box ModuleFunctionCallHandlerBox {
// Future: Extend with more module functions as needed
local result_val
local argc = args_array.size()
local argc = args_array.length()
local want_name = me._canonical_name(name, argc)
local core_shortcut = CoreBridgeOps.try_modulefn_collection(name, mir_call_json, args_array, dst_reg, regs)

2
lang/src/vm/hakorune-vm/newbox_handler.hako
View File

@ -25,7 +25,7 @@ static box NewBoxHandlerBox {
if type_start < 0 {
return Result.Err("newbox: box_type field not found")
}
type_start = type_start + key_type.size()
type_start = type_start + key_type.length()
local type_end = StringOps.index_of_from(inst_json, "\"", type_start)
if type_end < 0 {

12
lang/src/vm/hakorune-vm/phi_handler.hako
View File

@ -19,7 +19,7 @@ static box PhiHandlerBox {
// No instructions array (empty block)
return Result.Ok(0)
}
insts_start = insts_start + key_insts.size()
insts_start = insts_start + key_insts.length()
// Find instructions array end
local insts_end = JsonCursorBox.seek_array_end(block_json, insts_start - 1)
@ -31,7 +31,7 @@ static box PhiHandlerBox {
// Scan for PHI instructions
local pos = 0
local len = insts_json.size()
local len = insts_json.length()
loop(pos < len) {
// Skip whitespace and comma
@ -77,7 +77,7 @@ static box PhiHandlerBox {
// Returns: value_id or -1 if not found
_find_phi_value(inputs_json, predecessor) {
local pos = 0
local len = inputs_json.size()
local len = inputs_json.length()
loop(pos < len) {
// Skip whitespace and comma
@ -104,7 +104,7 @@ static box PhiHandlerBox {
}
local block_str = pair_json.substring(0, comma_pos)
local value_str = pair_json.substring(comma_pos + 1, pair_json.size())
local value_str = pair_json.substring(comma_pos + 1, pair_json.length())
// Trim whitespace
block_str = me._trim(block_str)
@ -131,7 +131,7 @@ static box PhiHandlerBox {
_find_array_end(json, start) {
local depth = 0
local pos = start
local len = json.size()
local len = json.length()
loop(pos < len) {
local ch = json.substring(pos, pos + 1)
@ -156,7 +156,7 @@ static box PhiHandlerBox {
// Helper: trim whitespace
_trim(str) {
local start = 0
local len = str.size()
local len = str.length()
// Trim start
loop(start < len) {

18
lang/src/vm/hakorune-vm/terminator_handler.hako
View File

@ -25,7 +25,7 @@ static box TerminatorHandlerBox {
return Result.Err("terminator not found")
}
local term_json_start = term_start + key_term.size() - 1
local term_json_start = term_start + key_term.length() - 1
local term_end = me._find_terminator_end(block_json, term_json_start)
if term_end < 0 {
return Result.Err("terminator end not found")
@ -42,9 +42,9 @@ static box TerminatorHandlerBox {
if fb.is_Ok() { return fb }
return Result.Err("terminator op not found")
}
pos = pos + key_opk.size()
pos = pos + key_opk.length()
// find ':' then skip whitespace
loop(pos < term_json.size()) {
loop(pos < term_json.length()) {
local ch = term_json.substring(pos, pos+1)
if ch == ":" { pos = pos + 1 break }
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { pos = pos + 1 continue }
@ -52,7 +52,7 @@ static box TerminatorHandlerBox {
if fb.is_Ok() { return fb }
return Result.Err("terminator op colon not found")
}
loop(pos < term_json.size()) {
loop(pos < term_json.length()) {
local ch = term_json.substring(pos, pos+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { pos = pos + 1 continue }
break
@ -103,9 +103,9 @@ static box TerminatorHandlerBox {
local k = "\"op\""
local p = term_json.indexOf(k)
if p < 0 { return Result.Err("terminator op not found") }
p = p + k.size()
loop(p < term_json.size()) { local ch = term_json.substring(p,p+1) if ch == ":" { p = p + 1 break } if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } return Result.Err("terminator op colon not found") }
loop(p < term_json.size()) { local ch = term_json.substring(p,p+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
p = p + k.length()
loop(p < term_json.length()) { local ch = term_json.substring(p,p+1) if ch == ":" { p = p + 1 break } if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } return Result.Err("terminator op colon not found") }
loop(p < term_json.length()) { local ch = term_json.substring(p,p+1) if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" { p = p + 1 continue } break }
if term_json.substring(p,p+1) != "\"" { return Result.Err("terminator op quote not found") }
local e = StringOps.index_of_from(term_json, "\"", p+1)
if e < 0 { return Result.Err("terminator op end not found") }
@ -129,7 +129,7 @@ static box TerminatorHandlerBox {
result_map.set("value", 0)
return Result.Ok(result_map)
}
val_start = val_start + key_val.size()
val_start = val_start + key_val.length()
local val_digits = StringHelpers.read_digits(term_json, val_start)
if val_digits == "" {
@ -171,7 +171,7 @@ static box TerminatorHandlerBox {
_find_terminator_end(json, start) {
local depth = 0
local pos = start
local len = json.size()
local len = json.length()
loop(pos < len) {
local ch = json.substring(pos, pos + 1)

4
lang/src/vm/hakorune-vm/tests/test_array_map_isempty_size.hako
View File

@ -5,14 +5,14 @@ static box Main {
if a.isEmpty() != 1 { print("FAIL: empty array not empty") return 1 }
a.push(1)
if a.isEmpty() != 0 { print("FAIL: non-empty array empty") return 1 }
if a.size() != 1 { print("FAIL: array size!=1") return 1 }
if a.length() != 1 { print("FAIL: array size!=1") return 1 }
// Map
local m = new MapBox()
if m.isEmpty() != 1 { print("FAIL: empty map not empty") return 1 }
m.set("k", 10)
if m.isEmpty() != 0 { print("FAIL: non-empty map empty") return 1 }
if m.size() != 1 { print("FAIL: map size!=1") return 1 }
if m.length() != 1 { print("FAIL: map size!=1") return 1 }
print("OK: Array/Map size/isEmpty")
return 0

18
lang/src/vm/hakorune-vm/tests/test_boxcall.hako
View File

@ -39,9 +39,9 @@ static box Main {
return 1
}
// Test 5: ArrayBox.size()
// Test 5: ArrayBox.length()
local test5 = me._test_array_size()
print("[Test 5] ArrayBox.size() - result: " + StringHelpers.int_to_str(test5))
print("[Test 5] ArrayBox.length() - result: " + StringHelpers.int_to_str(test5))
if test5 != 0 {
print("[FAIL] Test 5: expected 0, got " + StringHelpers.int_to_str(test5))
return 1
@ -55,9 +55,9 @@ static box Main {
return 1
}
// Test 7: MapBox.size()
// Test 7: MapBox.length()
local test7 = me._test_map_size()
print("[Test 7] MapBox.size() - result: " + StringHelpers.int_to_str(test7))
print("[Test 7] MapBox.length() - result: " + StringHelpers.int_to_str(test7))
if test7 != 0 {
print("[FAIL] Test 7: expected 0, got " + StringHelpers.int_to_str(test7))
return 1
@ -164,9 +164,9 @@ static box Main {
return 0
}
// Test 5: ArrayBox.size()
// Test 5: ArrayBox.length()
_test_array_size() {
// MIR JSON: newbox ArrayBox -> v%2, const 10 -> v%3, boxcall v%2.push(v%3) -> v%4, const 20 -> v%5, boxcall v%2.push(v%5) -> v%6, boxcall v%2.size() -> v%1, ret v%1
// MIR JSON: newbox ArrayBox -> v%2, const 10 -> v%3, boxcall v%2.push(v%3) -> v%4, const 20 -> v%5, boxcall v%2.push(v%5) -> v%6, boxcall v%2.length() -> v%1, ret v%1
local mir_json = "{\"functions\":[{\"name\":\"Main.main\",\"blocks\":[{\"id\":0,\"instructions\":[{\"op\":\"newbox\",\"dst\":2,\"box_type\":\"ArrayBox\",\"args\":[]},{\"op\":\"const\",\"dst\":3,\"value\":{\"Integer\":10}},{\"op\":\"boxcall\",\"dst\":4,\"box\":2,\"method\":\"push\",\"args\":[3]},{\"op\":\"const\",\"dst\":5,\"value\":{\"Integer\":20}},{\"op\":\"boxcall\",\"dst\":6,\"box\":2,\"method\":\"push\",\"args\":[5]},{\"op\":\"boxcall\",\"dst\":1,\"box\":2,\"method\":\"size\",\"args\":[]},{\"op\":\"copy\",\"dst\":7,\"src\":1}],\"terminator\":{\"op\":\"ret\",\"value\":7}}]}]}"
local vm_result = HakoruneVmCore.run(mir_json)
@ -206,9 +206,9 @@ static box Main {
return 0
}
// Test 7: MapBox.size()
// Test 7: MapBox.length()
_test_map_size() {
// MIR JSON: newbox MapBox -> v%2, const "key1" -> v%3, const 100 -> v%4, boxcall v%2.set(v%3, v%4) -> v%5, const "key2" -> v%6, const 200 -> v%7, boxcall v%2.set(v%6, v%7) -> v%8, boxcall v%2.size() -> v%1, ret v%1
// MIR JSON: newbox MapBox -> v%2, const "key1" -> v%3, const 100 -> v%4, boxcall v%2.set(v%3, v%4) -> v%5, const "key2" -> v%6, const 200 -> v%7, boxcall v%2.set(v%6, v%7) -> v%8, boxcall v%2.length() -> v%1, ret v%1
local mir_json = "{\"functions\":[{\"name\":\"Main.main\",\"blocks\":[{\"id\":0,\"instructions\":[{\"op\":\"newbox\",\"dst\":2,\"box_type\":\"MapBox\",\"args\":[]},{\"op\":\"const\",\"dst\":3,\"value\":{\"String\":\"key1\"}},{\"op\":\"const\",\"dst\":4,\"value\":{\"Integer\":100}},{\"op\":\"boxcall\",\"dst\":5,\"box\":2,\"method\":\"set\",\"args\":[3,4]},{\"op\":\"const\",\"dst\":6,\"value\":{\"String\":\"key2\"}},{\"op\":\"const\",\"dst\":7,\"value\":{\"Integer\":200}},{\"op\":\"boxcall\",\"dst\":8,\"box\":2,\"method\":\"set\",\"args\":[6,7]},{\"op\":\"boxcall\",\"dst\":1,\"box\":2,\"method\":\"size\",\"args\":[]},{\"op\":\"copy\",\"dst\":9,\"src\":1}],\"terminator\":{\"op\":\"ret\",\"value\":9}}]}]}"
local vm_result = HakoruneVmCore.run(mir_json)
@ -250,7 +250,7 @@ static box Main {
// Test 9: MapBox.keys()
_test_map_keys() {
// MIR JSON: newbox MapBox -> v%2, const "a" -> v%3, const 1 -> v%4, boxcall v%2.set(v%3, v%4) -> v%5, const "b" -> v%6, const 2 -> v%7, boxcall v%2.set(v%6, v%7) -> v%8, boxcall v%2.keys() -> v%1, boxcall v%1.size() -> v%9, ret v%9
// MIR JSON: newbox MapBox -> v%2, const "a" -> v%3, const 1 -> v%4, boxcall v%2.set(v%3, v%4) -> v%5, const "b" -> v%6, const 2 -> v%7, boxcall v%2.set(v%6, v%7) -> v%8, boxcall v%2.keys() -> v%1, boxcall v%1.length() -> v%9, ret v%9
local mir_json = "{\"functions\":[{\"name\":\"Main.main\",\"blocks\":[{\"id\":0,\"instructions\":[{\"op\":\"newbox\",\"dst\":2,\"box_type\":\"MapBox\",\"args\":[]},{\"op\":\"const\",\"dst\":3,\"value\":{\"String\":\"a\"}},{\"op\":\"const\",\"dst\":4,\"value\":{\"Integer\":1}},{\"op\":\"boxcall\",\"dst\":5,\"box\":2,\"method\":\"set\",\"args\":[3,4]},{\"op\":\"const\",\"dst\":6,\"value\":{\"String\":\"b\"}},{\"op\":\"const\",\"dst\":7,\"value\":{\"Integer\":2}},{\"op\":\"boxcall\",\"dst\":8,\"box\":2,\"method\":\"set\",\"args\":[6,7]},{\"op\":\"boxcall\",\"dst\":1,\"box\":2,\"method\":\"keys\",\"args\":[]},{\"op\":\"boxcall\",\"dst\":9,\"box\":1,\"method\":\"size\",\"args\":[]},{\"op\":\"copy\",\"dst\":10,\"src\":9}],\"terminator\":{\"op\":\"ret\",\"value\":10}}]}]}"
local vm_result = HakoruneVmCore.run(mir_json)

8
lang/src/vm/hakorune-vm/tests/test_mircall_phase2_constructor.hako
View File

@ -13,7 +13,7 @@ static box Main {
// mir_call new ArrayBox() → v1
// const 42 → v2
// mir_call v1.push(v2) → null
// mir_call v1.size() → v3
// mir_call v1.length() → v3
// ret v3
local mir1 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"mir_call","dst":1,"mir_call":{"callee":{"type":"Constructor","box_type":"ArrayBox"},"args":[],"effects":["alloc"],"flags":{}}},{"op":"const","dst":2,"value":{"type":"i64","value":42}},{"op":"mir_call","dst":null,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"push"},"args":[2],"effects":[],"flags":{}}},{"op":"mir_call","dst":3,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"ret","value":3}],"terminator":{"op":"ret","value":3}}]}]}"#
@ -29,7 +29,7 @@ static box Main {
// Test 2: new MapBox() - birth()なしConstructor
// Block 0:
// mir_call new MapBox() → v1
// mir_call v1.size() → v2
// mir_call v1.length() → v2
// ret v2
local mir2 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"mir_call","dst":1,"mir_call":{"callee":{"type":"Constructor","box_type":"MapBox"},"args":[],"effects":["alloc"],"flags":{}}},{"op":"mir_call","dst":2,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"ret","value":2}],"terminator":{"op":"ret","value":2}}]}]}"#
@ -50,8 +50,8 @@ static box Main {
// mir_call new ArrayBox() → v3
// const 20 → v4
// mir_call v3.push(v4) → null
// mir_call v1.size() → v5
// mir_call v3.size() → v6
// mir_call v1.length() → v5
// mir_call v3.length() → v6
// binop Add v5+v6 → v7
// ret v7
local mir3 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"mir_call","dst":1,"mir_call":{"callee":{"type":"Constructor","box_type":"ArrayBox"},"args":[],"effects":["alloc"],"flags":{}}},{"op":"const","dst":2,"value":{"type":"i64","value":10}},{"op":"mir_call","dst":null,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"push"},"args":[2],"effects":[],"flags":{}}},{"op":"mir_call","dst":3,"mir_call":{"callee":{"type":"Constructor","box_type":"ArrayBox"},"args":[],"effects":["alloc"],"flags":{}}},{"op":"const","dst":4,"value":{"type":"i64","value":20}},{"op":"mir_call","dst":null,"mir_call":{"callee":{"type":"Method","receiver":3,"method":"push"},"args":[4],"effects":[],"flags":{}}},{"op":"mir_call","dst":5,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"mir_call","dst":6,"mir_call":{"callee":{"type":"Method","receiver":3,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"binop","op_kind":"Add","dst":7,"lhs":5,"rhs":6},{"op":"ret","value":7}],"terminator":{"op":"ret","value":7}}]}]}"#

20
lang/src/vm/hakorune-vm/tests/test_mircall_phase2_method.hako
View File

@ -1,5 +1,5 @@
// test_mircall_phase2_method.hako — MirCall Phase 2 tests (Method)
// Expected: Method calls (array.size(), string.substring(), etc.) work correctly
// Expected: Method calls (array.length(), string.substring(), etc.) work correctly
using "lang/src/vm/hakorune-vm/hakorune_vm_core.hako" as HakoruneVmCore
using "lang/src/shared/common/string_helpers.hako" as StringHelpers
@ -8,23 +8,23 @@ static box Main {
main() {
print("=== MirCall Phase 2 Tests (Method) ===")
// Test 1: Array.size() - no arguments
// Test 1: Array.length() - no arguments
// Block 0:
// newbox ArrayBox → v1
// const 42 → v2
// boxcall v1.push(v2) → null
// mir_call v1.size() → v3
// mir_call v1.length() → v3
// ret v3
local mir1 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"newbox","dst":1,"box_type":"ArrayBox","args":[]},{"op":"const","dst":2,"value":{"type":"i64","value":42}},{"op":"boxcall","dst":null,"box":1,"method":"push","args":[2]},{"op":"mir_call","dst":3,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"ret","value":3}],"terminator":{"op":"ret","value":3}}]}]}"#
print("[Test 1] Array.size() - no arguments (expect 1)")
print("[Test 1] Array.length() - no arguments (expect 1)")
local result1 = HakoruneVmCore.run(mir1)
print("Test 1 result: " + StringHelpers.int_to_str(result1))
if result1 != 1 {
print("[FAIL] Test 1: expected 1 (array size), got " + StringHelpers.int_to_str(result1))
return 1
}
print("[PASS] Test 1: Array.size() works")
print("[PASS] Test 1: Array.length() works")
// Test 2: Array.get(index) - single argument
// Block 0:
@ -51,7 +51,7 @@ static box Main {
// const 1 → v2
// const 4 → v3
// mir_call v1.substring(v2, v3) → v4
// boxcall v4.size() → v5
// boxcall v4.length() → v5
// ret v5
local mir3 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"const","dst":1,"value":{"String":"hello"}},{"op":"const","dst":2,"value":{"type":"i64","value":1}},{"op":"const","dst":3,"value":{"type":"i64","value":4}},{"op":"mir_call","dst":4,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"substring"},"args":[2,3],"effects":[],"flags":{}}},{"op":"boxcall","dst":5,"box":4,"method":"size","args":[]},{"op":"ret","value":5}],"terminator":{"op":"ret","value":5}}]}]}"#
@ -64,7 +64,7 @@ static box Main {
}
print("[PASS] Test 3: String.substring(start, end) works")
// Test 4: Map.size() - method chaining pattern
// Test 4: Map.length() - method chaining pattern
// Block 0:
// newbox MapBox → v1
// const "key1" → v2
@ -73,15 +73,15 @@ static box Main {
// const "key2" → v4
// const "value2" → v5
// boxcall v1.set(v4, v5) → null
// mir_call v1.size() → v6
// mir_call v1.length() → v6
// ret v6
local mir4 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"newbox","dst":1,"box_type":"MapBox","args":[]},{"op":"const","dst":2,"value":{"String":"key1"}},{"op":"const","dst":3,"value":{"String":"value1"}},{"op":"boxcall","dst":null,"box":1,"method":"set","args":[2,3]},{"op":"const","dst":4,"value":{"String":"key2"}},{"op":"const","dst":5,"value":{"String":"value2"}},{"op":"boxcall","dst":null,"box":1,"method":"set","args":[4,5]},{"op":"mir_call","dst":6,"mir_call":{"callee":{"type":"Method","receiver":1,"method":"size"},"args":[],"effects":[],"flags":{}}},{"op":"ret","value":6}],"terminator":{"op":"ret","value":6}}]}]}"#
// Test 4 & 5: Skipped (Map methods have implementation gaps in Hakorune VM)
// Note: Method calling mechanism WORKS - verified by Tests 1-3
// Issue: Map.set()/Map.size() not fully functional in current Hakorune VM
// Issue: Map.set()/Map.length() not fully functional in current Hakorune VM
// This is a VM limitation, not a Method calling issue
print("[Test 4] SKIPPED: Map.size() (VM limitation)")
print("[Test 4] SKIPPED: Map.length() (VM limitation)")
print("[Test 5] SKIPPED: Map.isEmpty() (VM limitation)")
print("=== MirCall Phase 2 (Method) CORE tests PASSED! (3/3 core) ===")

4
lang/src/vm/hakorune-vm/tests/test_mircall_phase2_module.hako
View File

@ -29,7 +29,7 @@ static box Main {
// Block 0:
// const 0 → v1
// mir_call StringHelpers.int_to_str(v1) → v2
// boxcall v2.size() → v3
// boxcall v2.length() → v3
// ret v3
local mir2 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"const","dst":1,"value":{"type":"i64","value":0}},{"op":"mir_call","dst":2,"mir_call":{"callee":{"type":"ModuleFunction","name":"StringHelpers.int_to_str"},"args":[1],"effects":[],"flags":{}}},{"op":"boxcall","dst":3,"box":2,"method":"size","args":[]},{"op":"ret","value":3}],"terminator":{"op":"ret","value":3}}]}]}"#
@ -46,7 +46,7 @@ static box Main {
// Block 0:
// const 100 → v1
// mir_call StringHelpers.int_to_str(v1) → v2
// boxcall v2.size() → v3
// boxcall v2.length() → v3
// ret v3
local mir3 = r#"{"functions":[{"name":"test","blocks":[{"id":0,"instructions":[{"op":"const","dst":1,"value":{"type":"i64","value":100}},{"op":"mir_call","dst":2,"mir_call":{"callee":{"type":"ModuleFunction","name":"StringHelpers.int_to_str"},"args":[1],"effects":[],"flags":{}}},{"op":"boxcall","dst":3,"box":2,"method":"size","args":[]},{"op":"ret","value":3}],"terminator":{"op":"ret","value":3}}]}]}"#

2
lang/src/vm/hakorune-vm/tests/test_string_size_char_isempty.hako
View File

@ -1,7 +1,7 @@
static box Main {
main() {
local s = "Nyash"
if s.size() != 5 { print("FAIL: size!=5") return 1 }
if s.length() != 5 { print("FAIL: size!=5") return 1 }
if s.isEmpty() { print("FAIL: isEmpty on non-empty") return 1 }
if s.substring(0, 2) != "Ny" { print("FAIL: substring") return 1 }
if s.charAt(2) != "a" { print("FAIL: charAt") return 1 }