Adds initial support for lists.

Author: modlfo

.gitignore

@@ -79,3 +79,7 @@ tramp
 [._]ss[a-gi-z]
 [._]sw[a-p]
 /src/lsp/vscode-extension/vult_lsp_js.js
+/test/integration/serialization/vultin.o
+/test/integration/serialization/test_serialization_main.o
+/test/integration/serialization/test_serialization
+/test/integration/serialization/test_serialization.o

runtime/vultin.cpp

@@ -331,6 +331,11 @@ int32_t first_array_element(CustomBuffer &buffer, int32_t index) {
   return next_object(buffer, index);
 }
 
+int32_t get_array_count(CustomBuffer &buffer, int32_t index) {
+  index = index + 4; // skip header (tag + size bytes)
+  return deserialize_int(buffer, index);
+}
+
 int32_t get_field(CustomBuffer &buffer, int32_t object, int32_t field) {
   int32_t index = object + 4; // Skip the header
   int32_t n = 0;
@@ -414,9 +419,9 @@ std::string deserialize_string(CustomBuffer &buffer, int32_t index) {
   // Check the tag
   if (read_byte(buffer, index) == STRING_TAG) {
     int32_t total_size = block_size(buffer, index);
-    // String size = total_size - header(4) - tag(1) = total_size - 5
-    // But we need to account for null terminator, so actual string length = total_size - 5 - 1
-    int32_t string_length = total_size - 5 - 1;
+    // total_size = header(4) + string_content + null_terminator(1)
+    // string_length = total_size - 4 - 1 = total_size - 5
+    int32_t string_length = total_size - 5;
 
     if (string_length < 0) {
       buffer.error = true;

runtime/vultin.hpp

@@ -305,6 +305,8 @@ int32_t goto_data(CustomBuffer &buffer);
 
 int32_t first_array_element(CustomBuffer &buffer, int32_t index);
 
+int32_t get_array_count(CustomBuffer &buffer, int32_t index);
+
 template <std::size_t SIZE, typename DATA>
 void serialize_data(CustomBuffer &buffer,
                     int32_t (*serialize_type_descr_function)(CustomBuffer &, int32_t, std::array<bool, SIZE> &),

src/core/env.ml

@@ -257,6 +257,15 @@ let builtin_functions =
     ; "samplerate", C.unit_real
     ; "wrap_array", C.wrap_array
     ; "length", C.str_length
+    ; "list_size", C.list_size
+    ; "list_append", C.list_append
+    ; "list_insert", C.list_insert
+    ; "list_remove", C.list_remove
+    ; "list_clear", C.list_clear
+    ; "list_reserve", C.list_reserve
+    ; "list_capacity", C.list_capacity
+    ; "list_get", C.list_get
+    ; "list_set", C.list_set
     ]
   |> Map.of_list
 

src/core/inference.ml

@@ -1302,7 +1302,8 @@ and exp ?(context = normal_context) ?(in_constant_context = false) (env : env) (
     let env, e = exp ~context env e in
     let env, index = exp ~context env index in
     let t = C.unbound Loc.default in
-    unifyRaise e.loc (C.array ~fixed:false t) e.t;
+    (* Allow indexing on arrays and lists *)
+    unifyRaise e.loc (C.indexable t) e.t;
     unifyRaise index.loc (C.int ~loc:Loc.default) index.t;
     (* if the type is a builtin (a value) do not unify the constness *)
     let () =

src/core/initializer.ml

@@ -131,6 +131,10 @@ let rec initStatement (cstyle : cstyle) lhs rhs (t : type_) =
     let transfer = { s = StmtBind (lhs, rhs_temp); loc } in
     { s = StmtBlock [ decl_array; decl; init; loop; transfer ]; loc }
   | { t = TArray (None, _); _ } -> failwith "initStatement: Array without size"
+  | { t = TList _; loc; _ } ->
+    (* Lists are initialized as empty - use EEmptyValue with list type *)
+    let rhs = { e = EEmptyValue; t; loc } in
+    { s = StmtBind (lhs, rhs); loc }
 
 
 let customInitializerCall (custom_initializers : string Util.Maps.Map.t) name ectx void_type loc =

src/core/interpreter.ml

@@ -34,12 +34,14 @@ type dvalue =
   | DBool of bool
   | DString of string
   | DArray of dvalue array
+  | DList of dvalue list ref (* Dynamic list with mutable reference *)
   | DStruct of dvalue array
 
 (* Expression with resolved indices *)
 type iexp =
   | IEUnit
   | IEEmptyValue
+  | IEEmptyList of type_ (* Empty list of the given element type *)
   | IEBool of bool
   | IEInt of int
   | IEReal of float
@@ -105,6 +107,16 @@ type iexp =
   (* Array/string functions *)
   | IEBuiltinSize of iexp
   | IEBuiltinLength of iexp
+  (* List functions *)
+  | IEBuiltinListSize of iexp
+  | IEBuiltinListCapacity of iexp
+  | IEBuiltinListAppend of iexp * iexp
+  | IEBuiltinListInsert of iexp * iexp * iexp
+  | IEBuiltinListRemove of iexp * iexp
+  | IEBuiltinListClear of iexp
+  | IEBuiltinListReserve of iexp * iexp
+  | IEBuiltinListGet of iexp * iexp
+  | IEBuiltinListSet of iexp * iexp * iexp
   | IEIndex of iexp * iexp
   | IEArray of iexp list
   | IECall of int * iexp list (* Function index and args *)
@@ -302,6 +314,7 @@ let rec printDvalue (dv : dvalue) : string =
   | DBool b -> string_of_bool b
   | DString s -> "\"" ^ s ^ "\""
   | DArray arr -> "[" ^ String.concat "; " (Array.to_list (Array.map printDvalue arr)) ^ "]"
+  | DList list_ref -> "list[" ^ String.concat "; " (CCList.map printDvalue !list_ref) ^ "]"
   | DStruct arr ->
     "{" ^ String.concat "; " (Array.to_list (Array.mapi (fun i v -> string_of_int i ^ ":" ^ printDvalue v) arr)) ^ "}"
 
@@ -341,6 +354,7 @@ let rec printIexp (ie : iexp) : string =
   match ie with
   | IEUnit -> "()"
   | IEEmptyValue -> "empty"
+  | IEEmptyList _ -> "empty_list"
   | IEBool b -> string_of_bool b
   | IEInt i -> string_of_int i
   | IEReal f -> string_of_float f
@@ -408,6 +422,16 @@ let rec printIexp (ie : iexp) : string =
   (* Array/string functions *)
   | IEBuiltinSize e -> "size(" ^ printIexp e ^ ")"
   | IEBuiltinLength e -> "length(" ^ printIexp e ^ ")"
+  (* List functions *)
+  | IEBuiltinListSize e -> "list_size(" ^ printIexp e ^ ")"
+  | IEBuiltinListCapacity e -> "list_capacity(" ^ printIexp e ^ ")"
+  | IEBuiltinListAppend (l, v) -> "list_append(" ^ printIexp l ^ ", " ^ printIexp v ^ ")"
+  | IEBuiltinListInsert (l, i, v) -> "list_insert(" ^ printIexp l ^ ", " ^ printIexp i ^ ", " ^ printIexp v ^ ")"
+  | IEBuiltinListRemove (l, i) -> "list_remove(" ^ printIexp l ^ ", " ^ printIexp i ^ ")"
+  | IEBuiltinListClear e -> "list_clear(" ^ printIexp e ^ ")"
+  | IEBuiltinListReserve (l, n) -> "list_reserve(" ^ printIexp l ^ ", " ^ printIexp n ^ ")"
+  | IEBuiltinListGet (l, i) -> "list_get(" ^ printIexp l ^ ", " ^ printIexp i ^ ")"
+  | IEBuiltinListSet (l, i, v) -> "list_set(" ^ printIexp l ^ ", " ^ printIexp i ^ ", " ^ printIexp v ^ ")"
   | IEIndex (arr, idx) -> printIexp arr ^ "[" ^ printIexp idx ^ "]"
   | IEArray exprs -> "[" ^ String.concat "; " (CCList.map printIexp exprs) ^ "]"
   | IECall (func_idx, args) ->
@@ -498,7 +522,11 @@ let isInt16Type (typ : type_) : bool =
 let rec transformExp (ctx : transform_ctx) (exp : exp) : iexp =
   match exp.e with
   | EUnit -> IEUnit
-  | EEmptyValue -> IEEmptyValue
+  | EEmptyValue -> (
+    (* Check if the empty value is for a list type *)
+    match exp.t.t with
+    | TList _ -> IEEmptyList exp.t
+    | _ -> IEEmptyValue)
   | EBool b -> IEBool b
   | EInt i -> IEInt i
   | EReal f -> IEReal f
@@ -579,6 +607,16 @@ let rec transformExp (ctx : transform_ctx) (exp : exp) : iexp =
     (* Array/string functions *)
     | "size", [ arg ] -> IEBuiltinSize arg
     | "length", [ arg ] -> IEBuiltinLength arg
+    (* List functions *)
+    | "list_size", [ arg ] -> IEBuiltinListSize arg
+    | "list_capacity", [ arg ] -> IEBuiltinListCapacity arg
+    | "list_append", [ l; v ] -> IEBuiltinListAppend (l, v)
+    | "list_insert", [ l; i; v ] -> IEBuiltinListInsert (l, i, v)
+    | "list_remove", [ l; i ] -> IEBuiltinListRemove (l, i)
+    | "list_clear", [ arg ] -> IEBuiltinListClear arg
+    | "list_reserve", [ l; n ] -> IEBuiltinListReserve (l, n)
+    | "list_get", [ l; i ] -> IEBuiltinListGet (l, i)
+    | "list_set", [ l; i; v ] -> IEBuiltinListSet (l, i, v)
     (* External runtime functions *)
     | "push_block_header", args -> IECallExt ("push_block_header", args)
     | "push_int", args -> IECallExt ("push_int", args)
@@ -594,6 +632,7 @@ let rec transformExp (ctx : transform_ctx) (exp : exp) : iexp =
     | "deserialize_string", args -> IECallExt ("deserialize_string", args)
     | "search_type_description", args -> IECallExt ("search_type_description", args)
     | "first_array_element", args -> IECallExt ("first_array_element", args)
+    | "get_array_count", args -> IECallExt ("get_array_count", args)
     | "next_object", args -> IECallExt ("next_object", args)
     (* Fall back to regular call for non-builtins *)
     | _ -> (
@@ -706,6 +745,7 @@ let rec evalConstantExpression (constants : dvalue array) (exp : iexp) : dvalue
   match exp with
   | IEUnit -> DVoid
   | IEEmptyValue -> DVoid
+  | IEEmptyList _ -> DList (ref [])
   | IEBool b -> DBool b
   | IEInt i -> DInt i
   | IEReal f -> DReal f
@@ -844,8 +884,11 @@ let rec defaultValue (typ : type_) : dvalue =
   | TTuple types -> DArray (Array.of_list (CCList.map defaultValue types))
   | TEmptyType -> DVoid
   | TArray (None, _) -> error "Cannot create default value for unsized array"
+  | TList _ -> DList (ref [])
 
 
+(* Empty mutable list *)
+
 (* Sets up a function call on the runtime stack and returns the frame start offset *)
 let setupFunctionCall (stack : runtime_stack) (ifunc : ifunc_def) (args : dvalue list) : int =
   let frame_start = stack.sp in
@@ -877,7 +920,17 @@ let getArrayElement (ctx : call_context) (arr : dvalue) (idx : dvalue) : dvalue
       ^ string_of_int (Array.length elems)
       ^ " index = "
       ^ string_of_int i)
-  | _ -> error_with_context ctx "getArrayElement: Invalid array access. This is not an array"
+  | DList list_ref, DInt i -> (
+    match CCList.nth_opt !list_ref i with
+    | Some v -> v
+    | None ->
+      error_with_context
+        ctx
+        ("getArrayElement: List index out of bounds. size = "
+        ^ string_of_int (CCList.length !list_ref)
+        ^ " index = "
+        ^ string_of_int i))
+  | _ -> error_with_context ctx "getArrayElement: Invalid array access. This is not an array or list"
 
 
 (* Retrieves a member from a struct using a member index *)
@@ -1084,7 +1137,17 @@ and assignIlvalue : call_context -> iprog -> runtime_stack -> int -> ilexp -> dv
     let array_val = evalIlexpAsRvalue ctx prog stack frame_start e in
     match array_val, idx_val with
     | DArray arr, DInt i when i >= 0 && i < Array.length arr -> arr.(i) <- val_
-    | _ -> error_with_context ctx "Invalid array assignment")
+    | DList list_ref, DInt i ->
+      let old_list = !list_ref in
+      let len = CCList.length old_list in
+      if i >= 0 && i < len then
+        let before, after = CCList.take_drop i old_list in
+        match after with
+        | _ :: rest -> list_ref := before @ [ val_ ] @ rest
+        | [] -> error_with_context ctx "List index out of bounds for assignment"
+      else
+        error_with_context ctx ("List index out of bounds: index = " ^ string_of_int i ^ " size = " ^ string_of_int len)
+    | _ -> error_with_context ctx "Invalid array or list assignment")
   | ILTuple lexps -> (
     match val_ with
     | DArray vals when Array.length vals = CCList.length lexps ->
@@ -1123,6 +1186,7 @@ and evalIexp (ctx : call_context) (prog : iprog) (stack : runtime_stack) (frame_
   match exp with
   | IEUnit -> DVoid
   | IEEmptyValue -> DVoid
+  | IEEmptyList _ -> DList (ref [])
   | IEBool b -> DBool b
   | IEInt i -> DInt i
   | IEReal f -> DReal f
@@ -1390,6 +1454,89 @@ and evalIexp (ctx : call_context) (prog : iprog) (stack : runtime_stack) (frame_
     match evalIexp ctx prog stack frame_start e with
     | DString s -> DInt (String.length s)
     | _ -> error_with_context ctx "Type mismatch in length - expected string")
+  (* List functions *)
+  | IEBuiltinListSize e -> (
+    match evalIexp ctx prog stack frame_start e with
+    | DArray arr -> DInt (Array.length arr)
+    | DList list_ref -> DInt (CCList.length !list_ref)
+    | _ -> error_with_context ctx "Type mismatch in list_size - expected list")
+  | IEBuiltinListCapacity e -> (
+    (* Lists in the interpreter don't have a separate capacity, return size *)
+    match evalIexp ctx prog stack frame_start e with
+    | DArray arr -> DInt (Array.length arr)
+    | DList list_ref -> DInt (CCList.length !list_ref)
+    | _ -> error_with_context ctx "Type mismatch in list_capacity - expected list")
+  | IEBuiltinListAppend (l, v) -> (
+    let list_val = evalIexp ctx prog stack frame_start l in
+    let new_val = evalIexp ctx prog stack frame_start v in
+    match list_val with
+    | DList list_ref ->
+      list_ref := !list_ref @ [ new_val ];
+      DVoid
+    | _ -> error_with_context ctx "list_append requires list type")
+  | IEBuiltinListInsert (l, i, v) -> (
+    let list_val = evalIexp ctx prog stack frame_start l in
+    let idx = evalIexp ctx prog stack frame_start i in
+    let new_val = evalIexp ctx prog stack frame_start v in
+    match list_val, idx with
+    | DList list_ref, DInt index ->
+      let before, after = CCList.take_drop index !list_ref in
+      list_ref := before @ [ new_val ] @ after;
+      DVoid
+    | _ -> error_with_context ctx "list_insert: invalid arguments")
+  | IEBuiltinListRemove (l, i) -> (
+    let list_val = evalIexp ctx prog stack frame_start l in
+    let idx = evalIexp ctx prog stack frame_start i in
+    match list_val, idx with
+    | DList list_ref, DInt index ->
+      let before, after = CCList.take_drop index !list_ref in
+      list_ref := before @ CCList.drop 1 after;
+      DVoid
+    | _ -> error_with_context ctx "list_remove: invalid arguments")
+  | IEBuiltinListClear l -> (
+    match evalIexp ctx prog stack frame_start l with
+    | DList list_ref ->
+      list_ref := [];
+      DVoid
+    | _ -> error_with_context ctx "list_clear requires list type")
+  | IEBuiltinListReserve _ ->
+    (* Reserve is a hint, we can safely ignore it and return unit *)
+    DVoid
+  | IEBuiltinListGet (l, i) -> (
+    let list_val = evalIexp ctx prog stack frame_start l in
+    let idx = evalIexp ctx prog stack frame_start i in
+    match list_val, idx with
+    | DList list_ref, DInt index -> (
+      match CCList.nth_opt !list_ref index with
+      | Some v -> v
+      | None ->
+        error_with_context
+          ctx
+          ("list_get: index out of bounds. size = "
+          ^ string_of_int (CCList.length !list_ref)
+          ^ " index = "
+          ^ string_of_int index))
+    | _ -> error_with_context ctx "list_get: invalid arguments")
+  | IEBuiltinListSet (l, i, v) -> (
+    let list_val = evalIexp ctx prog stack frame_start l in
+    let idx = evalIexp ctx prog stack frame_start i in
+    let new_val = evalIexp ctx prog stack frame_start v in
+    match list_val, idx with
+    | DList list_ref, DInt index ->
+      let old_list = !list_ref in
+      let len = CCList.length old_list in
+      if index >= 0 && index < len then
+        let before, after = CCList.take_drop index old_list in
+        match after with
+        | _ :: rest ->
+          list_ref := before @ [ new_val ] @ rest;
+          DVoid
+        | [] -> error_with_context ctx "list_set: index out of bounds"
+      else
+        error_with_context
+          ctx
+          ("list_set: index out of bounds. size = " ^ string_of_int len ^ " index = " ^ string_of_int index)
+    | _ -> error_with_context ctx "list_set: invalid arguments")
   | IEIndex (e, index) ->
     let arr_val = evalIexp ctx prog stack frame_start e in
     let idx_val = evalIexp ctx prog stack frame_start index in

src/core/mapper.ml

@@ -277,6 +277,12 @@ let rec type_ (mapper : ('env, 'data) mapper) (env : 'env) (state : 'data state)
       apply mapper.type_ env state t
     else
       apply mapper.type_ env state { t = TArray (dim, t1'); const; loc }
+  | { t = TList t1; const; _ } ->
+    let state, t1' = type_ mapper sub_env state t1 in
+    if t1' == t1 then
+      apply mapper.type_ env state t
+    else
+      apply mapper.type_ env state { t = TList t1'; const; loc }
   | { t = TTuple elems; const; _ } ->
     let state, elems' = (mapper_list type_) mapper sub_env state elems in
     if elems' == elems then

src/core/prog.ml

@@ -37,6 +37,7 @@ type type_d_ =
   | TBool
   | TFix16
   | TArray of int option * type_
+  | TList of type_ (* Dynamic list type, like std::vector *)
   | TStruct of struct_descr
   | TTuple of type_ list
   | TEmptyType
@@ -218,6 +219,9 @@ module Print = struct
     | TArray (None, t) ->
       let t = print_type_ t in
       prefix {%pla|<#t#>[:]|}
+    | TList t ->
+      let t = print_type_ t in
+      prefix {%pla|list(<#t#>)|}
     | TStruct { path; _ } -> prefix {%pla|struct <#path#s>|}
     | TTuple elems ->
       let elems = Pla.map_sep Pla.commaspace print_type_ elems in
@@ -469,6 +473,8 @@ module C = struct
 
   let array_t ?dim t = { t = TArray (dim, t); loc = Loc.default; const = false }
 
+  let list_t t = { t = TList t; loc = Loc.default; const = false }
+
   let ereal ?(loc = Loc.default) i = { e = EReal i; t = real_t; loc }
 
   let efix16 ?(loc = Loc.default) i = { e = EFixed i; t = fix16_t; loc }