flake: add platformdirs artiq dependency

Causes linker errors for unknown reasons.

.pre-commit-config.yaml

@@ -1,24 +1,24 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
-default_stages: [commit]
+default_stages: [pre-commit]
 
 repos:
   - repo: local
     hooks:
       - id: nac3-cargo-fmt
         name: nac3 cargo format
-        entry: cargo
+        entry: nix
         language: system
         types: [file, rust]
         pass_filenames: false
         description: Runs cargo fmt on the codebase.
-        args: [fmt]
+        args: [develop, -c, cargo, fmt, --all]
       - id: nac3-cargo-clippy
         name: nac3 cargo clippy
-        entry: cargo
+        entry: nix
         language: system
         types: [file, rust]
         pass_filenames: false
         description: Runs cargo clippy on the codebase.
-        args: [clippy, --tests]
+        args: [develop, -c, cargo, clippy, --tests]

Cargo.toml

@@ -4,6 +4,7 @@ members = [
   "nac3ast",
   "nac3parser",
   "nac3core",
+  "nac3core/nac3core_derive",
   "nac3standalone",
   "nac3artiq",
   "runkernel",

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723637854,
+        "lastModified": 1731319897,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -107,18 +107,18 @@
             (pkgs.fetchFromGitHub {
               owner = "m-labs";
               repo = "sipyco";
-              rev = "939f84f9b5eef7efbf7423c735d1834783b6140e";
+              rev = "094a6cd63ffa980ef63698920170e50dc9ba77fd";
-              sha256 = "sha256-15Nun4EY35j+6SPZkjzZtyH/ncxLS60KuGJjFh5kSTc=";
+              sha256 = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=";
             })
             (pkgs.fetchFromGitHub {
               owner = "m-labs";
               repo = "artiq";
-              rev = "923ca3377d42c815f979983134ec549dc39d3ca0";
+              rev = "28c9de3e251daa89a8c9fd79d5ab64a3ec03bac6";
-              sha256 = "sha256-oJoEeNEeNFSUyh6jXG8Tzp6qHVikeHS0CzfE+mODPgw=";
+              sha256 = "sha256-vAvpbHc5B+1wtG8zqN7j9dQE1ON+i22v+uqA+tw6Gak=";
             })
           ];
           buildInputs = [
-            (python3-mimalloc.withPackages(ps: [ ps.numpy ps.scipy ps.jsonschema ps.lmdb nac3artiq-instrumented ]))
+            (python3-mimalloc.withPackages(ps: [ ps.numpy ps.scipy ps.jsonschema ps.lmdb ps.platformdirs nac3artiq-instrumented ]))
             pkgs.llvmPackages_14.llvm.out
           ];
           phases = [ "buildPhase" "installPhase" ];

nac3artiq/Cargo.toml

@@ -12,16 +12,10 @@ crate-type = ["cdylib"]
 itertools = "0.13"
 pyo3 = { version = "0.21", features = ["extension-module", "gil-refs"] }
 parking_lot = "0.12"
-tempfile = "3.10"
+tempfile = "3.13"
-nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 nac3ld = { path = "../nac3ld" }
 
-[dependencies.inkwell]
-version = "0.4"
-default-features = false
-features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
-
 [features]
 init-llvm-profile = []
 no-escape-analysis = ["nac3core/no-escape-analysis"]

nac3artiq/demo/min_artiq.py

@@ -112,10 +112,15 @@ def extern(function):
     register_function(function)
     return function
 
-def rpc(function):
+
-    """Decorates a function declaration defined by the core device runtime."""
+def rpc(arg=None, flags={}):
-    register_function(function)
+    """Decorates a function or method to be executed on the host interpreter."""
-    return function
+    if arg is None:
+        def inner_decorator(function):
+            return rpc(function, flags)
+        return inner_decorator
+    register_function(arg)
+    return arg
 
 def kernel(function_or_method):
     """Decorates a function or method to be executed on the core device."""
@@ -201,7 +206,7 @@ class Core:
         embedding = EmbeddingMap()
 
         if allow_registration:
-            compiler.analyze(registered_functions, registered_classes)
+            compiler.analyze(registered_functions, registered_classes, set())
             allow_registration = False
 
         if hasattr(method, "__self__"):

nac3artiq/src/codegen.rs

@@ -1,38 +1,3 @@
-use nac3core::{
-    codegen::{
-        classes::{
-            ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayType,
-            NDArrayValue, RangeValue, UntypedArrayLikeAccessor,
-        },
-        expr::{destructure_range, gen_call},
-        irrt::call_ndarray_calc_size,
-        llvm_intrinsics::{call_int_smax, call_memcpy_generic, call_stackrestore, call_stacksave},
-        stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
-        CodeGenContext, CodeGenerator,
-    },
-    symbol_resolver::ValueEnum,
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, DefinitionId, GenCall},
-    typecheck::typedef::{iter_type_vars, FunSignature, FuncArg, Type, TypeEnum, VarMap},
-};
-
-use nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
-
-use inkwell::{
-    context::Context,
-    module::Linkage,
-    types::{BasicType, IntType},
-    values::{BasicValueEnum, PointerValue, StructValue},
-    AddressSpace, IntPredicate,
-};
-
-use pyo3::{
-    types::{PyDict, PyList},
-    PyObject, PyResult, Python,
-};
-
-use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
-
-use itertools::Itertools;
 use std::{
     collections::{hash_map::DefaultHasher, HashMap},
     hash::{Hash, Hasher},
@@ -41,6 +6,40 @@ use std::{
     sync::Arc,
 };
 
+use itertools::Itertools;
+use pyo3::{
+    types::{PyDict, PyList},
+    PyObject, PyResult, Python,
+};
+
+use nac3core::{
+    codegen::{
+        expr::{destructure_range, gen_call},
+        irrt::call_ndarray_calc_size,
+        llvm_intrinsics::{call_int_smax, call_memcpy_generic, call_stackrestore, call_stacksave},
+        stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
+        types::{NDArrayType, ProxyType},
+        values::{
+            ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayValue, ProxyValue,
+            RangeValue, UntypedArrayLikeAccessor,
+        },
+        CodeGenContext, CodeGenerator,
+    },
+    inkwell::{
+        context::Context,
+        module::Linkage,
+        types::{BasicType, IntType},
+        values::{BasicValueEnum, IntValue, PointerValue, StructValue},
+        AddressSpace, IntPredicate, OptimizationLevel,
+    },
+    nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef},
+    symbol_resolver::ValueEnum,
+    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, DefinitionId, GenCall},
+    typecheck::typedef::{iter_type_vars, FunSignature, FuncArg, Type, TypeEnum, VarMap},
+};
+
+use super::{symbol_resolver::InnerResolver, timeline::TimeFns};
+
 /// The parallelism mode within a block.
 #[derive(Copy, Clone, Eq, PartialEq)]
 enum ParallelMode {
@@ -460,9 +459,9 @@ fn format_rpc_arg<'ctx>(
             let llvm_usize = generator.get_size_type(ctx.ctx);
 
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, arg_ty);
-            let llvm_arg_ty =
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
-                NDArrayType::new(generator, ctx.ctx, ctx.get_llvm_type(generator, elem_ty));
+            let llvm_arg_ty = NDArrayType::new(generator, ctx.ctx, llvm_elem_ty);
-            let llvm_arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), llvm_usize, None);
+            let llvm_arg = llvm_arg_ty.map_value(arg.into_pointer_value(), None);
 
             let llvm_usize_sizeof = ctx
                 .builder
@@ -471,7 +470,7 @@ fn format_rpc_arg<'ctx>(
             let llvm_pdata_sizeof = ctx
                 .builder
                 .build_int_truncate_or_bit_cast(
-                    llvm_arg_ty.element_type().ptr_type(AddressSpace::default()).size_of(),
+                    llvm_elem_ty.ptr_type(AddressSpace::default()).size_of(),
                     llvm_usize,
                     "",
                 )
@@ -486,13 +485,10 @@ fn format_rpc_arg<'ctx>(
             let buffer = ctx.builder.build_array_alloca(llvm_i8, buffer_size, "rpc.arg").unwrap();
             let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, Some("rpc.arg"));
 
-            let ppdata = generator.gen_var_alloc(ctx, llvm_arg_ty.element_type(), None).unwrap();
-            ctx.builder.build_store(ppdata, llvm_arg.data().base_ptr(ctx, generator)).unwrap();
-
             call_memcpy_generic(
                 ctx,
                 buffer.base_ptr(ctx, generator),
-                ppdata,
+                llvm_arg.ptr_to_data(ctx),
                 llvm_pdata_sizeof,
                 llvm_i1.const_zero(),
             );
@@ -502,7 +498,7 @@ fn format_rpc_arg<'ctx>(
             call_memcpy_generic(
                 ctx,
                 pbuffer_dims_begin,
-                llvm_arg.dim_sizes().base_ptr(ctx, generator),
+                llvm_arg.shape().base_ptr(ctx, generator),
                 dims_buf_sz,
                 llvm_i1.const_zero(),
             );
@@ -517,7 +513,7 @@ fn format_rpc_arg<'ctx>(
             ctx.builder.build_store(arg_slot, arg).unwrap();
 
             ctx.builder
-                .build_bitcast(arg_slot, llvm_pi8, "rpc.arg")
+                .build_bit_cast(arg_slot, llvm_pi8, "rpc.arg")
                 .map(BasicValueEnum::into_pointer_value)
                 .unwrap()
         }
@@ -528,12 +524,305 @@ fn format_rpc_arg<'ctx>(
     arg_slot
 }
 
+/// Formats an RPC return value to conform to the expected format required by NAC3.
+fn format_rpc_ret<'ctx>(
+    generator: &mut dyn CodeGenerator,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    ret_ty: Type,
+) -> Option<BasicValueEnum<'ctx>> {
+    // -- receive value:
+    // T result = {
+    //   void *ret_ptr = alloca(sizeof(T));
+    //   void *ptr = ret_ptr;
+    //   loop: int size = rpc_recv(ptr);
+    //   // Non-zero: Provide `size` bytes of extra storage for variable-length data.
+    //   if(size) { ptr = alloca(size); goto loop; }
+    //   else *(T*)ret_ptr
+    // }
+
+    let llvm_i8 = ctx.ctx.i8_type();
+    let llvm_i32 = ctx.ctx.i32_type();
+    let llvm_i8_8 = ctx.ctx.struct_type(&[llvm_i8.array_type(8).into()], false);
+    let llvm_pi8 = llvm_i8.ptr_type(AddressSpace::default());
+
+    let rpc_recv = ctx.module.get_function("rpc_recv").unwrap_or_else(|| {
+        ctx.module.add_function("rpc_recv", llvm_i32.fn_type(&[llvm_pi8.into()], false), None)
+    });
+
+    if ctx.unifier.unioned(ret_ty, ctx.primitives.none) {
+        ctx.build_call_or_invoke(rpc_recv, &[llvm_pi8.const_null().into()], "rpc_recv");
+        return None;
+    }
+
+    let prehead_bb = ctx.builder.get_insert_block().unwrap();
+    let current_function = prehead_bb.get_parent().unwrap();
+    let head_bb = ctx.ctx.append_basic_block(current_function, "rpc.head");
+    let alloc_bb = ctx.ctx.append_basic_block(current_function, "rpc.continue");
+    let tail_bb = ctx.ctx.append_basic_block(current_function, "rpc.tail");
+
+    let llvm_ret_ty = ctx.get_llvm_abi_type(generator, ret_ty);
+
+    let result = match &*ctx.unifier.get_ty_immutable(ret_ty) {
+        TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
+            let llvm_i1 = ctx.ctx.bool_type();
+            let llvm_usize = generator.get_size_type(ctx.ctx);
+
+            // Round `val` up to its modulo `power_of_two`
+            let round_up = |ctx: &mut CodeGenContext<'ctx, '_>,
+                            val: IntValue<'ctx>,
+                            power_of_two: IntValue<'ctx>| {
+                debug_assert_eq!(
+                    val.get_type().get_bit_width(),
+                    power_of_two.get_type().get_bit_width()
+                );
+
+                let llvm_val_t = val.get_type();
+
+                let max_rem = ctx
+                    .builder
+                    .build_int_sub(power_of_two, llvm_val_t.const_int(1, false), "")
+                    .unwrap();
+                ctx.builder
+                    .build_and(
+                        ctx.builder.build_int_add(val, max_rem, "").unwrap(),
+                        ctx.builder.build_not(max_rem, "").unwrap(),
+                        "",
+                    )
+                    .unwrap()
+            };
+
+            // Setup types
+            let (elem_ty, ndims) = unpack_ndarray_var_tys(&mut ctx.unifier, ret_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+            let llvm_ret_ty = NDArrayType::new(generator, ctx.ctx, llvm_elem_ty);
+
+            // Allocate the resulting ndarray
+            // A condition after format_rpc_ret ensures this will not be popped this off.
+            let ndarray = llvm_ret_ty.new_value(generator, ctx, Some("rpc.result"));
+
+            // Setup ndims
+            let ndims =
+                if let TypeEnum::TLiteral { values, .. } = &*ctx.unifier.get_ty_immutable(ndims) {
+                    assert_eq!(values.len(), 1);
+
+                    u64::try_from(values[0].clone()).unwrap()
+                } else {
+                    unreachable!();
+                };
+            // Set `ndarray.ndims`
+            ndarray.store_ndims(ctx, generator, llvm_usize.const_int(ndims, false));
+            // Allocate `ndarray.shape` [size_t; ndims]
+            ndarray.create_shape(ctx, llvm_usize, ndarray.load_ndims(ctx));
+
+            /*
+                ndarray now:
+                  - .ndims: initialized
+                  - .shape: allocated but uninitialized .shape
+                  - .data: uninitialized
+            */
+
+            let llvm_usize_sizeof = ctx
+                .builder
+                .build_int_truncate_or_bit_cast(llvm_usize.size_of(), llvm_usize, "")
+                .unwrap();
+            let llvm_pdata_sizeof = ctx
+                .builder
+                .build_int_truncate_or_bit_cast(
+                    llvm_elem_ty.ptr_type(AddressSpace::default()).size_of(),
+                    llvm_usize,
+                    "",
+                )
+                .unwrap();
+            let llvm_elem_sizeof = ctx
+                .builder
+                .build_int_truncate_or_bit_cast(llvm_elem_ty.size_of().unwrap(), llvm_usize, "")
+                .unwrap();
+
+            // Allocates a buffer for the initial RPC'ed object, which is guaranteed to be
+            // (4 + 4 * ndims) bytes with 8-byte alignment
+            let sizeof_dims =
+                ctx.builder.build_int_mul(ndarray.load_ndims(ctx), llvm_usize_sizeof, "").unwrap();
+            let unaligned_buffer_size =
+                ctx.builder.build_int_add(sizeof_dims, llvm_pdata_sizeof, "").unwrap();
+            let buffer_size = round_up(ctx, unaligned_buffer_size, llvm_usize.const_int(8, false));
+
+            let stackptr = call_stacksave(ctx, None);
+            // Just to be absolutely sure, alloca in [i8 x 8] slices to force 8-byte alignment
+            let buffer = ctx
+                .builder
+                .build_array_alloca(
+                    llvm_i8_8,
+                    ctx.builder
+                        .build_int_unsigned_div(buffer_size, llvm_usize.const_int(8, false), "")
+                        .unwrap(),
+                    "rpc.buffer",
+                )
+                .unwrap();
+            let buffer = ctx
+                .builder
+                .build_bit_cast(buffer, llvm_pi8, "")
+                .map(BasicValueEnum::into_pointer_value)
+                .unwrap();
+            let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
+
+            // The first call to `rpc_recv` reads the top-level ndarray object: [pdata, shape]
+            //
+            // The returned value is the number of bytes for `ndarray.data`.
+            let ndarray_nbytes = ctx
+                .build_call_or_invoke(
+                    rpc_recv,
+                    &[buffer.base_ptr(ctx, generator).into()], // Reads [usize; ndims]. NOTE: We are allocated [size_t; ndims].
+                    "rpc.size.next",
+                )
+                .map(BasicValueEnum::into_int_value)
+                .unwrap();
+
+            // debug_assert(ndarray_nbytes > 0)
+            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
+                ctx.make_assert(
+                    generator,
+                    ctx.builder
+                        .build_int_compare(
+                            IntPredicate::UGT,
+                            ndarray_nbytes,
+                            ndarray_nbytes.get_type().const_zero(),
+                            "",
+                        )
+                        .unwrap(),
+                    "0:AssertionError",
+                    "Unexpected RPC termination for ndarray - Expected data buffer next",
+                    [None, None, None],
+                    ctx.current_loc,
+                );
+            }
+
+            // Copy shape from the buffer to `ndarray.shape`.
+            let pbuffer_dims =
+                unsafe { buffer.ptr_offset_unchecked(ctx, generator, &llvm_pdata_sizeof, None) };
+
+            call_memcpy_generic(
+                ctx,
+                ndarray.shape().base_ptr(ctx, generator),
+                pbuffer_dims,
+                sizeof_dims,
+                llvm_i1.const_zero(),
+            );
+            // Restore stack from before allocation of buffer
+            call_stackrestore(ctx, stackptr);
+
+            // Allocate `ndarray.data`.
+            // `ndarray.shape` must be initialized beforehand in this implementation
+            //   (for ndarray.create_data() to know how many elements to allocate)
+            let num_elements =
+                call_ndarray_calc_size(generator, ctx, &ndarray.shape(), (None, None));
+
+            // debug_assert(nelems * sizeof(T) >= ndarray_nbytes)
+            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
+                let sizeof_data =
+                    ctx.builder.build_int_mul(num_elements, llvm_elem_sizeof, "").unwrap();
+
+                ctx.make_assert(
+                    generator,
+                    ctx.builder.build_int_compare(IntPredicate::UGE,
+                        sizeof_data,
+                        ndarray_nbytes,
+                        "",
+                    ).unwrap(),
+                    "0:AssertionError",
+                    "Unexpected allocation size request for ndarray data - Expected up to {0} bytes, got {1} bytes",
+                    [Some(sizeof_data), Some(ndarray_nbytes), None],
+                    ctx.current_loc,
+                );
+            }
+
+            ndarray.create_data(ctx, llvm_elem_ty, num_elements);
+
+            let ndarray_data = ndarray.data().base_ptr(ctx, generator);
+            let ndarray_data_i8 =
+                ctx.builder.build_pointer_cast(ndarray_data, llvm_pi8, "").unwrap();
+
+            // NOTE: Currently on `prehead_bb`
+            ctx.builder.build_unconditional_branch(head_bb).unwrap();
+
+            // Inserting into `head_bb`. Do `rpc_recv` for `data` recursively.
+            ctx.builder.position_at_end(head_bb);
+
+            let phi = ctx.builder.build_phi(llvm_pi8, "rpc.ptr").unwrap();
+            phi.add_incoming(&[(&ndarray_data_i8, prehead_bb)]);
+
+            let alloc_size = ctx
+                .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
+                .map(BasicValueEnum::into_int_value)
+                .unwrap();
+
+            let is_done = ctx
+                .builder
+                .build_int_compare(IntPredicate::EQ, llvm_i32.const_zero(), alloc_size, "rpc.done")
+                .unwrap();
+            ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
+
+            ctx.builder.position_at_end(alloc_bb);
+            // Align the allocation to sizeof(T)
+            let alloc_size = round_up(ctx, alloc_size, llvm_elem_sizeof);
+            let alloc_ptr = ctx
+                .builder
+                .build_array_alloca(
+                    llvm_elem_ty,
+                    ctx.builder.build_int_unsigned_div(alloc_size, llvm_elem_sizeof, "").unwrap(),
+                    "rpc.alloc",
+                )
+                .unwrap();
+            let alloc_ptr =
+                ctx.builder.build_pointer_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
+            phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
+            ctx.builder.build_unconditional_branch(head_bb).unwrap();
+
+            ctx.builder.position_at_end(tail_bb);
+            ndarray.as_base_value().into()
+        }
+
+        _ => {
+            let slot = ctx.builder.build_alloca(llvm_ret_ty, "rpc.ret.slot").unwrap();
+            let slotgen = ctx.builder.build_bit_cast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
+            ctx.builder.build_unconditional_branch(head_bb).unwrap();
+            ctx.builder.position_at_end(head_bb);
+
+            let phi = ctx.builder.build_phi(llvm_pi8, "rpc.ptr").unwrap();
+            phi.add_incoming(&[(&slotgen, prehead_bb)]);
+            let alloc_size = ctx
+                .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
+                .unwrap()
+                .into_int_value();
+            let is_done = ctx
+                .builder
+                .build_int_compare(IntPredicate::EQ, llvm_i32.const_zero(), alloc_size, "rpc.done")
+                .unwrap();
+
+            ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
+            ctx.builder.position_at_end(alloc_bb);
+
+            let alloc_ptr =
+                ctx.builder.build_array_alloca(llvm_pi8, alloc_size, "rpc.alloc").unwrap();
+            let alloc_ptr =
+                ctx.builder.build_bit_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
+            phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
+            ctx.builder.build_unconditional_branch(head_bb).unwrap();
+
+            ctx.builder.position_at_end(tail_bb);
+            ctx.builder.build_load(slot, "rpc.result").unwrap()
+        }
+    };
+
+    Some(result)
+}
+
 fn rpc_codegen_callback_fn<'ctx>(
     ctx: &mut CodeGenContext<'ctx, '_>,
     obj: Option<(Type, ValueEnum<'ctx>)>,
     fun: (&FunSignature, DefinitionId),
     args: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
     generator: &mut dyn CodeGenerator,
+    is_async: bool,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
     let int8 = ctx.ctx.i8_type();
     let int32 = ctx.ctx.i32_type();
@@ -642,91 +931,72 @@ fn rpc_codegen_callback_fn<'ctx>(
     }
 
     // call
-    let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
+    if is_async {
-        ctx.module.add_function(
+        let rpc_send_async = ctx.module.get_function("rpc_send_async").unwrap_or_else(|| {
-            "rpc_send",
+            ctx.module.add_function(
-            ctx.ctx.void_type().fn_type(
+                "rpc_send_async",
-                &[
+                ctx.ctx.void_type().fn_type(
-                    int32.into(),
+                    &[
-                    tag_ptr_type.ptr_type(AddressSpace::default()).into(),
+                        int32.into(),
-                    ptr_type.ptr_type(AddressSpace::default()).into(),
+                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
-                ],
+                        ptr_type.ptr_type(AddressSpace::default()).into(),
-                false,
+                    ],
-            ),
+                    false,
-            None,
+                ),
-        )
+                None,
-    });
+            )
-    ctx.builder
+        });
-        .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
+        ctx.builder
-        .unwrap();
+            .build_call(
+                rpc_send_async,
+                &[service_id.into(), tag_ptr.into(), args_ptr.into()],
+                "rpc.send",
+            )
+            .unwrap();
+    } else {
+        let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
+            ctx.module.add_function(
+                "rpc_send",
+                ctx.ctx.void_type().fn_type(
+                    &[
+                        int32.into(),
+                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
+                        ptr_type.ptr_type(AddressSpace::default()).into(),
+                    ],
+                    false,
+                ),
+                None,
+            )
+        });
+        ctx.builder
+            .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
+            .unwrap();
+    }
 
     // reclaim stack space used by arguments
     call_stackrestore(ctx, stackptr);
 
-    // -- receive value:
+    if is_async {
-    // T result = {
+        // async RPCs do not return any values
-    //   void *ret_ptr = alloca(sizeof(T));
+        Ok(None)
-    //   void *ptr = ret_ptr;
+    } else {
-    //   loop: int size = rpc_recv(ptr);
+        let result = format_rpc_ret(generator, ctx, fun.0.ret);
-    //   // Non-zero: Provide `size` bytes of extra storage for variable-length data.
-    //   if(size) { ptr = alloca(size); goto loop; }
-    //   else *(T*)ret_ptr
-    // }
-    let rpc_recv = ctx.module.get_function("rpc_recv").unwrap_or_else(|| {
-        ctx.module.add_function("rpc_recv", int32.fn_type(&[ptr_type.into()], false), None)
-    });
 
-    if ctx.unifier.unioned(fun.0.ret, ctx.primitives.none) {
+        if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
-        ctx.build_call_or_invoke(rpc_recv, &[ptr_type.const_null().into()], "rpc_recv");
+            // An RPC returning an NDArray would not touch here.
-        return Ok(None);
+            call_stackrestore(ctx, stackptr);
+        }
+
+        Ok(result)
     }
-
-    let prehead_bb = ctx.builder.get_insert_block().unwrap();
-    let current_function = prehead_bb.get_parent().unwrap();
-    let head_bb = ctx.ctx.append_basic_block(current_function, "rpc.head");
-    let alloc_bb = ctx.ctx.append_basic_block(current_function, "rpc.continue");
-    let tail_bb = ctx.ctx.append_basic_block(current_function, "rpc.tail");
-
-    let ret_ty = ctx.get_llvm_abi_type(generator, fun.0.ret);
-    let need_load = !ret_ty.is_pointer_type();
-    let slot = ctx.builder.build_alloca(ret_ty, "rpc.ret.slot").unwrap();
-    let slotgen = ctx.builder.build_bitcast(slot, ptr_type, "rpc.ret.ptr").unwrap();
-    ctx.builder.build_unconditional_branch(head_bb).unwrap();
-    ctx.builder.position_at_end(head_bb);
-
-    let phi = ctx.builder.build_phi(ptr_type, "rpc.ptr").unwrap();
-    phi.add_incoming(&[(&slotgen, prehead_bb)]);
-    let alloc_size = ctx
-        .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
-        .unwrap()
-        .into_int_value();
-    let is_done = ctx
-        .builder
-        .build_int_compare(inkwell::IntPredicate::EQ, int32.const_zero(), alloc_size, "rpc.done")
-        .unwrap();
-
-    ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
-    ctx.builder.position_at_end(alloc_bb);
-
-    let alloc_ptr = ctx.builder.build_array_alloca(ptr_type, alloc_size, "rpc.alloc").unwrap();
-    let alloc_ptr = ctx.builder.build_bitcast(alloc_ptr, ptr_type, "rpc.alloc.ptr").unwrap();
-    phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
-    ctx.builder.build_unconditional_branch(head_bb).unwrap();
-
-    ctx.builder.position_at_end(tail_bb);
-
-    let result = ctx.builder.build_load(slot, "rpc.result").unwrap();
-    if need_load {
-        call_stackrestore(ctx, stackptr);
-    }
-    Ok(Some(result))
 }
 
-pub fn attributes_writeback(
+pub fn attributes_writeback<'ctx>(
-    ctx: &mut CodeGenContext<'_, '_>,
+    ctx: &mut CodeGenContext<'ctx, '_>,
     generator: &mut dyn CodeGenerator,
     inner_resolver: &InnerResolver,
     host_attributes: &PyObject,
+    return_obj: Option<(Type, ValueEnum<'ctx>)>,
 ) -> Result<(), String> {
     Python::with_gil(|py| -> PyResult<Result<(), String>> {
         let host_attributes: &PyList = host_attributes.downcast(py)?;
@@ -736,6 +1006,11 @@ pub fn attributes_writeback(
         let zero = int32.const_zero();
         let mut values = Vec::new();
         let mut scratch_buffer = Vec::new();
+
+        if let Some((ty, obj)) = return_obj {
+            values.push((ty, obj.to_basic_value_enum(ctx, generator, ty).unwrap()));
+        }
+
         for val in (*globals).values() {
             let val = val.as_ref(py);
             let ty = inner_resolver.get_obj_type(
@@ -814,7 +1089,7 @@ pub fn attributes_writeback(
         let args: Vec<_> =
             values.into_iter().map(|(_, val)| (None, ValueEnum::Dynamic(val))).collect();
         if let Err(e) =
-            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator)
+            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator, true)
         {
             return Ok(Err(e));
         }
@@ -824,9 +1099,9 @@ pub fn attributes_writeback(
     Ok(())
 }
 
-pub fn rpc_codegen_callback() -> Arc<GenCall> {
+pub fn rpc_codegen_callback(is_async: bool) -> Arc<GenCall> {
-    Arc::new(GenCall::new(Box::new(|ctx, obj, fun, args, generator| {
+    Arc::new(GenCall::new(Box::new(move |ctx, obj, fun, args, generator| {
-        rpc_codegen_callback_fn(ctx, obj, fun, args, generator)
+        rpc_codegen_callback_fn(ctx, obj, fun, args, generator, is_async)
     })))
 }
 
@@ -1040,7 +1315,8 @@ fn polymorphic_print<'ctx>(
                 fmt.push('[');
                 flush(ctx, generator, &mut fmt, &mut args);
 
-                let val = ListValue::from_ptr_val(value.into_pointer_value(), llvm_usize, None);
+                let val =
+                    ListValue::from_pointer_value(value.into_pointer_value(), llvm_usize, None);
                 let len = val.load_size(ctx, None);
                 let last =
                     ctx.builder.build_int_sub(len, llvm_usize.const_int(1, false), "").unwrap();
@@ -1092,12 +1368,18 @@ fn polymorphic_print<'ctx>(
 
             TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
                 let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, ty);
+                let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
                 fmt.push_str("array([");
                 flush(ctx, generator, &mut fmt, &mut args);
 
-                let val = NDArrayValue::from_ptr_val(value.into_pointer_value(), llvm_usize, None);
+                let val = NDArrayValue::from_pointer_value(
-                let len = call_ndarray_calc_size(generator, ctx, &val.dim_sizes(), (None, None));
+                    value.into_pointer_value(),
+                    llvm_elem_ty,
+                    llvm_usize,
+                    None,
+                );
+                let len = call_ndarray_calc_size(generator, ctx, &val.shape(), (None, None));
                 let last =
                     ctx.builder.build_int_sub(len, llvm_usize.const_int(1, false), "").unwrap();
 
@@ -1150,7 +1432,7 @@ fn polymorphic_print<'ctx>(
                 fmt.push_str("range(");
                 flush(ctx, generator, &mut fmt, &mut args);
 
-                let val = RangeValue::from_ptr_val(value.into_pointer_value(), None);
+                let val = RangeValue::from_pointer_value(value.into_pointer_value(), None);
 
                 let (start, stop, step) = destructure_range(ctx, val);
 

nac3artiq/src/lib.rs

@@ -1,10 +1,4 @@
-#![deny(
+#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
-    future_incompatible,
-    let_underscore,
-    nonstandard_style,
-    rust_2024_compatibility,
-    clippy::all
-)]
 #![warn(clippy::pedantic)]
 #![allow(
     unsafe_op_in_unsafe_fn,
@@ -16,64 +10,65 @@
     clippy::wildcard_imports
 )]
 
-use std::collections::{HashMap, HashSet};
+use std::{
-use std::fs;
+    collections::{HashMap, HashSet},
-use std::io::Write;
+    fs,
-use std::process::Command;
+    io::Write,
-use std::rc::Rc;
+    process::Command,
-use std::sync::Arc;
+    rc::Rc,
-
+    sync::Arc,
-use inkwell::{
-    context::Context,
-    memory_buffer::MemoryBuffer,
-    module::{Linkage, Module},
-    passes::PassBuilderOptions,
-    support::is_multithreaded,
-    targets::*,
-    OptimizationLevel,
 };
+
 use itertools::Itertools;
-use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
-use nac3core::toplevel::builtins::get_exn_constructor;
-use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
-use nac3parser::{
-    ast::{ExprKind, Stmt, StmtKind, StrRef},
-    parser::parse_program,
-};
-use pyo3::create_exception;
-use pyo3::prelude::*;
-use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};
-
 use parking_lot::{Mutex, RwLock};
+use pyo3::{
+    create_exception, exceptions,
+    prelude::*,
+    types::{PyBytes, PyDict, PyNone, PySet},
+};
+use tempfile::{self, TempDir};
 
 use nac3core::{
-    codegen::irrt::load_irrt,
+    codegen::{
-    codegen::{concrete_type::ConcreteTypeStore, CodeGenTask, WithCall, WorkerRegistry},
+        concrete_type::ConcreteTypeStore, gen_func_impl, irrt::load_irrt, CodeGenLLVMOptions,
+        CodeGenTargetMachineOptions, CodeGenTask, CodeGenerator, WithCall, WorkerRegistry,
+    },
+    inkwell::{
+        context::Context,
+        memory_buffer::MemoryBuffer,
+        module::{FlagBehavior, Linkage, Module},
+        passes::PassBuilderOptions,
+        support::is_multithreaded,
+        targets::*,
+        OptimizationLevel,
+    },
+    nac3parser::{
+        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
+        parser::parse_program,
+    },
     symbol_resolver::SymbolResolver,
     toplevel::{
+        builtins::get_exn_constructor,
         composer::{BuiltinFuncCreator, BuiltinFuncSpec, ComposerConfig, TopLevelComposer},
         DefinitionId, GenCall, TopLevelDef,
     },
-    typecheck::typedef::{FunSignature, FuncArg},
+    typecheck::{
-    typecheck::{type_inferencer::PrimitiveStore, typedef::Type},
+        type_inferencer::PrimitiveStore,
+        typedef::{into_var_map, FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
+    },
 };
-
 use nac3ld::Linker;
 
-use crate::{
+use codegen::{
-    codegen::{
+    attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
-        attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
-    },
-    symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver},
 };
-use tempfile::{self, TempDir};
+use symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver};
+use timeline::TimeFns;
 
 mod codegen;
 mod symbol_resolver;
 mod timeline;
 
-use timeline::TimeFns;
-
 #[derive(PartialEq, Clone, Copy)]
 enum Isa {
     Host,
@@ -147,14 +142,32 @@ impl Nac3 {
         module: &PyObject,
         registered_class_ids: &HashSet<u64>,
     ) -> PyResult<()> {
-        let (module_name, source_file) = Python::with_gil(|py| -> PyResult<(String, String)> {
+        let (module_name, source_file, source) =
-            let module: &PyAny = module.extract(py)?;
+            Python::with_gil(|py| -> PyResult<(String, String, String)> {
-            Ok((module.getattr("__name__")?.extract()?, module.getattr("__file__")?.extract()?))
+                let module: &PyAny = module.extract(py)?;
-        })?;
+                let source_file = module.getattr("__file__");
+                let (source_file, source) = if let Ok(source_file) = source_file {
+                    let source_file = source_file.extract()?;
+                    (
+                        source_file,
+                        fs::read_to_string(&source_file).map_err(|e| {
+                            exceptions::PyIOError::new_err(format!(
+                                "failed to read input file: {e}"
+                            ))
+                        })?,
+                    )
+                } else {
+                    // kernels submitted by content have no file
+                    // but still can provide source by StringLoader
+                    let get_src_fn = module
+                        .getattr("__loader__")?
+                        .extract::<PyObject>()?
+                        .getattr(py, "get_source")?;
+                    ("<expcontent>", get_src_fn.call1(py, (PyNone::get(py),))?.extract(py)?)
+                };
+                Ok((module.getattr("__name__")?.extract()?, source_file.to_string(), source))
+            })?;
 
-        let source = fs::read_to_string(&source_file).map_err(|e| {
-            exceptions::PyIOError::new_err(format!("failed to read input file: {e}"))
-        })?;
         let parser_result = parse_program(&source, source_file.into())
             .map_err(|e| exceptions::PySyntaxError::new_err(format!("parse error: {e}")))?;
 
@@ -194,10 +207,8 @@ impl Nac3 {
                     body.retain(|stmt| {
                         if let StmtKind::FunctionDef { ref decorator_list, .. } = stmt.node {
                             decorator_list.iter().any(|decorator| {
-                                if let ExprKind::Name { id, .. } = decorator.node {
+                                if let Some(id) = decorator_id_string(decorator) {
-                                    id.to_string() == "kernel"
+                                    id == "kernel" || id == "portable" || id == "rpc"
-                                        || id.to_string() == "portable"
-                                        || id.to_string() == "rpc"
                                 } else {
                                     false
                                 }
@@ -210,9 +221,8 @@ impl Nac3 {
                 }
                 StmtKind::FunctionDef { ref decorator_list, .. } => {
                     decorator_list.iter().any(|decorator| {
-                        if let ExprKind::Name { id, .. } = decorator.node {
+                        if let Some(id) = decorator_id_string(decorator) {
-                            let id = id.to_string();
+                            id == "extern" || id == "kernel" || id == "portable" || id == "rpc"
-                            id == "extern" || id == "portable" || id == "kernel" || id == "rpc"
                         } else {
                             false
                         }
@@ -448,7 +458,6 @@ impl Nac3 {
                         pyid_to_type: pyid_to_type.clone(),
                         primitive_ids: self.primitive_ids.clone(),
                         global_value_ids: global_value_ids.clone(),
-                        class_names: Mutex::default(),
                         name_to_pyid: name_to_pyid.clone(),
                         module: module.clone(),
                         id_to_pyval: RwLock::default(),
@@ -479,9 +488,25 @@ impl Nac3 {
 
             match &stmt.node {
                 StmtKind::FunctionDef { decorator_list, .. } => {
-                    if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
+                    if decorator_list
-                        store_fun.call1(py, (def_id.0.into_py(py), module.getattr(py, name.to_string().as_str()).unwrap())).unwrap();
+                        .iter()
-                        rpc_ids.push((None, def_id));
+                        .any(|decorator| decorator_id_string(decorator) == Some("rpc".to_string()))
+                    {
+                        store_fun
+                            .call1(
+                                py,
+                                (
+                                    def_id.0.into_py(py),
+                                    module.getattr(py, name.to_string().as_str()).unwrap(),
+                                ),
+                            )
+                            .unwrap();
+                        let is_async = decorator_list.iter().any(|decorator| {
+                            decorator_get_flags(decorator)
+                                .iter()
+                                .any(|constant| *constant == Constant::Str("async".into()))
+                        });
+                        rpc_ids.push((None, def_id, is_async));
                     }
                 }
                 StmtKind::ClassDef { name, body, .. } => {
@@ -489,19 +514,26 @@ impl Nac3 {
                     let class_obj = module.getattr(py, class_name.as_str()).unwrap();
                     for stmt in body {
                         if let StmtKind::FunctionDef { name, decorator_list, .. } = &stmt.node {
-                            if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
+                            if decorator_list.iter().any(|decorator| {
+                                decorator_id_string(decorator) == Some("rpc".to_string())
+                            }) {
+                                let is_async = decorator_list.iter().any(|decorator| {
+                                    decorator_get_flags(decorator)
+                                        .iter()
+                                        .any(|constant| *constant == Constant::Str("async".into()))
+                                });
                                 if name == &"__init__".into() {
                                     return Err(CompileError::new_err(format!(
                                         "compilation failed\n----------\nThe constructor of class {} should not be decorated with rpc decorator (at {})",
                                         class_name, stmt.location
                                     )));
                                 }
-                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id));
+                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id, is_async));
                             }
                         }
                     }
                 }
-                _ => ()
+                _ => (),
             }
 
             let id = *name_to_pyid.get(&name).unwrap();
@@ -540,7 +572,6 @@ impl Nac3 {
             pyid_to_type: pyid_to_type.clone(),
             primitive_ids: self.primitive_ids.clone(),
             global_value_ids: global_value_ids.clone(),
-            class_names: Mutex::default(),
             id_to_pyval: RwLock::default(),
             id_to_primitive: RwLock::default(),
             field_to_val: RwLock::default(),
@@ -558,7 +589,7 @@ impl Nac3 {
             .unwrap();
 
         // Process IRRT
-        let context = inkwell::context::Context::create();
+        let context = Context::create();
         let irrt = load_irrt(&context, resolver.as_ref());
 
         let fun_signature =
@@ -598,13 +629,12 @@ impl Nac3 {
         let top_level = Arc::new(composer.make_top_level_context());
 
         {
-            let rpc_codegen = rpc_codegen_callback();
             let defs = top_level.definitions.read();
-            for (class_data, id) in &rpc_ids {
+            for (class_data, id, is_async) in &rpc_ids {
                 let mut def = defs[id.0].write();
                 match &mut *def {
                     TopLevelDef::Function { codegen_callback, .. } => {
-                        *codegen_callback = Some(rpc_codegen.clone());
+                        *codegen_callback = Some(rpc_codegen_callback(*is_async));
                     }
                     TopLevelDef::Class { methods, .. } => {
                         let (class_def, method_name) = class_data.as_ref().unwrap();
@@ -615,7 +645,7 @@ impl Nac3 {
                             if let TopLevelDef::Function { codegen_callback, .. } =
                                 &mut *defs[id.0].write()
                             {
-                                *codegen_callback = Some(rpc_codegen.clone());
+                                *codegen_callback = Some(rpc_codegen_callback(*is_async));
                                 store_fun
                                     .call1(
                                         py,
@@ -630,6 +660,11 @@ impl Nac3 {
                             }
                         }
                     }
+                    TopLevelDef::Variable { .. } => {
+                        return Err(CompileError::new_err(String::from(
+                            "Unsupported @rpc annotation on global variable",
+                        )))
+                    }
                 }
             }
         }
@@ -650,33 +685,12 @@ impl Nac3 {
         let task = CodeGenTask {
             subst: Vec::default(),
             symbol_name: "__modinit__".to_string(),
-            body: instance.body,
-            signature,
-            resolver: resolver.clone(),
-            store,
-            unifier_index: instance.unifier_id,
-            calls: instance.calls,
-            id: 0,
-        };
-
-        let mut store = ConcreteTypeStore::new();
-        let mut cache = HashMap::new();
-        let signature = store.from_signature(
-            &mut composer.unifier,
-            &self.primitive,
-            &fun_signature,
-            &mut cache,
-        );
-        let signature = store.add_cty(signature);
-        let attributes_writeback_task = CodeGenTask {
-            subst: Vec::default(),
-            symbol_name: "attributes_writeback".to_string(),
             body: Arc::new(Vec::default()),
             signature,
             resolver,
             store,
             unifier_index: instance.unifier_id,
-            calls: Arc::new(HashMap::default()),
+            calls: instance.calls,
             id: 0,
         };
 
@@ -689,7 +703,7 @@ impl Nac3 {
             let buffer = buffer.as_slice().into();
             membuffer.lock().push(buffer);
         })));
-        let size_t = Context::create()
+        let size_t = context
             .ptr_sized_int_type(&self.get_llvm_target_machine().get_target_data(), None)
             .get_bit_width();
         let num_threads = if is_multithreaded() { 4 } else { 1 };
@@ -700,19 +714,27 @@ impl Nac3 {
             .collect();
 
         let membuffer = membuffers.clone();
+        let mut has_return = false;
         py.allow_threads(|| {
             let (registry, handles) =
                 WorkerRegistry::create_workers(threads, top_level.clone(), &self.llvm_options, &f);
-            registry.add_task(task);
-            registry.wait_tasks_complete(handles);
 
-            let mut generator =
+            let mut generator = ArtiqCodeGenerator::new("main".to_string(), size_t, self.time_fns);
-                ArtiqCodeGenerator::new("attributes_writeback".to_string(), size_t, self.time_fns);
+            let context = Context::create();
-            let context = inkwell::context::Context::create();
+            let module = context.create_module("main");
-            let module = context.create_module("attributes_writeback");
             let target_machine = self.llvm_options.create_target_machine().unwrap();
             module.set_data_layout(&target_machine.get_target_data().get_data_layout());
             module.set_triple(&target_machine.get_triple());
+            module.add_basic_value_flag(
+                "Debug Info Version",
+                FlagBehavior::Warning,
+                context.i32_type().const_int(3, false),
+            );
+            module.add_basic_value_flag(
+                "Dwarf Version",
+                FlagBehavior::Warning,
+                context.i32_type().const_int(4, false),
+            );
             let builder = context.create_builder();
             let (_, module, _) = gen_func_impl(
                 &context,
@@ -720,9 +742,27 @@ impl Nac3 {
                 &registry,
                 builder,
                 module,
-                attributes_writeback_task,
+                task,
                 |generator, ctx| {
-                    attributes_writeback(ctx, generator, inner_resolver.as_ref(), &host_attributes)
+                    assert_eq!(instance.body.len(), 1, "toplevel module should have 1 statement");
+                    let StmtKind::Expr { value: ref expr, .. } = instance.body[0].node else {
+                        unreachable!("toplevel statement must be an expression")
+                    };
+                    let ExprKind::Call { .. } = expr.node else {
+                        unreachable!("toplevel expression must be a function call")
+                    };
+
+                    let return_obj =
+                        generator.gen_expr(ctx, expr)?.map(|value| (expr.custom.unwrap(), value));
+                    has_return = return_obj.is_some();
+                    registry.wait_tasks_complete(handles);
+                    attributes_writeback(
+                        ctx,
+                        generator,
+                        inner_resolver.as_ref(),
+                        &host_attributes,
+                        return_obj,
+                    )
                 },
             )
             .unwrap();
@@ -731,35 +771,23 @@ impl Nac3 {
             membuffer.lock().push(buffer);
         });
 
+        embedding_map.setattr("expects_return", has_return).unwrap();
+
         // Link all modules into `main`.
         let buffers = membuffers.lock();
         let main = context
-            .create_module_from_ir(MemoryBuffer::create_from_memory_range(&buffers[0], "main"))
+            .create_module_from_ir(MemoryBuffer::create_from_memory_range(
+                buffers.last().unwrap(),
+                "main",
+            ))
             .unwrap();
-        for buffer in buffers.iter().skip(1) {
+        for buffer in buffers.iter().rev().skip(1) {
             let other = context
                 .create_module_from_ir(MemoryBuffer::create_from_memory_range(buffer, "main"))
                 .unwrap();
 
             main.link_in_module(other).map_err(|err| CompileError::new_err(err.to_string()))?;
         }
-        let builder = context.create_builder();
-        let modinit_return = main
-            .get_function("__modinit__")
-            .unwrap()
-            .get_last_basic_block()
-            .unwrap()
-            .get_terminator()
-            .unwrap();
-        builder.position_before(&modinit_return);
-        builder
-            .build_call(
-                main.get_function("attributes_writeback").unwrap(),
-                &[],
-                "attributes_writeback",
-            )
-            .unwrap();
-
         main.link_in_module(irrt).map_err(|err| CompileError::new_err(err.to_string()))?;
 
         let mut function_iter = main.get_first_function();
@@ -846,6 +874,41 @@ impl Nac3 {
     }
 }
 
+/// Retrieves the Name.id from a decorator, supports decorators with arguments.
+fn decorator_id_string(decorator: &Located<ExprKind>) -> Option<String> {
+    if let ExprKind::Name { id, .. } = decorator.node {
+        // Bare decorator
+        return Some(id.to_string());
+    } else if let ExprKind::Call { func, .. } = &decorator.node {
+        // Decorators that are calls (e.g. "@rpc()") have Call for the node,
+        // need to extract the id from within.
+        if let ExprKind::Name { id, .. } = func.node {
+            return Some(id.to_string());
+        }
+    }
+    None
+}
+
+/// Retrieves flags from a decorator, if any.
+fn decorator_get_flags(decorator: &Located<ExprKind>) -> Vec<Constant> {
+    let mut flags = vec![];
+    if let ExprKind::Call { keywords, .. } = &decorator.node {
+        for keyword in keywords {
+            if keyword.node.arg != Some("flags".into()) {
+                continue;
+            }
+            if let ExprKind::Set { elts } = &keyword.node.value.node {
+                for elt in elts {
+                    if let ExprKind::Constant { value, .. } = &elt.node {
+                        flags.push(value.clone());
+                    }
+                }
+            }
+        }
+    }
+    flags
+}
+
 fn link_with_lld(elf_filename: String, obj_filename: String) -> PyResult<()> {
     let linker_args = vec![
         "-shared".to_string(),
@@ -1027,7 +1090,12 @@ impl Nac3 {
         })
     }
 
-    fn analyze(&mut self, functions: &PySet, classes: &PySet) -> PyResult<()> {
+    fn analyze(
+        &mut self,
+        functions: &PySet,
+        classes: &PySet,
+        content_modules: &PySet,
+    ) -> PyResult<()> {
         let (modules, class_ids) =
             Python::with_gil(|py| -> PyResult<(HashMap<u64, PyObject>, HashSet<u64>)> {
                 let mut modules: HashMap<u64, PyObject> = HashMap::new();
@@ -1037,14 +1105,22 @@ impl Nac3 {
                 let getmodule_fn = PyModule::import(py, "inspect")?.getattr("getmodule")?;
 
                 for function in functions {
-                    let module = getmodule_fn.call1((function,))?.extract()?;
+                    let module: PyObject = getmodule_fn.call1((function,))?.extract()?;
-                    modules.insert(id_fn.call1((&module,))?.extract()?, module);
+                    if !module.is_none(py) {
+                        modules.insert(id_fn.call1((&module,))?.extract()?, module);
+                    }
                 }
                 for class in classes {
-                    let module = getmodule_fn.call1((class,))?.extract()?;
+                    let module: PyObject = getmodule_fn.call1((class,))?.extract()?;
-                    modules.insert(id_fn.call1((&module,))?.extract()?, module);
+                    if !module.is_none(py) {
+                        modules.insert(id_fn.call1((&module,))?.extract()?, module);
+                    }
                     class_ids.insert(id_fn.call1((class,))?.extract()?);
                 }
+                for module in content_modules {
+                    let module: PyObject = module.extract()?;
+                    modules.insert(id_fn.call1((&module,))?.extract()?, module.into());
+                }
                 Ok((modules, class_ids))
             })?;
 

nac3artiq/src/symbol_resolver.rs

@@ -1,16 +1,27 @@
-use crate::PrimitivePythonId;
+use std::{
-use inkwell::{
+    collections::{HashMap, HashSet},
-    module::Linkage,
+    sync::{
-    types::{BasicType, BasicTypeEnum},
+        atomic::{AtomicBool, Ordering::Relaxed},
-    values::BasicValueEnum,
+        Arc,
-    AddressSpace,
-};
-use itertools::Itertools;
-use nac3core::{
-    codegen::{
-        classes::{NDArrayType, ProxyType},
-        CodeGenContext, CodeGenerator,
     },
+};
+
+use itertools::Itertools;
+use parking_lot::RwLock;
+use pyo3::{
+    types::{PyDict, PyTuple},
+    PyAny, PyObject, PyResult, Python,
+};
+
+use nac3core::{
+    codegen::{types::NDArrayType, CodeGenContext, CodeGenerator},
+    inkwell::{
+        module::Linkage,
+        types::{BasicType, BasicTypeEnum},
+        values::BasicValueEnum,
+        AddressSpace,
+    },
+    nac3parser::ast::{self, StrRef},
     symbol_resolver::{StaticValue, SymbolResolver, SymbolValue, ValueEnum},
     toplevel::{
         helper::PrimDef,
@@ -22,19 +33,8 @@ use nac3core::{
         typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
     },
 };
-use nac3parser::ast::{self, StrRef};
+
-use parking_lot::{Mutex, RwLock};
+use super::PrimitivePythonId;
-use pyo3::{
-    types::{PyDict, PyTuple},
-    PyAny, PyObject, PyResult, Python,
-};
-use std::{
-    collections::{HashMap, HashSet},
-    sync::{
-        atomic::{AtomicBool, Ordering::Relaxed},
-        Arc,
-    },
-};
 
 pub enum PrimitiveValue {
     I32(i32),
@@ -79,7 +79,6 @@ pub struct InnerResolver {
     pub id_to_primitive: RwLock<HashMap<u64, PrimitiveValue>>,
     pub field_to_val: RwLock<HashMap<ResolverField, Option<PyFieldHandle>>>,
     pub global_value_ids: Arc<RwLock<HashMap<u64, PyObject>>>,
-    pub class_names: Mutex<HashMap<StrRef, Type>>,
     pub pyid_to_def: Arc<RwLock<HashMap<u64, DefinitionId>>>,
     pub pyid_to_type: Arc<RwLock<HashMap<u64, Type>>>,
     pub primitive_ids: PrimitivePythonId,
@@ -1094,7 +1093,7 @@ impl InnerResolver {
                 if self.global_value_ids.read().contains_key(&id) {
                     let global = ctx.module.get_global(&id_str).unwrap_or_else(|| {
                         ctx.module.add_global(
-                            ndarray_llvm_ty.as_underlying_type(),
+                            ndarray_llvm_ty.element_type().into_struct_type(),
                             Some(AddressSpace::default()),
                             &id_str,
                         )
@@ -1188,7 +1187,7 @@ impl InnerResolver {
             data_global.set_initializer(&data);
 
             // create a global for the ndarray object and initialize it
-            let value = ndarray_llvm_ty.as_underlying_type().const_named_struct(&[
+            let value = ndarray_llvm_ty.element_type().into_struct_type().const_named_struct(&[
                 llvm_usize.const_int(ndarray_ndims, false).into(),
                 shape_global
                     .as_pointer_value()
@@ -1201,7 +1200,7 @@ impl InnerResolver {
             ]);
 
             let ndarray = ctx.module.add_global(
-                ndarray_llvm_ty.as_underlying_type(),
+                ndarray_llvm_ty.element_type().into_struct_type(),
                 Some(AddressSpace::default()),
                 &id_str,
             );
@@ -1468,6 +1467,7 @@ impl SymbolResolver for Resolver {
         &self,
         id: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
+        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         let sym_value = {
             let id_to_val = self.0.id_to_pyval.read();

nac3artiq/src/timeline.rs

@@ -1,9 +1,12 @@
-use inkwell::{
-    values::{BasicValueEnum, CallSiteValue},
-    AddressSpace, AtomicOrdering,
-};
 use itertools::Either;
-use nac3core::codegen::CodeGenContext;
+
+use nac3core::{
+    codegen::CodeGenContext,
+    inkwell::{
+        values::{BasicValueEnum, CallSiteValue},
+        AddressSpace, AtomicOrdering,
+    },
+};
 
 /// Functions for manipulating the timeline.
 pub trait TimeFns {
@@ -31,7 +34,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -80,7 +83,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -109,7 +112,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -207,7 +210,7 @@ impl TimeFns for NowPinningTimeFns {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -258,7 +261,7 @@ impl TimeFns for NowPinningTimeFns {
         let time_lo = ctx.builder.build_int_truncate(time, i32_type, "time.lo").unwrap();
         let now_hiptr = ctx
             .builder
-            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 

nac3ast/Cargo.toml

@@ -10,7 +10,6 @@ constant-optimization = ["fold"]
 fold = []
 
 [dependencies]
-lazy_static = "1.5"
 parking_lot = "0.12"
 string-interner = "0.17"
 fxhash = "0.2"

nac3ast/src/ast_gen.rs

@@ -5,14 +5,12 @@ pub use crate::location::Location;
 
 use fxhash::FxBuildHasher;
 use parking_lot::{Mutex, MutexGuard};
-use std::{cell::RefCell, collections::HashMap, fmt};
+use std::{cell::RefCell, collections::HashMap, fmt, sync::LazyLock};
 use string_interner::{symbol::SymbolU32, DefaultBackend, StringInterner};
 
 pub type Interner = StringInterner<DefaultBackend, FxBuildHasher>;
-lazy_static! {
+static INTERNER: LazyLock<Mutex<Interner>> =
-    static ref INTERNER: Mutex<Interner> =
+    LazyLock::new(|| Mutex::new(StringInterner::with_hasher(FxBuildHasher::default())));
-        Mutex::new(StringInterner::with_hasher(FxBuildHasher::default()));
-}
 
 thread_local! {
     static LOCAL_INTERNER: RefCell<HashMap<String, StrRef>> = RefCell::default();

nac3ast/src/lib.rs

@@ -1,10 +1,4 @@
-#![deny(
+#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
-    future_incompatible,
-    let_underscore,
-    nonstandard_style,
-    rust_2024_compatibility,
-    clippy::all
-)]
 #![warn(clippy::pedantic)]
 #![allow(
     clippy::missing_errors_doc,
@@ -14,9 +8,6 @@
     clippy::wildcard_imports
 )]
 
-#[macro_use]
-extern crate lazy_static;
-
 mod ast_gen;
 mod constant;
 #[cfg(feature = "fold")]

nac3core/Cargo.toml

@@ -5,22 +5,25 @@ authors = ["M-Labs"]
 edition = "2021"
 
 [features]
+default = ["derive"]
+derive = ["dep:nac3core_derive"]
 no-escape-analysis = []
 
 [dependencies]
 itertools = "0.13"
 crossbeam = "0.8"
-indexmap = "2.2"
+indexmap = "2.6"
 parking_lot = "0.12"
-rayon = "1.8"
+rayon = "1.10"
+nac3core_derive = { path = "nac3core_derive", optional = true }
 nac3parser = { path = "../nac3parser" }
 strum = "0.26"
 strum_macros = "0.26"
 
 [dependencies.inkwell]
-version = "0.4"
+version = "0.5"
 default-features = false
-features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
+features = ["llvm14-0-prefer-dynamic", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 
 [dev-dependencies]
 test-case = "1.2.0"

nac3core/build.rs

@@ -1,4 +1,3 @@
-use regex::Regex;
 use std::{
     env,
     fs::File,
@@ -7,6 +6,8 @@ use std::{
     process::{Command, Stdio},
 };
 
+use regex::Regex;
+
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
     let out_dir = Path::new(&out_dir);
@@ -55,9 +56,8 @@ fn main() {
     let output = Command::new("clang-irrt")
         .args(flags)
         .output()
-        .map(|o| {
+        .inspect(|o| {
             assert!(o.status.success(), "{}", std::str::from_utf8(&o.stderr).unwrap());
-            o
         })
         .unwrap();
 

nac3core/irrt/irrt.cpp

@@ -1,6 +1,5 @@
-#include <irrt/exception.hpp>
+#include "irrt/exception.hpp"
-#include <irrt/int_types.hpp>
+#include "irrt/list.hpp"
-#include <irrt/list.hpp>
+#include "irrt/math.hpp"
-#include <irrt/math.hpp>
+#include "irrt/ndarray.hpp"
-#include <irrt/ndarray.hpp>
+#include "irrt/slice.hpp"
-#include <irrt/slice.hpp>

nac3core/irrt/irrt/cslice.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <irrt/int_types.hpp>
+#include "irrt/int_types.hpp"
 
 template<typename SizeT>
 struct CSlice {
-    uint8_t* base;
+    void* base;
     SizeT len;
 };

nac3core/irrt/irrt/exception.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <irrt/cslice.hpp>
+#include "irrt/cslice.hpp"
-#include <irrt/int_types.hpp>
+#include "irrt/int_types.hpp"
 
 /**
  * @brief The int type of ARTIQ exception IDs.
  */
-typedef int32_t ExceptionId;
+using ExceptionId = int32_t;
 
 /*
  * Set of exceptions C++ IRRT can use.
@@ -55,11 +55,14 @@ void _raise_exception_helper(ExceptionId id,
                              int64_t param2) {
     Exception<SizeT> e = {
         .id = id,
-        .filename = {.base = reinterpret_cast<const uint8_t*>(filename), .len = __builtin_strlen(filename)},
+        .filename = {.base = reinterpret_cast<void*>(const_cast<char*>(filename)),
+                     .len = static_cast<SizeT>(__builtin_strlen(filename))},
         .line = line,
         .column = 0,
-        .function = {.base = reinterpret_cast<const uint8_t*>(function), .len = __builtin_strlen(function)},
+        .function = {.base = reinterpret_cast<void*>(const_cast<char*>(function)),
-        .msg = {.base = reinterpret_cast<const uint8_t*>(msg), .len = __builtin_strlen(msg)},
+                     .len = static_cast<SizeT>(__builtin_strlen(function))},
+        .msg = {.base = reinterpret_cast<void*>(const_cast<char*>(msg)),
+                .len = static_cast<SizeT>(__builtin_strlen(msg))},
     };
     e.params[0] = param0;
     e.params[1] = param1;
@@ -67,6 +70,7 @@ void _raise_exception_helper(ExceptionId id,
     __nac3_raise(reinterpret_cast<void*>(&e));
     __builtin_unreachable();
 }
+}  // namespace
 
 /**
  * @brief Raise an exception with location details (location in the IRRT source files).
@@ -79,4 +83,3 @@ void _raise_exception_helper(ExceptionId id,
  */
 #define raise_exception(SizeT, id, msg, param0, param1, param2) \
     _raise_exception_helper<SizeT>(id, __FILE__, __LINE__, __FUNCTION__, msg, param0, param1, param2)
-}  // namespace

nac3core/irrt/irrt/int_types.hpp

@@ -1,13 +1,27 @@
 #pragma once
 
+#if __STDC_VERSION__ >= 202000
 using int8_t = _BitInt(8);
 using uint8_t = unsigned _BitInt(8);
 using int32_t = _BitInt(32);
 using uint32_t = unsigned _BitInt(32);
 using int64_t = _BitInt(64);
 using uint64_t = unsigned _BitInt(64);
+#else
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-type"
+using int8_t = _ExtInt(8);
+using uint8_t = unsigned _ExtInt(8);
+using int32_t = _ExtInt(32);
+using uint32_t = unsigned _ExtInt(32);
+using int64_t = _ExtInt(64);
+using uint64_t = unsigned _ExtInt(64);
+#pragma clang diagnostic pop
+
+#endif
 
 // NDArray indices are always `uint32_t`.
 using NDIndex = uint32_t;
 // The type of an index or a value describing the length of a range/slice is always `int32_t`.
-using SliceIndex = int32_t;
+using SliceIndex = int32_t;

nac3core/irrt/irrt/list.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <irrt/int_types.hpp>
+#include "irrt/int_types.hpp"
-#include <irrt/math_util.hpp>
+#include "irrt/math_util.hpp"
 
 extern "C" {
 // Handle list assignment and dropping part of the list when
@@ -13,12 +13,12 @@ extern "C" {
 SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
                                              SliceIndex dest_end,
                                              SliceIndex dest_step,
-                                             uint8_t* dest_arr,
+                                             void* dest_arr,
                                              SliceIndex dest_arr_len,
                                              SliceIndex src_start,
                                              SliceIndex src_end,
                                              SliceIndex src_step,
-                                             uint8_t* src_arr,
+                                             void* src_arr,
                                              SliceIndex src_arr_len,
                                              const SliceIndex size) {
     /* if dest_arr_len == 0, do nothing since we do not support extending list */
@@ -29,11 +29,13 @@ SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
         const SliceIndex src_len = (src_end >= src_start) ? (src_end - src_start + 1) : 0;
         const SliceIndex dest_len = (dest_end >= dest_start) ? (dest_end - dest_start + 1) : 0;
         if (src_len > 0) {
-            __builtin_memmove(dest_arr + dest_start * size, src_arr + src_start * size, src_len * size);
+            __builtin_memmove(static_cast<uint8_t*>(dest_arr) + dest_start * size,
+                              static_cast<uint8_t*>(src_arr) + src_start * size, src_len * size);
         }
         if (dest_len > 0) {
             /* dropping */
-            __builtin_memmove(dest_arr + (dest_start + src_len) * size, dest_arr + (dest_end + 1) * size,
+            __builtin_memmove(static_cast<uint8_t*>(dest_arr) + (dest_start + src_len) * size,
+                              static_cast<uint8_t*>(dest_arr) + (dest_end + 1) * size,
                               (dest_arr_len - dest_end - 1) * size);
         }
         /* shrink size */
@@ -44,7 +46,7 @@ SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
                           && !(max(dest_start, dest_end) < min(src_start, src_end)
                                || max(src_start, src_end) < min(dest_start, dest_end));
     if (need_alloca) {
-        uint8_t* tmp = reinterpret_cast<uint8_t*>(__builtin_alloca(src_arr_len * size));
+        void* tmp = __builtin_alloca(src_arr_len * size);
         __builtin_memcpy(tmp, src_arr, src_arr_len * size);
         src_arr = tmp;
     }
@@ -53,20 +55,24 @@ SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
     for (; (src_step > 0) ? (src_ind <= src_end) : (src_ind >= src_end); src_ind += src_step, dest_ind += dest_step) {
         /* for constant optimization */
         if (size == 1) {
-            __builtin_memcpy(dest_arr + dest_ind, src_arr + src_ind, 1);
+            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind, static_cast<uint8_t*>(src_arr) + src_ind, 1);
         } else if (size == 4) {
-            __builtin_memcpy(dest_arr + dest_ind * 4, src_arr + src_ind * 4, 4);
+            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * 4,
+                             static_cast<uint8_t*>(src_arr) + src_ind * 4, 4);
         } else if (size == 8) {
-            __builtin_memcpy(dest_arr + dest_ind * 8, src_arr + src_ind * 8, 8);
+            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * 8,
+                             static_cast<uint8_t*>(src_arr) + src_ind * 8, 8);
         } else {
             /* memcpy for var size, cannot overlap after previous alloca */
-            __builtin_memcpy(dest_arr + dest_ind * size, src_arr + src_ind * size, size);
+            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * size,
+                             static_cast<uint8_t*>(src_arr) + src_ind * size, size);
         }
     }
     /* only dest_step == 1 can we shrink the dest list. */
     /* size should be ensured prior to calling this function */
     if (dest_step == 1 && dest_end >= dest_start) {
-        __builtin_memmove(dest_arr + dest_ind * size, dest_arr + (dest_end + 1) * size,
+        __builtin_memmove(static_cast<uint8_t*>(dest_arr) + dest_ind * size,
+                          static_cast<uint8_t*>(dest_arr) + (dest_end + 1) * size,
                           (dest_arr_len - dest_end - 1) * size);
         return dest_arr_len - (dest_end - dest_ind) - 1;
     }

nac3core/irrt/irrt/math.hpp

@@ -90,4 +90,4 @@ double __nac3_j0(double x) {
 
     return j0(x);
 }
-}
+}  // namespace

nac3core/irrt/irrt/ndarray.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <irrt/int_types.hpp>
+#include "irrt/int_types.hpp"
 
 namespace {
 template<typename SizeT>
@@ -141,4 +141,4 @@ void __nac3_ndarray_calc_broadcast_idx64(const uint64_t* src_dims,
                                          NDIndex* out_idx) {
     __nac3_ndarray_calc_broadcast_idx_impl(src_dims, src_ndims, in_idx, out_idx);
 }
-}
+}  // namespace

nac3core/irrt/irrt/slice.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <irrt/int_types.hpp>
+#include "irrt/int_types.hpp"
 
 extern "C" {
 SliceIndex __nac3_slice_index_bound(SliceIndex i, const SliceIndex len) {
@@ -25,4 +25,4 @@ SliceIndex __nac3_range_slice_len(const SliceIndex start, const SliceIndex end,
         return 0;
     }
 }
-}
+}  // namespace

nac3core/nac3core_derive/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "nac3core_derive"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[[test]]
+name = "structfields_tests"
+path = "tests/structfields_test.rs"
+
+[dev-dependencies]
+nac3core = { path = ".." }
+trybuild = { version = "1.0", features = ["diff"] }
+
+[dependencies]
+proc-macro2 = "1.0"
+proc-macro-error = "1.0"
+syn = "2.0"
+quote = "1.0"

nac3core/nac3core_derive/src/lib.rs

@@ -0,0 +1,320 @@
+use proc_macro::TokenStream;
+use proc_macro_error::{abort, proc_macro_error};
+use quote::quote;
+use syn::{
+    parse_macro_input, spanned::Spanned, Data, DataStruct, Expr, ExprField, ExprMethodCall,
+    ExprPath, GenericArgument, Ident, LitStr, Path, PathArguments, Type, TypePath,
+};
+
+/// Extracts all generic arguments of a [`Type`] into a [`Vec`].
+///
+/// Returns [`Some`] of a possibly-empty [`Vec`] if the path of `ty` matches with
+/// `expected_ty_name`, otherwise returns [`None`].
+fn extract_generic_args(expected_ty_name: &'static str, ty: &Type) -> Option<Vec<GenericArgument>> {
+    let Type::Path(TypePath { qself: None, path, .. }) = ty else {
+        return None;
+    };
+
+    let segments = &path.segments;
+    if segments.len() != 1 {
+        return None;
+    };
+
+    let segment = segments.iter().next().unwrap();
+    if segment.ident != expected_ty_name {
+        return None;
+    }
+
+    let PathArguments::AngleBracketed(path_args) = &segment.arguments else {
+        return Some(Vec::new());
+    };
+    let args = &path_args.args;
+
+    Some(args.iter().cloned().collect::<Vec<_>>())
+}
+
+/// Maps a `path` matching one of the `target_idents` into the `replacement` [`Ident`].
+fn map_path_to_ident(path: &Path, target_idents: &[&str], replacement: &str) -> Option<Ident> {
+    path.require_ident()
+        .ok()
+        .filter(|ident| target_idents.iter().any(|target| ident == target))
+        .map(|ident| Ident::new(replacement, ident.span()))
+}
+
+/// Extracts the left-hand side of a dot-expression.
+fn extract_dot_operand(expr: &Expr) -> Option<&Expr> {
+    match expr {
+        Expr::MethodCall(ExprMethodCall { receiver: operand, .. })
+        | Expr::Field(ExprField { base: operand, .. }) => Some(operand),
+        _ => None,
+    }
+}
+
+/// Replaces the top-level receiver of a dot-expression with an [`Ident`], returning `Some(&mut expr)` if the
+/// replacement is performed.
+///
+/// The top-level receiver is the left-most receiver expression, e.g. the top-level receiver of `a.b.c.foo()` is `a`.
+fn replace_top_level_receiver(expr: &mut Expr, ident: Ident) -> Option<&mut Expr> {
+    if let Expr::MethodCall(ExprMethodCall { receiver: operand, .. })
+    | Expr::Field(ExprField { base: operand, .. }) = expr
+    {
+        return if extract_dot_operand(operand).is_some() {
+            if replace_top_level_receiver(operand, ident).is_some() {
+                Some(expr)
+            } else {
+                None
+            }
+        } else {
+            *operand = Box::new(Expr::Path(ExprPath {
+                attrs: Vec::default(),
+                qself: None,
+                path: ident.into(),
+            }));
+
+            Some(expr)
+        };
+    }
+
+    None
+}
+
+/// Iterates all operands to the left-hand side of the `.` of an [expression][`Expr`], i.e. the container operand of all
+/// [`Expr::Field`] and the receiver operand of all [`Expr::MethodCall`].
+///
+/// The iterator will return the operand expressions in reverse order of appearance. For example, `a.b.c.func()` will
+/// return `vec![c, b, a]`.
+fn iter_dot_operands(expr: &Expr) -> impl Iterator<Item = &Expr> {
+    let mut o = extract_dot_operand(expr);
+
+    std::iter::from_fn(move || {
+        let this = o;
+        o = o.as_ref().and_then(|o| extract_dot_operand(o));
+
+        this
+    })
+}
+
+/// Normalizes a value expression for use when creating an instance of this structure, returning a
+/// [`proc_macro2::TokenStream`] of tokens representing the normalized expression.
+fn normalize_value_expr(expr: &Expr) -> proc_macro2::TokenStream {
+    match &expr {
+        Expr::Path(ExprPath { qself: None, path, .. }) => {
+            if let Some(ident) = map_path_to_ident(path, &["usize", "size_t"], "llvm_usize") {
+                quote! { #ident }
+            } else {
+                abort!(
+                    path,
+                    format!(
+                        "Expected one of `size_t`, `usize`, or an implicit call expression in #[value_type(...)], found {}", 
+                        quote!(#expr).to_string(),
+                    )
+                )
+            }
+        }
+
+        Expr::Call(_) => {
+            quote! { ctx.#expr }
+        }
+
+        Expr::MethodCall(_) => {
+            let base_receiver = iter_dot_operands(expr).last();
+
+            match base_receiver {
+                // `usize.{...}`, `size_t.{...}` -> Rewrite the identifiers to `llvm_usize`
+                Some(Expr::Path(ExprPath { qself: None, path, .. }))
+                    if map_path_to_ident(path, &["usize", "size_t"], "llvm_usize").is_some() =>
+                {
+                    let ident =
+                        map_path_to_ident(path, &["usize", "size_t"], "llvm_usize").unwrap();
+
+                    let mut expr = expr.clone();
+                    let expr = replace_top_level_receiver(&mut expr, ident).unwrap();
+
+                    quote!(#expr)
+                }
+
+                // `ctx.{...}`, `context.{...}` -> Rewrite the identifiers to `ctx`
+                Some(Expr::Path(ExprPath { qself: None, path, .. }))
+                    if map_path_to_ident(path, &["ctx", "context"], "ctx").is_some() =>
+                {
+                    let ident = map_path_to_ident(path, &["ctx", "context"], "ctx").unwrap();
+
+                    let mut expr = expr.clone();
+                    let expr = replace_top_level_receiver(&mut expr, ident).unwrap();
+
+                    quote!(#expr)
+                }
+
+                // No reserved identifier prefix -> Prepend `ctx.` to the entire expression
+                _ => quote! { ctx.#expr },
+            }
+        }
+
+        _ => {
+            abort!(
+                expr,
+                format!(
+                    "Expected one of `size_t`, `usize`, or an implicit call expression in #[value_type(...)], found {}", 
+                    quote!(#expr).to_string(),
+                )
+            )
+        }
+    }
+}
+
+/// Derives an implementation of `codegen::types::structure::StructFields`.
+///
+/// The benefit of using `#[derive(StructFields)]` is that all index- or order-dependent logic required by
+/// `impl StructFields` is automatically generated by this implementation, including the field index as required by
+/// `StructField::new` and the fields as returned by `StructFields::to_vec`.
+///
+/// # Prerequisites
+///
+/// In order to derive from [`StructFields`], you must implement (or derive) [`Eq`] and [`Copy`] as required by
+/// `StructFields`.
+///
+/// Moreover, `#[derive(StructFields)]` can only be used for `struct`s with named fields, and may only contain fields
+/// with either `StructField` or [`PhantomData`] types.
+///
+/// # Attributes for [`StructFields`]
+///
+/// Each `StructField` field must be declared with the `#[value_type(...)]` attribute. The argument of `value_type`
+/// accepts one of the following:
+///
+/// - An expression returning an instance of `inkwell::types::BasicType` (with or without the receiver `ctx`/`context`).
+/// For example, `context.i8_type()`, `ctx.i8_type()`, and `i8_type()` all refer to `i8`.
+/// - The reserved identifiers `usize` and `size_t` referring to an `inkwell::types::IntType` of the platform-dependent
+/// integer size. `usize` and `size_t` can also be used as the receiver to other method calls, e.g.
+/// `usize.array_type(3)`.
+///
+/// # Example
+///
+/// The following is an example of an LLVM slice implemented using `#[derive(StructFields)]`.
+///
+/// ```rust,ignore
+/// use nac3core::{
+///     codegen::types::structure::StructField,
+///     inkwell::{
+///         values::{IntValue, PointerValue},
+///         AddressSpace,
+///     },
+/// };
+/// use nac3core_derive::StructFields;
+///
+/// // All classes that implement StructFields must also implement Eq and Copy
+/// #[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+/// pub struct SliceValue<'ctx> {
+///     // Declares ptr have a value type of i8*
+///     //
+///     // Can also be written as `ctx.i8_type().ptr_type(...)` or `context.i8_type().ptr_type(...)`
+///     #[value_type(i8_type().ptr_type(AddressSpace::default()))]
+///     ptr: StructField<'ctx, PointerValue<'ctx>>,
+///
+///     // Declares len have a value type of usize, depending on the target compilation platform
+///     #[value_type(usize)]
+///     len: StructField<'ctx, IntValue<'ctx>>,
+/// }
+/// ```
+#[proc_macro_derive(StructFields, attributes(value_type))]
+#[proc_macro_error]
+pub fn derive(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as syn::DeriveInput);
+    let ident = &input.ident;
+
+    let Data::Struct(DataStruct { fields, .. }) = &input.data else {
+        abort!(input, "Only structs with named fields are supported");
+    };
+    if let Err(err_span) =
+        fields
+            .iter()
+            .try_for_each(|field| if field.ident.is_some() { Ok(()) } else { Err(field.span()) })
+    {
+        abort!(err_span, "Only structs with named fields are supported");
+    };
+
+    // Check if struct<'ctx>
+    if input.generics.params.len() != 1 {
+        abort!(input.generics, "Expected exactly 1 generic parameter")
+    }
+
+    let phantom_info = fields
+        .iter()
+        .filter(|field| extract_generic_args("PhantomData", &field.ty).is_some())
+        .map(|field| field.ident.as_ref().unwrap())
+        .cloned()
+        .collect::<Vec<_>>();
+
+    let field_info = fields
+        .iter()
+        .filter(|field| extract_generic_args("PhantomData", &field.ty).is_none())
+        .map(|field| {
+            let ident = field.ident.as_ref().unwrap();
+            let ty = &field.ty;
+
+            let Some(_) = extract_generic_args("StructField", ty) else {
+                abort!(field, "Only StructField and PhantomData are allowed")
+            };
+
+            let attrs = &field.attrs;
+            let Some(value_type_attr) =
+                attrs.iter().find(|attr| attr.path().is_ident("value_type"))
+            else {
+                abort!(field, "Expected #[value_type(...)] attribute for field");
+            };
+
+            let Ok(value_type_expr) = value_type_attr.parse_args::<Expr>() else {
+                abort!(value_type_attr, "Expected expression in #[value_type(...)]");
+            };
+
+            let value_expr_toks = normalize_value_expr(&value_type_expr);
+
+            (ident.clone(), value_expr_toks)
+        })
+        .collect::<Vec<_>>();
+
+    // `<*>::new` impl of `StructField` and `PhantomData` for `StructFields::new`
+    let phantoms_create = phantom_info
+        .iter()
+        .map(|id| quote! { #id: ::std::marker::PhantomData })
+        .collect::<Vec<_>>();
+    let fields_create = field_info
+        .iter()
+        .map(|(id, ty)| {
+            let id_lit = LitStr::new(&id.to_string(), id.span());
+            quote! {
+                #id: ::nac3core::codegen::types::structure::StructField::create(
+                    &mut counter,
+                    #id_lit,
+                    #ty,
+                )
+            }
+        })
+        .collect::<Vec<_>>();
+
+    // `.into()` impl of `StructField` for `StructFields::to_vec`
+    let fields_into =
+        field_info.iter().map(|(id, _)| quote! { self.#id.into() }).collect::<Vec<_>>();
+
+    let impl_block = quote! {
+        impl<'ctx> ::nac3core::codegen::types::structure::StructFields<'ctx> for #ident<'ctx> {
+            fn new(ctx: impl ::nac3core::inkwell::context::AsContextRef<'ctx>, llvm_usize: ::nac3core::inkwell::types::IntType<'ctx>) -> Self {
+                let ctx = unsafe { ::nac3core::inkwell::context::ContextRef::new(ctx.as_ctx_ref()) };
+
+                let mut counter = ::nac3core::codegen::types::structure::FieldIndexCounter::default();
+
+                #ident {
+                    #(#fields_create),*
+                    #(#phantoms_create),*
+                }
+            }
+
+            fn to_vec(&self) -> ::std::vec::Vec<(&'static str, ::nac3core::inkwell::types::BasicTypeEnum<'ctx>)> {
+                vec![
+                    #(#fields_into),*
+                ]
+            }
+        }
+    };
+
+    impl_block.into()
+}

nac3core/nac3core_derive/tests/structfields_empty.rs

@@ -0,0 +1,9 @@
+use nac3core_derive::StructFields;
+use std::marker::PhantomData;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct EmptyValue<'ctx> {
+    _phantom: PhantomData<&'ctx ()>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_ndarray.rs

@@ -0,0 +1,20 @@
+use nac3core::{
+    codegen::types::structure::StructField,
+    inkwell::{
+        values::{IntValue, PointerValue},
+        AddressSpace,
+    },
+};
+use nac3core_derive::StructFields;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct NDArrayValue<'ctx> {
+    #[value_type(usize)]
+    ndims: StructField<'ctx, IntValue<'ctx>>,
+    #[value_type(usize.ptr_type(AddressSpace::default()))]
+    shape: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(i8_type().ptr_type(AddressSpace::default()))]
+    data: StructField<'ctx, PointerValue<'ctx>>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_slice.rs

@@ -0,0 +1,18 @@
+use nac3core::{
+    codegen::types::structure::StructField,
+    inkwell::{
+        values::{IntValue, PointerValue},
+        AddressSpace,
+    },
+};
+use nac3core_derive::StructFields;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct SliceValue<'ctx> {
+    #[value_type(i8_type().ptr_type(AddressSpace::default()))]
+    ptr: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(usize)]
+    len: StructField<'ctx, IntValue<'ctx>>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_slice_context.rs

@@ -0,0 +1,18 @@
+use nac3core::{
+    codegen::types::structure::StructField,
+    inkwell::{
+        values::{IntValue, PointerValue},
+        AddressSpace,
+    },
+};
+use nac3core_derive::StructFields;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct SliceValue<'ctx> {
+    #[value_type(context.i8_type().ptr_type(AddressSpace::default()))]
+    ptr: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(usize)]
+    len: StructField<'ctx, IntValue<'ctx>>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_slice_ctx.rs

@@ -0,0 +1,18 @@
+use nac3core::{
+    codegen::types::structure::StructField,
+    inkwell::{
+        values::{IntValue, PointerValue},
+        AddressSpace,
+    },
+};
+use nac3core_derive::StructFields;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct SliceValue<'ctx> {
+    #[value_type(ctx.i8_type().ptr_type(AddressSpace::default()))]
+    ptr: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(usize)]
+    len: StructField<'ctx, IntValue<'ctx>>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_slice_sizet.rs

@@ -0,0 +1,18 @@
+use nac3core::{
+    codegen::types::structure::StructField,
+    inkwell::{
+        values::{IntValue, PointerValue},
+        AddressSpace,
+    },
+};
+use nac3core_derive::StructFields;
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct SliceValue<'ctx> {
+    #[value_type(i8_type().ptr_type(AddressSpace::default()))]
+    ptr: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(size_t)]
+    len: StructField<'ctx, IntValue<'ctx>>,
+}
+
+fn main() {}

nac3core/nac3core_derive/tests/structfields_test.rs

@@ -0,0 +1,10 @@
+#[test]
+fn test_parse_empty() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/structfields_empty.rs");
+    t.pass("tests/structfields_slice.rs");
+    t.pass("tests/structfields_slice_ctx.rs");
+    t.pass("tests/structfields_slice_context.rs");
+    t.pass("tests/structfields_slice_sizet.rs");
+    t.pass("tests/structfields_ndarray.rs");
+}

nac3core/src/codegen/builtin_fns.rs

@@ -1,26 +1,39 @@
-use inkwell::types::BasicTypeEnum;
+use inkwell::{
-use inkwell::values::{BasicValue, BasicValueEnum, IntValue, PointerValue};
+    types::BasicTypeEnum,
-use inkwell::{FloatPredicate, IntPredicate, OptimizationLevel};
+    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
+    FloatPredicate, IntPredicate, OptimizationLevel,
+};
 use itertools::Itertools;
 
-use crate::codegen::classes::{
+use super::{
-    ArrayLikeValue, NDArrayValue, ProxyValue, RangeValue, TypedArrayLikeAccessor,
+    expr::destructure_range,
-    UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+    extern_fns, irrt,
+    irrt::calculate_len_for_slice_range,
+    llvm_intrinsics,
+    macros::codegen_unreachable,
+    numpy,
+    numpy::ndarray_elementwise_unaryop_impl,
+    stmt::gen_for_callback_incrementing,
+    values::{
+        ArrayLikeValue, NDArrayValue, ProxyValue, RangeValue, TypedArrayLikeAccessor,
+        UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+    },
+    CodeGenContext, CodeGenerator,
+};
+use crate::{
+    toplevel::{
+        helper::{arraylike_flatten_element_type, PrimDef},
+        numpy::unpack_ndarray_var_tys,
+    },
+    typecheck::typedef::{Type, TypeEnum},
 };
-use crate::codegen::expr::destructure_range;
-use crate::codegen::irrt::calculate_len_for_slice_range;
-use crate::codegen::numpy::ndarray_elementwise_unaryop_impl;
-use crate::codegen::stmt::gen_for_callback_incrementing;
-use crate::codegen::{extern_fns, irrt, llvm_intrinsics, numpy, CodeGenContext, CodeGenerator};
-use crate::toplevel::helper::PrimDef;
-use crate::toplevel::numpy::unpack_ndarray_var_tys;
-use crate::typecheck::typedef::{Type, TypeEnum};
 
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.
 ///
 /// The generated message will contain the function name and the name of the unsupported type.
 fn unsupported_type(ctx: &CodeGenContext<'_, '_>, fn_name: &str, tys: &[Type]) -> ! {
-    unreachable!(
+    codegen_unreachable!(
+        ctx,
         "{fn_name}() not supported for '{}'",
         tys.iter().map(|ty| format!("'{}'", ctx.unifier.stringify(*ty))).join(", "),
     )
@@ -37,7 +50,7 @@ pub fn call_len<'ctx, G: CodeGenerator + ?Sized>(
     let (arg_ty, arg) = n;
 
     Ok(if ctx.unifier.unioned(arg_ty, range_ty) {
-        let arg = RangeValue::from_ptr_val(arg.into_pointer_value(), Some("range"));
+        let arg = RangeValue::from_pointer_value(arg.into_pointer_value(), Some("range"));
         let (start, end, step) = destructure_range(ctx, arg);
         calculate_len_for_slice_range(generator, ctx, start, end, step)
     } else {
@@ -55,11 +68,17 @@ pub fn call_len<'ctx, G: CodeGenerator + ?Sized>(
                 ctx.builder.build_int_truncate_or_bit_cast(len, llvm_i32, "len").unwrap()
             }
             TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
+                let elem_ty = arraylike_flatten_element_type(&mut ctx.unifier, arg_ty);
                 let llvm_usize = generator.get_size_type(ctx.ctx);
 
-                let arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), llvm_usize, None);
+                let arg = NDArrayValue::from_pointer_value(
+                    arg.into_pointer_value(),
+                    ctx.get_llvm_type(generator, elem_ty),
+                    llvm_usize,
+                    None,
+                );
 
-                let ndims = arg.dim_sizes().size(ctx, generator);
+                let ndims = arg.shape().size(ctx, generator);
                 ctx.make_assert(
                     generator,
                     ctx.builder
@@ -72,17 +91,12 @@ pub fn call_len<'ctx, G: CodeGenerator + ?Sized>(
                 );
 
                 let len = unsafe {
-                    arg.dim_sizes().get_typed_unchecked(
+                    arg.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
-                        ctx,
-                        generator,
-                        &llvm_usize.const_zero(),
-                        None,
-                    )
                 };
 
                 ctx.builder.build_int_truncate_or_bit_cast(len, llvm_i32, "len").unwrap()
             }
-            _ => unreachable!(),
+            _ => codegen_unreachable!(ctx),
         }
     })
 }
@@ -132,13 +146,14 @@ pub fn call_int32<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.int32,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_int32(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -194,13 +209,14 @@ pub fn call_int64<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.int64,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_int64(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -272,13 +288,14 @@ pub fn call_uint32<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.uint32,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_uint32(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -339,13 +356,14 @@ pub fn call_uint64<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.uint64,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_uint64(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -405,13 +423,14 @@ pub fn call_float<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.float,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_float(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -451,13 +470,14 @@ pub fn call_round<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ret_elem_ty,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_round(generator, ctx, (elem_ty, val), ret_elem_ty),
             )?;
 
@@ -491,13 +511,14 @@ pub fn call_numpy_round<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.float,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_numpy_round(generator, ctx, (elem_ty, val)),
             )?;
 
@@ -556,13 +577,14 @@ pub fn call_bool<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ctx.primitives.bool,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| {
                     let elem = call_bool(generator, ctx, (elem_ty, val))?;
 
@@ -610,13 +632,14 @@ pub fn call_floor<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ret_elem_ty,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_floor(generator, ctx, (elem_ty, val), ret_elem_ty),
             )?;
 
@@ -660,13 +683,14 @@ pub fn call_ceil<'ctx, G: CodeGenerator + ?Sized>(
             if n_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, n_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
                 generator,
                 ctx,
                 ret_elem_ty,
                 None,
-                NDArrayValue::from_ptr_val(n, llvm_usize, None),
+                NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None),
                 |generator, ctx, val| call_ceil(generator, ctx, (elem_ty, val), ret_elem_ty),
             )?;
 
@@ -784,7 +808,7 @@ pub fn call_numpy_minimum<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -795,8 +819,8 @@ pub fn call_numpy_minimum<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_minimum(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -888,17 +912,17 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
             match fn_name {
                 "np_argmin" | "np_argmax" => llvm_int64.const_zero().into(),
                 "np_max" | "np_min" => a,
-                _ => unreachable!(),
+                _ => codegen_unreachable!(ctx),
             }
         }
         BasicValueEnum::PointerValue(n)
             if a_ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) =>
         {
             let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, a_ty);
-            let llvm_ndarray_ty = ctx.get_llvm_type(generator, elem_ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
 
-            let n = NDArrayValue::from_ptr_val(n, llvm_usize, None);
+            let n = NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None);
-            let n_sz = irrt::call_ndarray_calc_size(generator, ctx, &n.dim_sizes(), (None, None));
+            let n_sz = irrt::call_ndarray_calc_size(generator, ctx, &n.shape(), (None, None));
             if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
                 let n_sz_eqz = ctx
                     .builder
@@ -915,7 +939,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
                 );
             }
 
-            let accumulator_addr = generator.gen_var_alloc(ctx, llvm_ndarray_ty, None)?;
+            let accumulator_addr = generator.gen_var_alloc(ctx, llvm_elem_ty, None)?;
             let res_idx = generator.gen_var_alloc(ctx, llvm_int64.into(), None)?;
 
             unsafe {
@@ -943,7 +967,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
                         "np_argmax" | "np_max" => {
                             call_max(ctx, (elem_ty, accumulator), (elem_ty, elem))
                         }
-                        _ => unreachable!(),
+                        _ => codegen_unreachable!(ctx),
                     };
 
                     let updated_idx = match (accumulator, result) {
@@ -980,7 +1004,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
             match fn_name {
                 "np_argmin" | "np_argmax" => ctx.builder.build_load(res_idx, "").unwrap(),
                 "np_max" | "np_min" => ctx.builder.build_load(accumulator_addr, "").unwrap(),
-                _ => unreachable!(),
+                _ => codegen_unreachable!(ctx),
             }
         }
 
@@ -1046,7 +1070,7 @@ pub fn call_numpy_maximum<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1057,8 +1081,8 @@ pub fn call_numpy_maximum<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_maximum(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1103,6 +1127,7 @@ where
         {
             let llvm_usize = generator.get_size_type(ctx.ctx);
             let (arg_elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, arg_ty);
+            let llvm_arg_elem_ty = ctx.get_llvm_type(generator, arg_elem_ty);
             let ret_elem_ty = get_ret_elem_type(ctx, arg_elem_ty);
 
             let ndarray = ndarray_elementwise_unaryop_impl(
@@ -1110,7 +1135,7 @@ where
                 ctx,
                 ret_elem_ty,
                 None,
-                NDArrayValue::from_ptr_val(x, llvm_usize, None),
+                NDArrayValue::from_pointer_value(x, llvm_arg_elem_ty, llvm_usize, None),
                 |generator, ctx, elem_val| {
                     helper_call_numpy_unary_elementwise(
                         generator,
@@ -1486,7 +1511,7 @@ pub fn call_numpy_arctan2<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1497,8 +1522,8 @@ pub fn call_numpy_arctan2<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_arctan2(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1553,7 +1578,7 @@ pub fn call_numpy_copysign<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1564,8 +1589,8 @@ pub fn call_numpy_copysign<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_copysign(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1620,7 +1645,7 @@ pub fn call_numpy_fmax<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1631,8 +1656,8 @@ pub fn call_numpy_fmax<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_fmax(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1687,7 +1712,7 @@ pub fn call_numpy_fmin<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1698,8 +1723,8 @@ pub fn call_numpy_fmin<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_fmin(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1754,8 +1779,8 @@ pub fn call_numpy_ldexp<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_ldexp(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1810,7 +1835,7 @@ pub fn call_numpy_hypot<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1821,8 +1846,8 @@ pub fn call_numpy_hypot<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_hypot(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1877,7 +1902,7 @@ pub fn call_numpy_nextafter<'ctx, G: CodeGenerator + ?Sized>(
             } else if is_ndarray2 {
                 unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@@ -1888,8 +1913,8 @@ pub fn call_numpy_nextafter<'ctx, G: CodeGenerator + ?Sized>(
                 ctx,
                 dtype,
                 None,
-                (x1, !is_ndarray1),
+                (x1_ty, x1, !is_ndarray1),
-                (x2, !is_ndarray2),
+                (x2_ty, x2, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     call_numpy_nextafter(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                 },
@@ -1949,14 +1974,14 @@ pub fn call_np_linalg_cholesky<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -1991,14 +2016,14 @@ pub fn call_np_linalg_qr<'ctx, G: CodeGenerator + ?Sized>(
             unimplemented!("{FN_NAME} operates on float type NdArrays only");
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2041,15 +2066,15 @@ pub fn call_np_linalg_svd<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
 
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2096,14 +2121,14 @@ pub fn call_np_linalg_inv<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2138,15 +2163,15 @@ pub fn call_np_linalg_pinv<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
 
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2181,15 +2206,15 @@ pub fn call_sp_linalg_lu<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
 
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let dim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2234,7 +2259,7 @@ pub fn call_np_linalg_matrix_power<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty, x2_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
         // Changing second parameter to a `NDArray` for uniformity in function call
         let n2_array = numpy::create_ndarray_const_shape(
             generator,
@@ -2254,12 +2279,12 @@ pub fn call_np_linalg_matrix_power<'ctx, G: CodeGenerator + ?Sized>(
         let n2_array = n2_array.as_base_value().as_basic_value_enum();
 
         let outdim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
         let outdim1 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                 .into_int_value()
         };
@@ -2329,10 +2354,10 @@ pub fn call_sp_linalg_schur<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
 
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };
@@ -2372,10 +2397,10 @@ pub fn call_sp_linalg_hessenberg<'ctx, G: CodeGenerator + ?Sized>(
             unsupported_type(ctx, FN_NAME, &[x1_ty]);
         };
 
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
 
         let dim0 = unsafe {
-            n1.dim_sizes()
+            n1.shape()
                 .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                 .into_int_value()
         };

nac3core/src/codegen/concrete_type.rs

@@ -1,3 +1,9 @@
+use std::collections::HashMap;
+
+use indexmap::IndexMap;
+
+use nac3parser::ast::StrRef;
+
 use crate::{
     symbol_resolver::SymbolValue,
     toplevel::DefinitionId,
@@ -9,10 +15,6 @@ use crate::{
     },
 };
 
-use indexmap::IndexMap;
-use nac3parser::ast::StrRef;
-use std::collections::HashMap;
-
 pub struct ConcreteTypeStore {
     store: Vec<ConcreteTypeEnum>,
 }

nac3core/src/codegen/expr.rs

@@ -1,23 +1,45 @@
-use crate::{
+use std::{
-    codegen::{
+    cmp::min,
-        classes::{
+    collections::HashMap,
-            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayValue, ProxyType,
+    convert::TryInto,
-            ProxyValue, RangeValue, TypedArrayLikeAccessor, UntypedArrayLikeAccessor,
+    iter::{once, repeat, repeat_with, zip},
-        },
+};
-        concrete_type::{ConcreteFuncArg, ConcreteTypeEnum, ConcreteTypeStore},
+
-        gen_in_range_check, get_llvm_abi_type, get_llvm_type, get_va_count_arg_name,
+use inkwell::{
-        irrt::*,
+    attributes::{Attribute, AttributeLoc},
-        llvm_intrinsics::{
+    types::{AnyType, BasicType, BasicTypeEnum},
-            call_expect, call_float_floor, call_float_pow, call_float_powi, call_int_smax,
+    values::{BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue, StructValue},
-            call_int_umin, call_memcpy_generic,
+    AddressSpace, IntPredicate, OptimizationLevel,
-        },
+};
-        need_sret, numpy,
+use itertools::{chain, izip, Either, Itertools};
-        stmt::{
+
-            gen_for_callback_incrementing, gen_if_callback, gen_if_else_expr_callback, gen_raise,
+use nac3parser::ast::{
-            gen_var,
+    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
-        },
+    Unaryop,
-        CodeGenContext, CodeGenTask, CodeGenerator,
+};
+
+use super::{
+    concrete_type::{ConcreteFuncArg, ConcreteTypeEnum, ConcreteTypeStore},
+    gen_in_range_check, get_llvm_abi_type, get_llvm_type, get_va_count_arg_name,
+    irrt::*,
+    llvm_intrinsics::{
+        call_expect, call_float_floor, call_float_pow, call_float_powi, call_int_smax,
+        call_int_umin, call_memcpy_generic,
     },
+    macros::codegen_unreachable,
+    need_sret, numpy,
+    stmt::{
+        gen_for_callback_incrementing, gen_if_callback, gen_if_else_expr_callback, gen_raise,
+        gen_var,
+    },
+    types::{ListType, ProxyType},
+    values::{
+        ArrayLikeIndexer, ArrayLikeValue, ListValue, NDArrayValue, ProxyValue, RangeValue,
+        TypedArrayLikeAccessor, UntypedArrayLikeAccessor,
+    },
+    CodeGenContext, CodeGenTask, CodeGenerator,
+};
+use crate::{
     symbol_resolver::{SymbolValue, ValueEnum},
     toplevel::{
         helper::PrimDef,
@@ -29,20 +51,6 @@ use crate::{
         typedef::{FunSignature, FuncArg, Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    types::{AnyType, BasicType, BasicTypeEnum},
-    values::{BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue, StructValue},
-    AddressSpace, IntPredicate, OptimizationLevel,
-};
-use itertools::{chain, izip, Either, Itertools};
-use nac3parser::ast::{
-    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
-    Unaryop,
-};
-use std::cmp::min;
-use std::iter::{repeat, repeat_with};
-use std::{collections::HashMap, convert::TryInto, iter::once, iter::zip};
 
 pub fn get_subst_key(
     unifier: &mut Unifier,
@@ -112,7 +120,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
         let obj_id = match &*self.unifier.get_ty(ty) {
             TypeEnum::TObj { obj_id, .. } => *obj_id,
             // we cannot have other types, virtual type should be handled by function calls
-            _ => unreachable!(),
+            _ => codegen_unreachable!(self),
         };
         let def = &self.top_level.definitions.read()[obj_id.0];
         let (index, value) = if let TopLevelDef::Class { fields, attributes, .. } = &*def.read() {
@@ -123,7 +131,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                 (attribute_index.0, Some(attribute_index.1 .2.clone()))
             }
         } else {
-            unreachable!()
+            codegen_unreachable!(self)
         };
         (index, value)
     }
@@ -133,7 +141,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
             TypeEnum::TObj { fields, .. } => {
                 fields.iter().find_position(|x| *x.0 == attr).unwrap().0
             }
-            _ => unreachable!(),
+            _ => codegen_unreachable!(self),
         }
     }
 
@@ -188,7 +196,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                     {
                         *params.iter().next().unwrap().1
                     }
-                    _ => unreachable!("must be option type"),
+                    _ => codegen_unreachable!(self, "must be option type"),
                 };
                 let val = self.gen_symbol_val(generator, v, ty);
                 let ptr = generator
@@ -204,7 +212,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                     {
                         *params.iter().next().unwrap().1
                     }
-                    _ => unreachable!("must be option type"),
+                    _ => codegen_unreachable!(self, "must be option type"),
                 };
                 let actual_ptr_type =
                     self.get_llvm_type(generator, ty).ptr_type(AddressSpace::default());
@@ -271,7 +279,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                 {
                     self.ctx.i64_type()
                 } else {
-                    unreachable!()
+                    codegen_unreachable!(self)
                 };
                 Some(ty.const_int(*val as u64, false).into())
             }
@@ -285,7 +293,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                 let (types, is_vararg_ctx) = if let TypeEnum::TTuple { ty, is_vararg_ctx } = &*ty {
                     (ty.clone(), *is_vararg_ctx)
                 } else {
-                    unreachable!()
+                    codegen_unreachable!(self)
                 };
                 let values = zip(types, v.iter())
                     .map_while(|(ty, v)| self.gen_const(generator, v, ty))
@@ -330,7 +338,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
 
                 None
             }
-            _ => unreachable!(),
+            _ => codegen_unreachable!(self),
         }
     }
 
@@ -344,7 +352,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
         signed: bool,
     ) -> BasicValueEnum<'ctx> {
         let (BasicValueEnum::IntValue(lhs), BasicValueEnum::IntValue(rhs)) = (lhs, rhs) else {
-            unreachable!()
+            codegen_unreachable!(self)
         };
         let float = self.ctx.f64_type();
         match (op, signed) {
@@ -419,7 +427,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                         .build_right_shift(lhs, rhs, signed, "rshift")
                         .map(Into::into)
                         .unwrap(),
-                    _ => unreachable!(),
+                    _ => codegen_unreachable!(self),
                 }
             }
 
@@ -431,7 +439,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
             }
             (Operator::Pow, s) => integer_power(generator, self, lhs, rhs, s).into(),
             // special implementation?
-            (Operator::MatMult, _) => unreachable!(),
+            (Operator::MatMult, _) => codegen_unreachable!(self),
         }
     }
 
@@ -443,7 +451,8 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
         rhs: BasicValueEnum<'ctx>,
     ) -> BasicValueEnum<'ctx> {
         let (BasicValueEnum::FloatValue(lhs), BasicValueEnum::FloatValue(rhs)) = (lhs, rhs) else {
-            unreachable!(
+            codegen_unreachable!(
+                self,
                 "Expected (FloatValue, FloatValue), got ({}, {})",
                 lhs.get_type(),
                 rhs.get_type()
@@ -549,7 +558,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                             && val_ty.get_element_type().is_struct_type()
                     } =>
                 {
-                    self.builder.build_bitcast(*val, arg_ty, "call_arg_cast").unwrap()
+                    self.builder.build_bit_cast(*val, arg_ty, "call_arg_cast").unwrap()
                 }
                 _ => *val,
             })
@@ -687,7 +696,7 @@ pub fn gen_constructor<'ctx, 'a, G: CodeGenerator>(
     def: &TopLevelDef,
     params: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
 ) -> Result<BasicValueEnum<'ctx>, String> {
-    let TopLevelDef::Class { methods, .. } = def else { unreachable!() };
+    let TopLevelDef::Class { methods, .. } = def else { codegen_unreachable!(ctx) };
 
     // TODO: what about other fields that require alloca?
     let fun_id = methods.iter().find(|method| method.0 == "__init__".into()).map(|method| method.2);
@@ -719,7 +728,7 @@ pub fn gen_func_instance<'ctx>(
         key,
     ) = fun
     else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     };
 
     if let Some(sym) = instance_to_symbol.get(&key) {
@@ -751,7 +760,7 @@ pub fn gen_func_instance<'ctx>(
         .collect();
 
     let mut signature = store.from_signature(&mut ctx.unifier, &ctx.primitives, sign, &mut cache);
-    let ConcreteTypeEnum::TFunc { args, .. } = &mut signature else { unreachable!() };
+    let ConcreteTypeEnum::TFunc { args, .. } = &mut signature else { codegen_unreachable!(ctx) };
 
     if let Some(obj) = &obj {
         let zelf = store.from_unifier_type(&mut ctx.unifier, &ctx.primitives, obj.0, &mut cache);
@@ -969,6 +978,7 @@ pub fn gen_call<'ctx, G: CodeGenerator>(
             TopLevelDef::Class { .. } => {
                 return Ok(Some(generator.gen_constructor(ctx, fun.0, &def, params)?))
             }
+            TopLevelDef::Variable { .. } => unreachable!(),
         }
     }
     .or_else(|_: String| {
@@ -1117,7 +1127,7 @@ pub fn gen_comprehension<'ctx, G: CodeGenerator>(
     ctx: &mut CodeGenContext<'ctx, '_>,
     expr: &Expr<Option<Type>>,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
-    let ExprKind::ListComp { elt, generators } = &expr.node else { unreachable!() };
+    let ExprKind::ListComp { elt, generators } = &expr.node else { codegen_unreachable!(ctx) };
 
     let current = ctx.builder.get_insert_block().unwrap().get_parent().unwrap();
 
@@ -1158,7 +1168,8 @@ pub fn gen_comprehension<'ctx, G: CodeGenerator>(
         TypeEnum::TObj { obj_id, .. }
             if *obj_id == ctx.primitives.range.obj_id(&ctx.unifier).unwrap() =>
         {
-            let iter_val = RangeValue::from_ptr_val(iter_val.into_pointer_value(), Some("range"));
+            let iter_val =
+                RangeValue::from_pointer_value(iter_val.into_pointer_value(), Some("range"));
             let (start, stop, step) = destructure_range(ctx, iter_val);
             let diff = ctx.builder.build_int_sub(stop, start, "diff").unwrap();
             // add 1 to the length as the value is rounded to zero
@@ -1376,21 +1387,23 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                     if let TypeEnum::TObj { params, .. } = &*ctx.unifier.get_ty_immutable(ty1) {
                         ctx.unifier.get_representative(*params.iter().next().unwrap().1)
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
                 let elem_ty2 =
                     if let TypeEnum::TObj { params, .. } = &*ctx.unifier.get_ty_immutable(ty2) {
                         ctx.unifier.get_representative(*params.iter().next().unwrap().1)
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
                 debug_assert!(ctx.unifier.unioned(elem_ty1, elem_ty2));
 
                 let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty1);
                 let sizeof_elem = llvm_elem_ty.size_of().unwrap();
 
-                let lhs = ListValue::from_ptr_val(left_val.into_pointer_value(), llvm_usize, None);
+                let lhs =
-                let rhs = ListValue::from_ptr_val(right_val.into_pointer_value(), llvm_usize, None);
+                    ListValue::from_pointer_value(left_val.into_pointer_value(), llvm_usize, None);
+                let rhs =
+                    ListValue::from_pointer_value(right_val.into_pointer_value(), llvm_usize, None);
 
                 let size = ctx
                     .builder
@@ -1455,7 +1468,7 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                         {
                             *params.iter().next().unwrap().1
                         } else {
-                            unreachable!()
+                            codegen_unreachable!(ctx)
                         };
 
                         (elem_ty, left_val, right_val)
@@ -1465,15 +1478,15 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                         {
                             *params.iter().next().unwrap().1
                         } else {
-                            unreachable!()
+                            codegen_unreachable!(ctx)
                         };
 
                         (elem_ty, right_val, left_val)
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
                 let list_val =
-                    ListValue::from_ptr_val(list_val.into_pointer_value(), llvm_usize, None);
+                    ListValue::from_pointer_value(list_val.into_pointer_value(), llvm_usize, None);
                 let int_val = ctx
                     .builder
                     .build_int_s_extend(int_val.into_int_value(), llvm_usize, "")
@@ -1551,10 +1564,21 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
 
             assert!(ctx.unifier.unioned(ndarray_dtype1, ndarray_dtype2));
 
-            let left_val =
+            let llvm_ndarray_dtype1 = ctx.get_llvm_type(generator, ndarray_dtype1);
-                NDArrayValue::from_ptr_val(left_val.into_pointer_value(), llvm_usize, None);
+            let llvm_ndarray_dtype2 = ctx.get_llvm_type(generator, ndarray_dtype2);
-            let right_val =
+
-                NDArrayValue::from_ptr_val(right_val.into_pointer_value(), llvm_usize, None);
+            let left_val = NDArrayValue::from_pointer_value(
+                left_val.into_pointer_value(),
+                llvm_ndarray_dtype1,
+                llvm_usize,
+                None,
+            );
+            let right_val = NDArrayValue::from_pointer_value(
+                right_val.into_pointer_value(),
+                llvm_ndarray_dtype2,
+                llvm_usize,
+                None,
+            );
 
             let res = if op.base == Operator::MatMult {
                 // MatMult is the only binop which is not an elementwise op
@@ -1578,8 +1602,8 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                         BinopVariant::Normal => None,
                         BinopVariant::AugAssign => Some(left_val),
                     },
-                    (left_val.as_base_value().into(), false),
+                    (ty1, left_val.as_base_value().into(), false),
-                    (right_val.as_base_value().into(), false),
+                    (ty2, right_val.as_base_value().into(), false),
                     |generator, ctx, (lhs, rhs)| {
                         gen_binop_expr_with_values(
                             generator,
@@ -1603,8 +1627,10 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
         } else {
             let (ndarray_dtype, _) =
                 unpack_ndarray_var_tys(&mut ctx.unifier, if is_ndarray1 { ty1 } else { ty2 });
-            let ndarray_val = NDArrayValue::from_ptr_val(
+            let llvm_ndarray_dtype = ctx.get_llvm_type(generator, ndarray_dtype);
+            let ndarray_val = NDArrayValue::from_pointer_value(
                 if is_ndarray1 { left_val } else { right_val }.into_pointer_value(),
+                llvm_ndarray_dtype,
                 llvm_usize,
                 None,
             );
@@ -1616,8 +1642,8 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                     BinopVariant::Normal => None,
                     BinopVariant::AugAssign => Some(ndarray_val),
                 },
-                (left_val, !is_ndarray1),
+                (ty1, left_val, !is_ndarray1),
-                (right_val, !is_ndarray2),
+                (ty2, right_val, !is_ndarray2),
                 |generator, ctx, (lhs, rhs)| {
                     gen_binop_expr_with_values(
                         generator,
@@ -1637,7 +1663,7 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
     } else {
         let left_ty_enum = ctx.unifier.get_ty_immutable(left_ty.unwrap());
         let TypeEnum::TObj { fields, obj_id, .. } = left_ty_enum.as_ref() else {
-            unreachable!("must be tobj")
+            codegen_unreachable!(ctx, "must be tobj")
         };
         let (op_name, id) = {
             let normal_method_name = Binop::normal(op.base).op_info().method_name;
@@ -1658,19 +1684,19 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
         } else {
             let left_enum_ty = ctx.unifier.get_ty_immutable(left_ty.unwrap());
             let TypeEnum::TObj { fields, .. } = left_enum_ty.as_ref() else {
-                unreachable!("must be tobj")
+                codegen_unreachable!(ctx, "must be tobj")
             };
 
             let fn_ty = fields.get(&op_name).unwrap().0;
             let fn_ty_enum = ctx.unifier.get_ty_immutable(fn_ty);
-            let TypeEnum::TFunc(sig) = fn_ty_enum.as_ref() else { unreachable!() };
+            let TypeEnum::TFunc(sig) = fn_ty_enum.as_ref() else { codegen_unreachable!(ctx) };
 
             sig.clone()
         };
         let fun_id = {
             let defs = ctx.top_level.definitions.read();
             let obj_def = defs.get(id.0).unwrap().read();
-            let TopLevelDef::Class { methods, .. } = &*obj_def else { unreachable!() };
+            let TopLevelDef::Class { methods, .. } = &*obj_def else { codegen_unreachable!(ctx) };
 
             methods.iter().find(|method| method.0 == op_name).unwrap().2
         };
@@ -1768,7 +1794,12 @@ pub fn gen_unaryop_expr_with_values<'ctx, G: CodeGenerator>(
             ast::Unaryop::Invert => ctx.builder.build_not(val, "not").map(Into::into).unwrap(),
             ast::Unaryop::Not => ctx
                 .builder
-                .build_xor(val, val.get_type().const_all_ones(), "not")
+                .build_int_compare(
+                    inkwell::IntPredicate::EQ,
+                    val,
+                    val.get_type().const_zero(),
+                    "not",
+                )
                 .map(Into::into)
                 .unwrap(),
             ast::Unaryop::UAdd => val.into(),
@@ -1792,8 +1823,14 @@ pub fn gen_unaryop_expr_with_values<'ctx, G: CodeGenerator>(
     } else if ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::NDArray.id()) {
         let llvm_usize = generator.get_size_type(ctx.ctx);
         let (ndarray_dtype, _) = unpack_ndarray_var_tys(&mut ctx.unifier, ty);
+        let llvm_ndarray_dtype = ctx.get_llvm_type(generator, ndarray_dtype);
 
-        let val = NDArrayValue::from_ptr_val(val.into_pointer_value(), llvm_usize, None);
+        let val = NDArrayValue::from_pointer_value(
+            val.into_pointer_value(),
+            llvm_ndarray_dtype,
+            llvm_usize,
+            None,
+        );
 
         // ndarray uses `~` rather than `not` to perform elementwise inversion, convert it before
         // passing it to the elementwise codegen function
@@ -1801,7 +1838,8 @@ pub fn gen_unaryop_expr_with_values<'ctx, G: CodeGenerator>(
             if op == ast::Unaryop::Invert {
                 ast::Unaryop::Not
             } else {
-                unreachable!(
+                codegen_unreachable!(
+                    ctx,
                     "ufunc {} not supported for ndarray[bool, N]",
                     op.op_info().method_name,
                 )
@@ -1868,8 +1906,8 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
         {
             let llvm_usize = generator.get_size_type(ctx.ctx);
 
-            let (Some(left_ty), lhs) = left else { unreachable!() };
+            let (Some(left_ty), lhs) = left else { codegen_unreachable!(ctx) };
-            let (Some(right_ty), rhs) = comparators[0] else { unreachable!() };
+            let (Some(right_ty), rhs) = comparators[0] else { codegen_unreachable!(ctx) };
             let op = ops[0];
 
             let is_ndarray1 =
@@ -1883,15 +1921,21 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
 
                 assert!(ctx.unifier.unioned(ndarray_dtype1, ndarray_dtype2));
 
-                let left_val =
+                let llvm_ndarray_dtype1 = ctx.get_llvm_type(generator, ndarray_dtype1);
-                    NDArrayValue::from_ptr_val(lhs.into_pointer_value(), llvm_usize, None);
+
+                let left_val = NDArrayValue::from_pointer_value(
+                    lhs.into_pointer_value(),
+                    llvm_ndarray_dtype1,
+                    llvm_usize,
+                    None,
+                );
                 let res = numpy::ndarray_elementwise_binop_impl(
                     generator,
                     ctx,
                     ctx.primitives.bool,
                     None,
-                    (left_val.as_base_value().into(), false),
+                    (left_ty, left_val.as_base_value().into(), false),
-                    (rhs, false),
+                    (right_ty, rhs, false),
                     |generator, ctx, (lhs, rhs)| {
                         let val = gen_cmpop_expr_with_values(
                             generator,
@@ -1922,8 +1966,8 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                     ctx,
                     ctx.primitives.bool,
                     None,
-                    (lhs, !is_ndarray1),
+                    (left_ty, lhs, !is_ndarray1),
-                    (rhs, !is_ndarray2),
+                    (right_ty, rhs, !is_ndarray2),
                     |generator, ctx, (lhs, rhs)| {
                         let val = gen_cmpop_expr_with_values(
                             generator,
@@ -1976,7 +2020,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                 let op = match op {
                     ast::Cmpop::Eq | ast::Cmpop::Is => IntPredicate::EQ,
                     ast::Cmpop::NotEq => IntPredicate::NE,
-                    _ if left_ty == ctx.primitives.bool => unreachable!(),
+                    _ if left_ty == ctx.primitives.bool => codegen_unreachable!(ctx),
                     ast::Cmpop::Lt => {
                         if use_unsigned_ops {
                             IntPredicate::ULT
@@ -2005,7 +2049,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                             IntPredicate::SGE
                         }
                     }
-                    _ => unreachable!(),
+                    _ => codegen_unreachable!(ctx),
                 };
 
                 ctx.builder.build_int_compare(op, lhs, rhs, "cmp").unwrap()
@@ -2022,7 +2066,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                     ast::Cmpop::LtE => inkwell::FloatPredicate::OLE,
                     ast::Cmpop::Gt => inkwell::FloatPredicate::OGT,
                     ast::Cmpop::GtE => inkwell::FloatPredicate::OGE,
-                    _ => unreachable!(),
+                    _ => codegen_unreachable!(ctx),
                 };
                 ctx.builder.build_float_compare(op, lhs, rhs, "cmp").unwrap()
             } else if left_ty == ctx.primitives.str {
@@ -2154,7 +2198,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                         match (op, val) {
                             (Cmpop::Eq, true) | (Cmpop::NotEq, false) => llvm_i1.const_all_ones(),
                             (Cmpop::Eq, false) | (Cmpop::NotEq, true) => llvm_i1.const_zero(),
-                            (_, _) => unreachable!(),
+                            (_, _) => codegen_unreachable!(ctx),
                         }
                     };
 
@@ -2167,14 +2211,14 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                     {
                         *params.iter().next().unwrap().1
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
                     let right_elem_ty = if let TypeEnum::TObj { params, .. } =
                         &*ctx.unifier.get_ty_immutable(right_ty)
                     {
                         *params.iter().next().unwrap().1
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
 
                     if !ctx.unifier.unioned(left_elem_ty, right_elem_ty) {
@@ -2186,9 +2230,9 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                     }
 
                     let left_val =
-                        ListValue::from_ptr_val(lhs.into_pointer_value(), llvm_usize, None);
+                        ListValue::from_pointer_value(lhs.into_pointer_value(), llvm_usize, None);
                     let right_val =
-                        ListValue::from_ptr_val(rhs.into_pointer_value(), llvm_usize, None);
+                        ListValue::from_pointer_value(rhs.into_pointer_value(), llvm_usize, None);
 
                     Ok(gen_if_else_expr_callback(
                         generator,
@@ -2382,7 +2426,10 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                                 })
                                 .map(BasicValueEnum::into_int_value)?;
 
-                            Ok(ctx.builder.build_not(cmp, "").unwrap())
+                            Ok(ctx.builder.build_not(
+                                generator.bool_to_i1(ctx, cmp),
+                                "",
+                            ).unwrap())
                         },
                         |_, ctx| {
                             let bb = ctx.builder.get_insert_block().unwrap();
@@ -2511,7 +2558,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
     let TypeEnum::TLiteral { values, .. } = &*ctx.unifier.get_ty_immutable(ndims) else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     };
 
     let ndims = values
@@ -2584,7 +2631,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                 let llvm_i32 = ctx.ctx.i32_type();
 
                 let len = unsafe {
-                    v.dim_sizes().get_typed_unchecked(
+                    v.shape().get_typed_unchecked(
                         ctx,
                         generator,
                         &llvm_usize.const_int(dim, true),
@@ -2625,7 +2672,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
 
             ExprKind::Slice { lower, upper, step } => {
                 let dim_sz = unsafe {
-                    v.dim_sizes().get_typed_unchecked(
+                    v.shape().get_typed_unchecked(
                         ctx,
                         generator,
                         &llvm_usize.const_int(dim, false),
@@ -2749,7 +2796,12 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                 // elements over
                 let subscripted_ndarray =
                     generator.gen_var_alloc(ctx, llvm_ndarray_t.into(), None)?;
-                let ndarray = NDArrayValue::from_ptr_val(subscripted_ndarray, llvm_usize, None);
+                let ndarray = NDArrayValue::from_pointer_value(
+                    subscripted_ndarray,
+                    llvm_ndarray_data_t,
+                    llvm_usize,
+                    None,
+                );
 
                 let num_dims = v.load_ndims(ctx);
                 ndarray.store_ndims(
@@ -2761,7 +2813,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                 );
 
                 let ndarray_num_dims = ndarray.load_ndims(ctx);
-                ndarray.create_dim_sizes(ctx, llvm_usize, ndarray_num_dims);
+                ndarray.create_shape(ctx, llvm_usize, ndarray_num_dims);
 
                 let ndarray_num_dims = ctx
                     .builder
@@ -2772,7 +2824,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                     )
                     .unwrap();
                 let v_dims_src_ptr = unsafe {
-                    v.dim_sizes().ptr_offset_unchecked(
+                    v.shape().ptr_offset_unchecked(
                         ctx,
                         generator,
                         &llvm_usize.const_int(1, false),
@@ -2781,7 +2833,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                 };
                 call_memcpy_generic(
                     ctx,
-                    ndarray.dim_sizes().base_ptr(ctx, generator),
+                    ndarray.shape().base_ptr(ctx, generator),
                     v_dims_src_ptr,
                     ctx.builder
                         .build_int_mul(ndarray_num_dims, llvm_usize.size_of(), "")
@@ -2793,7 +2845,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                 let ndarray_num_elems = call_ndarray_calc_size(
                     generator,
                     ctx,
-                    &ndarray.dim_sizes().as_slice_value(ctx, generator),
+                    &ndarray.shape().as_slice_value(ctx, generator),
                     (None, None),
                 );
                 let ndarray_num_elems = ctx
@@ -2863,7 +2915,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                         .const_null()
                         .into()
                 }
-                _ => unreachable!("must be option type"),
+                _ => codegen_unreachable!(ctx, "must be option type"),
             }
         }
         ExprKind::Name { id, .. } => match ctx.var_assignment.get(id) {
@@ -2873,28 +2925,30 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             Some((_, Some(static_value), _)) => ValueEnum::Static(static_value.clone()),
             None => {
                 let resolver = ctx.resolver.clone();
-                if let Some(res) = resolver.get_symbol_value(*id, ctx) {
+                let value = resolver.get_symbol_value(*id, ctx, generator).unwrap();
-                    res
+
+                let globals = ctx
+                    .top_level
+                    .definitions
+                    .read()
+                    .iter()
+                    .filter_map(|def| {
+                        if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
+                            Some((*simple_name, *ty))
+                        } else {
+                            None
+                        }
+                    })
+                    .collect_vec();
+
+                if let Some((_, ty)) = globals.iter().find(|(name, _)| name == id) {
+                    let ptr = value
+                        .to_basic_value_enum(ctx, generator, *ty)
+                        .map(BasicValueEnum::into_pointer_value)?;
+
+                    ctx.builder.build_load(ptr, id.to_string().as_str()).map(Into::into).unwrap()
                 } else {
-                    // Allow "raise Exception" short form
+                    value
-                    let def_id = resolver.get_identifier_def(*id).map_err(|e| {
-                        format!("{} (at {})", e.iter().next().unwrap(), expr.location)
-                    })?;
-                    let def = ctx.top_level.definitions.read();
-                    if let TopLevelDef::Class { constructor, .. } = *def[def_id.0].read() {
-                        let TypeEnum::TFunc(signature) =
-                            ctx.unifier.get_ty(constructor.unwrap()).as_ref().clone()
-                        else {
-                            return Err(format!(
-                                "Failed to resolve symbol {} (at {})",
-                                id, expr.location
-                            ));
-                        };
-                        return Ok(generator
-                            .gen_call(ctx, None, (&signature, def_id), Vec::default())?
-                            .map(Into::into));
-                    }
-                    return Err(format!("Failed to resolve symbol {} (at {})", id, expr.location));
                 }
             }
         },
@@ -2924,7 +2978,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
 
                     *params.iter().next().unwrap().1
                 } else {
-                    unreachable!()
+                    codegen_unreachable!(ctx)
                 };
 
                 if let TypeEnum::TVar { .. } = &*ctx.unifier.get_ty_immutable(ty) {
@@ -3018,7 +3072,9 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
 
                             return generator.gen_expr(ctx, &modified_expr);
                         }
-                        None => unreachable!("Function Type should not have attributes"),
+                        None => {
+                            codegen_unreachable!(ctx, "Function Type should not have attributes")
+                        }
                     }
                 } else if let TypeEnum::TObj { obj_id, fields, params } = &*ctx.unifier.get_ty(c) {
                     if fields.is_empty() && params.is_empty() {
@@ -3040,7 +3096,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
 
                                 return generator.gen_expr(ctx, &modified_expr);
                             }
-                            None => unreachable!(),
+                            None => codegen_unreachable!(ctx),
                         }
                     }
                 }
@@ -3086,48 +3142,53 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             };
             let left = generator.bool_to_i1(ctx, left);
             let current = ctx.builder.get_insert_block().unwrap().get_parent().unwrap();
-            let a_bb = ctx.ctx.append_basic_block(current, "a");
+            let a_begin_bb = ctx.ctx.append_basic_block(current, "a_begin");
-            let b_bb = ctx.ctx.append_basic_block(current, "b");
+            let a_end_bb = ctx.ctx.append_basic_block(current, "a_end");
+            let b_begin_bb = ctx.ctx.append_basic_block(current, "b_begin");
+            let b_end_bb = ctx.ctx.append_basic_block(current, "b_end");
             let cont_bb = ctx.ctx.append_basic_block(current, "cont");
-            ctx.builder.build_conditional_branch(left, a_bb, b_bb).unwrap();
+            ctx.builder.build_conditional_branch(left, a_begin_bb, b_begin_bb).unwrap();
+
+            ctx.builder.position_at_end(a_end_bb);
+            ctx.builder.build_unconditional_branch(cont_bb).unwrap();
+            ctx.builder.position_at_end(b_end_bb);
+            ctx.builder.build_unconditional_branch(cont_bb).unwrap();
             let (a, b) = match op {
                 Boolop::Or => {
-                    ctx.builder.position_at_end(a_bb);
+                    ctx.builder.position_at_end(a_begin_bb);
                     let a = ctx.ctx.i8_type().const_int(1, false);
-                    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
+                    ctx.builder.build_unconditional_branch(a_end_bb).unwrap();
 
-                    ctx.builder.position_at_end(b_bb);
+                    ctx.builder.position_at_end(b_begin_bb);
                     let b = if let Some(v) = generator.gen_expr(ctx, &values[1])? {
                         let b = v
                             .to_basic_value_enum(ctx, generator, values[1].custom.unwrap())?
                             .into_int_value();
                         let b = generator.bool_to_i8(ctx, b);
-                        ctx.builder.build_unconditional_branch(cont_bb).unwrap();
-
                         Some(b)
                     } else {
                         None
                     };
+                    ctx.builder.build_unconditional_branch(b_end_bb).unwrap();
 
                     (Some(a), b)
                 }
                 Boolop::And => {
-                    ctx.builder.position_at_end(a_bb);
+                    ctx.builder.position_at_end(a_begin_bb);
                     let a = if let Some(v) = generator.gen_expr(ctx, &values[1])? {
                         let a = v
                             .to_basic_value_enum(ctx, generator, values[1].custom.unwrap())?
                             .into_int_value();
                         let a = generator.bool_to_i8(ctx, a);
-                        ctx.builder.build_unconditional_branch(cont_bb).unwrap();
-
                         Some(a)
                     } else {
                         None
                     };
+                    ctx.builder.build_unconditional_branch(a_end_bb).unwrap();
 
-                    ctx.builder.position_at_end(b_bb);
+                    ctx.builder.position_at_end(b_begin_bb);
                     let b = ctx.ctx.i8_type().const_zero();
-                    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
+                    ctx.builder.build_unconditional_branch(b_end_bb).unwrap();
 
                     (a, Some(b))
                 }
@@ -3137,12 +3198,12 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             match (a, b) {
                 (Some(a), Some(b)) => {
                     let phi = ctx.builder.build_phi(ctx.ctx.i8_type(), "").unwrap();
-                    phi.add_incoming(&[(&a, a_bb), (&b, b_bb)]);
+                    phi.add_incoming(&[(&a, a_end_bb), (&b, b_end_bb)]);
                     phi.as_basic_value().into()
                 }
                 (Some(a), None) => a.into(),
                 (None, Some(b)) => b.into(),
-                (None, None) => unreachable!(),
+                (None, None) => codegen_unreachable!(ctx),
             }
         }
         ExprKind::BinOp { op, left, right } => {
@@ -3232,7 +3293,9 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                 ctx.unifier.get_call_signature(*call).unwrap()
             } else {
                 let ty = func.custom.unwrap();
-                let TypeEnum::TFunc(sign) = &*ctx.unifier.get_ty(ty) else { unreachable!() };
+                let TypeEnum::TFunc(sign) = &*ctx.unifier.get_ty(ty) else {
+                    codegen_unreachable!(ctx)
+                };
 
                 sign.clone()
             };
@@ -3251,17 +3314,26 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                     let Some(val) = generator.gen_expr(ctx, value)? else { return Ok(None) };
 
                     // Handle Class Method calls
+                    // The attribute will be `DefinitionId` of the method if the call is to one of the parent methods
+                    let func_id = attr.to_string().parse::<usize>();
+
                     let id = if let TypeEnum::TObj { obj_id, .. } =
                         &*ctx.unifier.get_ty(value.custom.unwrap())
                     {
                         *obj_id
                     } else {
-                        unreachable!()
+                        codegen_unreachable!(ctx)
                     };
-                    let fun_id = {
+
+                    // Use the `DefinitionID` from attribute if it is available
+                    let fun_id = if let Ok(func_id) = func_id {
+                        DefinitionId(func_id)
+                    } else {
                         let defs = ctx.top_level.definitions.read();
                         let obj_def = defs.get(id.0).unwrap().read();
-                        let TopLevelDef::Class { methods, .. } = &*obj_def else { unreachable!() };
+                        let TopLevelDef::Class { methods, .. } = &*obj_def else {
+                            codegen_unreachable!(ctx)
+                        };
 
                         methods.iter().find(|method| method.0 == *attr).unwrap().2
                     };
@@ -3332,7 +3404,9 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                                         .unwrap(),
                                 ));
                             }
-                            ValueEnum::Dynamic(_) => unreachable!("option must be static or ptr"),
+                            ValueEnum::Dynamic(_) => {
+                                codegen_unreachable!(ctx, "option must be static or ptr")
+                            }
                         }
                     }
 
@@ -3362,7 +3436,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                     } else {
                         return Ok(None);
                     };
-                    let v = ListValue::from_ptr_val(v, usize, Some("arr"));
+                    let v = ListValue::from_pointer_value(v, usize, Some("arr"));
                     let ty = ctx.get_llvm_type(generator, *ty);
                     if let ExprKind::Slice { lower, upper, step } = &slice.node {
                         let one = int32.const_int(1, false);
@@ -3465,6 +3539,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                 }
                 TypeEnum::TObj { obj_id, params, .. } if *obj_id == PrimDef::NDArray.id() => {
                     let (ty, ndims) = params.iter().map(|(_, ty)| ty).collect_tuple().unwrap();
+                    let llvm_ty = ctx.get_llvm_type(generator, *ty);
 
                     let v = if let Some(v) = generator.gen_expr(ctx, value)? {
                         v.to_basic_value_enum(ctx, generator, value.custom.unwrap())?
@@ -3472,7 +3547,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                     } else {
                         return Ok(None);
                     };
-                    let v = NDArrayValue::from_ptr_val(v, usize, None);
+                    let v = NDArrayValue::from_pointer_value(v, llvm_ty, usize, None);
 
                     return gen_ndarray_subscript_expr(generator, ctx, *ty, *ndims, v, slice);
                 }
@@ -3481,7 +3556,10 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                         if let ExprKind::Constant { value: Constant::Int(v), .. } = &slice.node {
                             (*v).try_into().unwrap()
                         } else {
-                            unreachable!("tuple subscript must be const int after type check");
+                            codegen_unreachable!(
+                                ctx,
+                                "tuple subscript must be const int after type check"
+                            );
                         };
                     match generator.gen_expr(ctx, value)? {
                         Some(ValueEnum::Dynamic(v)) => {
@@ -3504,7 +3582,10 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                         None => return Ok(None),
                     }
                 }
-                _ => unreachable!("should not be other subscriptable types after type check"),
+                _ => codegen_unreachable!(
+                    ctx,
+                    "should not be other subscriptable types after type check"
+                ),
             }
         }
         ExprKind::ListComp { .. } => {

nac3core/src/codegen/extern_fns.rs

@@ -1,8 +1,10 @@
-use inkwell::attributes::{Attribute, AttributeLoc};
+use inkwell::{
-use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue};
+    attributes::{Attribute, AttributeLoc},
+    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+};
 use itertools::Either;
 
-use crate::codegen::CodeGenContext;
+use super::CodeGenContext;
 
 /// Macro to generate extern function
 /// Both function return type and function parameter type are `FloatValue`

nac3core/src/codegen/generator.rs

@@ -1,16 +1,18 @@
-use crate::{
-    codegen::{bool_to_i1, bool_to_i8, classes::ArraySliceValue, expr::*, stmt::*, CodeGenContext},
-    symbol_resolver::ValueEnum,
-    toplevel::{DefinitionId, TopLevelDef},
-    typecheck::typedef::{FunSignature, Type},
-};
 use inkwell::{
     context::Context,
     types::{BasicTypeEnum, IntType},
     values::{BasicValueEnum, IntValue, PointerValue},
 };
+
 use nac3parser::ast::{Expr, Stmt, StrRef};
 
+use super::{bool_to_i1, bool_to_i8, expr::*, stmt::*, values::ArraySliceValue, CodeGenContext};
+use crate::{
+    symbol_resolver::ValueEnum,
+    toplevel::{DefinitionId, TopLevelDef},
+    typecheck::typedef::{FunSignature, Type},
+};
+
 pub trait CodeGenerator {
     /// Return the module name for the code generator.
     fn get_name(&self) -> &str;

nac3core/src/codegen/irrt/list.rs

@@ -0,0 +1,162 @@
+use inkwell::{
+    types::BasicTypeEnum,
+    values::{BasicValueEnum, CallSiteValue, IntValue},
+    AddressSpace, IntPredicate,
+};
+use itertools::Either;
+
+use super::calculate_len_for_slice_range;
+use crate::codegen::{
+    macros::codegen_unreachable,
+    values::{ArrayLikeValue, ListValue},
+    CodeGenContext, CodeGenerator,
+};
+
+/// This function handles 'end' **inclusively**.
+/// Order of tuples `assign_idx` and `value_idx` is ('start', 'end', 'step').
+/// Negative index should be handled before entering this function
+pub fn list_slice_assignment<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    ty: BasicTypeEnum<'ctx>,
+    dest_arr: ListValue<'ctx>,
+    dest_idx: (IntValue<'ctx>, IntValue<'ctx>, IntValue<'ctx>),
+    src_arr: ListValue<'ctx>,
+    src_idx: (IntValue<'ctx>, IntValue<'ctx>, IntValue<'ctx>),
+) {
+    let size_ty = generator.get_size_type(ctx.ctx);
+    let int8_ptr = ctx.ctx.i8_type().ptr_type(AddressSpace::default());
+    let int32 = ctx.ctx.i32_type();
+    let (fun_symbol, elem_ptr_type) = ("__nac3_list_slice_assign_var_size", int8_ptr);
+    let slice_assign_fun = {
+        let ty_vec = vec![
+            int32.into(),         // dest start idx
+            int32.into(),         // dest end idx
+            int32.into(),         // dest step
+            elem_ptr_type.into(), // dest arr ptr
+            int32.into(),         // dest arr len
+            int32.into(),         // src start idx
+            int32.into(),         // src end idx
+            int32.into(),         // src step
+            elem_ptr_type.into(), // src arr ptr
+            int32.into(),         // src arr len
+            int32.into(),         // size
+        ];
+        ctx.module.get_function(fun_symbol).unwrap_or_else(|| {
+            let fn_t = int32.fn_type(ty_vec.as_slice(), false);
+            ctx.module.add_function(fun_symbol, fn_t, None)
+        })
+    };
+
+    let zero = int32.const_zero();
+    let one = int32.const_int(1, false);
+    let dest_arr_ptr = dest_arr.data().base_ptr(ctx, generator);
+    let dest_arr_ptr =
+        ctx.builder.build_pointer_cast(dest_arr_ptr, elem_ptr_type, "dest_arr_ptr_cast").unwrap();
+    let dest_len = dest_arr.load_size(ctx, Some("dest.len"));
+    let dest_len = ctx.builder.build_int_truncate_or_bit_cast(dest_len, int32, "srclen32").unwrap();
+    let src_arr_ptr = src_arr.data().base_ptr(ctx, generator);
+    let src_arr_ptr =
+        ctx.builder.build_pointer_cast(src_arr_ptr, elem_ptr_type, "src_arr_ptr_cast").unwrap();
+    let src_len = src_arr.load_size(ctx, Some("src.len"));
+    let src_len = ctx.builder.build_int_truncate_or_bit_cast(src_len, int32, "srclen32").unwrap();
+
+    // index in bound and positive should be done
+    // assert if dest.step == 1 then len(src) <= len(dest) else len(src) == len(dest), and
+    // throw exception if not satisfied
+    let src_end = ctx
+        .builder
+        .build_select(
+            ctx.builder.build_int_compare(IntPredicate::SLT, src_idx.2, zero, "is_neg").unwrap(),
+            ctx.builder.build_int_sub(src_idx.1, one, "e_min_one").unwrap(),
+            ctx.builder.build_int_add(src_idx.1, one, "e_add_one").unwrap(),
+            "final_e",
+        )
+        .map(BasicValueEnum::into_int_value)
+        .unwrap();
+    let dest_end = ctx
+        .builder
+        .build_select(
+            ctx.builder.build_int_compare(IntPredicate::SLT, dest_idx.2, zero, "is_neg").unwrap(),
+            ctx.builder.build_int_sub(dest_idx.1, one, "e_min_one").unwrap(),
+            ctx.builder.build_int_add(dest_idx.1, one, "e_add_one").unwrap(),
+            "final_e",
+        )
+        .map(BasicValueEnum::into_int_value)
+        .unwrap();
+    let src_slice_len =
+        calculate_len_for_slice_range(generator, ctx, src_idx.0, src_end, src_idx.2);
+    let dest_slice_len =
+        calculate_len_for_slice_range(generator, ctx, dest_idx.0, dest_end, dest_idx.2);
+    let src_eq_dest = ctx
+        .builder
+        .build_int_compare(IntPredicate::EQ, src_slice_len, dest_slice_len, "slice_src_eq_dest")
+        .unwrap();
+    let src_slt_dest = ctx
+        .builder
+        .build_int_compare(IntPredicate::SLT, src_slice_len, dest_slice_len, "slice_src_slt_dest")
+        .unwrap();
+    let dest_step_eq_one = ctx
+        .builder
+        .build_int_compare(
+            IntPredicate::EQ,
+            dest_idx.2,
+            dest_idx.2.get_type().const_int(1, false),
+            "slice_dest_step_eq_one",
+        )
+        .unwrap();
+    let cond_1 = ctx.builder.build_and(dest_step_eq_one, src_slt_dest, "slice_cond_1").unwrap();
+    let cond = ctx.builder.build_or(src_eq_dest, cond_1, "slice_cond").unwrap();
+    ctx.make_assert(
+        generator,
+        cond,
+        "0:ValueError",
+        "attempt to assign sequence of size {0} to slice of size {1} with step size {2}",
+        [Some(src_slice_len), Some(dest_slice_len), Some(dest_idx.2)],
+        ctx.current_loc,
+    );
+
+    let new_len = {
+        let args = vec![
+            dest_idx.0.into(),   // dest start idx
+            dest_idx.1.into(),   // dest end idx
+            dest_idx.2.into(),   // dest step
+            dest_arr_ptr.into(), // dest arr ptr
+            dest_len.into(),     // dest arr len
+            src_idx.0.into(),    // src start idx
+            src_idx.1.into(),    // src end idx
+            src_idx.2.into(),    // src step
+            src_arr_ptr.into(),  // src arr ptr
+            src_len.into(),      // src arr len
+            {
+                let s = match ty {
+                    BasicTypeEnum::FloatType(t) => t.size_of(),
+                    BasicTypeEnum::IntType(t) => t.size_of(),
+                    BasicTypeEnum::PointerType(t) => t.size_of(),
+                    BasicTypeEnum::StructType(t) => t.size_of().unwrap(),
+                    _ => codegen_unreachable!(ctx),
+                };
+                ctx.builder.build_int_truncate_or_bit_cast(s, int32, "size").unwrap()
+            }
+            .into(),
+        ];
+        ctx.builder
+            .build_call(slice_assign_fun, args.as_slice(), "slice_assign")
+            .map(CallSiteValue::try_as_basic_value)
+            .map(|v| v.map_left(BasicValueEnum::into_int_value))
+            .map(Either::unwrap_left)
+            .unwrap()
+    };
+    // update length
+    let need_update =
+        ctx.builder.build_int_compare(IntPredicate::NE, new_len, dest_len, "need_update").unwrap();
+    let current = ctx.builder.get_insert_block().unwrap().get_parent().unwrap();
+    let update_bb = ctx.ctx.append_basic_block(current, "update");
+    let cont_bb = ctx.ctx.append_basic_block(current, "cont");
+    ctx.builder.build_conditional_branch(need_update, update_bb, cont_bb).unwrap();
+    ctx.builder.position_at_end(update_bb);
+    let new_len = ctx.builder.build_int_z_extend_or_bit_cast(new_len, size_ty, "new_len").unwrap();
+    dest_arr.store_size(ctx, generator, new_len);
+    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
+    ctx.builder.position_at_end(cont_bb);
+}

nac3core/src/codegen/irrt/math.rs

@@ -0,0 +1,152 @@
+use inkwell::{
+    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+    IntPredicate,
+};
+use itertools::Either;
+
+use crate::codegen::{
+    macros::codegen_unreachable,
+    {CodeGenContext, CodeGenerator},
+};
+
+// repeated squaring method adapted from GNU Scientific Library:
+// https://git.savannah.gnu.org/cgit/gsl.git/tree/sys/pow_int.c
+pub fn integer_power<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    base: IntValue<'ctx>,
+    exp: IntValue<'ctx>,
+    signed: bool,
+) -> IntValue<'ctx> {
+    let symbol = match (base.get_type().get_bit_width(), exp.get_type().get_bit_width(), signed) {
+        (32, 32, true) => "__nac3_int_exp_int32_t",
+        (64, 64, true) => "__nac3_int_exp_int64_t",
+        (32, 32, false) => "__nac3_int_exp_uint32_t",
+        (64, 64, false) => "__nac3_int_exp_uint64_t",
+        _ => codegen_unreachable!(ctx),
+    };
+    let base_type = base.get_type();
+    let pow_fun = ctx.module.get_function(symbol).unwrap_or_else(|| {
+        let fn_type = base_type.fn_type(&[base_type.into(), base_type.into()], false);
+        ctx.module.add_function(symbol, fn_type, None)
+    });
+    // throw exception when exp < 0
+    let ge_zero = ctx
+        .builder
+        .build_int_compare(
+            IntPredicate::SGE,
+            exp,
+            exp.get_type().const_zero(),
+            "assert_int_pow_ge_0",
+        )
+        .unwrap();
+    ctx.make_assert(
+        generator,
+        ge_zero,
+        "0:ValueError",
+        "integer power must be positive or zero",
+        [None, None, None],
+        ctx.current_loc,
+    );
+    ctx.builder
+        .build_call(pow_fun, &[base.into(), exp.into()], "call_int_pow")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}
+
+/// Generates a call to `isinf` in IR. Returns an `i1` representing the result.
+pub fn call_isinf<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &CodeGenContext<'ctx, '_>,
+    v: FloatValue<'ctx>,
+) -> IntValue<'ctx> {
+    let intrinsic_fn = ctx.module.get_function("__nac3_isinf").unwrap_or_else(|| {
+        let fn_type = ctx.ctx.i32_type().fn_type(&[ctx.ctx.f64_type().into()], false);
+        ctx.module.add_function("__nac3_isinf", fn_type, None)
+    });
+
+    let ret = ctx
+        .builder
+        .build_call(intrinsic_fn, &[v.into()], "isinf")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap();
+
+    generator.bool_to_i1(ctx, ret)
+}
+
+/// Generates a call to `isnan` in IR. Returns an `i1` representing the result.
+pub fn call_isnan<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &CodeGenContext<'ctx, '_>,
+    v: FloatValue<'ctx>,
+) -> IntValue<'ctx> {
+    let intrinsic_fn = ctx.module.get_function("__nac3_isnan").unwrap_or_else(|| {
+        let fn_type = ctx.ctx.i32_type().fn_type(&[ctx.ctx.f64_type().into()], false);
+        ctx.module.add_function("__nac3_isnan", fn_type, None)
+    });
+
+    let ret = ctx
+        .builder
+        .build_call(intrinsic_fn, &[v.into()], "isnan")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap();
+
+    generator.bool_to_i1(ctx, ret)
+}
+
+/// Generates a call to `gamma` in IR. Returns an `f64` representing the result.
+pub fn call_gamma<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
+    let llvm_f64 = ctx.ctx.f64_type();
+
+    let intrinsic_fn = ctx.module.get_function("__nac3_gamma").unwrap_or_else(|| {
+        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
+        ctx.module.add_function("__nac3_gamma", fn_type, None)
+    });
+
+    ctx.builder
+        .build_call(intrinsic_fn, &[v.into()], "gamma")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_float_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}
+
+/// Generates a call to `gammaln` in IR. Returns an `f64` representing the result.
+pub fn call_gammaln<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
+    let llvm_f64 = ctx.ctx.f64_type();
+
+    let intrinsic_fn = ctx.module.get_function("__nac3_gammaln").unwrap_or_else(|| {
+        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
+        ctx.module.add_function("__nac3_gammaln", fn_type, None)
+    });
+
+    ctx.builder
+        .build_call(intrinsic_fn, &[v.into()], "gammaln")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_float_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}
+
+/// Generates a call to `j0` in IR. Returns an `f64` representing the result.
+pub fn call_j0<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
+    let llvm_f64 = ctx.ctx.f64_type();
+
+    let intrinsic_fn = ctx.module.get_function("__nac3_j0").unwrap_or_else(|| {
+        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
+        ctx.module.add_function("__nac3_j0", fn_type, None)
+    });
+
+    ctx.builder
+        .build_call(intrinsic_fn, &[v.into()], "j0")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_float_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}

nac3core/src/codegen/irrt/mod.rs

@@ -1,26 +1,26 @@
-use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
-
-use super::{
-    classes::{
-        ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayValue,
-        TypedArrayLikeAdapter, UntypedArrayLikeAccessor,
-    },
-    llvm_intrinsics, CodeGenContext, CodeGenerator,
-};
-use crate::codegen::classes::TypedArrayLikeAccessor;
-use crate::codegen::stmt::gen_for_callback_incrementing;
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
     context::Context,
     memory_buffer::MemoryBuffer,
     module::Module,
-    types::{BasicTypeEnum, IntType},
+    values::{BasicValue, BasicValueEnum, IntValue},
-    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+    IntPredicate,
-    AddressSpace, IntPredicate,
 };
-use itertools::Either;
+
 use nac3parser::ast::Expr;
 
+use super::{CodeGenContext, CodeGenerator};
+use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
+pub use list::*;
+pub use math::*;
+pub use ndarray::*;
+pub use slice::*;
+
+mod list;
+mod math;
+mod ndarray;
+mod slice;
+
 #[must_use]
 pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver) -> Module<'ctx> {
     let bitcode_buf = MemoryBuffer::create_from_memory_range(
@@ -60,88 +60,6 @@ pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver)
     irrt_mod
 }
 
-// repeated squaring method adapted from GNU Scientific Library:
-// https://git.savannah.gnu.org/cgit/gsl.git/tree/sys/pow_int.c
-pub fn integer_power<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    base: IntValue<'ctx>,
-    exp: IntValue<'ctx>,
-    signed: bool,
-) -> IntValue<'ctx> {
-    let symbol = match (base.get_type().get_bit_width(), exp.get_type().get_bit_width(), signed) {
-        (32, 32, true) => "__nac3_int_exp_int32_t",
-        (64, 64, true) => "__nac3_int_exp_int64_t",
-        (32, 32, false) => "__nac3_int_exp_uint32_t",
-        (64, 64, false) => "__nac3_int_exp_uint64_t",
-        _ => unreachable!(),
-    };
-    let base_type = base.get_type();
-    let pow_fun = ctx.module.get_function(symbol).unwrap_or_else(|| {
-        let fn_type = base_type.fn_type(&[base_type.into(), base_type.into()], false);
-        ctx.module.add_function(symbol, fn_type, None)
-    });
-    // throw exception when exp < 0
-    let ge_zero = ctx
-        .builder
-        .build_int_compare(
-            IntPredicate::SGE,
-            exp,
-            exp.get_type().const_zero(),
-            "assert_int_pow_ge_0",
-        )
-        .unwrap();
-    ctx.make_assert(
-        generator,
-        ge_zero,
-        "0:ValueError",
-        "integer power must be positive or zero",
-        [None, None, None],
-        ctx.current_loc,
-    );
-    ctx.builder
-        .build_call(pow_fun, &[base.into(), exp.into()], "call_int_pow")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
-pub fn calculate_len_for_slice_range<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    start: IntValue<'ctx>,
-    end: IntValue<'ctx>,
-    step: IntValue<'ctx>,
-) -> IntValue<'ctx> {
-    const SYMBOL: &str = "__nac3_range_slice_len";
-    let len_func = ctx.module.get_function(SYMBOL).unwrap_or_else(|| {
-        let i32_t = ctx.ctx.i32_type();
-        let fn_t = i32_t.fn_type(&[i32_t.into(), i32_t.into(), i32_t.into()], false);
-        ctx.module.add_function(SYMBOL, fn_t, None)
-    });
-
-    // assert step != 0, throw exception if not
-    let not_zero = ctx
-        .builder
-        .build_int_compare(IntPredicate::NE, step, step.get_type().const_zero(), "range_step_ne")
-        .unwrap();
-    ctx.make_assert(
-        generator,
-        not_zero,
-        "0:ValueError",
-        "step must not be zero",
-        [None, None, None],
-        ctx.current_loc,
-    );
-    ctx.builder
-        .build_call(len_func, &[start.into(), end.into(), step.into()], "calc_len")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
 /// NOTE: the output value of the end index of this function should be compared ***inclusively***,
 /// because python allows `a[2::-1]`, whose semantic is `[a[2], a[1], a[0]]`, which is equivalent to
 /// NO numeric slice in python.
@@ -307,644 +225,3 @@ pub fn handle_slice_indices<'ctx, G: CodeGenerator>(
         }
     }))
 }
-
-/// this function allows index out of range, since python
-/// allows index out of range in slice (`a = [1,2,3]; a[1:10] == [2,3]`).
-pub fn handle_slice_index_bound<'ctx, G: CodeGenerator>(
-    i: &Expr<Option<Type>>,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    generator: &mut G,
-    length: IntValue<'ctx>,
-) -> Result<Option<IntValue<'ctx>>, String> {
-    const SYMBOL: &str = "__nac3_slice_index_bound";
-    let func = ctx.module.get_function(SYMBOL).unwrap_or_else(|| {
-        let i32_t = ctx.ctx.i32_type();
-        let fn_t = i32_t.fn_type(&[i32_t.into(), i32_t.into()], false);
-        ctx.module.add_function(SYMBOL, fn_t, None)
-    });
-
-    let i = if let Some(v) = generator.gen_expr(ctx, i)? {
-        v.to_basic_value_enum(ctx, generator, i.custom.unwrap())?
-    } else {
-        return Ok(None);
-    };
-    Ok(Some(
-        ctx.builder
-            .build_call(func, &[i.into(), length.into()], "bounded_ind")
-            .map(CallSiteValue::try_as_basic_value)
-            .map(|v| v.map_left(BasicValueEnum::into_int_value))
-            .map(Either::unwrap_left)
-            .unwrap(),
-    ))
-}
-
-/// This function handles 'end' **inclusively**.
-/// Order of tuples `assign_idx` and `value_idx` is ('start', 'end', 'step').
-/// Negative index should be handled before entering this function
-pub fn list_slice_assignment<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    ty: BasicTypeEnum<'ctx>,
-    dest_arr: ListValue<'ctx>,
-    dest_idx: (IntValue<'ctx>, IntValue<'ctx>, IntValue<'ctx>),
-    src_arr: ListValue<'ctx>,
-    src_idx: (IntValue<'ctx>, IntValue<'ctx>, IntValue<'ctx>),
-) {
-    let size_ty = generator.get_size_type(ctx.ctx);
-    let int8_ptr = ctx.ctx.i8_type().ptr_type(AddressSpace::default());
-    let int32 = ctx.ctx.i32_type();
-    let (fun_symbol, elem_ptr_type) = ("__nac3_list_slice_assign_var_size", int8_ptr);
-    let slice_assign_fun = {
-        let ty_vec = vec![
-            int32.into(),         // dest start idx
-            int32.into(),         // dest end idx
-            int32.into(),         // dest step
-            elem_ptr_type.into(), // dest arr ptr
-            int32.into(),         // dest arr len
-            int32.into(),         // src start idx
-            int32.into(),         // src end idx
-            int32.into(),         // src step
-            elem_ptr_type.into(), // src arr ptr
-            int32.into(),         // src arr len
-            int32.into(),         // size
-        ];
-        ctx.module.get_function(fun_symbol).unwrap_or_else(|| {
-            let fn_t = int32.fn_type(ty_vec.as_slice(), false);
-            ctx.module.add_function(fun_symbol, fn_t, None)
-        })
-    };
-
-    let zero = int32.const_zero();
-    let one = int32.const_int(1, false);
-    let dest_arr_ptr = dest_arr.data().base_ptr(ctx, generator);
-    let dest_arr_ptr =
-        ctx.builder.build_pointer_cast(dest_arr_ptr, elem_ptr_type, "dest_arr_ptr_cast").unwrap();
-    let dest_len = dest_arr.load_size(ctx, Some("dest.len"));
-    let dest_len = ctx.builder.build_int_truncate_or_bit_cast(dest_len, int32, "srclen32").unwrap();
-    let src_arr_ptr = src_arr.data().base_ptr(ctx, generator);
-    let src_arr_ptr =
-        ctx.builder.build_pointer_cast(src_arr_ptr, elem_ptr_type, "src_arr_ptr_cast").unwrap();
-    let src_len = src_arr.load_size(ctx, Some("src.len"));
-    let src_len = ctx.builder.build_int_truncate_or_bit_cast(src_len, int32, "srclen32").unwrap();
-
-    // index in bound and positive should be done
-    // assert if dest.step == 1 then len(src) <= len(dest) else len(src) == len(dest), and
-    // throw exception if not satisfied
-    let src_end = ctx
-        .builder
-        .build_select(
-            ctx.builder.build_int_compare(IntPredicate::SLT, src_idx.2, zero, "is_neg").unwrap(),
-            ctx.builder.build_int_sub(src_idx.1, one, "e_min_one").unwrap(),
-            ctx.builder.build_int_add(src_idx.1, one, "e_add_one").unwrap(),
-            "final_e",
-        )
-        .map(BasicValueEnum::into_int_value)
-        .unwrap();
-    let dest_end = ctx
-        .builder
-        .build_select(
-            ctx.builder.build_int_compare(IntPredicate::SLT, dest_idx.2, zero, "is_neg").unwrap(),
-            ctx.builder.build_int_sub(dest_idx.1, one, "e_min_one").unwrap(),
-            ctx.builder.build_int_add(dest_idx.1, one, "e_add_one").unwrap(),
-            "final_e",
-        )
-        .map(BasicValueEnum::into_int_value)
-        .unwrap();
-    let src_slice_len =
-        calculate_len_for_slice_range(generator, ctx, src_idx.0, src_end, src_idx.2);
-    let dest_slice_len =
-        calculate_len_for_slice_range(generator, ctx, dest_idx.0, dest_end, dest_idx.2);
-    let src_eq_dest = ctx
-        .builder
-        .build_int_compare(IntPredicate::EQ, src_slice_len, dest_slice_len, "slice_src_eq_dest")
-        .unwrap();
-    let src_slt_dest = ctx
-        .builder
-        .build_int_compare(IntPredicate::SLT, src_slice_len, dest_slice_len, "slice_src_slt_dest")
-        .unwrap();
-    let dest_step_eq_one = ctx
-        .builder
-        .build_int_compare(
-            IntPredicate::EQ,
-            dest_idx.2,
-            dest_idx.2.get_type().const_int(1, false),
-            "slice_dest_step_eq_one",
-        )
-        .unwrap();
-    let cond_1 = ctx.builder.build_and(dest_step_eq_one, src_slt_dest, "slice_cond_1").unwrap();
-    let cond = ctx.builder.build_or(src_eq_dest, cond_1, "slice_cond").unwrap();
-    ctx.make_assert(
-        generator,
-        cond,
-        "0:ValueError",
-        "attempt to assign sequence of size {0} to slice of size {1} with step size {2}",
-        [Some(src_slice_len), Some(dest_slice_len), Some(dest_idx.2)],
-        ctx.current_loc,
-    );
-
-    let new_len = {
-        let args = vec![
-            dest_idx.0.into(),   // dest start idx
-            dest_idx.1.into(),   // dest end idx
-            dest_idx.2.into(),   // dest step
-            dest_arr_ptr.into(), // dest arr ptr
-            dest_len.into(),     // dest arr len
-            src_idx.0.into(),    // src start idx
-            src_idx.1.into(),    // src end idx
-            src_idx.2.into(),    // src step
-            src_arr_ptr.into(),  // src arr ptr
-            src_len.into(),      // src arr len
-            {
-                let s = match ty {
-                    BasicTypeEnum::FloatType(t) => t.size_of(),
-                    BasicTypeEnum::IntType(t) => t.size_of(),
-                    BasicTypeEnum::PointerType(t) => t.size_of(),
-                    BasicTypeEnum::StructType(t) => t.size_of().unwrap(),
-                    _ => unreachable!(),
-                };
-                ctx.builder.build_int_truncate_or_bit_cast(s, int32, "size").unwrap()
-            }
-            .into(),
-        ];
-        ctx.builder
-            .build_call(slice_assign_fun, args.as_slice(), "slice_assign")
-            .map(CallSiteValue::try_as_basic_value)
-            .map(|v| v.map_left(BasicValueEnum::into_int_value))
-            .map(Either::unwrap_left)
-            .unwrap()
-    };
-    // update length
-    let need_update =
-        ctx.builder.build_int_compare(IntPredicate::NE, new_len, dest_len, "need_update").unwrap();
-    let current = ctx.builder.get_insert_block().unwrap().get_parent().unwrap();
-    let update_bb = ctx.ctx.append_basic_block(current, "update");
-    let cont_bb = ctx.ctx.append_basic_block(current, "cont");
-    ctx.builder.build_conditional_branch(need_update, update_bb, cont_bb).unwrap();
-    ctx.builder.position_at_end(update_bb);
-    let new_len = ctx.builder.build_int_z_extend_or_bit_cast(new_len, size_ty, "new_len").unwrap();
-    dest_arr.store_size(ctx, generator, new_len);
-    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
-    ctx.builder.position_at_end(cont_bb);
-}
-
-/// Generates a call to `isinf` in IR. Returns an `i1` representing the result.
-pub fn call_isinf<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &CodeGenContext<'ctx, '_>,
-    v: FloatValue<'ctx>,
-) -> IntValue<'ctx> {
-    let intrinsic_fn = ctx.module.get_function("__nac3_isinf").unwrap_or_else(|| {
-        let fn_type = ctx.ctx.i32_type().fn_type(&[ctx.ctx.f64_type().into()], false);
-        ctx.module.add_function("__nac3_isinf", fn_type, None)
-    });
-
-    let ret = ctx
-        .builder
-        .build_call(intrinsic_fn, &[v.into()], "isinf")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap();
-
-    generator.bool_to_i1(ctx, ret)
-}
-
-/// Generates a call to `isnan` in IR. Returns an `i1` representing the result.
-pub fn call_isnan<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &CodeGenContext<'ctx, '_>,
-    v: FloatValue<'ctx>,
-) -> IntValue<'ctx> {
-    let intrinsic_fn = ctx.module.get_function("__nac3_isnan").unwrap_or_else(|| {
-        let fn_type = ctx.ctx.i32_type().fn_type(&[ctx.ctx.f64_type().into()], false);
-        ctx.module.add_function("__nac3_isnan", fn_type, None)
-    });
-
-    let ret = ctx
-        .builder
-        .build_call(intrinsic_fn, &[v.into()], "isnan")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap();
-
-    generator.bool_to_i1(ctx, ret)
-}
-
-/// Generates a call to `gamma` in IR. Returns an `f64` representing the result.
-pub fn call_gamma<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
-    let llvm_f64 = ctx.ctx.f64_type();
-
-    let intrinsic_fn = ctx.module.get_function("__nac3_gamma").unwrap_or_else(|| {
-        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
-        ctx.module.add_function("__nac3_gamma", fn_type, None)
-    });
-
-    ctx.builder
-        .build_call(intrinsic_fn, &[v.into()], "gamma")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_float_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
-/// Generates a call to `gammaln` in IR. Returns an `f64` representing the result.
-pub fn call_gammaln<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
-    let llvm_f64 = ctx.ctx.f64_type();
-
-    let intrinsic_fn = ctx.module.get_function("__nac3_gammaln").unwrap_or_else(|| {
-        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
-        ctx.module.add_function("__nac3_gammaln", fn_type, None)
-    });
-
-    ctx.builder
-        .build_call(intrinsic_fn, &[v.into()], "gammaln")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_float_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
-/// Generates a call to `j0` in IR. Returns an `f64` representing the result.
-pub fn call_j0<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> FloatValue<'ctx> {
-    let llvm_f64 = ctx.ctx.f64_type();
-
-    let intrinsic_fn = ctx.module.get_function("__nac3_j0").unwrap_or_else(|| {
-        let fn_type = llvm_f64.fn_type(&[llvm_f64.into()], false);
-        ctx.module.add_function("__nac3_j0", fn_type, None)
-    });
-
-    ctx.builder
-        .build_call(intrinsic_fn, &[v.into()], "j0")
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_float_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
-/// Generates a call to `__nac3_ndarray_calc_size`. Returns an [`IntValue`] representing the
-/// calculated total size.
-///
-/// * `dims` - An [`ArrayLikeIndexer`] containing the size of each dimension.
-/// * `range` - The dimension index to begin and end (exclusively) calculating the dimensions for,
-///   or [`None`] if starting from the first dimension and ending at the last dimension
-///   respectively.
-pub fn call_ndarray_calc_size<'ctx, G, Dims>(
-    generator: &G,
-    ctx: &CodeGenContext<'ctx, '_>,
-    dims: &Dims,
-    (begin, end): (Option<IntValue<'ctx>>, Option<IntValue<'ctx>>),
-) -> IntValue<'ctx>
-where
-    G: CodeGenerator + ?Sized,
-    Dims: ArrayLikeIndexer<'ctx>,
-{
-    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
-
-    let ndarray_calc_size_fn_name = match llvm_usize.get_bit_width() {
-        32 => "__nac3_ndarray_calc_size",
-        64 => "__nac3_ndarray_calc_size64",
-        bw => unreachable!("Unsupported size type bit width: {}", bw),
-    };
-    let ndarray_calc_size_fn_t = llvm_usize.fn_type(
-        &[llvm_pusize.into(), llvm_usize.into(), llvm_usize.into(), llvm_usize.into()],
-        false,
-    );
-    let ndarray_calc_size_fn =
-        ctx.module.get_function(ndarray_calc_size_fn_name).unwrap_or_else(|| {
-            ctx.module.add_function(ndarray_calc_size_fn_name, ndarray_calc_size_fn_t, None)
-        });
-
-    let begin = begin.unwrap_or_else(|| llvm_usize.const_zero());
-    let end = end.unwrap_or_else(|| dims.size(ctx, generator));
-    ctx.builder
-        .build_call(
-            ndarray_calc_size_fn,
-            &[
-                dims.base_ptr(ctx, generator).into(),
-                dims.size(ctx, generator).into(),
-                begin.into(),
-                end.into(),
-            ],
-            "",
-        )
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap()
-}
-
-/// Generates a call to `__nac3_ndarray_calc_nd_indices`. Returns a [`TypeArrayLikeAdpater`]
-/// containing `i32` indices of the flattened index.
-///
-/// * `index` - The index to compute the multidimensional index for.
-/// * `ndarray` - LLVM pointer to the `NDArray`. This value must be the LLVM representation of an
-///   `NDArray`.
-pub fn call_ndarray_calc_nd_indices<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    index: IntValue<'ctx>,
-    ndarray: NDArrayValue<'ctx>,
-) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
-    let llvm_void = ctx.ctx.void_type();
-    let llvm_i32 = ctx.ctx.i32_type();
-    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
-    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
-
-    let ndarray_calc_nd_indices_fn_name = match llvm_usize.get_bit_width() {
-        32 => "__nac3_ndarray_calc_nd_indices",
-        64 => "__nac3_ndarray_calc_nd_indices64",
-        bw => unreachable!("Unsupported size type bit width: {}", bw),
-    };
-    let ndarray_calc_nd_indices_fn =
-        ctx.module.get_function(ndarray_calc_nd_indices_fn_name).unwrap_or_else(|| {
-            let fn_type = llvm_void.fn_type(
-                &[llvm_usize.into(), llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into()],
-                false,
-            );
-
-            ctx.module.add_function(ndarray_calc_nd_indices_fn_name, fn_type, None)
-        });
-
-    let ndarray_num_dims = ndarray.load_ndims(ctx);
-    let ndarray_dims = ndarray.dim_sizes();
-
-    let indices = ctx.builder.build_array_alloca(llvm_i32, ndarray_num_dims, "").unwrap();
-
-    ctx.builder
-        .build_call(
-            ndarray_calc_nd_indices_fn,
-            &[
-                index.into(),
-                ndarray_dims.base_ptr(ctx, generator).into(),
-                ndarray_num_dims.into(),
-                indices.into(),
-            ],
-            "",
-        )
-        .unwrap();
-
-    TypedArrayLikeAdapter::from(
-        ArraySliceValue::from_ptr_val(indices, ndarray_num_dims, None),
-        Box::new(|_, v| v.into_int_value()),
-        Box::new(|_, v| v.into()),
-    )
-}
-
-fn call_ndarray_flatten_index_impl<'ctx, G, Indices>(
-    generator: &G,
-    ctx: &CodeGenContext<'ctx, '_>,
-    ndarray: NDArrayValue<'ctx>,
-    indices: &Indices,
-) -> IntValue<'ctx>
-where
-    G: CodeGenerator + ?Sized,
-    Indices: ArrayLikeIndexer<'ctx>,
-{
-    let llvm_i32 = ctx.ctx.i32_type();
-    let llvm_usize = generator.get_size_type(ctx.ctx);
-
-    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
-    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
-
-    debug_assert_eq!(
-        IntType::try_from(indices.element_type(ctx, generator))
-            .map(IntType::get_bit_width)
-            .unwrap_or_default(),
-        llvm_i32.get_bit_width(),
-        "Expected i32 value for argument `indices` to `call_ndarray_flatten_index_impl`"
-    );
-    debug_assert_eq!(
-        indices.size(ctx, generator).get_type().get_bit_width(),
-        llvm_usize.get_bit_width(),
-        "Expected usize integer value for argument `indices_size` to `call_ndarray_flatten_index_impl`"
-    );
-
-    let ndarray_flatten_index_fn_name = match llvm_usize.get_bit_width() {
-        32 => "__nac3_ndarray_flatten_index",
-        64 => "__nac3_ndarray_flatten_index64",
-        bw => unreachable!("Unsupported size type bit width: {}", bw),
-    };
-    let ndarray_flatten_index_fn =
-        ctx.module.get_function(ndarray_flatten_index_fn_name).unwrap_or_else(|| {
-            let fn_type = llvm_usize.fn_type(
-                &[llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into(), llvm_usize.into()],
-                false,
-            );
-
-            ctx.module.add_function(ndarray_flatten_index_fn_name, fn_type, None)
-        });
-
-    let ndarray_num_dims = ndarray.load_ndims(ctx);
-    let ndarray_dims = ndarray.dim_sizes();
-
-    let index = ctx
-        .builder
-        .build_call(
-            ndarray_flatten_index_fn,
-            &[
-                ndarray_dims.base_ptr(ctx, generator).into(),
-                ndarray_num_dims.into(),
-                indices.base_ptr(ctx, generator).into(),
-                indices.size(ctx, generator).into(),
-            ],
-            "",
-        )
-        .map(CallSiteValue::try_as_basic_value)
-        .map(|v| v.map_left(BasicValueEnum::into_int_value))
-        .map(Either::unwrap_left)
-        .unwrap();
-
-    index
-}
-
-/// Generates a call to `__nac3_ndarray_flatten_index`. Returns the flattened index for the
-/// multidimensional index.
-///
-/// * `ndarray` - LLVM pointer to the `NDArray`. This value must be the LLVM representation of an
-///   `NDArray`.
-/// * `indices` - The multidimensional index to compute the flattened index for.
-pub fn call_ndarray_flatten_index<'ctx, G, Index>(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    ndarray: NDArrayValue<'ctx>,
-    indices: &Index,
-) -> IntValue<'ctx>
-where
-    G: CodeGenerator + ?Sized,
-    Index: ArrayLikeIndexer<'ctx>,
-{
-    call_ndarray_flatten_index_impl(generator, ctx, ndarray, indices)
-}
-
-/// Generates a call to `__nac3_ndarray_calc_broadcast`. Returns a tuple containing the number of
-/// dimension and size of each dimension of the resultant `ndarray`.
-pub fn call_ndarray_calc_broadcast<'ctx, G: CodeGenerator + ?Sized>(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    lhs: NDArrayValue<'ctx>,
-    rhs: NDArrayValue<'ctx>,
-) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
-    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
-
-    let ndarray_calc_broadcast_fn_name = match llvm_usize.get_bit_width() {
-        32 => "__nac3_ndarray_calc_broadcast",
-        64 => "__nac3_ndarray_calc_broadcast64",
-        bw => unreachable!("Unsupported size type bit width: {}", bw),
-    };
-    let ndarray_calc_broadcast_fn =
-        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
-            let fn_type = llvm_usize.fn_type(
-                &[
-                    llvm_pusize.into(),
-                    llvm_usize.into(),
-                    llvm_pusize.into(),
-                    llvm_usize.into(),
-                    llvm_pusize.into(),
-                ],
-                false,
-            );
-
-            ctx.module.add_function(ndarray_calc_broadcast_fn_name, fn_type, None)
-        });
-
-    let lhs_ndims = lhs.load_ndims(ctx);
-    let rhs_ndims = rhs.load_ndims(ctx);
-    let min_ndims = llvm_intrinsics::call_int_umin(ctx, lhs_ndims, rhs_ndims, None);
-
-    gen_for_callback_incrementing(
-        generator,
-        ctx,
-        None,
-        llvm_usize.const_zero(),
-        (min_ndims, false),
-        |generator, ctx, _, idx| {
-            let idx = ctx.builder.build_int_sub(min_ndims, idx, "").unwrap();
-            let (lhs_dim_sz, rhs_dim_sz) = unsafe {
-                (
-                    lhs.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None),
-                    rhs.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None),
-                )
-            };
-
-            let llvm_usize_const_one = llvm_usize.const_int(1, false);
-            let lhs_eqz = ctx
-                .builder
-                .build_int_compare(IntPredicate::EQ, lhs_dim_sz, llvm_usize_const_one, "")
-                .unwrap();
-            let rhs_eqz = ctx
-                .builder
-                .build_int_compare(IntPredicate::EQ, rhs_dim_sz, llvm_usize_const_one, "")
-                .unwrap();
-            let lhs_or_rhs_eqz = ctx.builder.build_or(lhs_eqz, rhs_eqz, "").unwrap();
-
-            let lhs_eq_rhs = ctx
-                .builder
-                .build_int_compare(IntPredicate::EQ, lhs_dim_sz, rhs_dim_sz, "")
-                .unwrap();
-
-            let is_compatible = ctx.builder.build_or(lhs_or_rhs_eqz, lhs_eq_rhs, "").unwrap();
-
-            ctx.make_assert(
-                generator,
-                is_compatible,
-                "0:ValueError",
-                "operands could not be broadcast together",
-                [None, None, None],
-                ctx.current_loc,
-            );
-
-            Ok(())
-        },
-        llvm_usize.const_int(1, false),
-    )
-    .unwrap();
-
-    let max_ndims = llvm_intrinsics::call_int_umax(ctx, lhs_ndims, rhs_ndims, None);
-    let lhs_dims = lhs.dim_sizes().base_ptr(ctx, generator);
-    let lhs_ndims = lhs.load_ndims(ctx);
-    let rhs_dims = rhs.dim_sizes().base_ptr(ctx, generator);
-    let rhs_ndims = rhs.load_ndims(ctx);
-    let out_dims = ctx.builder.build_array_alloca(llvm_usize, max_ndims, "").unwrap();
-    let out_dims = ArraySliceValue::from_ptr_val(out_dims, max_ndims, None);
-
-    ctx.builder
-        .build_call(
-            ndarray_calc_broadcast_fn,
-            &[
-                lhs_dims.into(),
-                lhs_ndims.into(),
-                rhs_dims.into(),
-                rhs_ndims.into(),
-                out_dims.base_ptr(ctx, generator).into(),
-            ],
-            "",
-        )
-        .unwrap();
-
-    TypedArrayLikeAdapter::from(
-        out_dims,
-        Box::new(|_, v| v.into_int_value()),
-        Box::new(|_, v| v.into()),
-    )
-}
-
-/// Generates a call to `__nac3_ndarray_calc_broadcast_idx`. Returns an [`ArrayAllocaValue`]
-/// containing the indices used for accessing `array` corresponding to the index of the broadcasted
-/// array `broadcast_idx`.
-pub fn call_ndarray_calc_broadcast_index<
-    'ctx,
-    G: CodeGenerator + ?Sized,
-    BroadcastIdx: UntypedArrayLikeAccessor<'ctx>,
->(
-    generator: &mut G,
-    ctx: &mut CodeGenContext<'ctx, '_>,
-    array: NDArrayValue<'ctx>,
-    broadcast_idx: &BroadcastIdx,
-) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
-    let llvm_i32 = ctx.ctx.i32_type();
-    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
-    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
-
-    let ndarray_calc_broadcast_fn_name = match llvm_usize.get_bit_width() {
-        32 => "__nac3_ndarray_calc_broadcast_idx",
-        64 => "__nac3_ndarray_calc_broadcast_idx64",
-        bw => unreachable!("Unsupported size type bit width: {}", bw),
-    };
-    let ndarray_calc_broadcast_fn =
-        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
-            let fn_type = llvm_usize.fn_type(
-                &[llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into(), llvm_pi32.into()],
-                false,
-            );
-
-            ctx.module.add_function(ndarray_calc_broadcast_fn_name, fn_type, None)
-        });
-
-    let broadcast_size = broadcast_idx.size(ctx, generator);
-    let out_idx = ctx.builder.build_array_alloca(llvm_i32, broadcast_size, "").unwrap();
-
-    let array_dims = array.dim_sizes().base_ptr(ctx, generator);
-    let array_ndims = array.load_ndims(ctx);
-    let broadcast_idx_ptr = unsafe {
-        broadcast_idx.ptr_offset_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
-    };
-
-    ctx.builder
-        .build_call(
-            ndarray_calc_broadcast_fn,
-            &[array_dims.into(), array_ndims.into(), broadcast_idx_ptr.into(), out_idx.into()],
-            "",
-        )
-        .unwrap();
-
-    TypedArrayLikeAdapter::from(
-        ArraySliceValue::from_ptr_val(out_idx, broadcast_size, None),
-        Box::new(|_, v| v.into_int_value()),
-        Box::new(|_, v| v.into()),
-    )
-}

nac3core/src/codegen/irrt/ndarray.rs

@@ -0,0 +1,384 @@
+use inkwell::{
+    types::IntType,
+    values::{BasicValueEnum, CallSiteValue, IntValue},
+    AddressSpace, IntPredicate,
+};
+use itertools::Either;
+
+use crate::codegen::{
+    llvm_intrinsics,
+    macros::codegen_unreachable,
+    stmt::gen_for_callback_incrementing,
+    values::{
+        ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, NDArrayValue, TypedArrayLikeAccessor,
+        TypedArrayLikeAdapter, UntypedArrayLikeAccessor,
+    },
+    CodeGenContext, CodeGenerator,
+};
+
+/// Generates a call to `__nac3_ndarray_calc_size`. Returns an [`IntValue`] representing the
+/// calculated total size.
+///
+/// * `dims` - An [`ArrayLikeIndexer`] containing the size of each dimension.
+/// * `range` - The dimension index to begin and end (exclusively) calculating the dimensions for,
+///   or [`None`] if starting from the first dimension and ending at the last dimension
+///   respectively.
+pub fn call_ndarray_calc_size<'ctx, G, Dims>(
+    generator: &G,
+    ctx: &CodeGenContext<'ctx, '_>,
+    dims: &Dims,
+    (begin, end): (Option<IntValue<'ctx>>, Option<IntValue<'ctx>>),
+) -> IntValue<'ctx>
+where
+    G: CodeGenerator + ?Sized,
+    Dims: ArrayLikeIndexer<'ctx>,
+{
+    let llvm_usize = generator.get_size_type(ctx.ctx);
+    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
+
+    let ndarray_calc_size_fn_name = match llvm_usize.get_bit_width() {
+        32 => "__nac3_ndarray_calc_size",
+        64 => "__nac3_ndarray_calc_size64",
+        bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
+    };
+    let ndarray_calc_size_fn_t = llvm_usize.fn_type(
+        &[llvm_pusize.into(), llvm_usize.into(), llvm_usize.into(), llvm_usize.into()],
+        false,
+    );
+    let ndarray_calc_size_fn =
+        ctx.module.get_function(ndarray_calc_size_fn_name).unwrap_or_else(|| {
+            ctx.module.add_function(ndarray_calc_size_fn_name, ndarray_calc_size_fn_t, None)
+        });
+
+    let begin = begin.unwrap_or_else(|| llvm_usize.const_zero());
+    let end = end.unwrap_or_else(|| dims.size(ctx, generator));
+    ctx.builder
+        .build_call(
+            ndarray_calc_size_fn,
+            &[
+                dims.base_ptr(ctx, generator).into(),
+                dims.size(ctx, generator).into(),
+                begin.into(),
+                end.into(),
+            ],
+            "",
+        )
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}
+
+/// Generates a call to `__nac3_ndarray_calc_nd_indices`. Returns a [`TypeArrayLikeAdpater`]
+/// containing `i32` indices of the flattened index.
+///
+/// * `index` - The index to compute the multidimensional index for.
+/// * `ndarray` - LLVM pointer to the `NDArray`. This value must be the LLVM representation of an
+///   `NDArray`.
+pub fn call_ndarray_calc_nd_indices<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    index: IntValue<'ctx>,
+    ndarray: NDArrayValue<'ctx>,
+) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
+    let llvm_void = ctx.ctx.void_type();
+    let llvm_i32 = ctx.ctx.i32_type();
+    let llvm_usize = generator.get_size_type(ctx.ctx);
+    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
+    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
+
+    let ndarray_calc_nd_indices_fn_name = match llvm_usize.get_bit_width() {
+        32 => "__nac3_ndarray_calc_nd_indices",
+        64 => "__nac3_ndarray_calc_nd_indices64",
+        bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
+    };
+    let ndarray_calc_nd_indices_fn =
+        ctx.module.get_function(ndarray_calc_nd_indices_fn_name).unwrap_or_else(|| {
+            let fn_type = llvm_void.fn_type(
+                &[llvm_usize.into(), llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into()],
+                false,
+            );
+
+            ctx.module.add_function(ndarray_calc_nd_indices_fn_name, fn_type, None)
+        });
+
+    let ndarray_num_dims = ndarray.load_ndims(ctx);
+    let ndarray_dims = ndarray.shape();
+
+    let indices = ctx.builder.build_array_alloca(llvm_i32, ndarray_num_dims, "").unwrap();
+
+    ctx.builder
+        .build_call(
+            ndarray_calc_nd_indices_fn,
+            &[
+                index.into(),
+                ndarray_dims.base_ptr(ctx, generator).into(),
+                ndarray_num_dims.into(),
+                indices.into(),
+            ],
+            "",
+        )
+        .unwrap();
+
+    TypedArrayLikeAdapter::from(
+        ArraySliceValue::from_ptr_val(indices, ndarray_num_dims, None),
+        Box::new(|_, v| v.into_int_value()),
+        Box::new(|_, v| v.into()),
+    )
+}
+
+fn call_ndarray_flatten_index_impl<'ctx, G, Indices>(
+    generator: &G,
+    ctx: &CodeGenContext<'ctx, '_>,
+    ndarray: NDArrayValue<'ctx>,
+    indices: &Indices,
+) -> IntValue<'ctx>
+where
+    G: CodeGenerator + ?Sized,
+    Indices: ArrayLikeIndexer<'ctx>,
+{
+    let llvm_i32 = ctx.ctx.i32_type();
+    let llvm_usize = generator.get_size_type(ctx.ctx);
+
+    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
+    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
+
+    debug_assert_eq!(
+        IntType::try_from(indices.element_type(ctx, generator))
+            .map(IntType::get_bit_width)
+            .unwrap_or_default(),
+        llvm_i32.get_bit_width(),
+        "Expected i32 value for argument `indices` to `call_ndarray_flatten_index_impl`"
+    );
+    debug_assert_eq!(
+        indices.size(ctx, generator).get_type().get_bit_width(),
+        llvm_usize.get_bit_width(),
+        "Expected usize integer value for argument `indices_size` to `call_ndarray_flatten_index_impl`"
+    );
+
+    let ndarray_flatten_index_fn_name = match llvm_usize.get_bit_width() {
+        32 => "__nac3_ndarray_flatten_index",
+        64 => "__nac3_ndarray_flatten_index64",
+        bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
+    };
+    let ndarray_flatten_index_fn =
+        ctx.module.get_function(ndarray_flatten_index_fn_name).unwrap_or_else(|| {
+            let fn_type = llvm_usize.fn_type(
+                &[llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into(), llvm_usize.into()],
+                false,
+            );
+
+            ctx.module.add_function(ndarray_flatten_index_fn_name, fn_type, None)
+        });
+
+    let ndarray_num_dims = ndarray.load_ndims(ctx);
+    let ndarray_dims = ndarray.shape();
+
+    let index = ctx
+        .builder
+        .build_call(
+            ndarray_flatten_index_fn,
+            &[
+                ndarray_dims.base_ptr(ctx, generator).into(),
+                ndarray_num_dims.into(),
+                indices.base_ptr(ctx, generator).into(),
+                indices.size(ctx, generator).into(),
+            ],
+            "",
+        )
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap();
+
+    index
+}
+
+/// Generates a call to `__nac3_ndarray_flatten_index`. Returns the flattened index for the
+/// multidimensional index.
+///
+/// * `ndarray` - LLVM pointer to the `NDArray`. This value must be the LLVM representation of an
+///   `NDArray`.
+/// * `indices` - The multidimensional index to compute the flattened index for.
+pub fn call_ndarray_flatten_index<'ctx, G, Index>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    ndarray: NDArrayValue<'ctx>,
+    indices: &Index,
+) -> IntValue<'ctx>
+where
+    G: CodeGenerator + ?Sized,
+    Index: ArrayLikeIndexer<'ctx>,
+{
+    call_ndarray_flatten_index_impl(generator, ctx, ndarray, indices)
+}
+
+/// Generates a call to `__nac3_ndarray_calc_broadcast`. Returns a tuple containing the number of
+/// dimension and size of each dimension of the resultant `ndarray`.
+pub fn call_ndarray_calc_broadcast<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    lhs: NDArrayValue<'ctx>,
+    rhs: NDArrayValue<'ctx>,
+) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
+    let llvm_usize = generator.get_size_type(ctx.ctx);
+    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
+
+    let ndarray_calc_broadcast_fn_name = match llvm_usize.get_bit_width() {
+        32 => "__nac3_ndarray_calc_broadcast",
+        64 => "__nac3_ndarray_calc_broadcast64",
+        bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
+    };
+    let ndarray_calc_broadcast_fn =
+        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
+            let fn_type = llvm_usize.fn_type(
+                &[
+                    llvm_pusize.into(),
+                    llvm_usize.into(),
+                    llvm_pusize.into(),
+                    llvm_usize.into(),
+                    llvm_pusize.into(),
+                ],
+                false,
+            );
+
+            ctx.module.add_function(ndarray_calc_broadcast_fn_name, fn_type, None)
+        });
+
+    let lhs_ndims = lhs.load_ndims(ctx);
+    let rhs_ndims = rhs.load_ndims(ctx);
+    let min_ndims = llvm_intrinsics::call_int_umin(ctx, lhs_ndims, rhs_ndims, None);
+
+    gen_for_callback_incrementing(
+        generator,
+        ctx,
+        None,
+        llvm_usize.const_zero(),
+        (min_ndims, false),
+        |generator, ctx, _, idx| {
+            let idx = ctx.builder.build_int_sub(min_ndims, idx, "").unwrap();
+            let (lhs_dim_sz, rhs_dim_sz) = unsafe {
+                (
+                    lhs.shape().get_typed_unchecked(ctx, generator, &idx, None),
+                    rhs.shape().get_typed_unchecked(ctx, generator, &idx, None),
+                )
+            };
+
+            let llvm_usize_const_one = llvm_usize.const_int(1, false);
+            let lhs_eqz = ctx
+                .builder
+                .build_int_compare(IntPredicate::EQ, lhs_dim_sz, llvm_usize_const_one, "")
+                .unwrap();
+            let rhs_eqz = ctx
+                .builder
+                .build_int_compare(IntPredicate::EQ, rhs_dim_sz, llvm_usize_const_one, "")
+                .unwrap();
+            let lhs_or_rhs_eqz = ctx.builder.build_or(lhs_eqz, rhs_eqz, "").unwrap();
+
+            let lhs_eq_rhs = ctx
+                .builder
+                .build_int_compare(IntPredicate::EQ, lhs_dim_sz, rhs_dim_sz, "")
+                .unwrap();
+
+            let is_compatible = ctx.builder.build_or(lhs_or_rhs_eqz, lhs_eq_rhs, "").unwrap();
+
+            ctx.make_assert(
+                generator,
+                is_compatible,
+                "0:ValueError",
+                "operands could not be broadcast together",
+                [None, None, None],
+                ctx.current_loc,
+            );
+
+            Ok(())
+        },
+        llvm_usize.const_int(1, false),
+    )
+    .unwrap();
+
+    let max_ndims = llvm_intrinsics::call_int_umax(ctx, lhs_ndims, rhs_ndims, None);
+    let lhs_dims = lhs.shape().base_ptr(ctx, generator);
+    let lhs_ndims = lhs.load_ndims(ctx);
+    let rhs_dims = rhs.shape().base_ptr(ctx, generator);
+    let rhs_ndims = rhs.load_ndims(ctx);
+    let out_dims = ctx.builder.build_array_alloca(llvm_usize, max_ndims, "").unwrap();
+    let out_dims = ArraySliceValue::from_ptr_val(out_dims, max_ndims, None);
+
+    ctx.builder
+        .build_call(
+            ndarray_calc_broadcast_fn,
+            &[
+                lhs_dims.into(),
+                lhs_ndims.into(),
+                rhs_dims.into(),
+                rhs_ndims.into(),
+                out_dims.base_ptr(ctx, generator).into(),
+            ],
+            "",
+        )
+        .unwrap();
+
+    TypedArrayLikeAdapter::from(
+        out_dims,
+        Box::new(|_, v| v.into_int_value()),
+        Box::new(|_, v| v.into()),
+    )
+}
+
+/// Generates a call to `__nac3_ndarray_calc_broadcast_idx`. Returns an [`ArrayAllocaValue`]
+/// containing the indices used for accessing `array` corresponding to the index of the broadcasted
+/// array `broadcast_idx`.
+pub fn call_ndarray_calc_broadcast_index<
+    'ctx,
+    G: CodeGenerator + ?Sized,
+    BroadcastIdx: UntypedArrayLikeAccessor<'ctx>,
+>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    array: NDArrayValue<'ctx>,
+    broadcast_idx: &BroadcastIdx,
+) -> TypedArrayLikeAdapter<'ctx, IntValue<'ctx>> {
+    let llvm_i32 = ctx.ctx.i32_type();
+    let llvm_usize = generator.get_size_type(ctx.ctx);
+    let llvm_pi32 = llvm_i32.ptr_type(AddressSpace::default());
+    let llvm_pusize = llvm_usize.ptr_type(AddressSpace::default());
+
+    let ndarray_calc_broadcast_fn_name = match llvm_usize.get_bit_width() {
+        32 => "__nac3_ndarray_calc_broadcast_idx",
+        64 => "__nac3_ndarray_calc_broadcast_idx64",
+        bw => codegen_unreachable!(ctx, "Unsupported size type bit width: {}", bw),
+    };
+    let ndarray_calc_broadcast_fn =
+        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
+            let fn_type = llvm_usize.fn_type(
+                &[llvm_pusize.into(), llvm_usize.into(), llvm_pi32.into(), llvm_pi32.into()],
+                false,
+            );
+
+            ctx.module.add_function(ndarray_calc_broadcast_fn_name, fn_type, None)
+        });
+
+    let broadcast_size = broadcast_idx.size(ctx, generator);
+    let out_idx = ctx.builder.build_array_alloca(llvm_i32, broadcast_size, "").unwrap();
+
+    let array_dims = array.shape().base_ptr(ctx, generator);
+    let array_ndims = array.load_ndims(ctx);
+    let broadcast_idx_ptr = unsafe {
+        broadcast_idx.ptr_offset_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+    };
+
+    ctx.builder
+        .build_call(
+            ndarray_calc_broadcast_fn,
+            &[array_dims.into(), array_ndims.into(), broadcast_idx_ptr.into(), out_idx.into()],
+            "",
+        )
+        .unwrap();
+
+    TypedArrayLikeAdapter::from(
+        ArraySliceValue::from_ptr_val(out_idx, broadcast_size, None),
+        Box::new(|_, v| v.into_int_value()),
+        Box::new(|_, v| v.into()),
+    )
+}

nac3core/src/codegen/irrt/slice.rs

@@ -0,0 +1,76 @@
+use inkwell::{
+    values::{BasicValueEnum, CallSiteValue, IntValue},
+    IntPredicate,
+};
+use itertools::Either;
+use nac3parser::ast::Expr;
+
+use crate::{
+    codegen::{CodeGenContext, CodeGenerator},
+    typecheck::typedef::Type,
+};
+
+/// this function allows index out of range, since python
+/// allows index out of range in slice (`a = [1,2,3]; a[1:10] == [2,3]`).
+pub fn handle_slice_index_bound<'ctx, G: CodeGenerator>(
+    i: &Expr<Option<Type>>,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    generator: &mut G,
+    length: IntValue<'ctx>,
+) -> Result<Option<IntValue<'ctx>>, String> {
+    const SYMBOL: &str = "__nac3_slice_index_bound";
+    let func = ctx.module.get_function(SYMBOL).unwrap_or_else(|| {
+        let i32_t = ctx.ctx.i32_type();
+        let fn_t = i32_t.fn_type(&[i32_t.into(), i32_t.into()], false);
+        ctx.module.add_function(SYMBOL, fn_t, None)
+    });
+
+    let i = if let Some(v) = generator.gen_expr(ctx, i)? {
+        v.to_basic_value_enum(ctx, generator, i.custom.unwrap())?
+    } else {
+        return Ok(None);
+    };
+    Ok(Some(
+        ctx.builder
+            .build_call(func, &[i.into(), length.into()], "bounded_ind")
+            .map(CallSiteValue::try_as_basic_value)
+            .map(|v| v.map_left(BasicValueEnum::into_int_value))
+            .map(Either::unwrap_left)
+            .unwrap(),
+    ))
+}
+
+pub fn calculate_len_for_slice_range<'ctx, G: CodeGenerator + ?Sized>(
+    generator: &mut G,
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    start: IntValue<'ctx>,
+    end: IntValue<'ctx>,
+    step: IntValue<'ctx>,
+) -> IntValue<'ctx> {
+    const SYMBOL: &str = "__nac3_range_slice_len";
+    let len_func = ctx.module.get_function(SYMBOL).unwrap_or_else(|| {
+        let i32_t = ctx.ctx.i32_type();
+        let fn_t = i32_t.fn_type(&[i32_t.into(), i32_t.into(), i32_t.into()], false);
+        ctx.module.add_function(SYMBOL, fn_t, None)
+    });
+
+    // assert step != 0, throw exception if not
+    let not_zero = ctx
+        .builder
+        .build_int_compare(IntPredicate::NE, step, step.get_type().const_zero(), "range_step_ne")
+        .unwrap();
+    ctx.make_assert(
+        generator,
+        not_zero,
+        "0:ValueError",
+        "step must not be zero",
+        [None, None, None],
+        ctx.current_loc,
+    );
+    ctx.builder
+        .build_call(len_func, &[start.into(), end.into(), step.into()], "calc_len")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}

nac3core/src/codegen/llvm_intrinsics.rs

@@ -1,12 +1,14 @@
-use crate::codegen::CodeGenContext;
+use inkwell::{
-use inkwell::context::Context;
+    context::Context,
-use inkwell::intrinsics::Intrinsic;
+    intrinsics::Intrinsic,
-use inkwell::types::AnyTypeEnum::IntType;
+    types::{AnyTypeEnum::IntType, FloatType},
-use inkwell::types::FloatType;
+    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue},
-use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue};
+    AddressSpace,
-use inkwell::AddressSpace;
+};
 use itertools::Either;
 
+use super::CodeGenContext;
+
 /// Returns the string representation for the floating-point type `ft` when used in intrinsic
 /// functions.
 fn get_float_intrinsic_repr(ctx: &Context, ft: FloatType) -> &'static str {
@@ -183,7 +185,7 @@ pub fn call_memcpy_generic<'ctx>(
         dest
     } else {
         ctx.builder
-            .build_bitcast(dest, llvm_p0i8, "")
+            .build_bit_cast(dest, llvm_p0i8, "")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap()
     };
@@ -191,7 +193,7 @@ pub fn call_memcpy_generic<'ctx>(
         src
     } else {
         ctx.builder
-            .build_bitcast(src, llvm_p0i8, "")
+            .build_bit_cast(src, llvm_p0i8, "")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap()
     };

nac3core/src/codegen/mod.rs

@@ -1,12 +1,12 @@
-use crate::{
+use std::{
-    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
+    collections::{HashMap, HashSet},
-    symbol_resolver::{StaticValue, SymbolResolver},
+    sync::{
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
+        atomic::{AtomicBool, Ordering},
-    typecheck::{
+        Arc,
-        type_inferencer::{CodeLocation, PrimitiveStore},
-        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
     },
+    thread,
 };
+
 use crossbeam::channel::{unbounded, Receiver, Sender};
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -24,32 +24,52 @@ use inkwell::{
     AddressSpace, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
-use nac3parser::ast::{Location, Stmt, StrRef};
 use parking_lot::{Condvar, Mutex};
-use std::collections::{HashMap, HashSet};
+
-use std::sync::{
+use nac3parser::ast::{Location, Stmt, StrRef};
-    atomic::{AtomicBool, Ordering},
+
-    Arc,
+use crate::{
+    symbol_resolver::{StaticValue, SymbolResolver},
+    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
+    typecheck::{
+        type_inferencer::{CodeLocation, PrimitiveStore},
+        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
+    },
 };
-use std::thread;
+use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
+pub use generator::{CodeGenerator, DefaultCodeGenerator};
+use types::{ListType, NDArrayType, ProxyType, RangeType};
 
 pub mod builtin_fns;
-pub mod classes;
 pub mod concrete_type;
 pub mod expr;
 pub mod extern_fns;
 mod generator;
 pub mod irrt;
 pub mod llvm_intrinsics;
-pub mod model;
 pub mod numpy;
 pub mod stmt;
+pub mod types;
+pub mod values;
 
 #[cfg(test)]
 mod test;
 
-use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
+mod macros {
-pub use generator::{CodeGenerator, DefaultCodeGenerator};
+    /// Codegen-variant of [`std::unreachable`] which accepts an instance of [`CodeGenContext`] as
+    /// its first argument to provide Python source information to indicate the codegen location
+    /// causing the assertion.
+    macro_rules! codegen_unreachable {
+        ($ctx:expr $(,)?) => {
+            std::unreachable!("unreachable code while processing {}", &$ctx.current_loc)
+        };
+        ($ctx:expr, $($arg:tt)*) => {
+            std::unreachable!("unreachable code while processing {}: {}", &$ctx.current_loc, std::format!("{}", std::format_args!($($arg)+)))
+        };
+    }
+
+    pub(crate) use codegen_unreachable;
+}
 
 #[derive(Default)]
 pub struct StaticValueStore {
@@ -833,10 +853,9 @@ pub fn gen_func_impl<
     builder.position_at_end(init_bb);
     let body_bb = context.append_basic_block(fn_val, "body");
 
+    // Store non-vararg argument values into local variables
     let mut var_assignment = HashMap::new();
     let offset = u32::from(has_sret);
-
-    // Store non-vararg argument values into local variables
     for (n, arg) in args.iter().enumerate().filter(|(_, arg)| !arg.is_vararg) {
         let param = fn_val.get_nth_param((n as u32) + offset).unwrap();
         let local_type = get_llvm_type(

nac3core/src/codegen/model/any.rs

@@ -1,37 +0,0 @@
-use inkwell::{
-    context::Context,
-    types::{BasicType, BasicTypeEnum, IntType},
-    values::IntValue,
-};
-
-use super::*;
-
-/// A [`Model`] of any [`BasicTypeEnum`].
-///
-/// Use this when it is infeasible to use model abstractions.
-#[derive(Debug, Clone, Copy)]
-pub struct Any<'ctx>(pub BasicTypeEnum<'ctx>);
-
-impl<'ctx> ModelBase<'ctx> for Any<'ctx> {
-    fn llvm_type_impl(&self, _size_t: IntType<'ctx>, _ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        self.0.as_basic_type_enum()
-    }
-
-    fn check_type_impl(
-        &self,
-        _size_t: IntType<'ctx>,
-        _ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        if ty == self.0 {
-            Ok(())
-        } else {
-            Err(ModelError(format!("Expecting {}, but got {}", self.0, ty)))
-        }
-    }
-}
-
-impl<'ctx> Model<'ctx> for Any<'ctx> {
-    type Type = IntType<'ctx>;
-    type Value = IntValue<'ctx>;
-}

nac3core/src/codegen/model/array.rs

@@ -1,152 +0,0 @@
-use std::{fmt, marker::PhantomData};
-
-use inkwell::{
-    context::Context,
-    types::{ArrayType, BasicType, BasicTypeEnum, IntType},
-    values::{ArrayValue, IntValue},
-};
-
-use crate::codegen::{CodeGenContext, CodeGenerator};
-
-use super::*;
-
-/// Trait for Rust structs identifying length values for [`Array`].
-pub trait ArrayLen: fmt::Debug + Clone + Copy {
-    fn length(&self) -> u32;
-}
-
-/// A statically known length.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Len<const N: u32>;
-
-/// A dynamically known length.
-#[derive(Debug, Clone, Copy)]
-pub struct AnyLen(pub u32);
-
-impl<const N: u32> ArrayLen for Len<N> {
-    fn length(&self) -> u32 {
-        N
-    }
-}
-
-impl ArrayLen for AnyLen {
-    fn length(&self) -> u32 {
-        self.0
-    }
-}
-
-/// A Model for an [`ArrayType`].
-///
-/// `Len` should be of a [`LenKind`] and `Item` should be a of [`Model`].
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Array<'ctx, Len: ArrayLen, Item: ModelBase<'ctx>> {
-    /// Length of this array.
-    pub len: Len,
-    /// [`Model`] of the array items.
-    pub item: Item,
-    pub _phantom: PhantomData<&'ctx ()>,
-}
-
-impl<'ctx, Len: ArrayLen, Item: ModelBase<'ctx>> Array<'ctx, Len, Item> {
-    pub fn new(len: Len, item: Item) -> Self {
-        Array { len, item, _phantom: PhantomData }
-    }
-}
-
-impl<'ctx, Len: ArrayLen, Item: ModelBase<'ctx>> ModelBase<'ctx> for Array<'ctx, Len, Item> {
-    fn llvm_type_impl(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        let item = self.item.llvm_type_impl(size_t, ctx);
-        item.array_type(self.len.length()).into()
-    }
-
-    fn check_type_impl(
-        &self,
-        size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        let BasicTypeEnum::ArrayType(ty) = ty else {
-            return Err(ModelError(format!("Expecting ArrayType, but got {ty:?}")));
-        };
-
-        if ty.len() != self.len.length() {
-            return Err(ModelError(format!(
-                "Expecting ArrayType with size {}, but got an ArrayType with size {}",
-                ty.len(),
-                self.len.length()
-            )));
-        }
-
-        self.item
-            .check_type_impl(size_t, ctx, ty.get_element_type())
-            .map_err(|err| err.under_context("an ArrayType"))?;
-
-        Ok(())
-    }
-}
-
-impl<'ctx, Len: ArrayLen, Item: Model<'ctx>> Model<'ctx> for Array<'ctx, Len, Item> {
-    type Type = ArrayType<'ctx>;
-    type Value = ArrayValue<'ctx>;
-}
-
-impl<'ctx, Len: ArrayLen, Item: Model<'ctx>> Instance<'ctx, Ptr<Array<'ctx, Len, Item>>> {
-    /// Get the pointer to the `i`-th (0-based) array element.
-    pub fn gep(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        i: IntValue<'ctx>,
-    ) -> Instance<'ctx, Ptr<Item>> {
-        let zero = ctx.ctx.i64_type().const_zero();
-        let ptr = unsafe { ctx.builder.build_in_bounds_gep(self.value, &[zero, i], "").unwrap() };
-
-        unsafe { Ptr::new(self.model.item.item).believe_value(ptr) }
-    }
-
-    /// Like `gep` but `i` is a constant.
-    pub fn gep_const(&self, ctx: &CodeGenContext<'ctx, '_>, i: u64) -> Instance<'ctx, Ptr<Item>> {
-        assert!(
-            i < u64::from(self.model.item.len.length()),
-            "Index {i} is out of bounds. Array length = {}",
-            self.model.item.len.length()
-        );
-
-        let i = ctx.ctx.i64_type().const_int(i, true);
-        self.gep(ctx, i)
-    }
-
-    /// Convenience function equivalent to `.gep(...).load(...)`.
-    pub fn get<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        i: IntValue<'ctx>,
-    ) -> Instance<'ctx, Item> {
-        self.gep(ctx, i).load(generator, ctx)
-    }
-
-    /// Like `get` but `i` is a constant.
-    pub fn get_const<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        i: u64,
-    ) -> Instance<'ctx, Item> {
-        self.gep_const(ctx, i).load(generator, ctx)
-    }
-
-    /// Convenience function equivalent to `.gep(...).store(...)`.
-    pub fn set(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        i: IntValue<'ctx>,
-        value: Instance<'ctx, Item>,
-    ) {
-        self.gep(ctx, i).store(ctx, value);
-    }
-
-    /// Like `set` but `i` is a constant.
-    pub fn set_const(&self, ctx: &CodeGenContext<'ctx, '_>, i: u64, value: Instance<'ctx, Item>) {
-        self.gep_const(ctx, i).store(ctx, value);
-    }
-}

nac3core/src/codegen/model/core.rs

@@ -1,237 +0,0 @@
-use std::fmt;
-
-use inkwell::{context::Context, types::*, values::*};
-use itertools::Itertools;
-
-use super::*;
-use crate::codegen::{CodeGenContext, CodeGenerator};
-
-/// A error type for reporting any [`Model`]-related error (e.g., a [`BasicType`] mismatch).
-#[derive(Debug, Clone)]
-pub struct ModelError(pub String);
-
-impl ModelError {
-    /// Append a context message to the error.
-    pub(super) fn under_context(mut self, context: &str) -> Self {
-        self.0.push_str(" ... in ");
-        self.0.push_str(context);
-        self
-    }
-}
-
-// NOTE: A watered down version of `Model` trait. Made to be object safe.
-pub trait ModelBase<'ctx> {
-    // NOTE: Taking `size_t` here instead of `CodeGenerator` to be object safe.
-    // In fact, all the entire model abstraction need from the `CodeGenerator` is its `get_size_type()`.
-
-    // NOTE: Model's llvm_type but object-safe and returns BasicTypeEnum, instead of a known BasicType variant.
-    fn llvm_type_impl(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx>;
-
-    // NOTE: Model's check_type but object-safe.
-    fn check_type_impl(
-        &self,
-        size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        scrutinee: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError>;
-}
-
-/// Trait for Rust structs identifying [`BasicType`]s in the context of a known [`CodeGenerator`] and [`CodeGenContext`].
-///
-/// For instance,
-/// - [`Int<Int32>`] identifies an [`IntType`] with 32-bits.
-/// - [`Int<SizeT>`] identifies an [`IntType`] with bit-width [`CodeGenerator::get_size_type`].
-/// - [`Ptr<Int<SizeT>>`] identifies a [`PointerType`] that points to an [`IntType`] with bit-width [`CodeGenerator::get_size_type`].
-/// - [`Int<AnyInt>`] identifies an [`IntType`] with bit-width of whatever is set in the [`AnyInt`] object.
-/// - [`Any`] identifies a [`BasicType`] set in the [`Any`] object itself.
-///
-/// You can get the [`BasicType`] out of a model with [`Model::llvm_type`].
-///
-/// Furthermore, [`Instance<'ctx, M>`] is a simple structure that carries a [`BasicValue`] with [`BasicType`] identified by model `M`.
-///
-/// The main purpose of this abstraction is to have a more Rust type-safe way to use Inkwell and give type-hints for programmers.
-///
-/// ### Notes on `Default` trait
-///
-/// For some models like [`Int<Int32>`] or [`Int<SizeT>`], they have a [`Default`] trait since just by looking at their types, it is possible
-/// to tell the [`BasicType`]s they are identifying.
-///
-/// This can be used to create strongly-typed interfaces accepting only values of a specific [`BasicType`] without having to worry about
-/// writing debug assertions to check, for example, if the programmer has passed in an [`IntValue`] with the wrong bit-width.
-/// ```ignore
-/// fn give_me_i32_and_get_a_size_t_back<'ctx>(i32: Instance<'ctx, Int<Int32>>) -> Instance<'ctx, Int<SizeT>> {
-///     // code...
-/// }
-/// ```
-///
-/// ### Notes on converting between Inkwell and model.
-///
-/// Suppose you have an [`IntValue`], and you want to pass it into a function that takes a [`Instance<'ctx, Int<Int32>>`]. You can do use
-/// [`Model::check_value`] or [`Model::believe_value`].
-/// ```ignore
-/// let my_value: IntValue<'ctx>;
-///
-/// let my_value = Int(Int32).check_value(my_value).unwrap(); // Panics if `my_value` is not 32-bit with a descriptive error message.
-///
-/// // or, if you are absolutely certain that `my_value` is 32-bit and doing extra checks is a waste of time:
-/// let my_value = Int(Int32).believe_value(my_value);
-/// ```
-pub trait Model<'ctx>: fmt::Debug + Clone + Copy + ModelBase<'ctx> {
-    /// The [`BasicType`] *variant* this model is identifying.
-    type Type: BasicType<'ctx> + TryFrom<BasicTypeEnum<'ctx>>;
-
-    /// The [`BasicValue`] type of the [`BasicType`] of this model.
-    type Value: BasicValue<'ctx> + TryFrom<BasicValueEnum<'ctx>>;
-
-    /// Return the [`BasicType`] of this model.
-    #[must_use]
-    fn llvm_type<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &G,
-        ctx: &'ctx Context,
-    ) -> Self::Type {
-        let size_t = generator.get_size_type(ctx);
-
-        let ty = self.llvm_type_impl(size_t, ctx);
-        match Self::Type::try_from(ty) {
-            Ok(ty) => ty,
-            _ => panic!("Model::Type is inconsistent with what is returned from ModelBase::get_type_impl()! Got {ty:?}."),
-        }
-    }
-
-    /// Get the number of bytes of the [`BasicType`] of this model.
-    fn size_of<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> IntValue<'ctx> {
-        self.llvm_type(generator, ctx).size_of().unwrap()
-    }
-
-    /// Check if a [`BasicType`] matches the [`BasicType`] of this model.
-    fn check_type<T: BasicType<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        ty: T,
-    ) -> Result<(), ModelError> {
-        let size_t = generator.get_size_type(ctx);
-        self.check_type_impl(size_t, ctx, ty.as_basic_type_enum())
-    }
-
-    /// Create an instance from a value.
-    ///
-    /// # Safety
-    ///
-    /// Caller must make sure the type of `value` and the type of this `model` are equivalent.
-    #[must_use]
-    unsafe fn believe_value(&self, value: Self::Value) -> Instance<'ctx, Self> {
-        Instance { model: *self, value }
-    }
-
-    /// Check if a [`BasicValue`]'s type is equivalent to the type of this model.
-    /// Wrap the [`BasicValue`] into an [`Instance`] if it is.
-    fn check_value<V: BasicValue<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        value: V,
-    ) -> Result<Instance<'ctx, Self>, ModelError> {
-        let value = value.as_basic_value_enum();
-        self.check_type(generator, ctx, value.get_type())
-            .map_err(|err| err.under_context(format!("the value {value:?}").as_str()))?;
-
-        let Ok(value) = Self::Value::try_from(value) else {
-            unreachable!("check_type() has bad implementation")
-        };
-        Ok(unsafe { self.believe_value(value) })
-    }
-
-    // Allocate a value on the stack and return its pointer.
-    fn alloca<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-    ) -> Instance<'ctx, Ptr<Self>> {
-        let p = ctx.builder.build_alloca(self.llvm_type(generator, ctx.ctx), "").unwrap();
-        unsafe { Ptr::new(*self).believe_value(p) }
-    }
-
-    // Allocate an array on the stack and return its pointer.
-    fn array_alloca<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        len: IntValue<'ctx>,
-    ) -> Instance<'ctx, Ptr<Self>> {
-        let p =
-            ctx.builder.build_array_alloca(self.llvm_type(generator, ctx.ctx), len, "").unwrap();
-        unsafe { Ptr::new(*self).believe_value(p) }
-    }
-
-    fn var_alloca<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &mut CodeGenContext<'ctx, '_>,
-        name: Option<&str>,
-    ) -> Result<Instance<'ctx, Ptr<Self>>, String> {
-        let ty = self.llvm_type(generator, ctx.ctx).as_basic_type_enum();
-        let p = generator.gen_var_alloc(ctx, ty, name)?;
-        Ok(unsafe { Ptr::new(*self).believe_value(p) })
-    }
-
-    fn array_var_alloca<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &mut CodeGenContext<'ctx, '_>,
-        len: IntValue<'ctx>,
-        name: Option<&'ctx str>,
-    ) -> Result<Instance<'ctx, Ptr<Self>>, String> {
-        // TODO: Remove ArraySliceValue
-        let ty = self.llvm_type(generator, ctx.ctx).as_basic_type_enum();
-        let p = generator.gen_array_var_alloc(ctx, ty, len, name)?;
-        Ok(unsafe { Ptr::new(*self).believe_value(PointerValue::from(p)) })
-    }
-
-    /// Allocate a constant array.
-    fn const_array<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        values: &[Instance<'ctx, Self>],
-    ) -> Instance<'ctx, Array<'ctx, AnyLen, Self>> {
-        macro_rules! make {
-            ($t:expr, $into_value:expr) => {
-                $t.const_array(
-                    &values
-                        .iter()
-                        .map(|x| $into_value(x.value.as_basic_value_enum()))
-                        .collect_vec(),
-                )
-            };
-        }
-
-        let value = match self.llvm_type(generator, ctx).as_basic_type_enum() {
-            BasicTypeEnum::ArrayType(t) => make!(t, BasicValueEnum::into_array_value),
-            BasicTypeEnum::IntType(t) => make!(t, BasicValueEnum::into_int_value),
-            BasicTypeEnum::FloatType(t) => make!(t, BasicValueEnum::into_float_value),
-            BasicTypeEnum::PointerType(t) => make!(t, BasicValueEnum::into_pointer_value),
-            BasicTypeEnum::StructType(t) => make!(t, BasicValueEnum::into_struct_value),
-            BasicTypeEnum::VectorType(t) => make!(t, BasicValueEnum::into_vector_value),
-        };
-
-        let model = Array::new(AnyLen(values.len() as u32), *self);
-        model.check_value(generator, ctx, value).unwrap()
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Instance<'ctx, M: Model<'ctx>> {
-    /// The model of this instance.
-    pub model: M,
-
-    /// The value of this instance.
-    ///
-    /// It is guaranteed the [`BasicType`] of `value` is consistent with that of `model`.
-    pub value: M::Value,
-}

nac3core/src/codegen/model/float.rs

@@ -1,80 +0,0 @@
-use std::{fmt, marker::PhantomData};
-
-use inkwell::{
-    context::Context,
-    types::{BasicTypeEnum, FloatType, IntType},
-    values::FloatValue,
-};
-
-use super::*;
-
-pub trait FloatKind<'ctx>: fmt::Debug + Clone + Copy {
-    fn float_type(&self, ctx: &'ctx Context) -> FloatType<'ctx>;
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Float32;
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Float64;
-
-impl<'ctx> FloatKind<'ctx> for Float32 {
-    fn float_type(&self, ctx: &'ctx Context) -> FloatType<'ctx> {
-        ctx.f32_type()
-    }
-}
-
-impl<'ctx> FloatKind<'ctx> for Float64 {
-    fn float_type(&self, ctx: &'ctx Context) -> FloatType<'ctx> {
-        ctx.f64_type()
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct AnyFloat<'ctx>(FloatType<'ctx>);
-
-impl<'ctx> FloatKind<'ctx> for AnyFloat<'ctx> {
-    fn float_type(&self, _ctx: &'ctx Context) -> FloatType<'ctx> {
-        self.0
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Float<'ctx, N: FloatKind<'ctx>> {
-    kind: N,
-    _phantom: PhantomData<&'ctx ()>,
-}
-
-impl<'ctx, N: FloatKind<'ctx>> Float<'ctx, N> {
-    pub fn new(kind: N) -> Self {
-        Float { kind, _phantom: PhantomData }
-    }
-}
-
-impl<'ctx, N: FloatKind<'ctx>> ModelBase<'ctx> for Float<'ctx, N> {
-    fn llvm_type_impl(&self, _size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        self.kind.float_type(ctx).into()
-    }
-
-    fn check_type_impl(
-        &self,
-        _size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        let Ok(ty) = FloatType::try_from(ty) else {
-            return Err(ModelError(format!("Expecting FloatType, but got {ty:?}")));
-        };
-
-        let expected_ty = self.kind.float_type(ctx);
-        if ty != expected_ty {
-            return Err(ModelError(format!("Expecting {expected_ty:?}, but got {ty:?}")));
-        }
-
-        Ok(())
-    }
-}
-
-impl<'ctx, N: FloatKind<'ctx>> Model<'ctx> for Float<'ctx, N> {
-    type Value = FloatValue<'ctx>;
-    type Type = FloatType<'ctx>;
-}

nac3core/src/codegen/model/function.rs

@@ -1,122 +0,0 @@
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    types::{BasicMetadataTypeEnum, BasicType, FunctionType},
-    values::{AnyValue, BasicMetadataValueEnum, BasicValue, BasicValueEnum, CallSiteValue},
-};
-use itertools::Itertools;
-
-use crate::codegen::{CodeGenContext, CodeGenerator};
-
-use super::*;
-
-#[derive(Debug, Clone, Copy)]
-struct Arg<'ctx> {
-    ty: BasicMetadataTypeEnum<'ctx>,
-    val: BasicMetadataValueEnum<'ctx>,
-}
-
-/// A convenience structure to construct & call an LLVM function.
-///
-/// ### Usage
-///
-/// The syntax is like this:
-/// ```ignore
-/// let result = CallFunction::begin("my_function_name")
-///   .attrs(...)
-///   .arg(arg1)
-///   .arg(arg2)
-///   .arg(arg3)
-///   .returning("my_function_result", Int32);
-/// ```
-///
-/// The function `my_function_name` is called when `.returning()` (or its variants) is called, returning
-/// the result as an `Instance<'ctx, Int<Int32>>`.
-///
-/// If `my_function_name` has not been declared in `ctx.module`, once `.returning()` is called, a function
-/// declaration of `my_function_name` is added to `ctx.module`, where the [`FunctionType`] is deduced from
-/// the argument types and returning type.
-pub struct FnCall<'ctx, 'a, 'b, G: CodeGenerator + ?Sized> {
-    generator: &'b mut G,
-    ctx: &'b CodeGenContext<'ctx, 'a>,
-    /// Function name
-    name: &'b str,
-    /// Call arguments
-    args: Vec<Arg<'ctx>>,
-    /// LLVM function Attributes
-    attrs: Vec<&'static str>,
-}
-
-impl<'ctx, 'a, 'b, G: CodeGenerator + ?Sized> FnCall<'ctx, 'a, 'b, G> {
-    pub fn begin(generator: &'b mut G, ctx: &'b CodeGenContext<'ctx, 'a>, name: &'b str) -> Self {
-        FnCall { generator, ctx, name, args: Vec::new(), attrs: Vec::new() }
-    }
-
-    /// Push a list of LLVM function attributes to the function declaration.
-    #[must_use]
-    pub fn attrs(mut self, attrs: Vec<&'static str>) -> Self {
-        self.attrs = attrs;
-        self
-    }
-
-    /// Push a call argument to the function call.
-    #[allow(clippy::needless_pass_by_value)]
-    #[must_use]
-    pub fn arg<M: Model<'ctx>>(mut self, arg: Instance<'ctx, M>) -> Self {
-        let arg = Arg {
-            ty: arg.model.llvm_type(self.generator, self.ctx.ctx).as_basic_type_enum().into(),
-            val: arg.value.as_basic_value_enum().into(),
-        };
-        self.args.push(arg);
-        self
-    }
-
-    /// Call the function and expect the function to return a value of type of `return_model`.
-    #[must_use]
-    pub fn returning<M: Model<'ctx>>(self, name: &str, return_model: M) -> Instance<'ctx, M> {
-        let ret_ty = return_model.llvm_type(self.generator, self.ctx.ctx);
-
-        let ret = self.call(|tys| ret_ty.fn_type(tys, false), name);
-        let ret = BasicValueEnum::try_from(ret.as_any_value_enum()).unwrap(); // Must work
-        let ret = return_model.check_value(self.generator, self.ctx.ctx, ret).unwrap(); // Must work
-        ret
-    }
-
-    /// Like [`CallFunction::returning_`] but `return_model` is automatically inferred.
-    #[must_use]
-    pub fn returning_auto<M: Model<'ctx> + Default>(self, name: &str) -> Instance<'ctx, M> {
-        self.returning(name, M::default())
-    }
-
-    /// Call the function and expect the function to return a void-type.
-    pub fn returning_void(self) {
-        let ret_ty = self.ctx.ctx.void_type();
-
-        let _ = self.call(|tys| ret_ty.fn_type(tys, false), "");
-    }
-
-    fn call<F>(&self, make_fn_type: F, return_value_name: &str) -> CallSiteValue<'ctx>
-    where
-        F: FnOnce(&[BasicMetadataTypeEnum<'ctx>]) -> FunctionType<'ctx>,
-    {
-        // Get the LLVM function.
-        let func = self.ctx.module.get_function(self.name).unwrap_or_else(|| {
-            // Declare the function if it doesn't exist.
-            let tys = self.args.iter().map(|arg| arg.ty).collect_vec();
-
-            let func_type = make_fn_type(&tys);
-            let func = self.ctx.module.add_function(self.name, func_type, None);
-
-            for attr in &self.attrs {
-                func.add_attribute(
-                    AttributeLoc::Function,
-                    self.ctx.ctx.create_enum_attribute(Attribute::get_named_enum_kind_id(attr), 0),
-                );
-            }
-
-            func
-        });
-
-        let vals = self.args.iter().map(|arg| arg.val).collect_vec();
-        self.ctx.builder.build_call(func, &vals, return_value_name).unwrap()
-    }
-}

nac3core/src/codegen/model/int.rs

@@ -1,400 +0,0 @@
-use std::{cmp::Ordering, fmt, marker::PhantomData};
-
-use inkwell::{
-    context::Context,
-    types::{BasicTypeEnum, IntType},
-    values::IntValue,
-    IntPredicate,
-};
-
-use crate::codegen::{CodeGenContext, CodeGenerator};
-
-use super::*;
-
-pub trait IntKind<'ctx>: fmt::Debug + Clone + Copy {
-    fn int_type(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> IntType<'ctx>;
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Bool;
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Byte;
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Int32;
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Int64;
-#[derive(Debug, Clone, Copy, Default)]
-pub struct SizeT;
-
-impl<'ctx> IntKind<'ctx> for Bool {
-    fn int_type(&self, _size_t: IntType<'ctx>, ctx: &'ctx Context) -> IntType<'ctx> {
-        ctx.bool_type()
-    }
-}
-
-impl<'ctx> IntKind<'ctx> for Byte {
-    fn int_type(&self, _size_t: IntType<'ctx>, ctx: &'ctx Context) -> IntType<'ctx> {
-        ctx.i8_type()
-    }
-}
-
-impl<'ctx> IntKind<'ctx> for Int32 {
-    fn int_type(&self, _size_t: IntType<'ctx>, ctx: &'ctx Context) -> IntType<'ctx> {
-        ctx.i32_type()
-    }
-}
-
-impl<'ctx> IntKind<'ctx> for Int64 {
-    fn int_type(&self, _size_t: IntType<'ctx>, ctx: &'ctx Context) -> IntType<'ctx> {
-        ctx.i64_type()
-    }
-}
-
-impl<'ctx> IntKind<'ctx> for SizeT {
-    fn int_type(&self, size_t: IntType<'ctx>, _ctx: &'ctx Context) -> IntType<'ctx> {
-        size_t
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct AnyInt<'ctx>(pub IntType<'ctx>);
-
-impl<'ctx> IntKind<'ctx> for AnyInt<'ctx> {
-    fn int_type(&self, _size_t: IntType<'ctx>, _ctx: &'ctx Context) -> IntType<'ctx> {
-        self.0
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Int<'ctx, N: IntKind<'ctx>> {
-    kind: N,
-    _phantom: PhantomData<&'ctx ()>,
-}
-
-impl<'ctx, N: IntKind<'ctx>> ModelBase<'ctx> for Int<'ctx, N> {
-    fn llvm_type_impl(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        self.kind.int_type(size_t, ctx).into()
-    }
-
-    fn check_type_impl(
-        &self,
-        size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        let Ok(ty) = IntType::try_from(ty) else {
-            return Err(ModelError(format!("Expecting IntType, but got {ty:?}")));
-        };
-
-        let exp_ty = self.kind.int_type(size_t, ctx);
-        if ty.get_bit_width() != exp_ty.get_bit_width() {
-            return Err(ModelError(format!(
-                "Expecting IntType to have {} bit(s), but got {} bit(s)",
-                exp_ty.get_bit_width(),
-                ty.get_bit_width()
-            )));
-        }
-
-        Ok(())
-    }
-}
-
-impl<'ctx, N: IntKind<'ctx>> Model<'ctx> for Int<'ctx, N> {
-    type Type = IntType<'ctx>;
-    type Value = IntValue<'ctx>;
-}
-
-impl<'ctx, N: IntKind<'ctx>> Int<'ctx, N> {
-    pub fn new(kind: N) -> Self {
-        Int { kind, _phantom: PhantomData }
-    }
-
-    pub fn const_int<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        value: u64,
-        sign_extend: bool,
-    ) -> Instance<'ctx, Self> {
-        let value = self.llvm_type(generator, ctx).const_int(value, sign_extend);
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn const_0<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Self> {
-        let value = self.llvm_type(generator, ctx).const_zero();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn const_1<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Self> {
-        self.const_int(generator, ctx, 1, false)
-    }
-
-    pub fn const_all_ones<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Self> {
-        let value = self.llvm_type(generator, ctx).const_all_ones();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn s_extend_or_bit_cast<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                <= self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value = ctx
-            .builder
-            .build_int_s_extend_or_bit_cast(value, self.llvm_type(generator, ctx.ctx), "")
-            .unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn s_extend<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                < self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value =
-            ctx.builder.build_int_s_extend(value, self.llvm_type(generator, ctx.ctx), "").unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn z_extend_or_bit_cast<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                <= self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value = ctx
-            .builder
-            .build_int_z_extend_or_bit_cast(value, self.llvm_type(generator, ctx.ctx), "")
-            .unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn z_extend<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                < self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value =
-            ctx.builder.build_int_z_extend(value, self.llvm_type(generator, ctx.ctx), "").unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn truncate_or_bit_cast<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                >= self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value = ctx
-            .builder
-            .build_int_truncate_or_bit_cast(value, self.llvm_type(generator, ctx.ctx), "")
-            .unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    pub fn truncate<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        assert!(
-            value.get_type().get_bit_width()
-                > self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width()
-        );
-        let value =
-            ctx.builder.build_int_truncate(value, self.llvm_type(generator, ctx.ctx), "").unwrap();
-        unsafe { self.believe_value(value) }
-    }
-
-    /// `sext` or `trunc` an int to this model's int type. Does nothing if equal bit-widths.
-    pub fn s_extend_or_truncate<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        let their_width = value.get_type().get_bit_width();
-        let our_width =
-            self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width();
-        match their_width.cmp(&our_width) {
-            Ordering::Less => self.s_extend(generator, ctx, value),
-            Ordering::Equal => unsafe { self.believe_value(value) },
-            Ordering::Greater => self.truncate(generator, ctx, value),
-        }
-    }
-
-    /// `zext` or `trunc` an int to this model's int type. Does nothing if equal bit-widths.
-    pub fn z_extend_or_truncate<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        value: IntValue<'ctx>,
-    ) -> Instance<'ctx, Self> {
-        let their_width = value.get_type().get_bit_width();
-        let our_width =
-            self.kind.int_type(generator.get_size_type(ctx.ctx), ctx.ctx).get_bit_width();
-        match their_width.cmp(&our_width) {
-            Ordering::Less => self.z_extend(generator, ctx, value),
-            Ordering::Equal => unsafe { self.believe_value(value) },
-            Ordering::Greater => self.truncate(generator, ctx, value),
-        }
-    }
-}
-
-impl<'ctx> Int<'ctx, Bool> {
-    #[must_use]
-    pub fn const_false<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Self> {
-        self.const_int(generator, ctx, 0, false)
-    }
-
-    #[must_use]
-    pub fn const_true<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Self> {
-        self.const_int(generator, ctx, 1, false)
-    }
-}
-
-impl<'ctx, N: IntKind<'ctx>> Instance<'ctx, Int<'ctx, N>> {
-    pub fn s_extend_or_bit_cast<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).s_extend_or_bit_cast(generator, ctx, self.value)
-    }
-
-    pub fn s_extend<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).s_extend(generator, ctx, self.value)
-    }
-
-    pub fn z_extend_or_bit_cast<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).z_extend_or_bit_cast(generator, ctx, self.value)
-    }
-
-    pub fn z_extend<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).z_extend(generator, ctx, self.value)
-    }
-
-    pub fn truncate_or_bit_cast<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).truncate_or_bit_cast(generator, ctx, self.value)
-    }
-
-    pub fn truncate<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).truncate(generator, ctx, self.value)
-    }
-
-    pub fn s_extend_or_truncate<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).s_extend_or_truncate(generator, ctx, self.value)
-    }
-
-    pub fn z_extend_or_truncate<NewN: IntKind<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        to_int_kind: NewN,
-    ) -> Instance<'ctx, Int<'ctx, NewN>> {
-        Int::new(to_int_kind).z_extend_or_truncate(generator, ctx, self.value)
-    }
-
-    #[must_use]
-    pub fn add(&self, ctx: &CodeGenContext<'ctx, '_>, other: Self) -> Self {
-        let value = ctx.builder.build_int_add(self.value, other.value, "").unwrap();
-        unsafe { self.model.believe_value(value) }
-    }
-
-    #[must_use]
-    pub fn sub(&self, ctx: &CodeGenContext<'ctx, '_>, other: Self) -> Self {
-        let value = ctx.builder.build_int_sub(self.value, other.value, "").unwrap();
-        unsafe { self.model.believe_value(value) }
-    }
-
-    #[must_use]
-    pub fn mul(&self, ctx: &CodeGenContext<'ctx, '_>, other: Self) -> Self {
-        let value = ctx.builder.build_int_mul(self.value, other.value, "").unwrap();
-        unsafe { self.model.believe_value(value) }
-    }
-
-    pub fn compare(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        op: IntPredicate,
-        other: Self,
-    ) -> Instance<'ctx, Int<'ctx, Bool>> {
-        let value = ctx.builder.build_int_compare(op, self.value, other.value, "").unwrap();
-        unsafe { Int::new(Bool).believe_value(value) }
-    }
-}

nac3core/src/codegen/model/mod.rs

@@ -1,16 +0,0 @@
-mod any;
-mod array;
-mod core;
-mod float;
-pub mod function;
-mod int;
-mod ptr;
-mod structure;
-
-pub use any::*;
-pub use array::*;
-pub use core::*;
-pub use float::*;
-pub use int::*;
-pub use ptr::*;
-pub use structure::*;

nac3core/src/codegen/model/ptr.rs

@@ -1,223 +0,0 @@
-use inkwell::{
-    context::Context,
-    types::{BasicType, BasicTypeEnum, IntType, PointerType},
-    values::{IntValue, PointerValue},
-    AddressSpace,
-};
-
-use crate::codegen::{llvm_intrinsics::call_memcpy_generic, CodeGenContext, CodeGenerator};
-
-use super::*;
-
-/// A model for [`PointerType`].
-///
-/// `Item` is the element type this pointer is pointing to, and should be of a [`Model`].
-///
-// TODO: LLVM 15: `Item` is a Rust type-hint for the LLVM type of value the `.store()/.load()` family
-// of functions return. If a truly opaque pointer is needed, tell the programmer to use `OpaquePtr`.
-//
-// NOTE: Do not put `Item: ModelBase<'ctx>`. See the LLVM 15 note above.
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Ptr<Item> {
-    pub item: Item,
-}
-
-/// An opaque pointer. Like [`Ptr`] but without any Rust type-hints about its element type.
-///
-/// `.load()/.store()` is not available for [`Instance`]s of opaque pointers.
-pub type OpaquePtr = Ptr<()>;
-
-impl<Item> Ptr<Item> {
-    pub fn new(item: Item) -> Self {
-        Ptr { item }
-    }
-}
-
-// TODO: LLVM 15: `Item: ModelBase<'ctx>` don't even need to be a model anymore. It will only be
-// a type-hint for the `.load()/.store()` functions for the `pointee_ty`.
-//
-// See https://thedan64.github.io/inkwell/inkwell/builder/struct.Builder.html#method.build_load.
-impl<'ctx, Item: ModelBase<'ctx>> ModelBase<'ctx> for Ptr<Item> {
-    fn llvm_type_impl(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        // TODO: LLVM 15: ctx.ptr_type(AddressSpace::default())
-        let item = self.item.llvm_type_impl(size_t, ctx);
-        item.ptr_type(AddressSpace::default()).into()
-    }
-
-    fn check_type_impl(
-        &self,
-        size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        let Ok(ty) = PointerType::try_from(ty) else {
-            return Err(ModelError(format!("Expecting PointerType, but got {ty:?}")));
-        };
-
-        let elem_ty = ty.get_element_type();
-        let Ok(elem_ty) = BasicTypeEnum::try_from(elem_ty) else {
-            return Err(ModelError(format!(
-                "Expecting pointer element type to be a BasicTypeEnum, but got {elem_ty:?}"
-            )));
-        };
-
-        // TODO: inkwell `get_element_type()` will be deprecated.
-        // Remove the check for `get_element_type()` when the time comes.
-        self.item
-            .check_type_impl(size_t, ctx, elem_ty)
-            .map_err(|err| err.under_context("a PointerType"))?;
-
-        Ok(())
-    }
-}
-
-impl<'ctx, Item: Model<'ctx>> Model<'ctx> for Ptr<Item> {
-    type Type = PointerType<'ctx>;
-    type Value = PointerValue<'ctx>;
-}
-
-impl<'ctx, Item: Model<'ctx>> Ptr<Item> {
-    /// Return a ***constant*** nullptr.
-    pub fn nullptr<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-    ) -> Instance<'ctx, Ptr<Item>> {
-        // TODO: LLVM 15: Write in an impl where `Item` does not have to be `Model<'ctx>`.
-        let ptr = self.llvm_type(generator, ctx).const_null();
-        unsafe { self.believe_value(ptr) }
-    }
-
-    /// Cast a pointer into this model with [`inkwell::builder::Builder::build_pointer_cast`]
-    pub fn pointer_cast<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        ptr: PointerValue<'ctx>,
-    ) -> Instance<'ctx, Ptr<Item>> {
-        // TODO: LLVM 15: Write in an impl where `Item` does not have to be `Model<'ctx>`.
-        // TODO: LLVM 15: This function will only have to be:
-        // ```
-        // return self.believe_value(ptr);
-        // ```
-        let t = self.llvm_type(generator, ctx.ctx);
-        let ptr = ctx.builder.build_pointer_cast(ptr, t, "").unwrap();
-        unsafe { self.believe_value(ptr) }
-    }
-}
-
-impl<'ctx, Item: Model<'ctx>> Instance<'ctx, Ptr<Item>> {
-    /// Offset the pointer by [`inkwell::builder::Builder::build_in_bounds_gep`].
-    #[must_use]
-    pub fn offset(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        offset: IntValue<'ctx>,
-    ) -> Instance<'ctx, Ptr<Item>> {
-        let p = unsafe { ctx.builder.build_in_bounds_gep(self.value, &[offset], "").unwrap() };
-        unsafe { self.model.believe_value(p) }
-    }
-
-    /// Offset the pointer by [`inkwell::builder::Builder::build_in_bounds_gep`] by a constant offset.
-    #[must_use]
-    pub fn offset_const(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        offset: i64,
-    ) -> Instance<'ctx, Ptr<Item>> {
-        let offset = ctx.ctx.i64_type().const_int(offset as u64, true);
-        self.offset(ctx, offset)
-    }
-
-    pub fn set_index(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        index: IntValue<'ctx>,
-        value: Instance<'ctx, Item>,
-    ) {
-        self.offset(ctx, index).store(ctx, value);
-    }
-
-    pub fn set_index_const(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        index: i64,
-        value: Instance<'ctx, Item>,
-    ) {
-        self.offset_const(ctx, index).store(ctx, value);
-    }
-
-    pub fn get_index<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        index: IntValue<'ctx>,
-    ) -> Instance<'ctx, Item> {
-        self.offset(ctx, index).load(generator, ctx)
-    }
-
-    pub fn get_index_const<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        index: i64,
-    ) -> Instance<'ctx, Item> {
-        self.offset_const(ctx, index).load(generator, ctx)
-    }
-
-    /// Load the value with [`inkwell::builder::Builder::build_load`].
-    pub fn load<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-    ) -> Instance<'ctx, Item> {
-        let value = ctx.builder.build_load(self.value, "").unwrap();
-        self.model.item.check_value(generator, ctx.ctx, value).unwrap() // If unwrap() panics, there is a logic error.
-    }
-
-    /// Store a value with [`inkwell::builder::Builder::build_store`].
-    pub fn store(&self, ctx: &CodeGenContext<'ctx, '_>, value: Instance<'ctx, Item>) {
-        ctx.builder.build_store(self.value, value.value).unwrap();
-    }
-
-    /// Return a casted pointer of element type `NewElement` with [`inkwell::builder::Builder::build_pointer_cast`].
-    pub fn pointer_cast<NewItem: Model<'ctx>, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        new_item: NewItem,
-    ) -> Instance<'ctx, Ptr<NewItem>> {
-        // TODO: LLVM 15: Write in an impl where `Item` does not have to be `Model<'ctx>`.
-        Ptr::new(new_item).pointer_cast(generator, ctx, self.value)
-    }
-
-    /// Check if the pointer is null with [`inkwell::builder::Builder::build_is_null`].
-    pub fn is_null(&self, ctx: &CodeGenContext<'ctx, '_>) -> Instance<'ctx, Int<'ctx, Bool>> {
-        let value = ctx.builder.build_is_null(self.value, "").unwrap();
-        unsafe { Int::new(Bool).believe_value(value) }
-    }
-
-    /// Check if the pointer is not null with [`inkwell::builder::Builder::build_is_not_null`].
-    pub fn is_not_null(&self, ctx: &CodeGenContext<'ctx, '_>) -> Instance<'ctx, Int<'ctx, Bool>> {
-        let value = ctx.builder.build_is_not_null(self.value, "").unwrap();
-        unsafe { Int::new(Bool).believe_value(value) }
-    }
-
-    /// `memcpy` from another pointer.
-    pub fn copy_from<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        source: Self,
-        num_items: IntValue<'ctx>,
-    ) {
-        // Force extend `num_items` and `itemsize` to `i64` so their types would match.
-        let itemsize = self.model.size_of(generator, ctx.ctx);
-        let itemsize = Int::new(Int64).z_extend_or_truncate(generator, ctx, itemsize);
-        let num_items = Int::new(Int64).z_extend_or_truncate(generator, ctx, num_items);
-        let totalsize = itemsize.mul(ctx, num_items);
-
-        let is_volatile = ctx.ctx.bool_type().const_zero(); // is_volatile = false
-        call_memcpy_generic(ctx, self.value, source.value, totalsize.value, is_volatile);
-    }
-}

nac3core/src/codegen/model/structure.rs

@@ -1,275 +0,0 @@
-use std::{fmt, marker::PhantomData};
-
-use inkwell::{
-    context::Context,
-    types::{BasicType, BasicTypeEnum, IntType, StructType},
-    values::{BasicValueEnum, StructValue},
-};
-use itertools::{izip, Itertools};
-
-use crate::codegen::{CodeGenContext, CodeGenerator};
-
-use super::*;
-
-// pub trait StructKind2<'ctx>: fmt::Debug + Clone + Copy {
-//     type Fields<F: FieldTraversal2<'ctx>> = ;
-// }
-
-pub struct Field<M> {
-    gep_index: u32,
-    model: M,
-    name: &'static str,
-}
-
-// NOTE: Very similar to Field, but is forall on `M`, (and also uses ModelBase to get object safety for the `Box<dyn ____>`.
-pub struct Entry<'ctx> {
-    model: Box<dyn ModelBase<'ctx> + 'ctx>,
-    name: &'static str,
-}
-
-pub struct FieldMapper<'ctx> {
-    gep_index_counter: u32,
-    entries: Vec<Entry<'ctx>>,
-}
-
-impl<'ctx> FieldMapper<'ctx> {
-    fn add<M: 'ctx + Model<'ctx>>(&mut self, name: &'static str, model: M) -> Field<M> {
-        let entry = Entry { model: Box::new(model), name };
-        self.entries.push(entry);
-
-        let gep_index = self.gep_index_counter;
-        self.gep_index_counter += 1;
-        Field { gep_index, model, name }
-    }
-
-    fn add_auto<M: 'ctx + Model<'ctx> + Default>(&mut self, name: &'static str) -> Field<M> {
-        self.add(name, M::default())
-    }
-}
-
-pub trait StructKind<'ctx>: fmt::Debug + Clone + Copy {
-    type Fields;
-
-    fn iter_fields(&self, mapper: &mut FieldMapper<'ctx>) -> Self::Fields;
-
-    // Produce `Vec<Entry>` and `Self::Fields` simultaneously.
-    // The former is for doing field-wise type checks.
-    // The latter is for enabling the `.gep(|f| f.data)` syntax.
-    fn entries_and_fields(&self) -> (Vec<Entry<'ctx>>, Self::Fields) {
-        let mut mapper = FieldMapper { gep_index_counter: 0, entries: Vec::new() };
-        let fields = self.iter_fields(&mut mapper);
-        (mapper.entries, fields)
-    }
-
-    fn entries(&self) -> Vec<Entry<'ctx>> {
-        self.entries_and_fields().0
-    }
-
-    fn fields(&self) -> Self::Fields {
-        self.entries_and_fields().1
-    }
-
-    /// Get the LLVM [`StructType`] of this [`StructKind`].
-    fn get_struct_type(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> StructType<'ctx> {
-        let entries = self.entries();
-        let entries =
-            entries.into_iter().map(|t| t.model.llvm_type_impl(size_t, ctx)).collect_vec();
-        ctx.struct_type(&entries, false)
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct Struct<'ctx, S: StructKind<'ctx>> {
-    pub kind: S,
-    _phantom: PhantomData<&'ctx ()>,
-}
-
-impl<'ctx, S: StructKind<'ctx>> ModelBase<'ctx> for Struct<'ctx, S> {
-    fn llvm_type_impl(&self, size_t: IntType<'ctx>, ctx: &'ctx Context) -> BasicTypeEnum<'ctx> {
-        self.kind.get_struct_type(size_t, ctx).as_basic_type_enum()
-    }
-
-    fn check_type_impl(
-        &self,
-        size_t: IntType<'ctx>,
-        ctx: &'ctx Context,
-        ty: BasicTypeEnum<'ctx>,
-    ) -> Result<(), ModelError> {
-        let Ok(ty) = StructType::try_from(ty) else {
-            return Err(ModelError(format!("Expecting StructType, but got {ty:?}")));
-        };
-
-        let entries = self.kind.entries();
-        let field_types = ty.get_field_types();
-
-        // Check the number of fields.
-        if entries.len() != field_types.len() {
-            return Err(ModelError(format!(
-                "Expecting StructType with {} field(s), but got {}",
-                entries.len(),
-                field_types.len()
-            )));
-        }
-
-        // Check each field.
-        for (i, (entry, field_type)) in izip!(entries, field_types).enumerate() {
-            entry.model.check_type_impl(size_t, ctx, field_type).map_err(|err| {
-                let context = &format!("in field #{i} '{}'", entry.name);
-                err.under_context(context)
-            })?;
-        }
-
-        Ok(())
-    }
-}
-
-impl<'ctx, S: StructKind<'ctx>> Model<'ctx> for Struct<'ctx, S> {
-    type Type = StructType<'ctx>;
-    type Value = StructValue<'ctx>;
-}
-
-impl<'ctx, S: StructKind<'ctx>> Struct<'ctx, S> {
-    pub fn new(kind: S) -> Self {
-        Struct { kind, _phantom: PhantomData }
-    }
-
-    pub fn const_struct<G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        fields: &[BasicValueEnum<'ctx>],
-    ) -> Instance<'ctx, Self> {
-        let val = ctx.const_struct(fields, false);
-        self.check_value(generator, ctx, val).unwrap()
-    }
-}
-
-impl<'ctx, S: StructKind<'ctx>> Instance<'ctx, Struct<'ctx, S>> {
-    /// Get a field with [`StructValue::get_field_at_index`].
-    pub fn get_field<G: CodeGenerator + ?Sized, M, GetField>(
-        &self,
-        generator: &mut G,
-        ctx: &'ctx Context,
-        get_field: GetField,
-    ) -> Instance<'ctx, M>
-    where
-        M: Model<'ctx>,
-        GetField: FnOnce(S::Fields) -> Field<M>,
-    {
-        let field = get_field(self.model.kind.fields());
-        let val = self.value.get_field_at_index(field.gep_index).unwrap();
-        field.model.check_value(generator, ctx, val).unwrap()
-    }
-}
-
-impl<'ctx, S: StructKind<'ctx>> Instance<'ctx, Ptr<Struct<'ctx, S>>> {
-    /// Get a pointer to a field with [`Builder::build_in_bounds_gep`].
-    pub fn gep<M, GetField>(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        get_field: GetField,
-    ) -> Instance<'ctx, Ptr<M>>
-    where
-        M: Model<'ctx>,
-        GetField: FnOnce(S::Fields) -> Field<M>,
-    {
-        let field = get_field(self.model.item.kind.fields());
-        let llvm_i32 = ctx.ctx.i32_type();
-
-        let ptr = unsafe {
-            ctx.builder
-                .build_in_bounds_gep(
-                    self.value,
-                    &[llvm_i32.const_zero(), llvm_i32.const_int(u64::from(field.gep_index), false)],
-                    field.name,
-                )
-                .unwrap()
-        };
-
-        unsafe { Ptr::new(field.model).believe_value(ptr) }
-    }
-
-    /// Convenience function equivalent to `.gep(...).load(...)`.
-    pub fn get<M, GetField, G: CodeGenerator + ?Sized>(
-        &self,
-        generator: &mut G,
-        ctx: &CodeGenContext<'ctx, '_>,
-        get_field: GetField,
-    ) -> Instance<'ctx, M>
-    where
-        M: Model<'ctx>,
-        GetField: FnOnce(S::Fields) -> Field<M>,
-    {
-        self.gep(ctx, get_field).load(generator, ctx)
-    }
-
-    /// Convenience function equivalent to `.gep(...).store(...)`.
-    pub fn set<M, GetField>(
-        &self,
-        ctx: &CodeGenContext<'ctx, '_>,
-        get_field: GetField,
-        value: Instance<'ctx, M>,
-    ) where
-        M: Model<'ctx>,
-        GetField: FnOnce(S::Fields) -> Field<M>,
-    {
-        self.gep(ctx, get_field).store(ctx, value);
-    }
-}
-
-/////////////////////// Example; Delete later
-
-// Example: NDArray.
-//
-// Compared to List, it has no generic models.
-pub struct NDArrayFields<'ctx> {
-    data: Field<Ptr<Int<'ctx, Byte>>>,
-    itemsize: Field<Int<'ctx, SizeT>>,
-    ndims: Field<Int<'ctx, SizeT>>,
-    shape: Field<Ptr<Int<'ctx, SizeT>>>,
-    strides: Field<Ptr<Int<'ctx, SizeT>>>,
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-struct NDArray;
-
-impl<'ctx> StructKind<'ctx> for NDArray {
-    type Fields = NDArrayFields<'ctx>;
-
-    fn iter_fields(&self, mapper: &mut FieldMapper<'ctx>) -> Self::Fields {
-        NDArrayFields {
-            data: mapper.add_auto("data"),
-            itemsize: mapper.add_auto("itemsize"),
-            ndims: mapper.add_auto("ndims"),
-            shape: mapper.add_auto("shape"),
-            strides: mapper.add_auto("strides"),
-        }
-    }
-}
-
-// Example: List.
-//
-// Compared to NDArray, it has generic models.
-pub struct ListFields<'ctx, Item: Model<'ctx>> {
-    items: Field<Ptr<Item>>,
-    len: Field<Int<'ctx, SizeT>>,
-    _phantom: PhantomData<&'ctx ()>,
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub struct List<'ctx, Item: Model<'ctx>> {
-    item: Item,
-    _phantom: PhantomData<&'ctx ()>,
-}
-
-impl<'ctx, Item: Model<'ctx> + 'ctx> StructKind<'ctx> for List<'ctx, Item> {
-    type Fields = ListFields<'ctx, Item>;
-
-    fn iter_fields(&self, mapper: &mut FieldMapper<'ctx>) -> Self::Fields {
-        ListFields {
-            items: mapper.add("items", Ptr::new(self.item)),
-            len: mapper.add_auto("len"),
-            _phantom: PhantomData,
-        }
-    }
-}

nac3core/src/codegen/numpy.rs

@@ -1,23 +1,32 @@
-use crate::{
+use inkwell::{
-    codegen::{
+    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
-        classes::{
+    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
-            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayType, NDArrayValue,
+    AddressSpace, IntPredicate, OptimizationLevel,
-            ProxyType, ProxyValue, TypedArrayLikeAccessor, TypedArrayLikeAdapter,
+};
-            TypedArrayLikeMutator, UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+
-        },
+use nac3parser::ast::{Operator, StrRef};
-        expr::gen_binop_expr_with_values,
+
-        irrt::{
+use super::{
-            calculate_len_for_slice_range, call_ndarray_calc_broadcast,
+    expr::gen_binop_expr_with_values,
-            call_ndarray_calc_broadcast_index, call_ndarray_calc_nd_indices,
+    irrt::{
-            call_ndarray_calc_size,
+        calculate_len_for_slice_range, call_ndarray_calc_broadcast,
-        },
+        call_ndarray_calc_broadcast_index, call_ndarray_calc_nd_indices, call_ndarray_calc_size,
-        llvm_intrinsics::{self, call_memcpy_generic},
-        stmt::{gen_for_callback_incrementing, gen_for_range_callback, gen_if_else_expr_callback},
-        CodeGenContext, CodeGenerator,
     },
+    llvm_intrinsics::{self, call_memcpy_generic},
+    macros::codegen_unreachable,
+    stmt::{gen_for_callback_incrementing, gen_for_range_callback, gen_if_else_expr_callback},
+    types::{ListType, NDArrayType, ProxyType},
+    values::{
+        ArrayLikeIndexer, ArrayLikeValue, ListValue, NDArrayValue, ProxyValue,
+        TypedArrayLikeAccessor, TypedArrayLikeAdapter, TypedArrayLikeMutator,
+        UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+    },
+    CodeGenContext, CodeGenerator,
+};
+use crate::{
     symbol_resolver::ValueEnum,
     toplevel::{
-        helper::PrimDef,
+        helper::{arraylike_flatten_element_type, PrimDef},
         numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
         DefinitionId,
     },
@@ -26,16 +35,6 @@ use crate::{
         typedef::{FunSignature, Type, TypeEnum},
     },
 };
-use inkwell::{
-    types::BasicType,
-    values::{BasicValueEnum, IntValue, PointerValue},
-    AddressSpace, IntPredicate, OptimizationLevel,
-};
-use inkwell::{
-    types::{AnyTypeEnum, BasicTypeEnum, PointerType},
-    values::BasicValue,
-};
-use nac3parser::ast::{Operator, StrRef};
 
 /// Creates an uninitialized `NDArray` instance.
 fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
@@ -43,6 +42,7 @@ fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
     ctx: &mut CodeGenContext<'ctx, '_>,
     elem_ty: Type,
 ) -> Result<NDArrayValue<'ctx>, String> {
+    let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
     let ndarray_ty = make_ndarray_ty(&mut ctx.unifier, &ctx.primitives, Some(elem_ty), None);
 
     let llvm_usize = generator.get_size_type(ctx.ctx);
@@ -55,7 +55,7 @@ fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
 
     let ndarray = generator.gen_var_alloc(ctx, llvm_ndarray_t.into(), None)?;
 
-    Ok(NDArrayValue::from_ptr_val(ndarray, llvm_usize, None))
+    Ok(NDArrayValue::from_pointer_value(ndarray, llvm_elem_ty, llvm_usize, None))
 }
 
 /// Creates an `NDArray` instance from a dynamic shape.
@@ -128,7 +128,7 @@ where
     ndarray.store_ndims(ctx, generator, num_dims);
 
     let ndarray_num_dims = ndarray.load_ndims(ctx);
-    ndarray.create_dim_sizes(ctx, llvm_usize, ndarray_num_dims);
+    ndarray.create_shape(ctx, llvm_usize, ndarray_num_dims);
 
     // Copy the dimension sizes from shape to ndarray.dims
     let shape_len = shape_len_fn(generator, ctx, shape)?;
@@ -144,7 +144,7 @@ where
             let shape_dim = ctx.builder.build_int_z_extend(shape_dim, llvm_usize, "").unwrap();
 
             let ndarray_pdim =
-                unsafe { ndarray.dim_sizes().ptr_offset_unchecked(ctx, generator, &i, None) };
+                unsafe { ndarray.shape().ptr_offset_unchecked(ctx, generator, &i, None) };
 
             ctx.builder.build_store(ndarray_pdim, shape_dim).unwrap();
 
@@ -195,12 +195,12 @@ pub fn create_ndarray_const_shape<'ctx, G: CodeGenerator + ?Sized>(
     ndarray.store_ndims(ctx, generator, num_dims);
 
     let ndarray_num_dims = ndarray.load_ndims(ctx);
-    ndarray.create_dim_sizes(ctx, llvm_usize, ndarray_num_dims);
+    ndarray.create_shape(ctx, llvm_usize, ndarray_num_dims);
 
     for (i, &shape_dim) in shape.iter().enumerate() {
         let shape_dim = ctx.builder.build_int_z_extend(shape_dim, llvm_usize, "").unwrap();
         let ndarray_dim = unsafe {
-            ndarray.dim_sizes().ptr_offset_unchecked(
+            ndarray.shape().ptr_offset_unchecked(
                 ctx,
                 generator,
                 &llvm_usize.const_int(i as u64, true),
@@ -229,7 +229,7 @@ fn ndarray_init_data<'ctx, G: CodeGenerator + ?Sized>(
     let ndarray_num_elems = call_ndarray_calc_size(
         generator,
         ctx,
-        &ndarray.dim_sizes().as_slice_value(ctx, generator),
+        &ndarray.shape().as_slice_value(ctx, generator),
         (None, None),
     );
     ndarray.create_data(ctx, llvm_ndarray_data_t, ndarray_num_elems);
@@ -259,7 +259,7 @@ fn ndarray_zero_value<'ctx, G: CodeGenerator + ?Sized>(
     } else if ctx.unifier.unioned(elem_ty, ctx.primitives.str) {
         ctx.gen_string(generator, "").into()
     } else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     }
 }
 
@@ -287,7 +287,7 @@ fn ndarray_one_value<'ctx, G: CodeGenerator + ?Sized>(
     } else if ctx.unifier.unioned(elem_ty, ctx.primitives.str) {
         ctx.gen_string(generator, "1").into()
     } else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     }
 }
 
@@ -315,11 +315,11 @@ fn call_ndarray_empty_impl<'ctx, G: CodeGenerator + ?Sized>(
 
     match shape {
         BasicValueEnum::PointerValue(shape_list_ptr)
-            if ListValue::is_instance(shape_list_ptr, llvm_usize).is_ok() =>
+            if ListValue::is_representable(shape_list_ptr, llvm_usize).is_ok() =>
         {
             // 1. A list of ints; e.g., `np.empty([600, 800, 3])`
 
-            let shape_list = ListValue::from_ptr_val(shape_list_ptr, llvm_usize, None);
+            let shape_list = ListValue::from_pointer_value(shape_list_ptr, llvm_usize, None);
             create_ndarray_dyn_shape(
                 generator,
                 ctx,
@@ -355,7 +355,7 @@ fn call_ndarray_empty_impl<'ctx, G: CodeGenerator + ?Sized>(
 
             create_ndarray_const_shape(generator, ctx, elem_ty, &[shape_int])
         }
-        _ => unreachable!(),
+        _ => codegen_unreachable!(ctx),
     }
 }
 
@@ -380,7 +380,7 @@ where
     let ndarray_num_elems = call_ndarray_calc_size(
         generator,
         ctx,
-        &ndarray.dim_sizes().as_slice_value(ctx, generator),
+        &ndarray.shape().as_slice_value(ctx, generator),
         (None, None),
     );
 
@@ -474,8 +474,8 @@ fn ndarray_broadcast_fill<'ctx, 'a, G, ValueFn>(
     generator: &mut G,
     ctx: &mut CodeGenContext<'ctx, 'a>,
     res: NDArrayValue<'ctx>,
-    lhs: (BasicValueEnum<'ctx>, bool),
+    lhs: (Type, BasicValueEnum<'ctx>, bool),
-    rhs: (BasicValueEnum<'ctx>, bool),
+    rhs: (Type, BasicValueEnum<'ctx>, bool),
     value_fn: ValueFn,
 ) -> Result<NDArrayValue<'ctx>, String>
 where
@@ -488,8 +488,8 @@ where
 {
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
-    let (lhs_val, lhs_scalar) = lhs;
+    let (lhs_ty, lhs_val, lhs_scalar) = lhs;
-    let (rhs_val, rhs_scalar) = rhs;
+    let (rhs_ty, rhs_val, rhs_scalar) = rhs;
 
     assert!(
         !(lhs_scalar && rhs_scalar),
@@ -500,12 +500,26 @@ where
 
     // Assert that all ndarray operands are broadcastable to the target size
     if !lhs_scalar {
-        let lhs_val = NDArrayValue::from_ptr_val(lhs_val.into_pointer_value(), llvm_usize, None);
+        let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
+        let llvm_lhs_elem_ty = ctx.get_llvm_type(generator, lhs_dtype);
+        let lhs_val = NDArrayValue::from_pointer_value(
+            lhs_val.into_pointer_value(),
+            llvm_lhs_elem_ty,
+            llvm_usize,
+            None,
+        );
         ndarray_assert_is_broadcastable(generator, ctx, res, lhs_val);
     }
 
     if !rhs_scalar {
-        let rhs_val = NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
+        let rhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, rhs_ty);
+        let llvm_rhs_elem_ty = ctx.get_llvm_type(generator, rhs_dtype);
+        let rhs_val = NDArrayValue::from_pointer_value(
+            rhs_val.into_pointer_value(),
+            llvm_rhs_elem_ty,
+            llvm_usize,
+            None,
+        );
         ndarray_assert_is_broadcastable(generator, ctx, res, rhs_val);
     }
 
@@ -513,7 +527,14 @@ where
         let lhs_elem = if lhs_scalar {
             lhs_val
         } else {
-            let lhs = NDArrayValue::from_ptr_val(lhs_val.into_pointer_value(), llvm_usize, None);
+            let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
+            let llvm_lhs_elem_ty = ctx.get_llvm_type(generator, lhs_dtype);
+            let lhs = NDArrayValue::from_pointer_value(
+                lhs_val.into_pointer_value(),
+                llvm_lhs_elem_ty,
+                llvm_usize,
+                None,
+            );
             let lhs_idx = call_ndarray_calc_broadcast_index(generator, ctx, lhs, idx);
 
             unsafe { lhs.data().get_unchecked(ctx, generator, &lhs_idx, None) }
@@ -522,7 +543,14 @@ where
         let rhs_elem = if rhs_scalar {
             rhs_val
         } else {
-            let rhs = NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
+            let rhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, rhs_ty);
+            let llvm_rhs_elem_ty = ctx.get_llvm_type(generator, rhs_dtype);
+            let rhs = NDArrayValue::from_pointer_value(
+                rhs_val.into_pointer_value(),
+                llvm_rhs_elem_ty,
+                llvm_usize,
+                None,
+            );
             let rhs_idx = call_ndarray_calc_broadcast_index(generator, ctx, rhs, idx);
 
             unsafe { rhs.data().get_unchecked(ctx, generator, &rhs_idx, None) }
@@ -626,7 +654,7 @@ fn call_ndarray_full_impl<'ctx, G: CodeGenerator + ?Sized>(
         } else if fill_value.is_int_value() || fill_value.is_float_value() {
             fill_value
         } else {
-            unreachable!()
+            codegen_unreachable!(ctx)
         };
 
         Ok(value)
@@ -648,11 +676,15 @@ fn llvm_ndlist_get_ndims<'ctx, G: CodeGenerator + ?Sized>(
 
     let ndims = llvm_usize.const_int(1, false);
     match list_elem_ty {
-        AnyTypeEnum::PointerType(ptr_ty) if ListType::is_type(ptr_ty, llvm_usize).is_ok() => {
+        AnyTypeEnum::PointerType(ptr_ty)
+            if ListType::is_representable(ptr_ty, llvm_usize).is_ok() =>
+        {
             ndims.const_add(llvm_ndlist_get_ndims(generator, ctx, ptr_ty))
         }
 
-        AnyTypeEnum::PointerType(ptr_ty) if NDArrayType::is_type(ptr_ty, llvm_usize).is_ok() => {
+        AnyTypeEnum::PointerType(ptr_ty)
+            if NDArrayType::is_representable(ptr_ty, llvm_usize).is_ok() =>
+        {
             todo!("Getting ndims for list[ndarray] not supported")
         }
 
@@ -664,16 +696,20 @@ fn llvm_ndlist_get_ndims<'ctx, G: CodeGenerator + ?Sized>(
 fn llvm_arraylike_get_ndims<'ctx, G: CodeGenerator + ?Sized>(
     generator: &mut G,
     ctx: &mut CodeGenContext<'ctx, '_>,
-    value: BasicValueEnum<'ctx>,
+    (ty, value): (Type, BasicValueEnum<'ctx>),
 ) -> IntValue<'ctx> {
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
     match value {
-        BasicValueEnum::PointerValue(v) if NDArrayValue::is_instance(v, llvm_usize).is_ok() => {
+        BasicValueEnum::PointerValue(v)
-            NDArrayValue::from_ptr_val(v, llvm_usize, None).load_ndims(ctx)
+            if NDArrayValue::is_representable(v, llvm_usize).is_ok() =>
+        {
+            let dtype = arraylike_flatten_element_type(&mut ctx.unifier, ty);
+            let llvm_elem_ty = ctx.get_llvm_type(generator, dtype);
+            NDArrayValue::from_pointer_value(v, llvm_elem_ty, llvm_usize, None).load_ndims(ctx)
         }
 
-        BasicValueEnum::PointerValue(v) if ListValue::is_instance(v, llvm_usize).is_ok() => {
+        BasicValueEnum::PointerValue(v) if ListValue::is_representable(v, llvm_usize).is_ok() => {
             llvm_ndlist_get_ndims(generator, ctx, v.get_type())
         }
 
@@ -685,7 +721,6 @@ fn llvm_arraylike_get_ndims<'ctx, G: CodeGenerator + ?Sized>(
 fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
     generator: &mut G,
     ctx: &mut CodeGenContext<'ctx, '_>,
-    elem_ty: Type,
     (dst_arr, dst_slice_ptr): (NDArrayValue<'ctx>, PointerValue<'ctx>),
     src_lst: ListValue<'ctx>,
     dim: u64,
@@ -696,13 +731,15 @@ fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
     let list_elem_ty = src_lst.get_type().element_type();
 
     match list_elem_ty {
-        AnyTypeEnum::PointerType(ptr_ty) if ListType::is_type(ptr_ty, llvm_usize).is_ok() => {
+        AnyTypeEnum::PointerType(ptr_ty)
+            if ListType::is_representable(ptr_ty, llvm_usize).is_ok() =>
+        {
             // The stride of elements in this dimension, i.e. the number of elements between arr[i]
             // and arr[i + 1] in this dimension
             let stride = call_ndarray_calc_size(
                 generator,
                 ctx,
-                &dst_arr.dim_sizes(),
+                &dst_arr.shape(),
                 (Some(llvm_usize.const_int(dim + 1, false)), None),
             );
 
@@ -716,11 +753,25 @@ fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
                 |_, _| Ok(llvm_usize.const_int(1, false)),
                 |generator, ctx, _, i| {
                     let offset = ctx.builder.build_int_mul(stride, i, "").unwrap();
+                    let offset = ctx
+                        .builder
+                        .build_int_mul(
+                            offset,
+                            ctx.builder
+                                .build_int_truncate_or_bit_cast(
+                                    dst_arr.get_type().element_type().size_of().unwrap(),
+                                    offset.get_type(),
+                                    "",
+                                )
+                                .unwrap(),
+                            "",
+                        )
+                        .unwrap();
 
                     let dst_ptr =
                         unsafe { ctx.builder.build_gep(dst_slice_ptr, &[offset], "").unwrap() };
 
-                    let nested_lst_elem = ListValue::from_ptr_val(
+                    let nested_lst_elem = ListValue::from_pointer_value(
                         unsafe { src_lst.data().get_unchecked(ctx, generator, &i, None) }
                             .into_pointer_value(),
                         llvm_usize,
@@ -730,7 +781,6 @@ fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
                     ndarray_from_ndlist_impl(
                         generator,
                         ctx,
-                        elem_ty,
                         (dst_arr, dst_ptr),
                         nested_lst_elem,
                         dim + 1,
@@ -741,13 +791,15 @@ fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
             )?;
         }
 
-        AnyTypeEnum::PointerType(ptr_ty) if NDArrayType::is_type(ptr_ty, llvm_usize).is_ok() => {
+        AnyTypeEnum::PointerType(ptr_ty)
+            if NDArrayType::is_representable(ptr_ty, llvm_usize).is_ok() =>
+        {
             todo!("Not implemented for list[ndarray]")
         }
 
         _ => {
             let lst_len = src_lst.load_size(ctx, None);
-            let sizeof_elem = ctx.get_llvm_type(generator, elem_ty).size_of().unwrap();
+            let sizeof_elem = dst_arr.get_type().element_type().size_of().unwrap();
             let sizeof_elem = ctx.builder.build_int_cast(sizeof_elem, llvm_usize, "").unwrap();
 
             let cpy_len = ctx
@@ -802,8 +854,9 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
     let object = object.into_pointer_value();
 
     // object is an NDArray instance - copy object unless copy=0 && ndmin < object.ndims
-    if NDArrayValue::is_instance(object, llvm_usize).is_ok() {
+    if NDArrayValue::is_representable(object, llvm_usize).is_ok() {
-        let object = NDArrayValue::from_ptr_val(object, llvm_usize, None);
+        let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+        let object = NDArrayValue::from_pointer_value(object, llvm_elem_ty, llvm_usize, None);
 
         let ndarray = gen_if_else_expr_callback(
             generator,
@@ -865,7 +918,6 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                 ndarray_sliced_copyto_impl(
                     generator,
                     ctx,
-                    elem_ty,
                     (ndarray, ndarray.data().base_ptr(ctx, generator)),
                     (object, object.data().base_ptr(ctx, generator)),
                     0,
@@ -877,16 +929,17 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
             |_, _| Ok(Some(object.as_base_value())),
         )?;
 
-        return Ok(NDArrayValue::from_ptr_val(
+        return Ok(NDArrayValue::from_pointer_value(
             ndarray.map(BasicValueEnum::into_pointer_value).unwrap(),
+            llvm_elem_ty,
             llvm_usize,
             None,
         ));
     }
 
     // Remaining case: TList
-    assert!(ListValue::is_instance(object, llvm_usize).is_ok());
+    assert!(ListValue::is_representable(object, llvm_usize).is_ok());
-    let object = ListValue::from_ptr_val(object, llvm_usize, None);
+    let object = ListValue::from_pointer_value(object, llvm_usize, None);
 
     // The number of dimensions to prepend 1's to
     let ndims = llvm_ndlist_get_ndims(generator, ctx, object.as_base_value().get_type());
@@ -941,7 +994,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                         .build_store(
                             lst,
                             ctx.builder
-                                .build_bitcast(object.as_base_value(), llvm_plist_i8, "")
+                                .build_bit_cast(object.as_base_value(), llvm_plist_i8, "")
                                 .unwrap(),
                         )
                         .unwrap();
@@ -963,10 +1016,11 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                                 .builder
                                 .build_load(lst, "")
                                 .map(BasicValueEnum::into_pointer_value)
-                                .map(|v| ctx.builder.build_bitcast(v, plist_plist_i8, "").unwrap())
+                                .map(|v| ctx.builder.build_bit_cast(v, plist_plist_i8, "").unwrap())
                                 .map(BasicValueEnum::into_pointer_value)
                                 .unwrap();
-                            let this_dim = ListValue::from_ptr_val(this_dim, llvm_usize, None);
+                            let this_dim =
+                                ListValue::from_pointer_value(this_dim, llvm_usize, None);
 
                             // TODO: Assert this_dim.sz != 0
 
@@ -982,7 +1036,9 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                             ctx.builder
                                 .build_store(
                                     lst,
-                                    ctx.builder.build_bitcast(next_dim, llvm_plist_i8, "").unwrap(),
+                                    ctx.builder
+                                        .build_bit_cast(next_dim, llvm_plist_i8, "")
+                                        .unwrap(),
                                 )
                                 .unwrap();
 
@@ -990,7 +1046,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                         },
                     )?;
 
-                    let lst = ListValue::from_ptr_val(
+                    let lst = ListValue::from_pointer_value(
                         ctx.builder
                             .build_load(lst, "")
                             .map(BasicValueEnum::into_pointer_value)
@@ -1010,7 +1066,6 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
     ndarray_from_ndlist_impl(
         generator,
         ctx,
-        elem_ty,
         (ndarray, ndarray.data().base_ptr(ctx, generator)),
         object,
         0,
@@ -1083,7 +1138,6 @@ fn call_ndarray_eye_impl<'ctx, G: CodeGenerator + ?Sized>(
 fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
     generator: &mut G,
     ctx: &mut CodeGenContext<'ctx, '_>,
-    elem_ty: Type,
     (dst_arr, dst_slice_ptr): (NDArrayValue<'ctx>, PointerValue<'ctx>),
     (src_arr, src_slice_ptr): (NDArrayValue<'ctx>, PointerValue<'ctx>),
     dim: u64,
@@ -1092,14 +1146,16 @@ fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
     let llvm_i1 = ctx.ctx.bool_type();
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
+    assert_eq!(dst_arr.get_type().element_type(), src_arr.get_type().element_type());
+
+    let sizeof_elem = dst_arr.get_type().element_type().size_of().unwrap();
+
     // If there are no (remaining) slice expressions, memcpy the entire dimension
     if slices.is_empty() {
-        let sizeof_elem = ctx.get_llvm_type(generator, elem_ty).size_of().unwrap();
-
         let stride = call_ndarray_calc_size(
             generator,
             ctx,
-            &src_arr.dim_sizes(),
+            &src_arr.shape(),
             (Some(llvm_usize.const_int(dim, false)), None),
         );
         let stride =
@@ -1117,13 +1173,13 @@ fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
     let src_stride = call_ndarray_calc_size(
         generator,
         ctx,
-        &src_arr.dim_sizes(),
+        &src_arr.shape(),
         (Some(llvm_usize.const_int(dim + 1, false)), None),
     );
     let dst_stride = call_ndarray_calc_size(
         generator,
         ctx,
-        &dst_arr.dim_sizes(),
+        &dst_arr.shape(),
         (Some(llvm_usize.const_int(dim + 1, false)), None),
     );
 
@@ -1146,9 +1202,29 @@ fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
         |generator, ctx, _, src_i| {
             // Calculate the offset of the active slice
             let src_data_offset = ctx.builder.build_int_mul(src_stride, src_i, "").unwrap();
+            let src_data_offset = ctx
+                .builder
+                .build_int_mul(
+                    src_data_offset,
+                    ctx.builder
+                        .build_int_cast(sizeof_elem, src_data_offset.get_type(), "")
+                        .unwrap(),
+                    "",
+                )
+                .unwrap();
             let dst_i =
                 ctx.builder.build_load(dst_i_addr, "").map(BasicValueEnum::into_int_value).unwrap();
             let dst_data_offset = ctx.builder.build_int_mul(dst_stride, dst_i, "").unwrap();
+            let dst_data_offset = ctx
+                .builder
+                .build_int_mul(
+                    dst_data_offset,
+                    ctx.builder
+                        .build_int_cast(sizeof_elem, dst_data_offset.get_type(), "")
+                        .unwrap(),
+                    "",
+                )
+                .unwrap();
 
             let (src_ptr, dst_ptr) = unsafe {
                 (
@@ -1160,7 +1236,6 @@ fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
             ndarray_sliced_copyto_impl(
                 generator,
                 ctx,
-                elem_ty,
                 (dst_arr, dst_ptr),
                 (src_arr, src_ptr),
                 dim + 1,
@@ -1203,7 +1278,7 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
             &this,
             |_, ctx, shape| Ok(shape.load_ndims(ctx)),
             |generator, ctx, shape, idx| unsafe {
-                Ok(shape.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
+                Ok(shape.shape().get_typed_unchecked(ctx, generator, &idx, None))
             },
         )?
     } else {
@@ -1211,7 +1286,7 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
         ndarray.store_ndims(ctx, generator, this.load_ndims(ctx));
 
         let ndims = this.load_ndims(ctx);
-        ndarray.create_dim_sizes(ctx, llvm_usize, ndims);
+        ndarray.create_shape(ctx, llvm_usize, ndims);
 
         // Populate the first slices.len() dimensions by computing the size of each dim slice
         for (i, (start, stop, step)) in slices.iter().enumerate() {
@@ -1243,7 +1318,7 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
                 ctx.builder.build_int_z_extend_or_bit_cast(slice_len, llvm_usize, "").unwrap();
 
             unsafe {
-                ndarray.dim_sizes().set_typed_unchecked(
+                ndarray.shape().set_typed_unchecked(
                     ctx,
                     generator,
                     &llvm_usize.const_int(i as u64, false),
@@ -1261,8 +1336,8 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
             (this.load_ndims(ctx), false),
             |generator, ctx, _, idx| {
                 unsafe {
-                    let dim_sz = this.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None);
+                    let dim_sz = this.shape().get_typed_unchecked(ctx, generator, &idx, None);
-                    ndarray.dim_sizes().set_typed_unchecked(ctx, generator, &idx, dim_sz);
+                    ndarray.shape().set_typed_unchecked(ctx, generator, &idx, dim_sz);
                 }
 
                 Ok(())
@@ -1277,7 +1352,6 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
     ndarray_sliced_copyto_impl(
         generator,
         ctx,
-        elem_ty,
         (ndarray, ndarray.data().base_ptr(ctx, generator)),
         (this, this.data().base_ptr(ctx, generator)),
         0,
@@ -1323,7 +1397,7 @@ where
             &operand,
             |_, ctx, v| Ok(v.load_ndims(ctx)),
             |generator, ctx, v, idx| unsafe {
-                Ok(v.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
+                Ok(v.shape().get_typed_unchecked(ctx, generator, &idx, None))
             },
         )
         .unwrap()
@@ -1360,8 +1434,8 @@ pub fn ndarray_elementwise_binop_impl<'ctx, 'a, G, ValueFn>(
     ctx: &mut CodeGenContext<'ctx, 'a>,
     elem_ty: Type,
     res: Option<NDArrayValue<'ctx>>,
-    lhs: (BasicValueEnum<'ctx>, bool),
+    lhs: (Type, BasicValueEnum<'ctx>, bool),
-    rhs: (BasicValueEnum<'ctx>, bool),
+    rhs: (Type, BasicValueEnum<'ctx>, bool),
     value_fn: ValueFn,
 ) -> Result<NDArrayValue<'ctx>, String>
 where
@@ -1374,8 +1448,8 @@ where
 {
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
-    let (lhs_val, lhs_scalar) = lhs;
+    let (lhs_ty, lhs_val, lhs_scalar) = lhs;
-    let (rhs_val, rhs_scalar) = rhs;
+    let (rhs_ty, rhs_val, rhs_scalar) = rhs;
 
     assert!(
         !(lhs_scalar && rhs_scalar),
@@ -1386,10 +1460,22 @@ where
 
     let ndarray = res.unwrap_or_else(|| {
         if lhs_scalar && rhs_scalar {
-            let lhs_val =
+            let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
-                NDArrayValue::from_ptr_val(lhs_val.into_pointer_value(), llvm_usize, None);
+            let llvm_lhs_elem_ty = ctx.get_llvm_type(generator, lhs_dtype);
-            let rhs_val =
+            let lhs_val = NDArrayValue::from_pointer_value(
-                NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
+                lhs_val.into_pointer_value(),
+                llvm_lhs_elem_ty,
+                llvm_usize,
+                None,
+            );
+            let rhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, rhs_ty);
+            let llvm_rhs_elem_ty = ctx.get_llvm_type(generator, rhs_dtype);
+            let rhs_val = NDArrayValue::from_pointer_value(
+                rhs_val.into_pointer_value(),
+                llvm_rhs_elem_ty,
+                llvm_usize,
+                None,
+            );
 
             let ndarray_dims = call_ndarray_calc_broadcast(generator, ctx, lhs_val, rhs_val);
 
@@ -1405,8 +1491,14 @@ where
             )
             .unwrap()
         } else {
-            let ndarray = NDArrayValue::from_ptr_val(
+            let dtype = arraylike_flatten_element_type(
+                &mut ctx.unifier,
+                if lhs_scalar { rhs_ty } else { lhs_ty },
+            );
+            let llvm_elem_ty = ctx.get_llvm_type(generator, dtype);
+            let ndarray = NDArrayValue::from_pointer_value(
                 if lhs_scalar { rhs_val } else { lhs_val }.into_pointer_value(),
+                llvm_elem_ty,
                 llvm_usize,
                 None,
             );
@@ -1418,7 +1510,7 @@ where
                 &ndarray,
                 |_, ctx, v| Ok(v.load_ndims(ctx)),
                 |generator, ctx, v, idx| unsafe {
-                    Ok(v.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
+                    Ok(v.shape().get_typed_unchecked(ctx, generator, &idx, None))
                 },
             )
             .unwrap()
@@ -1479,10 +1571,10 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
         if let Some(res) = res {
             let res_ndims = res.load_ndims(ctx);
             let res_dim0 = unsafe {
-                res.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                res.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
             };
             let res_dim1 = unsafe {
-                res.dim_sizes().get_typed_unchecked(
+                res.shape().get_typed_unchecked(
                     ctx,
                     generator,
                     &llvm_usize.const_int(1, false),
@@ -1490,10 +1582,10 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                 )
             };
             let lhs_dim0 = unsafe {
-                lhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                lhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
             };
             let rhs_dim1 = unsafe {
-                rhs.dim_sizes().get_typed_unchecked(
+                rhs.shape().get_typed_unchecked(
                     ctx,
                     generator,
                     &llvm_usize.const_int(1, false),
@@ -1542,15 +1634,10 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
 
     if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
         let lhs_dim1 = unsafe {
-            lhs.dim_sizes().get_typed_unchecked(
+            lhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
-                ctx,
-                generator,
-                &llvm_usize.const_int(1, false),
-                None,
-            )
         };
         let rhs_dim0 = unsafe {
-            rhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+            rhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
         };
 
         // lhs.dims[1] == rhs.dims[0]
@@ -1589,7 +1676,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                     },
                     |generator, ctx| {
                         Ok(Some(unsafe {
-                            lhs.dim_sizes().get_typed_unchecked(
+                            lhs.shape().get_typed_unchecked(
                                 ctx,
                                 generator,
                                 &llvm_usize.const_zero(),
@@ -1599,7 +1686,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                     },
                     |generator, ctx| {
                         Ok(Some(unsafe {
-                            rhs.dim_sizes().get_typed_unchecked(
+                            rhs.shape().get_typed_unchecked(
                                 ctx,
                                 generator,
                                 &llvm_usize.const_int(1, false),
@@ -1626,7 +1713,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
 
         let common_dim = {
             let lhs_idx1 = unsafe {
-                lhs.dim_sizes().get_typed_unchecked(
+                lhs.shape().get_typed_unchecked(
                     ctx,
                     generator,
                     &llvm_usize.const_int(1, false),
@@ -1634,7 +1721,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                 )
             };
             let rhs_idx0 = unsafe {
-                rhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                rhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
             };
 
             let idx = llvm_intrinsics::call_expect(ctx, rhs_idx0, lhs_idx1, None);
@@ -1965,11 +2052,18 @@ pub fn gen_ndarray_copy<'ctx>(
     let this_arg =
         obj.as_ref().unwrap().1.clone().to_basic_value_enum(context, generator, this_ty)?;
 
+    let llvm_elem_ty = context.get_llvm_type(generator, this_elem_ty);
+
     ndarray_copy_impl(
         generator,
         context,
         this_elem_ty,
-        NDArrayValue::from_ptr_val(this_arg.into_pointer_value(), llvm_usize, None),
+        NDArrayValue::from_pointer_value(
+            this_arg.into_pointer_value(),
+            llvm_elem_ty,
+            llvm_usize,
+            None,
+        ),
     )
     .map(NDArrayValue::into)
 }
@@ -1988,6 +2082,7 @@ pub fn gen_ndarray_fill<'ctx>(
     let llvm_usize = generator.get_size_type(context.ctx);
 
     let this_ty = obj.as_ref().unwrap().0;
+    let this_elem_ty = arraylike_flatten_element_type(&mut context.unifier, this_ty);
     let this_arg = obj
         .as_ref()
         .unwrap()
@@ -1998,10 +2093,12 @@ pub fn gen_ndarray_fill<'ctx>(
     let value_ty = fun.0.args[0].ty;
     let value_arg = args[0].1.clone().to_basic_value_enum(context, generator, value_ty)?;
 
+    let llvm_elem_ty = context.get_llvm_type(generator, this_elem_ty);
+
     ndarray_fill_flattened(
         generator,
         context,
-        NDArrayValue::from_ptr_val(this_arg, llvm_usize, None),
+        NDArrayValue::from_pointer_value(this_arg, llvm_elem_ty, llvm_usize, None),
         |generator, ctx, _| {
             let value = if value_arg.is_pointer_value() {
                 let llvm_i1 = ctx.ctx.bool_type();
@@ -2020,7 +2117,7 @@ pub fn gen_ndarray_fill<'ctx>(
             } else if value_arg.is_int_value() || value_arg.is_float_value() {
                 value_arg
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
 
             Ok(value)
@@ -2042,8 +2139,9 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
 
     if let BasicValueEnum::PointerValue(n1) = x1 {
         let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, x1_ty);
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
-        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, None));
+        let n1 = NDArrayValue::from_pointer_value(n1, llvm_elem_ty, llvm_usize, None);
+        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.shape(), (None, None));
 
         // Dimensions are reversed in the transposed array
         let out = create_ndarray_dyn_shape(
@@ -2058,7 +2156,7 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
                     .builder
                     .build_int_sub(new_idx, new_idx.get_type().const_int(1, false), "")
                     .unwrap();
-                unsafe { Ok(n.dim_sizes().get_typed_unchecked(ctx, generator, &new_idx, None)) }
+                unsafe { Ok(n.shape().get_typed_unchecked(ctx, generator, &new_idx, None)) }
             },
         )
         .unwrap();
@@ -2095,7 +2193,7 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
                             .build_int_sub(ndim_rev, llvm_usize.const_int(1, false), "")
                             .unwrap();
                         let dim = unsafe {
-                            n1.dim_sizes().get_typed_unchecked(ctx, generator, &ndim_rev, None)
+                            n1.shape().get_typed_unchecked(ctx, generator, &ndim_rev, None)
                         };
 
                         let rem_idx_val =
@@ -2129,7 +2227,8 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
 
         Ok(out.as_base_value().into())
     } else {
-        unreachable!(
+        codegen_unreachable!(
+            ctx,
             "{FN_NAME}() not supported for '{}'",
             format!("'{}'", ctx.unifier.stringify(x1_ty))
         )
@@ -2160,8 +2259,9 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
 
     if let BasicValueEnum::PointerValue(n1) = x1 {
         let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, x1_ty);
-        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+        let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
-        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, None));
+        let n1 = NDArrayValue::from_pointer_value(n1, llvm_elem_ty, llvm_usize, None);
+        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.shape(), (None, None));
 
         let acc = generator.gen_var_alloc(ctx, llvm_usize.into(), None)?;
         let num_neg = generator.gen_var_alloc(ctx, llvm_usize.into(), None)?;
@@ -2170,11 +2270,11 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
 
         let out = match shape {
             BasicValueEnum::PointerValue(shape_list_ptr)
-                if ListValue::is_instance(shape_list_ptr, llvm_usize).is_ok() =>
+                if ListValue::is_representable(shape_list_ptr, llvm_usize).is_ok() =>
             {
                 // 1. A list of ints; e.g., `np.reshape(arr, [int64(600), int64(800, -1])`
 
-                let shape_list = ListValue::from_ptr_val(shape_list_ptr, llvm_usize, None);
+                let shape_list = ListValue::from_pointer_value(shape_list_ptr, llvm_usize, None);
                 // Check for -1 in dimensions
                 gen_for_callback_incrementing(
                     generator,
@@ -2371,7 +2471,7 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
                 .into_int_value();
                 create_ndarray_const_shape(generator, ctx, elem_ty, &[shape_int])
             }
-            _ => unreachable!(),
+            _ => codegen_unreachable!(ctx),
         }
         .unwrap();
 
@@ -2389,7 +2489,7 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
         );
 
         // The new shape must be compatible with the old shape
-        let out_sz = call_ndarray_calc_size(generator, ctx, &out.dim_sizes(), (None, None));
+        let out_sz = call_ndarray_calc_size(generator, ctx, &out.shape(), (None, None));
         ctx.make_assert(
             generator,
             ctx.builder.build_int_compare(IntPredicate::EQ, out_sz, n_sz, "").unwrap(),
@@ -2415,7 +2515,8 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
 
         Ok(out.as_base_value().into())
     } else {
-        unreachable!(
+        codegen_unreachable!(
+            ctx,
             "{FN_NAME}() not supported for '{}'",
             format!("'{}'", ctx.unifier.stringify(x1_ty))
         )
@@ -2436,17 +2537,22 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
 ) -> Result<BasicValueEnum<'ctx>, String> {
     const FN_NAME: &str = "ndarray_dot";
     let (x1_ty, x1) = x1;
-    let (_, x2) = x2;
+    let (x2_ty, x2) = x2;
 
     let llvm_usize = generator.get_size_type(ctx.ctx);
 
     match (x1, x2) {
         (BasicValueEnum::PointerValue(n1), BasicValueEnum::PointerValue(n2)) => {
-            let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
+            let n1_dtype = arraylike_flatten_element_type(&mut ctx.unifier, x1_ty);
-            let n2 = NDArrayValue::from_ptr_val(n2, llvm_usize, None);
+            let n2_dtype = arraylike_flatten_element_type(&mut ctx.unifier, x2_ty);
+            let llvm_n1_data_ty = ctx.get_llvm_type(generator, n1_dtype);
+            let llvm_n2_data_ty = ctx.get_llvm_type(generator, n2_dtype);
 
-            let n1_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, None));
+            let n1 = NDArrayValue::from_pointer_value(n1, llvm_n1_data_ty, llvm_usize, None);
-            let n2_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, None));
+            let n2 = NDArrayValue::from_pointer_value(n2, llvm_n2_data_ty, llvm_usize, None);
+
+            let n1_sz = call_ndarray_calc_size(generator, ctx, &n1.shape(), (None, None));
+            let n2_sz = call_ndarray_calc_size(generator, ctx, &n1.shape(), (None, None));
 
             ctx.make_assert(
                 generator,
@@ -2483,7 +2589,7 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
                             .build_float_mul(e1, elem2.into_float_value(), "")
                             .unwrap()
                             .as_basic_value_enum(),
-                        _ => unreachable!(),
+                        _ => codegen_unreachable!(ctx, "product: {}", elem1.get_type()),
                     };
                     let acc_val = ctx.builder.build_load(acc, "").unwrap();
                     let acc_val = match acc_val {
@@ -2497,7 +2603,7 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
                             .build_float_add(e1, product.into_float_value(), "")
                             .unwrap()
                             .as_basic_value_enum(),
-                        _ => unreachable!(),
+                        _ => codegen_unreachable!(ctx, "acc_val: {}", acc_val.get_type()),
                     };
                     ctx.builder.build_store(acc, acc_val).unwrap();
 
@@ -2514,7 +2620,8 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
         (BasicValueEnum::FloatValue(e1), BasicValueEnum::FloatValue(e2)) => {
             Ok(ctx.builder.build_float_mul(e1, e2, "").unwrap().as_basic_value_enum())
         }
-        _ => unreachable!(
+        _ => codegen_unreachable!(
+            ctx,
             "{FN_NAME}() not supported for '{}'",
             format!("'{}'", ctx.unifier.stringify(x1_ty))
         ),

nac3core/src/codegen/stmt.rs

@@ -1,21 +1,3 @@
-use super::{
-    super::symbol_resolver::ValueEnum,
-    expr::destructure_range,
-    irrt::{handle_slice_indices, list_slice_assignment},
-    CodeGenContext, CodeGenerator,
-};
-use crate::{
-    codegen::{
-        classes::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
-        expr::gen_binop_expr,
-        gen_in_range_check,
-    },
-    toplevel::{DefinitionId, TopLevelDef},
-    typecheck::{
-        magic_methods::Binop,
-        typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
-    },
-};
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
     basic_block::BasicBlock,
@@ -24,10 +6,28 @@ use inkwell::{
     IntPredicate,
 };
 use itertools::{izip, Itertools};
+
 use nac3parser::ast::{
     Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
 };
 
+use super::{
+    expr::{destructure_range, gen_binop_expr},
+    gen_in_range_check,
+    irrt::{handle_slice_indices, list_slice_assignment},
+    macros::codegen_unreachable,
+    values::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
+    CodeGenContext, CodeGenerator,
+};
+use crate::{
+    symbol_resolver::ValueEnum,
+    toplevel::{DefinitionId, TopLevelDef},
+    typecheck::{
+        magic_methods::Binop,
+        typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
+    },
+};
+
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
     ctx: &mut CodeGenContext<'ctx, '_>,
@@ -121,7 +121,7 @@ pub fn gen_store_target<'ctx, G: CodeGenerator>(
                 return Ok(None);
             };
             let BasicValueEnum::PointerValue(ptr) = val else {
-                unreachable!();
+                codegen_unreachable!(ctx);
             };
             unsafe {
                 ctx.builder.build_in_bounds_gep(
@@ -135,7 +135,7 @@ pub fn gen_store_target<'ctx, G: CodeGenerator>(
             }
             .unwrap()
         }
-        _ => unreachable!(),
+        _ => codegen_unreachable!(ctx),
     }))
 }
 
@@ -176,6 +176,14 @@ pub fn gen_assign<'ctx, G: CodeGenerator>(
                 }
             }
             let val = value.to_basic_value_enum(ctx, generator, target.custom.unwrap())?;
+
+            // Perform i1 <-> i8 conversion as needed
+            let val = if ctx.unifier.unioned(target.custom.unwrap(), ctx.primitives.bool) {
+                generator.bool_to_i8(ctx, val.into_int_value()).into()
+            } else {
+                val
+            };
+
             ctx.builder.build_store(ptr, val).unwrap();
         }
     };
@@ -193,12 +201,12 @@ pub fn gen_assign_target_list<'ctx, G: CodeGenerator>(
     // Deconstruct the tuple `value`
     let BasicValueEnum::StructValue(tuple) = value.to_basic_value_enum(ctx, generator, value_ty)?
     else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     };
 
     // NOTE: Currently, RHS's type is forced to be a Tuple by the type inferencer.
     let TypeEnum::TTuple { ty: tuple_tys, .. } = &*ctx.unifier.get_ty(value_ty) else {
-        unreachable!();
+        codegen_unreachable!(ctx);
     };
 
     assert_eq!(tuple.get_type().count_fields() as usize, tuple_tys.len());
@@ -258,7 +266,7 @@ pub fn gen_assign_target_list<'ctx, G: CodeGenerator>(
             // Now assign with that sub-tuple to the starred target.
             generator.gen_assign(ctx, target, ValueEnum::Dynamic(sub_tuple_val), sub_tuple_ty)?;
         } else {
-            unreachable!() // The typechecker ensures this
+            codegen_unreachable!(ctx) // The typechecker ensures this
         }
 
         // Handle assignment after the starred target
@@ -302,11 +310,13 @@ pub fn gen_setitem<'ctx, G: CodeGenerator>(
                 .unwrap()
                 .to_basic_value_enum(ctx, generator, target_ty)?
                 .into_pointer_value();
-            let target = ListValue::from_ptr_val(target, llvm_usize, None);
+            let target = ListValue::from_pointer_value(target, llvm_usize, None);
 
             if let ExprKind::Slice { .. } = &key.node {
                 // Handle assigning to a slice
-                let ExprKind::Slice { lower, upper, step } = &key.node else { unreachable!() };
+                let ExprKind::Slice { lower, upper, step } = &key.node else {
+                    codegen_unreachable!(ctx)
+                };
                 let Some((start, end, step)) = handle_slice_indices(
                     lower,
                     upper,
@@ -321,7 +331,7 @@ pub fn gen_setitem<'ctx, G: CodeGenerator>(
 
                 let value =
                     value.to_basic_value_enum(ctx, generator, value_ty)?.into_pointer_value();
-                let value = ListValue::from_ptr_val(value, llvm_usize, None);
+                let value = ListValue::from_pointer_value(value, llvm_usize, None);
 
                 let target_item_ty = ctx.get_llvm_type(generator, target_item_ty);
                 let Some(src_ind) = handle_slice_indices(
@@ -416,7 +426,9 @@ pub fn gen_for<G: CodeGenerator>(
     ctx: &mut CodeGenContext<'_, '_>,
     stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::For { iter, target, body, orelse, .. } = &stmt.node else { unreachable!() };
+    let StmtKind::For { iter, target, body, orelse, .. } = &stmt.node else {
+        codegen_unreachable!(ctx)
+    };
 
     // var_assignment static values may be changed in another branch
     // if so, remove the static value as it may not be correct in this branch
@@ -451,14 +463,15 @@ pub fn gen_for<G: CodeGenerator>(
         TypeEnum::TObj { obj_id, .. }
             if *obj_id == ctx.primitives.range.obj_id(&ctx.unifier).unwrap() =>
         {
-            let iter_val = RangeValue::from_ptr_val(iter_val.into_pointer_value(), Some("range"));
+            let iter_val =
+                RangeValue::from_pointer_value(iter_val.into_pointer_value(), Some("range"));
             // Internal variable for loop; Cannot be assigned
             let i = generator.gen_var_alloc(ctx, int32.into(), Some("for.i.addr"))?;
             // Variable declared in "target" expression of the loop; Can be reassigned *or* shadowed
             let Some(target_i) =
                 generator.gen_store_target(ctx, target, Some("for.target.addr"))?
             else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
             let (start, stop, step) = destructure_range(ctx, iter_val);
 
@@ -901,7 +914,7 @@ pub fn gen_while<G: CodeGenerator>(
     ctx: &mut CodeGenContext<'_, '_>,
     stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::While { test, body, orelse, .. } = &stmt.node else { unreachable!() };
+    let StmtKind::While { test, body, orelse, .. } = &stmt.node else { codegen_unreachable!(ctx) };
 
     // var_assignment static values may be changed in another branch
     // if so, remove the static value as it may not be correct in this branch
@@ -931,7 +944,7 @@ pub fn gen_while<G: CodeGenerator>(
 
         return Ok(());
     };
-    let BasicValueEnum::IntValue(test) = test else { unreachable!() };
+    let BasicValueEnum::IntValue(test) = test else { codegen_unreachable!(ctx) };
 
     ctx.builder
         .build_conditional_branch(generator.bool_to_i1(ctx, test), body_bb, orelse_bb)
@@ -1079,7 +1092,7 @@ pub fn gen_if<G: CodeGenerator>(
     ctx: &mut CodeGenContext<'_, '_>,
     stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::If { test, body, orelse, .. } = &stmt.node else { unreachable!() };
+    let StmtKind::If { test, body, orelse, .. } = &stmt.node else { codegen_unreachable!(ctx) };
 
     // var_assignment static values may be changed in another branch
     // if so, remove the static value as it may not be correct in this branch
@@ -1202,11 +1215,11 @@ pub fn exn_constructor<'ctx>(
     let zelf_id = if let TypeEnum::TObj { obj_id, .. } = &*ctx.unifier.get_ty(zelf_ty) {
         obj_id.0
     } else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     };
     let defs = ctx.top_level.definitions.read();
     let def = defs[zelf_id].read();
-    let TopLevelDef::Class { name: zelf_name, .. } = &*def else { unreachable!() };
+    let TopLevelDef::Class { name: zelf_name, .. } = &*def else { codegen_unreachable!(ctx) };
     let exception_name = format!("{}:{}", ctx.resolver.get_exception_id(zelf_id), zelf_name);
     unsafe {
         let id_ptr = ctx.builder.build_in_bounds_gep(zelf, &[zero, zero], "exn.id").unwrap();
@@ -1314,7 +1327,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
     target: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
     let StmtKind::Try { body, handlers, orelse, finalbody, .. } = &target.node else {
-        unreachable!()
+        codegen_unreachable!(ctx)
     };
 
     // if we need to generate anything related to exception, we must have personality defined
@@ -1391,7 +1404,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
             if let TypeEnum::TObj { obj_id, .. } = &*ctx.unifier.get_ty(type_.custom.unwrap()) {
                 *obj_id
             } else {
-                unreachable!()
+                codegen_unreachable!(ctx)
             };
         let exception_name = format!("{}:{}", ctx.resolver.get_exception_id(obj_id.0), exn_name);
         let exn_id = ctx.resolver.get_string_id(&exception_name);
@@ -1663,6 +1676,23 @@ pub fn gen_return<G: CodeGenerator>(
     } else {
         None
     };
+
+    // Remap boolean return type into i1
+    let value = value.map(|ret_val| {
+        // The "return type" of a sret function is in the first parameter
+        let expected_ty = if ctx.need_sret {
+            func.get_type().get_param_types()[0]
+        } else {
+            func.get_type().get_return_type().unwrap()
+        };
+
+        if matches!(expected_ty, BasicTypeEnum::IntType(ty) if ty.get_bit_width() == 1) {
+            generator.bool_to_i1(ctx, ret_val.into_int_value()).into()
+        } else {
+            ret_val
+        }
+    });
+
     if let Some(return_target) = ctx.return_target {
         if let Some(value) = value {
             ctx.builder.build_store(ctx.return_buffer.unwrap(), value).unwrap();
@@ -1673,25 +1703,6 @@ pub fn gen_return<G: CodeGenerator>(
         ctx.builder.build_store(ctx.return_buffer.unwrap(), value.unwrap()).unwrap();
         ctx.builder.build_return(None).unwrap();
     } else {
-        // Remap boolean return type into i1
-        let value = value.map(|v| {
-            let expected_ty = func.get_type().get_return_type().unwrap();
-            let ret_val = v.as_basic_value_enum();
-
-            if expected_ty.is_int_type() && ret_val.is_int_value() {
-                let ret_type = expected_ty.into_int_type();
-                let ret_val = ret_val.into_int_value();
-
-                if ret_type.get_bit_width() == 1 && ret_val.get_type().get_bit_width() != 1 {
-                    generator.bool_to_i1(ctx, ret_val)
-                } else {
-                    ret_val
-                }
-                .into()
-            } else {
-                ret_val
-            }
-        });
         let value = value.as_ref().map(|v| v as &dyn BasicValue);
         ctx.builder.build_return(value).unwrap();
     }
@@ -1760,7 +1771,30 @@ pub fn gen_stmt<G: CodeGenerator>(
         StmtKind::Try { .. } => gen_try(generator, ctx, stmt)?,
         StmtKind::Raise { exc, .. } => {
             if let Some(exc) = exc {
-                let exc = if let Some(v) = generator.gen_expr(ctx, exc)? {
+                let exn = if let ExprKind::Name { id, .. } = &exc.node {
+                    // Handle "raise Exception" short form
+                    let def_id = ctx.resolver.get_identifier_def(*id).map_err(|e| {
+                        format!("{} (at {})", e.iter().next().unwrap(), exc.location)
+                    })?;
+                    let def = ctx.top_level.definitions.read();
+                    let TopLevelDef::Class { constructor, .. } = *def[def_id.0].read() else {
+                        return Err(format!("Failed to resolve symbol {id} (at {})", exc.location));
+                    };
+
+                    let TypeEnum::TFunc(signature) =
+                        ctx.unifier.get_ty(constructor.unwrap()).as_ref().clone()
+                    else {
+                        return Err(format!("Failed to resolve symbol {id} (at {})", exc.location));
+                    };
+
+                    generator
+                        .gen_call(ctx, None, (&signature, def_id), Vec::default())?
+                        .map(Into::into)
+                } else {
+                    generator.gen_expr(ctx, exc)?
+                };
+
+                let exc = if let Some(v) = exn {
                     v.to_basic_value_enum(ctx, generator, exc.custom.unwrap())?
                 } else {
                     return Ok(());
@@ -1795,6 +1829,37 @@ pub fn gen_stmt<G: CodeGenerator>(
                 stmt.location,
             );
         }
+        StmtKind::Global { names, .. } => {
+            let registered_globals = ctx
+                .top_level
+                .definitions
+                .read()
+                .iter()
+                .filter_map(|def| {
+                    if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
+                        Some((*simple_name, *ty))
+                    } else {
+                        None
+                    }
+                })
+                .collect_vec();
+
+            for id in names {
+                let Some((_, ty)) = registered_globals.iter().find(|(name, _)| name == id) else {
+                    return Err(format!("{id} is not a global at {}", stmt.location));
+                };
+
+                let resolver = ctx.resolver.clone();
+                let ptr = resolver
+                    .get_symbol_value(*id, ctx, generator)
+                    .map(|val| val.to_basic_value_enum(ctx, generator, *ty))
+                    .transpose()?
+                    .map(BasicValueEnum::into_pointer_value)
+                    .unwrap();
+
+                ctx.var_assignment.insert(*id, (ptr, None, 0));
+            }
+        }
         _ => unimplemented!(),
     };
     Ok(())

nac3core/src/codegen/test.rs

@@ -1,34 +1,37 @@
-use crate::{
+use std::{
-    codegen::{
+    collections::{HashMap, HashSet},
-        classes::{ListType, NDArrayType, ProxyType, RangeType},
+    sync::Arc,
-        concrete_type::ConcreteTypeStore,
-        CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask,
-        CodeGenerator, DefaultCodeGenerator, WithCall, WorkerRegistry,
-    },
-    symbol_resolver::{SymbolResolver, ValueEnum},
-    toplevel::{
-        composer::{ComposerConfig, TopLevelComposer},
-        DefinitionId, FunInstance, TopLevelContext, TopLevelDef,
-    },
-    typecheck::{
-        type_inferencer::{FunctionData, Inferencer, PrimitiveStore},
-        typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
-    },
 };
+
 use indexmap::IndexMap;
 use indoc::indoc;
 use inkwell::{
     targets::{InitializationConfig, Target},
     OptimizationLevel,
 };
-use nac3parser::ast::FileName;
 use nac3parser::{
-    ast::{fold::Fold, StrRef},
+    ast::{fold::Fold, FileName, StrRef},
     parser::parse_program,
 };
 use parking_lot::RwLock;
-use std::collections::{HashMap, HashSet};
+
-use std::sync::Arc;
+use super::{
+    concrete_type::ConcreteTypeStore,
+    types::{ListType, NDArrayType, ProxyType, RangeType},
+    CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask, CodeGenerator,
+    DefaultCodeGenerator, WithCall, WorkerRegistry,
+};
+use crate::{
+    symbol_resolver::{SymbolResolver, ValueEnum},
+    toplevel::{
+        composer::{ComposerConfig, TopLevelComposer},
+        DefinitionId, FunInstance, TopLevelContext, TopLevelDef,
+    },
+    typecheck::{
+        type_inferencer::{FunctionData, IdentifierInfo, Inferencer, PrimitiveStore},
+        typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
+    },
+};
 
 struct Resolver {
     id_to_type: HashMap<StrRef, Type>,
@@ -64,6 +67,7 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
+        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }
@@ -138,7 +142,8 @@ fn test_primitives() {
     };
     let mut virtual_checks = Vec::new();
     let mut calls = HashMap::new();
-    let mut identifiers: HashSet<_> = ["a".into(), "b".into()].into();
+    let mut identifiers: HashMap<_, _> =
+        ["a".into(), "b".into()].map(|id| (id, IdentifierInfo::default())).into();
     let mut inferencer = Inferencer {
         top_level: &top_level,
         function_data: &mut function_data,
@@ -317,7 +322,8 @@ fn test_simple_call() {
     };
     let mut virtual_checks = Vec::new();
     let mut calls = HashMap::new();
-    let mut identifiers: HashSet<_> = ["a".into(), "foo".into()].into();
+    let mut identifiers: HashMap<_, _> =
+        ["a".into(), "foo".into()].map(|id| (id, IdentifierInfo::default())).into();
     let mut inferencer = Inferencer {
         top_level: &top_level,
         function_data: &mut function_data,
@@ -446,7 +452,7 @@ fn test_classes_list_type_new() {
     let llvm_usize = generator.get_size_type(&ctx);
 
     let llvm_list = ListType::new(&generator, &ctx, llvm_i32.into());
-    assert!(ListType::is_type(llvm_list.as_base_type(), llvm_usize).is_ok());
+    assert!(ListType::is_representable(llvm_list.as_base_type(), llvm_usize).is_ok());
 }
 
 #[test]
@@ -454,7 +460,7 @@ fn test_classes_range_type_new() {
     let ctx = inkwell::context::Context::create();
 
     let llvm_range = RangeType::new(&ctx);
-    assert!(RangeType::is_type(llvm_range.as_base_type()).is_ok());
+    assert!(RangeType::is_representable(llvm_range.as_base_type()).is_ok());
 }
 
 #[test]
@@ -466,5 +472,5 @@ fn test_classes_ndarray_type_new() {
     let llvm_usize = generator.get_size_type(&ctx);
 
     let llvm_ndarray = NDArrayType::new(&generator, &ctx, llvm_i32.into());
-    assert!(NDArrayType::is_type(llvm_ndarray.as_base_type(), llvm_usize).is_ok());
+    assert!(NDArrayType::is_representable(llvm_ndarray.as_base_type(), llvm_usize).is_ok());
 }

nac3core/src/codegen/types/list.rs

@@ -0,0 +1,192 @@
+use inkwell::{
+    context::Context,
+    types::{AnyTypeEnum, BasicType, BasicTypeEnum, IntType, PointerType},
+    values::IntValue,
+    AddressSpace,
+};
+
+use super::ProxyType;
+use crate::codegen::{
+    values::{ArraySliceValue, ListValue, ProxyValue},
+    CodeGenContext, CodeGenerator,
+};
+
+/// Proxy type for a `list` type in LLVM.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub struct ListType<'ctx> {
+    ty: PointerType<'ctx>,
+    llvm_usize: IntType<'ctx>,
+}
+
+impl<'ctx> ListType<'ctx> {
+    /// Checks whether `llvm_ty` represents a `list` type, returning [Err] if it does not.
+    pub fn is_representable(
+        llvm_ty: PointerType<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> Result<(), String> {
+        let llvm_list_ty = llvm_ty.get_element_type();
+        let AnyTypeEnum::StructType(llvm_list_ty) = llvm_list_ty else {
+            return Err(format!("Expected struct type for `list` type, got {llvm_list_ty}"));
+        };
+        if llvm_list_ty.count_fields() != 2 {
+            return Err(format!(
+                "Expected 2 fields in `list`, got {}",
+                llvm_list_ty.count_fields()
+            ));
+        }
+
+        let list_size_ty = llvm_list_ty.get_field_type_at_index(0).unwrap();
+        let Ok(_) = PointerType::try_from(list_size_ty) else {
+            return Err(format!("Expected pointer type for `list.0`, got {list_size_ty}"));
+        };
+
+        let list_data_ty = llvm_list_ty.get_field_type_at_index(1).unwrap();
+        let Ok(list_data_ty) = IntType::try_from(list_data_ty) else {
+            return Err(format!("Expected int type for `list.1`, got {list_data_ty}"));
+        };
+        if list_data_ty.get_bit_width() != llvm_usize.get_bit_width() {
+            return Err(format!(
+                "Expected {}-bit int type for `list.1`, got {}-bit int",
+                llvm_usize.get_bit_width(),
+                list_data_ty.get_bit_width()
+            ));
+        }
+
+        Ok(())
+    }
+
+    /// Creates an LLVM type corresponding to the expected structure of a `List`.
+    #[must_use]
+    fn llvm_type(
+        ctx: &'ctx Context,
+        element_type: BasicTypeEnum<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> PointerType<'ctx> {
+        // struct List { data: T*, size: size_t }
+        let field_tys = [element_type.ptr_type(AddressSpace::default()).into(), llvm_usize.into()];
+
+        ctx.struct_type(&field_tys, false).ptr_type(AddressSpace::default())
+    }
+
+    /// Creates an instance of [`ListType`].
+    #[must_use]
+    pub fn new<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        element_type: BasicTypeEnum<'ctx>,
+    ) -> Self {
+        let llvm_usize = generator.get_size_type(ctx);
+        let llvm_list = Self::llvm_type(ctx, element_type, llvm_usize);
+
+        ListType::from_type(llvm_list, llvm_usize)
+    }
+
+    /// Creates an [`ListType`] from a [`PointerType`].
+    #[must_use]
+    pub fn from_type(ptr_ty: PointerType<'ctx>, llvm_usize: IntType<'ctx>) -> Self {
+        debug_assert!(Self::is_representable(ptr_ty, llvm_usize).is_ok());
+
+        ListType { ty: ptr_ty, llvm_usize }
+    }
+
+    /// Returns the type of the `size` field of this `list` type.
+    #[must_use]
+    pub fn size_type(&self) -> IntType<'ctx> {
+        self.as_base_type()
+            .get_element_type()
+            .into_struct_type()
+            .get_field_type_at_index(1)
+            .map(BasicTypeEnum::into_int_type)
+            .unwrap()
+    }
+
+    /// Returns the element type of this `list` type.
+    #[must_use]
+    pub fn element_type(&self) -> AnyTypeEnum<'ctx> {
+        self.as_base_type()
+            .get_element_type()
+            .into_struct_type()
+            .get_field_type_at_index(0)
+            .map(BasicTypeEnum::into_pointer_type)
+            .map(PointerType::get_element_type)
+            .unwrap()
+    }
+}
+
+impl<'ctx> ProxyType<'ctx> for ListType<'ctx> {
+    type Base = PointerType<'ctx>;
+    type Value = ListValue<'ctx>;
+
+    fn is_type<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: impl BasicType<'ctx>,
+    ) -> Result<(), String> {
+        if let BasicTypeEnum::PointerType(ty) = llvm_ty.as_basic_type_enum() {
+            <Self as ProxyType<'ctx>>::is_representable(generator, ctx, ty)
+        } else {
+            Err(format!("Expected pointer type, got {llvm_ty:?}"))
+        }
+    }
+
+    fn is_representable<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: Self::Base,
+    ) -> Result<(), String> {
+        Self::is_representable(llvm_ty, generator.get_size_type(ctx))
+    }
+
+    fn new_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        self.map_value(
+            generator
+                .gen_var_alloc(
+                    ctx,
+                    self.as_base_type().get_element_type().into_struct_type().into(),
+                    name,
+                )
+                .unwrap(),
+            name,
+        )
+    }
+
+    fn new_array_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        size: IntValue<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> ArraySliceValue<'ctx> {
+        generator
+            .gen_array_var_alloc(
+                ctx,
+                self.as_base_type().get_element_type().into_struct_type().into(),
+                size,
+                name,
+            )
+            .unwrap()
+    }
+
+    fn map_value(
+        &self,
+        value: <Self::Value as ProxyValue<'ctx>>::Base,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        Self::Value::from_pointer_value(value, self.llvm_usize, name)
+    }
+
+    fn as_base_type(&self) -> Self::Base {
+        self.ty
+    }
+}
+
+impl<'ctx> From<ListType<'ctx>> for PointerType<'ctx> {
+    fn from(value: ListType<'ctx>) -> Self {
+        value.as_base_type()
+    }
+}

nac3core/src/codegen/types/mod.rs

@@ -0,0 +1,64 @@
+use inkwell::{context::Context, types::BasicType, values::IntValue};
+
+use super::{
+    values::{ArraySliceValue, ProxyValue},
+    {CodeGenContext, CodeGenerator},
+};
+pub use list::*;
+pub use ndarray::*;
+pub use range::*;
+
+mod list;
+mod ndarray;
+mod range;
+pub mod structure;
+
+/// A LLVM type that is used to represent a corresponding type in NAC3.
+pub trait ProxyType<'ctx>: Into<Self::Base> {
+    /// The LLVM type of which values of this type possess. This is usually a
+    /// [LLVM pointer type][PointerType] for any non-primitive types.
+    type Base: BasicType<'ctx>;
+
+    /// The type of values represented by this type.
+    type Value: ProxyValue<'ctx, Type = Self>;
+
+    fn is_type<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: impl BasicType<'ctx>,
+    ) -> Result<(), String>;
+
+    /// Checks whether `llvm_ty` can be represented by this [`ProxyType`].
+    fn is_representable<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: Self::Base,
+    ) -> Result<(), String>;
+
+    /// Creates a new value of this type.
+    fn new_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        name: Option<&'ctx str>,
+    ) -> Self::Value;
+
+    /// Creates a new array value of this type.
+    fn new_array_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        size: IntValue<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> ArraySliceValue<'ctx>;
+
+    /// Converts an existing value into a [`ProxyValue`] of this type.
+    fn map_value(
+        &self,
+        value: <Self::Value as ProxyValue<'ctx>>::Base,
+        name: Option<&'ctx str>,
+    ) -> Self::Value;
+
+    /// Returns the [base type][Self::Base] of this proxy.
+    fn as_base_type(&self) -> Self::Base;
+}

nac3core/src/codegen/types/ndarray.rs

@@ -0,0 +1,258 @@
+use inkwell::{
+    context::Context,
+    types::{AnyTypeEnum, BasicType, BasicTypeEnum, IntType, PointerType},
+    values::{IntValue, PointerValue},
+    AddressSpace,
+};
+use itertools::Itertools;
+
+use nac3core_derive::StructFields;
+
+use super::{
+    structure::{StructField, StructFields},
+    ProxyType,
+};
+use crate::codegen::{
+    values::{ArraySliceValue, NDArrayValue, ProxyValue},
+    {CodeGenContext, CodeGenerator},
+};
+
+/// Proxy type for a `ndarray` type in LLVM.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub struct NDArrayType<'ctx> {
+    ty: PointerType<'ctx>,
+    dtype: BasicTypeEnum<'ctx>,
+    llvm_usize: IntType<'ctx>,
+}
+
+#[derive(PartialEq, Eq, Clone, Copy, StructFields)]
+pub struct NDArrayStructFields<'ctx> {
+    #[value_type(usize)]
+    pub ndims: StructField<'ctx, IntValue<'ctx>>,
+    #[value_type(usize.ptr_type(AddressSpace::default()))]
+    pub shape: StructField<'ctx, PointerValue<'ctx>>,
+    #[value_type(i8_type().ptr_type(AddressSpace::default()))]
+    pub data: StructField<'ctx, PointerValue<'ctx>>,
+}
+
+impl<'ctx> NDArrayType<'ctx> {
+    /// Checks whether `llvm_ty` represents a `ndarray` type, returning [Err] if it does not.
+    pub fn is_representable(
+        llvm_ty: PointerType<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> Result<(), String> {
+        let llvm_ndarray_ty = llvm_ty.get_element_type();
+        let AnyTypeEnum::StructType(llvm_ndarray_ty) = llvm_ndarray_ty else {
+            return Err(format!("Expected struct type for `NDArray` type, got {llvm_ndarray_ty}"));
+        };
+        if llvm_ndarray_ty.count_fields() != 3 {
+            return Err(format!(
+                "Expected 3 fields in `NDArray`, got {}",
+                llvm_ndarray_ty.count_fields()
+            ));
+        }
+
+        let ndarray_ndims_ty = llvm_ndarray_ty.get_field_type_at_index(0).unwrap();
+        let Ok(ndarray_ndims_ty) = IntType::try_from(ndarray_ndims_ty) else {
+            return Err(format!("Expected int type for `ndarray.0`, got {ndarray_ndims_ty}"));
+        };
+        if ndarray_ndims_ty.get_bit_width() != llvm_usize.get_bit_width() {
+            return Err(format!(
+                "Expected {}-bit int type for `ndarray.0`, got {}-bit int",
+                llvm_usize.get_bit_width(),
+                ndarray_ndims_ty.get_bit_width()
+            ));
+        }
+
+        let ndarray_dims_ty = llvm_ndarray_ty.get_field_type_at_index(1).unwrap();
+        let Ok(ndarray_pdims) = PointerType::try_from(ndarray_dims_ty) else {
+            return Err(format!("Expected pointer type for `ndarray.1`, got {ndarray_dims_ty}"));
+        };
+        let ndarray_dims = ndarray_pdims.get_element_type();
+        let Ok(ndarray_dims) = IntType::try_from(ndarray_dims) else {
+            return Err(format!(
+                "Expected pointer-to-int type for `ndarray.1`, got pointer-to-{ndarray_dims}"
+            ));
+        };
+        if ndarray_dims.get_bit_width() != llvm_usize.get_bit_width() {
+            return Err(format!(
+                "Expected pointer-to-{}-bit int type for `ndarray.1`, got pointer-to-{}-bit int",
+                llvm_usize.get_bit_width(),
+                ndarray_dims.get_bit_width()
+            ));
+        }
+
+        let ndarray_data_ty = llvm_ndarray_ty.get_field_type_at_index(2).unwrap();
+        let Ok(ndarray_pdata) = PointerType::try_from(ndarray_data_ty) else {
+            return Err(format!("Expected pointer type for `ndarray.2`, got {ndarray_data_ty}"));
+        };
+        let ndarray_data = ndarray_pdata.get_element_type();
+        let Ok(ndarray_data) = IntType::try_from(ndarray_data) else {
+            return Err(format!(
+                "Expected pointer-to-int type for `ndarray.2`, got pointer-to-{ndarray_data}"
+            ));
+        };
+        if ndarray_data.get_bit_width() != 8 {
+            return Err(format!(
+                "Expected pointer-to-8-bit int type for `ndarray.1`, got pointer-to-{}-bit int",
+                ndarray_data.get_bit_width()
+            ));
+        }
+
+        Ok(())
+    }
+
+    // TODO: Move this into e.g. StructProxyType
+    #[must_use]
+    fn fields(ctx: &'ctx Context, llvm_usize: IntType<'ctx>) -> NDArrayStructFields<'ctx> {
+        NDArrayStructFields::new(ctx, llvm_usize)
+    }
+
+    // TODO: Move this into e.g. StructProxyType
+    #[must_use]
+    pub fn get_fields(
+        &self,
+        ctx: &'ctx Context,
+        llvm_usize: IntType<'ctx>,
+    ) -> NDArrayStructFields<'ctx> {
+        Self::fields(ctx, llvm_usize)
+    }
+
+    /// Creates an LLVM type corresponding to the expected structure of an `NDArray`.
+    #[must_use]
+    fn llvm_type(ctx: &'ctx Context, llvm_usize: IntType<'ctx>) -> PointerType<'ctx> {
+        // struct NDArray { num_dims: size_t, dims: size_t*, data: i8* }
+        //
+        // * data    : Pointer to an array containing the array data
+        // * itemsize: The size of each NDArray elements in bytes
+        // * ndims   : Number of dimensions in the array
+        // * shape   : Pointer to an array containing the shape of the NDArray
+        // * strides : Pointer to an array indicating the number of bytes between each element at a dimension
+        let field_tys =
+            Self::fields(ctx, llvm_usize).into_iter().map(|field| field.1).collect_vec();
+
+        ctx.struct_type(&field_tys, false).ptr_type(AddressSpace::default())
+    }
+
+    /// Creates an instance of [`NDArrayType`].
+    #[must_use]
+    pub fn new<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        dtype: BasicTypeEnum<'ctx>,
+    ) -> Self {
+        let llvm_usize = generator.get_size_type(ctx);
+        let llvm_ndarray = Self::llvm_type(ctx, llvm_usize);
+
+        NDArrayType { ty: llvm_ndarray, dtype, llvm_usize }
+    }
+
+    /// Creates an [`NDArrayType`] from a [`PointerType`] representing an `NDArray`.
+    #[must_use]
+    pub fn from_type(
+        ptr_ty: PointerType<'ctx>,
+        dtype: BasicTypeEnum<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> Self {
+        debug_assert!(Self::is_representable(ptr_ty, llvm_usize).is_ok());
+
+        NDArrayType { ty: ptr_ty, dtype, llvm_usize }
+    }
+
+    /// Returns the type of the `size` field of this `ndarray` type.
+    #[must_use]
+    pub fn size_type(&self) -> IntType<'ctx> {
+        self.as_base_type()
+            .get_element_type()
+            .into_struct_type()
+            .get_field_type_at_index(0)
+            .map(BasicTypeEnum::into_int_type)
+            .unwrap()
+    }
+
+    /// Returns the element type of this `ndarray` type.
+    #[must_use]
+    pub fn element_type(&self) -> BasicTypeEnum<'ctx> {
+        self.dtype
+    }
+}
+
+impl<'ctx> ProxyType<'ctx> for NDArrayType<'ctx> {
+    type Base = PointerType<'ctx>;
+    type Value = NDArrayValue<'ctx>;
+
+    fn is_type<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: impl BasicType<'ctx>,
+    ) -> Result<(), String> {
+        if let BasicTypeEnum::PointerType(ty) = llvm_ty.as_basic_type_enum() {
+            <Self as ProxyType<'ctx>>::is_representable(generator, ctx, ty)
+        } else {
+            Err(format!("Expected pointer type, got {llvm_ty:?}"))
+        }
+    }
+
+    fn is_representable<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: Self::Base,
+    ) -> Result<(), String> {
+        Self::is_representable(llvm_ty, generator.get_size_type(ctx))
+    }
+
+    fn new_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        self.map_value(
+            generator
+                .gen_var_alloc(
+                    ctx,
+                    self.as_base_type().get_element_type().into_struct_type().into(),
+                    name,
+                )
+                .unwrap(),
+            name,
+        )
+    }
+
+    fn new_array_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        size: IntValue<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> ArraySliceValue<'ctx> {
+        generator
+            .gen_array_var_alloc(
+                ctx,
+                self.as_base_type().get_element_type().into_struct_type().into(),
+                size,
+                name,
+            )
+            .unwrap()
+    }
+
+    fn map_value(
+        &self,
+        value: <Self::Value as ProxyValue<'ctx>>::Base,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        debug_assert_eq!(value.get_type(), self.as_base_type());
+
+        NDArrayValue::from_pointer_value(value, self.dtype, self.llvm_usize, name)
+    }
+
+    fn as_base_type(&self) -> Self::Base {
+        self.ty
+    }
+}
+
+impl<'ctx> From<NDArrayType<'ctx>> for PointerType<'ctx> {
+    fn from(value: NDArrayType<'ctx>) -> Self {
+        value.as_base_type()
+    }
+}

nac3core/src/codegen/types/range.rs

@@ -0,0 +1,159 @@
+use inkwell::{
+    context::Context,
+    types::{AnyTypeEnum, BasicType, BasicTypeEnum, IntType, PointerType},
+    values::IntValue,
+    AddressSpace,
+};
+
+use super::ProxyType;
+use crate::codegen::{
+    values::{ArraySliceValue, ProxyValue, RangeValue},
+    {CodeGenContext, CodeGenerator},
+};
+
+/// Proxy type for a `range` type in LLVM.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub struct RangeType<'ctx> {
+    ty: PointerType<'ctx>,
+}
+
+impl<'ctx> RangeType<'ctx> {
+    /// Checks whether `llvm_ty` represents a `range` type, returning [Err] if it does not.
+    pub fn is_representable(llvm_ty: PointerType<'ctx>) -> Result<(), String> {
+        let llvm_range_ty = llvm_ty.get_element_type();
+        let AnyTypeEnum::ArrayType(llvm_range_ty) = llvm_range_ty else {
+            return Err(format!("Expected array type for `range` type, got {llvm_range_ty}"));
+        };
+        if llvm_range_ty.len() != 3 {
+            return Err(format!(
+                "Expected 3 elements for `range` type, got {}",
+                llvm_range_ty.len()
+            ));
+        }
+
+        let llvm_range_elem_ty = llvm_range_ty.get_element_type();
+        let Ok(llvm_range_elem_ty) = IntType::try_from(llvm_range_elem_ty) else {
+            return Err(format!(
+                "Expected int type for `range` element type, got {llvm_range_elem_ty}"
+            ));
+        };
+        if llvm_range_elem_ty.get_bit_width() != 32 {
+            return Err(format!(
+                "Expected 32-bit int type for `range` element type, got {}",
+                llvm_range_elem_ty.get_bit_width()
+            ));
+        }
+
+        Ok(())
+    }
+
+    /// Creates an LLVM type corresponding to the expected structure of a `Range`.
+    #[must_use]
+    fn llvm_type(ctx: &'ctx Context) -> PointerType<'ctx> {
+        // typedef int32_t Range[3];
+        let llvm_i32 = ctx.i32_type();
+        llvm_i32.array_type(3).ptr_type(AddressSpace::default())
+    }
+
+    /// Creates an instance of [`RangeType`].
+    #[must_use]
+    pub fn new(ctx: &'ctx Context) -> Self {
+        let llvm_range = Self::llvm_type(ctx);
+
+        RangeType::from_type(llvm_range)
+    }
+
+    /// Creates an [`RangeType`] from a [`PointerType`].
+    #[must_use]
+    pub fn from_type(ptr_ty: PointerType<'ctx>) -> Self {
+        debug_assert!(Self::is_representable(ptr_ty).is_ok());
+
+        RangeType { ty: ptr_ty }
+    }
+
+    /// Returns the type of all fields of this `range` type.
+    #[must_use]
+    pub fn value_type(&self) -> IntType<'ctx> {
+        self.as_base_type().get_element_type().into_array_type().get_element_type().into_int_type()
+    }
+}
+
+impl<'ctx> ProxyType<'ctx> for RangeType<'ctx> {
+    type Base = PointerType<'ctx>;
+    type Value = RangeValue<'ctx>;
+
+    fn is_type<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        llvm_ty: impl BasicType<'ctx>,
+    ) -> Result<(), String> {
+        if let BasicTypeEnum::PointerType(ty) = llvm_ty.as_basic_type_enum() {
+            <Self as ProxyType<'ctx>>::is_representable(generator, ctx, ty)
+        } else {
+            Err(format!("Expected pointer type, got {llvm_ty:?}"))
+        }
+    }
+
+    fn is_representable<G: CodeGenerator + ?Sized>(
+        _: &G,
+        _: &'ctx Context,
+        llvm_ty: Self::Base,
+    ) -> Result<(), String> {
+        Self::is_representable(llvm_ty)
+    }
+
+    fn new_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        self.map_value(
+            generator
+                .gen_var_alloc(
+                    ctx,
+                    self.as_base_type().get_element_type().into_struct_type().into(),
+                    name,
+                )
+                .unwrap(),
+            name,
+        )
+    }
+
+    fn new_array_value<G: CodeGenerator + ?Sized>(
+        &self,
+        generator: &mut G,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        size: IntValue<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> ArraySliceValue<'ctx> {
+        generator
+            .gen_array_var_alloc(
+                ctx,
+                self.as_base_type().get_element_type().into_struct_type().into(),
+                size,
+                name,
+            )
+            .unwrap()
+    }
+
+    fn map_value(
+        &self,
+        value: <Self::Value as ProxyValue<'ctx>>::Base,
+        name: Option<&'ctx str>,
+    ) -> Self::Value {
+        debug_assert_eq!(value.get_type(), self.as_base_type());
+
+        RangeValue::from_pointer_value(value, name)
+    }
+
+    fn as_base_type(&self) -> Self::Base {
+        self.ty
+    }
+}
+
+impl<'ctx> From<RangeType<'ctx>> for PointerType<'ctx> {
+    fn from(value: RangeType<'ctx>) -> Self {
+        value.as_base_type()
+    }
+}

nac3core/src/codegen/types/structure.rs

@@ -0,0 +1,203 @@
+use std::marker::PhantomData;
+
+use inkwell::{
+    context::AsContextRef,
+    types::{BasicTypeEnum, IntType},
+    values::{BasicValue, BasicValueEnum, IntValue, PointerValue, StructValue},
+};
+
+use crate::codegen::CodeGenContext;
+
+/// Trait indicating that the structure is a field-wise representation of an LLVM structure.
+///
+/// # Usage
+///
+/// For example, for a simple C-slice LLVM structure:
+///
+/// ```ignore
+/// struct CSliceFields<'ctx> {
+///     ptr: StructField<'ctx, PointerValue<'ctx>>,
+///     len: StructField<'ctx, IntValue<'ctx>>
+/// }
+/// ```
+pub trait StructFields<'ctx>: Eq + Copy {
+    /// Creates an instance of [`StructFields`] using the given `ctx` and `size_t` types.
+    fn new(ctx: impl AsContextRef<'ctx>, llvm_usize: IntType<'ctx>) -> Self;
+
+    /// Returns a [`Vec`] that contains the fields of the structure in the order as they appear in
+    /// the type definition.
+    #[must_use]
+    fn to_vec(&self) -> Vec<(&'static str, BasicTypeEnum<'ctx>)>;
+
+    /// Returns a [`Iterator`] that contains the fields of the structure in the order as they appear
+    /// in the type definition.
+    #[must_use]
+    fn iter(&self) -> impl Iterator<Item = (&'static str, BasicTypeEnum<'ctx>)> {
+        self.to_vec().into_iter()
+    }
+
+    /// Returns a [`Vec`] that contains the fields of the structure in the order as they appear in
+    /// the type definition.
+    #[must_use]
+    fn into_vec(self) -> Vec<(&'static str, BasicTypeEnum<'ctx>)>
+    where
+        Self: Sized,
+    {
+        self.to_vec()
+    }
+
+    /// Returns a [`Iterator`] that contains the fields of the structure in the order as they appear
+    /// in the type definition.
+    #[must_use]
+    fn into_iter(self) -> impl Iterator<Item = (&'static str, BasicTypeEnum<'ctx>)>
+    where
+        Self: Sized,
+    {
+        self.into_vec().into_iter()
+    }
+}
+
+/// A single field of an LLVM structure.
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub struct StructField<'ctx, Value>
+where
+    Value: BasicValue<'ctx> + TryFrom<BasicValueEnum<'ctx>, Error = ()>,
+{
+    /// The index of this field within the structure.
+    index: u32,
+
+    /// The name of this field.
+    name: &'static str,
+
+    /// The type of this field.
+    ty: BasicTypeEnum<'ctx>,
+
+    /// Instance of [`PhantomData`] containing [`Value`], used to implement automatic downcasts.
+    _value_ty: PhantomData<Value>,
+}
+
+impl<'ctx, Value> StructField<'ctx, Value>
+where
+    Value: BasicValue<'ctx> + TryFrom<BasicValueEnum<'ctx>, Error = ()>,
+{
+    /// Creates an instance of [`StructField`].
+    ///
+    /// * `idx_counter` - The instance of [`FieldIndexCounter`] used to track the current field
+    ///   index.
+    /// * `name` - Name of the field.
+    /// * `ty` - The type of this field.
+    pub fn create(
+        idx_counter: &mut FieldIndexCounter,
+        name: &'static str,
+        ty: impl Into<BasicTypeEnum<'ctx>>,
+    ) -> Self {
+        StructField { index: idx_counter.increment(), name, ty: ty.into(), _value_ty: PhantomData }
+    }
+
+    /// Creates an instance of [`StructField`] with a given index.
+    ///
+    /// * `index` - The index of this field within its enclosing structure.
+    /// * `name` - Name of the field.
+    /// * `ty` - The type of this field.
+    pub fn create_at(index: u32, name: &'static str, ty: impl Into<BasicTypeEnum<'ctx>>) -> Self {
+        StructField { index, name, ty: ty.into(), _value_ty: PhantomData }
+    }
+
+    /// Creates a pointer to this field in an arbitrary structure by performing a `getelementptr i32
+    /// {idx...}, i32 {self.index}`.
+    pub fn ptr_by_array_gep(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        pobj: PointerValue<'ctx>,
+        idx: &[IntValue<'ctx>],
+    ) -> PointerValue<'ctx> {
+        unsafe {
+            ctx.builder.build_in_bounds_gep(
+                pobj,
+                &[idx, &[ctx.ctx.i32_type().const_int(u64::from(self.index), false)]].concat(),
+                "",
+            )
+        }
+        .unwrap()
+    }
+
+    /// Creates a pointer to this field in an arbitrary structure by performing the equivalent of
+    /// `getelementptr i32 0, i32 {self.index}`.
+    pub fn ptr_by_gep(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        pobj: PointerValue<'ctx>,
+        obj_name: Option<&'ctx str>,
+    ) -> PointerValue<'ctx> {
+        ctx.builder
+            .build_struct_gep(
+                pobj,
+                self.index,
+                &obj_name.map(|name| format!("{name}.{}.addr", self.name)).unwrap_or_default(),
+            )
+            .unwrap()
+    }
+
+    /// Gets the value of this field for a given `obj`.
+    #[must_use]
+    pub fn get_from_value(&self, obj: StructValue<'ctx>) -> Value {
+        obj.get_field_at_index(self.index).and_then(|value| Value::try_from(value).ok()).unwrap()
+    }
+
+    /// Sets the value of this field for a given `obj`.
+    pub fn set_from_value(&self, obj: StructValue<'ctx>, value: Value) {
+        obj.set_field_at_index(self.index, value);
+    }
+
+    /// Gets the value of this field for a pointer-to-structure.
+    pub fn get(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        pobj: PointerValue<'ctx>,
+        obj_name: Option<&'ctx str>,
+    ) -> Value {
+        ctx.builder
+            .build_load(
+                self.ptr_by_gep(ctx, pobj, obj_name),
+                &obj_name.map(|name| format!("{name}.{}", self.name)).unwrap_or_default(),
+            )
+            .map_err(|_| ())
+            .and_then(|value| Value::try_from(value))
+            .unwrap()
+    }
+
+    /// Sets the value of this field for a pointer-to-structure.
+    pub fn set(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        pobj: PointerValue<'ctx>,
+        value: Value,
+        obj_name: Option<&'ctx str>,
+    ) {
+        ctx.builder.build_store(self.ptr_by_gep(ctx, pobj, obj_name), value).unwrap();
+    }
+}
+
+impl<'ctx, Value> From<StructField<'ctx, Value>> for (&'static str, BasicTypeEnum<'ctx>)
+where
+    Value: BasicValue<'ctx> + TryFrom<BasicValueEnum<'ctx>, Error = ()>,
+{
+    fn from(value: StructField<'ctx, Value>) -> Self {
+        (value.name, value.ty)
+    }
+}
+
+/// A counter that tracks the next index of a field using a monotonically increasing counter.
+#[derive(Default, Debug, PartialEq, Eq, Clone, Copy)]
+pub struct FieldIndexCounter(u32);
+
+impl FieldIndexCounter {
+    /// Increments the number stored by this counter, returning the previous value.
+    ///
+    /// Functionally equivalent to `i++` in C-based languages.
+    pub fn increment(&mut self) -> u32 {
+        let v = self.0;
+        self.0 += 1;
+        v
+    }
+}

nac3core/src/codegen/values/array.rs

@@ -0,0 +1,426 @@
+use inkwell::{
+    types::AnyTypeEnum,
+    values::{BasicValueEnum, IntValue, PointerValue},
+    IntPredicate,
+};
+
+use crate::codegen::{CodeGenContext, CodeGenerator};
+
+/// An LLVM value that is array-like, i.e. it contains a contiguous, sequenced collection of
+/// elements.
+pub trait ArrayLikeValue<'ctx> {
+    /// Returns the element type of this array-like value.
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> AnyTypeEnum<'ctx>;
+
+    /// Returns the base pointer to the array.
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> PointerValue<'ctx>;
+
+    /// Returns the size of this array-like value.
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> IntValue<'ctx>;
+
+    /// Returns a [`ArraySliceValue`] representing this value.
+    fn as_slice_value<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> ArraySliceValue<'ctx> {
+        ArraySliceValue::from_ptr_val(
+            self.base_ptr(ctx, generator),
+            self.size(ctx, generator),
+            None,
+        )
+    }
+}
+
+/// An array-like value that can be indexed by memory offset.
+pub trait ArrayLikeIndexer<'ctx, Index = IntValue<'ctx>>: ArrayLikeValue<'ctx> {
+    /// # Safety
+    ///
+    /// This function should be called with a valid index.
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx>;
+
+    /// Returns the pointer to the data at the `idx`-th index.
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx>;
+}
+
+/// An array-like value that can have its array elements accessed as a [`BasicValueEnum`].
+pub trait UntypedArrayLikeAccessor<'ctx, Index = IntValue<'ctx>>:
+    ArrayLikeIndexer<'ctx, Index>
+{
+    /// # Safety
+    ///
+    /// This function should be called with a valid index.
+    unsafe fn get_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> BasicValueEnum<'ctx> {
+        let ptr = unsafe { self.ptr_offset_unchecked(ctx, generator, idx, name) };
+        ctx.builder.build_load(ptr, name.unwrap_or_default()).unwrap()
+    }
+
+    /// Returns the data at the `idx`-th index.
+    fn get<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> BasicValueEnum<'ctx> {
+        let ptr = self.ptr_offset(ctx, generator, idx, name);
+        ctx.builder.build_load(ptr, name.unwrap_or_default()).unwrap()
+    }
+}
+
+/// An array-like value that can have its array elements mutated as a [`BasicValueEnum`].
+pub trait UntypedArrayLikeMutator<'ctx, Index = IntValue<'ctx>>:
+    ArrayLikeIndexer<'ctx, Index>
+{
+    /// # Safety
+    ///
+    /// This function should be called with a valid index.
+    unsafe fn set_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        value: BasicValueEnum<'ctx>,
+    ) {
+        let ptr = unsafe { self.ptr_offset_unchecked(ctx, generator, idx, None) };
+        ctx.builder.build_store(ptr, value).unwrap();
+    }
+
+    /// Sets the data at the `idx`-th index.
+    fn set<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        value: BasicValueEnum<'ctx>,
+    ) {
+        let ptr = self.ptr_offset(ctx, generator, idx, None);
+        ctx.builder.build_store(ptr, value).unwrap();
+    }
+}
+
+/// An array-like value that can have its array elements accessed as an arbitrary type `T`.
+pub trait TypedArrayLikeAccessor<'ctx, T, Index = IntValue<'ctx>>:
+    UntypedArrayLikeAccessor<'ctx, Index>
+{
+    /// Casts an element from [`BasicValueEnum`] into `T`.
+    fn downcast_to_type(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        value: BasicValueEnum<'ctx>,
+    ) -> T;
+
+    /// # Safety
+    ///
+    /// This function should be called with a valid index.
+    unsafe fn get_typed_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> T {
+        let value = unsafe { self.get_unchecked(ctx, generator, idx, name) };
+        self.downcast_to_type(ctx, value)
+    }
+
+    /// Returns the data at the `idx`-th index.
+    fn get_typed<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> T {
+        let value = self.get(ctx, generator, idx, name);
+        self.downcast_to_type(ctx, value)
+    }
+}
+
+/// An array-like value that can have its array elements mutated as an arbitrary type `T`.
+pub trait TypedArrayLikeMutator<'ctx, T, Index = IntValue<'ctx>>:
+    UntypedArrayLikeMutator<'ctx, Index>
+{
+    /// Casts an element from T into [`BasicValueEnum`].
+    fn upcast_from_type(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        value: T,
+    ) -> BasicValueEnum<'ctx>;
+
+    /// # Safety
+    ///
+    /// This function should be called with a valid index.
+    unsafe fn set_typed_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        value: T,
+    ) {
+        let value = self.upcast_from_type(ctx, value);
+        unsafe { self.set_unchecked(ctx, generator, idx, value) }
+    }
+
+    /// Sets the data at the `idx`-th index.
+    fn set_typed<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        value: T,
+    ) {
+        let value = self.upcast_from_type(ctx, value);
+        self.set(ctx, generator, idx, value);
+    }
+}
+
+/// Type alias for a function that casts a [`BasicValueEnum`] into a `T`.
+type ValueDowncastFn<'ctx, T> =
+    Box<dyn Fn(&mut CodeGenContext<'ctx, '_>, BasicValueEnum<'ctx>) -> T>;
+/// Type alias for a function that casts a `T` into a [`BasicValueEnum`].
+type ValueUpcastFn<'ctx, T> = Box<dyn Fn(&mut CodeGenContext<'ctx, '_>, T) -> BasicValueEnum<'ctx>>;
+
+/// An adapter for constraining untyped array values as typed values.
+pub struct TypedArrayLikeAdapter<'ctx, T, Adapted: ArrayLikeValue<'ctx> = ArraySliceValue<'ctx>> {
+    adapted: Adapted,
+    downcast_fn: ValueDowncastFn<'ctx, T>,
+    upcast_fn: ValueUpcastFn<'ctx, T>,
+}
+
+impl<'ctx, T, Adapted> TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: ArrayLikeValue<'ctx>,
+{
+    /// Creates a [`TypedArrayLikeAdapter`].
+    ///
+    /// * `adapted` - The value to be adapted.
+    /// * `downcast_fn` - The function converting a [`BasicValueEnum`] into a `T`.
+    /// * `upcast_fn` - The function converting a T into a [`BasicValueEnum`].
+    pub fn from(
+        adapted: Adapted,
+        downcast_fn: ValueDowncastFn<'ctx, T>,
+        upcast_fn: ValueUpcastFn<'ctx, T>,
+    ) -> Self {
+        TypedArrayLikeAdapter { adapted, downcast_fn, upcast_fn }
+    }
+}
+
+impl<'ctx, T, Adapted> ArrayLikeValue<'ctx> for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: ArrayLikeValue<'ctx>,
+{
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> AnyTypeEnum<'ctx> {
+        self.adapted.element_type(ctx, generator)
+    }
+
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> PointerValue<'ctx> {
+        self.adapted.base_ptr(ctx, generator)
+    }
+
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> IntValue<'ctx> {
+        self.adapted.size(ctx, generator)
+    }
+}
+
+impl<'ctx, T, Index, Adapted> ArrayLikeIndexer<'ctx, Index>
+    for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: ArrayLikeIndexer<'ctx, Index>,
+{
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        unsafe { self.adapted.ptr_offset_unchecked(ctx, generator, idx, name) }
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        self.adapted.ptr_offset(ctx, generator, idx, name)
+    }
+}
+
+impl<'ctx, T, Index, Adapted> UntypedArrayLikeAccessor<'ctx, Index>
+    for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: UntypedArrayLikeAccessor<'ctx, Index>,
+{
+}
+impl<'ctx, T, Index, Adapted> UntypedArrayLikeMutator<'ctx, Index>
+    for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: UntypedArrayLikeMutator<'ctx, Index>,
+{
+}
+
+impl<'ctx, T, Index, Adapted> TypedArrayLikeAccessor<'ctx, T, Index>
+    for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: UntypedArrayLikeAccessor<'ctx, Index>,
+{
+    fn downcast_to_type(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        value: BasicValueEnum<'ctx>,
+    ) -> T {
+        (self.downcast_fn)(ctx, value)
+    }
+}
+
+impl<'ctx, T, Index, Adapted> TypedArrayLikeMutator<'ctx, T, Index>
+    for TypedArrayLikeAdapter<'ctx, T, Adapted>
+where
+    Adapted: UntypedArrayLikeMutator<'ctx, Index>,
+{
+    fn upcast_from_type(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        value: T,
+    ) -> BasicValueEnum<'ctx> {
+        (self.upcast_fn)(ctx, value)
+    }
+}
+
+/// An LLVM value representing an array slice, consisting of a pointer to the data and the size of
+/// the slice.
+#[derive(Copy, Clone)]
+pub struct ArraySliceValue<'ctx>(PointerValue<'ctx>, IntValue<'ctx>, Option<&'ctx str>);
+
+impl<'ctx> ArraySliceValue<'ctx> {
+    /// Creates an [`ArraySliceValue`] from a [`PointerValue`] and its size.
+    #[must_use]
+    pub fn from_ptr_val(
+        ptr: PointerValue<'ctx>,
+        size: IntValue<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> Self {
+        ArraySliceValue(ptr, size, name)
+    }
+}
+
+impl<'ctx> From<ArraySliceValue<'ctx>> for PointerValue<'ctx> {
+    fn from(value: ArraySliceValue<'ctx>) -> Self {
+        value.0
+    }
+}
+
+impl<'ctx> ArrayLikeValue<'ctx> for ArraySliceValue<'ctx> {
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        _: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> AnyTypeEnum<'ctx> {
+        self.0.get_type().get_element_type()
+    }
+
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        _: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> PointerValue<'ctx> {
+        self.0
+    }
+
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        _: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> IntValue<'ctx> {
+        self.1
+    }
+}
+
+impl<'ctx> ArrayLikeIndexer<'ctx> for ArraySliceValue<'ctx> {
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let var_name = name.map(|v| format!("{v}.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(self.base_ptr(ctx, generator), &[*idx], var_name.as_str())
+                .unwrap()
+        }
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        debug_assert_eq!(idx.get_type(), generator.get_size_type(ctx.ctx));
+
+        let size = self.size(ctx, generator);
+        let in_range = ctx.builder.build_int_compare(IntPredicate::ULT, *idx, size, "").unwrap();
+        ctx.make_assert(
+            generator,
+            in_range,
+            "0:IndexError",
+            "list index out of range",
+            [None, None, None],
+            ctx.current_loc,
+        );
+
+        unsafe { self.ptr_offset_unchecked(ctx, generator, idx, name) }
+    }
+}
+
+impl<'ctx> UntypedArrayLikeAccessor<'ctx> for ArraySliceValue<'ctx> {}
+impl<'ctx> UntypedArrayLikeMutator<'ctx> for ArraySliceValue<'ctx> {}

nac3core/src/codegen/values/list.rs

@@ -0,0 +1,241 @@
+use inkwell::{
+    types::{AnyTypeEnum, BasicType, BasicTypeEnum, IntType},
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate,
+};
+
+use super::{
+    ArrayLikeIndexer, ArrayLikeValue, ProxyValue, UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+};
+use crate::codegen::{
+    types::ListType,
+    {CodeGenContext, CodeGenerator},
+};
+
+/// Proxy type for accessing a `list` value in LLVM.
+#[derive(Copy, Clone)]
+pub struct ListValue<'ctx> {
+    value: PointerValue<'ctx>,
+    llvm_usize: IntType<'ctx>,
+    name: Option<&'ctx str>,
+}
+
+impl<'ctx> ListValue<'ctx> {
+    /// Checks whether `value` is an instance of `list`, returning [Err] if `value` is not an
+    /// instance.
+    pub fn is_representable(
+        value: PointerValue<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> Result<(), String> {
+        ListType::is_representable(value.get_type(), llvm_usize)
+    }
+
+    /// Creates an [`ListValue`] from a [`PointerValue`].
+    #[must_use]
+    pub fn from_pointer_value(
+        ptr: PointerValue<'ctx>,
+        llvm_usize: IntType<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> Self {
+        debug_assert!(Self::is_representable(ptr, llvm_usize).is_ok());
+
+        ListValue { value: ptr, llvm_usize, name }
+    }
+
+    /// Returns the double-indirection pointer to the `data` array, as if by calling `getelementptr`
+    /// on the field.
+    fn pptr_to_data(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        let llvm_i32 = ctx.ctx.i32_type();
+        let var_name = self.name.map(|v| format!("{v}.data.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.as_base_value(),
+                    &[llvm_i32.const_zero(), llvm_i32.const_zero()],
+                    var_name.as_str(),
+                )
+                .unwrap()
+        }
+    }
+
+    /// Returns the pointer to the field storing the size of this `list`.
+    fn ptr_to_size(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        let llvm_i32 = ctx.ctx.i32_type();
+        let var_name = self.name.map(|v| format!("{v}.size.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.as_base_value(),
+                    &[llvm_i32.const_zero(), llvm_i32.const_int(1, true)],
+                    var_name.as_str(),
+                )
+                .unwrap()
+        }
+    }
+
+    /// Stores the array of data elements `data` into this instance.
+    fn store_data(&self, ctx: &CodeGenContext<'ctx, '_>, data: PointerValue<'ctx>) {
+        ctx.builder.build_store(self.pptr_to_data(ctx), data).unwrap();
+    }
+
+    /// Convenience method for creating a new array storing data elements with the given element
+    /// type `elem_ty` and `size`.
+    ///
+    /// If `size` is [None], the size stored in the field of this instance is used instead.
+    pub fn create_data(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        elem_ty: BasicTypeEnum<'ctx>,
+        size: Option<IntValue<'ctx>>,
+    ) {
+        let size = size.unwrap_or_else(|| self.load_size(ctx, None));
+
+        let data = ctx
+            .builder
+            .build_select(
+                ctx.builder
+                    .build_int_compare(IntPredicate::NE, size, self.llvm_usize.const_zero(), "")
+                    .unwrap(),
+                ctx.builder.build_array_alloca(elem_ty, size, "").unwrap(),
+                elem_ty.ptr_type(AddressSpace::default()).const_zero(),
+                "",
+            )
+            .map(BasicValueEnum::into_pointer_value)
+            .unwrap();
+        self.store_data(ctx, data);
+    }
+
+    /// Returns the double-indirection pointer to the `data` array, as if by calling `getelementptr`
+    /// on the field.
+    #[must_use]
+    pub fn data(&self) -> ListDataProxy<'ctx, '_> {
+        ListDataProxy(self)
+    }
+
+    /// Stores the `size` of this `list` into this instance.
+    pub fn store_size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+        size: IntValue<'ctx>,
+    ) {
+        debug_assert_eq!(size.get_type(), generator.get_size_type(ctx.ctx));
+
+        let psize = self.ptr_to_size(ctx);
+        ctx.builder.build_store(psize, size).unwrap();
+    }
+
+    /// Returns the size of this `list` as a value.
+    pub fn load_size(&self, ctx: &CodeGenContext<'ctx, '_>, name: Option<&str>) -> IntValue<'ctx> {
+        let psize = self.ptr_to_size(ctx);
+        let var_name = name
+            .map(ToString::to_string)
+            .or_else(|| self.name.map(|v| format!("{v}.size")))
+            .unwrap_or_default();
+
+        ctx.builder
+            .build_load(psize, var_name.as_str())
+            .map(BasicValueEnum::into_int_value)
+            .unwrap()
+    }
+}
+
+impl<'ctx> ProxyValue<'ctx> for ListValue<'ctx> {
+    type Base = PointerValue<'ctx>;
+    type Type = ListType<'ctx>;
+
+    fn get_type(&self) -> Self::Type {
+        ListType::from_type(self.as_base_value().get_type(), self.llvm_usize)
+    }
+
+    fn as_base_value(&self) -> Self::Base {
+        self.value
+    }
+}
+
+impl<'ctx> From<ListValue<'ctx>> for PointerValue<'ctx> {
+    fn from(value: ListValue<'ctx>) -> Self {
+        value.as_base_value()
+    }
+}
+
+/// Proxy type for accessing the `data` array of an `list` instance in LLVM.
+#[derive(Copy, Clone)]
+pub struct ListDataProxy<'ctx, 'a>(&'a ListValue<'ctx>);
+
+impl<'ctx> ArrayLikeValue<'ctx> for ListDataProxy<'ctx, '_> {
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        _: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> AnyTypeEnum<'ctx> {
+        self.0.value.get_type().get_element_type()
+    }
+
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> PointerValue<'ctx> {
+        let var_name = self.0.name.map(|v| format!("{v}.data")).unwrap_or_default();
+
+        ctx.builder
+            .build_load(self.0.pptr_to_data(ctx), var_name.as_str())
+            .map(BasicValueEnum::into_pointer_value)
+            .unwrap()
+    }
+
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> IntValue<'ctx> {
+        self.0.load_size(ctx, None)
+    }
+}
+
+impl<'ctx> ArrayLikeIndexer<'ctx> for ListDataProxy<'ctx, '_> {
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let var_name = name.map(|v| format!("{v}.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(self.base_ptr(ctx, generator), &[*idx], var_name.as_str())
+                .unwrap()
+        }
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        debug_assert_eq!(idx.get_type(), generator.get_size_type(ctx.ctx));
+
+        let size = self.size(ctx, generator);
+        let in_range = ctx.builder.build_int_compare(IntPredicate::ULT, *idx, size, "").unwrap();
+        ctx.make_assert(
+            generator,
+            in_range,
+            "0:IndexError",
+            "list index out of range",
+            [None, None, None],
+            ctx.current_loc,
+        );
+
+        unsafe { self.ptr_offset_unchecked(ctx, generator, idx, name) }
+    }
+}
+
+impl<'ctx> UntypedArrayLikeAccessor<'ctx> for ListDataProxy<'ctx, '_> {}
+impl<'ctx> UntypedArrayLikeMutator<'ctx> for ListDataProxy<'ctx, '_> {}

nac3core/src/codegen/values/mod.rs

@@ -0,0 +1,47 @@
+use inkwell::{context::Context, values::BasicValue};
+
+use super::types::ProxyType;
+use crate::codegen::CodeGenerator;
+pub use array::*;
+pub use list::*;
+pub use ndarray::*;
+pub use range::*;
+
+mod array;
+mod list;
+mod ndarray;
+mod range;
+
+/// A LLVM type that is used to represent a non-primitive value in NAC3.
+pub trait ProxyValue<'ctx>: Into<Self::Base> {
+    /// The type of LLVM values represented by this instance. This is usually the
+    /// [LLVM pointer type][PointerValue].
+    type Base: BasicValue<'ctx>;
+
+    /// The type of this value.
+    type Type: ProxyType<'ctx, Value = Self>;
+
+    /// Checks whether `value` can be represented by this [`ProxyValue`].
+    fn is_instance<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        value: impl BasicValue<'ctx>,
+    ) -> Result<(), String> {
+        Self::Type::is_type(generator, ctx, value.as_basic_value_enum().get_type())
+    }
+
+    /// Checks whether `value` can be represented by this [`ProxyValue`].
+    fn is_representable<G: CodeGenerator + ?Sized>(
+        generator: &G,
+        ctx: &'ctx Context,
+        value: Self::Base,
+    ) -> Result<(), String> {
+        Self::is_instance(generator, ctx, value.as_basic_value_enum())
+    }
+
+    /// Returns the [type][ProxyType] of this value.
+    fn get_type(&self) -> Self::Type;
+
+    /// Returns the [base value][Self::Base] of this proxy.
+    fn as_base_value(&self) -> Self::Base;
+}

nac3core/src/codegen/values/ndarray.rs

@@ -0,0 +1,523 @@
+use inkwell::{
+    types::{AnyType, AnyTypeEnum, BasicType, BasicTypeEnum, IntType},
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate,
+};
+
+use super::{
+    ArrayLikeIndexer, ArrayLikeValue, ProxyValue, TypedArrayLikeAccessor, TypedArrayLikeMutator,
+    UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
+};
+use crate::codegen::{
+    irrt::{call_ndarray_calc_size, call_ndarray_flatten_index},
+    llvm_intrinsics::call_int_umin,
+    stmt::gen_for_callback_incrementing,
+    types::NDArrayType,
+    CodeGenContext, CodeGenerator,
+};
+
+/// Proxy type for accessing an `NDArray` value in LLVM.
+#[derive(Copy, Clone)]
+pub struct NDArrayValue<'ctx> {
+    value: PointerValue<'ctx>,
+    dtype: BasicTypeEnum<'ctx>,
+    llvm_usize: IntType<'ctx>,
+    name: Option<&'ctx str>,
+}
+
+impl<'ctx> NDArrayValue<'ctx> {
+    /// Checks whether `value` is an instance of `NDArray`, returning [Err] if `value` is not an
+    /// instance.
+    pub fn is_representable(
+        value: PointerValue<'ctx>,
+        llvm_usize: IntType<'ctx>,
+    ) -> Result<(), String> {
+        NDArrayType::is_representable(value.get_type(), llvm_usize)
+    }
+
+    /// Creates an [`NDArrayValue`] from a [`PointerValue`].
+    #[must_use]
+    pub fn from_pointer_value(
+        ptr: PointerValue<'ctx>,
+        dtype: BasicTypeEnum<'ctx>,
+        llvm_usize: IntType<'ctx>,
+        name: Option<&'ctx str>,
+    ) -> Self {
+        debug_assert!(Self::is_representable(ptr, llvm_usize).is_ok());
+
+        NDArrayValue { value: ptr, dtype, llvm_usize, name }
+    }
+
+    /// Returns the pointer to the field storing the number of dimensions of this `NDArray`.
+    fn ptr_to_ndims(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        self.get_type()
+            .get_fields(ctx.ctx, self.llvm_usize)
+            .ndims
+            .ptr_by_gep(ctx, self.value, self.name)
+    }
+
+    /// Stores the number of dimensions `ndims` into this instance.
+    pub fn store_ndims<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+        ndims: IntValue<'ctx>,
+    ) {
+        debug_assert_eq!(ndims.get_type(), generator.get_size_type(ctx.ctx));
+
+        let pndims = self.ptr_to_ndims(ctx);
+        ctx.builder.build_store(pndims, ndims).unwrap();
+    }
+
+    /// Returns the number of dimensions of this `NDArray` as a value.
+    pub fn load_ndims(&self, ctx: &CodeGenContext<'ctx, '_>) -> IntValue<'ctx> {
+        let pndims = self.ptr_to_ndims(ctx);
+        ctx.builder.build_load(pndims, "").map(BasicValueEnum::into_int_value).unwrap()
+    }
+
+    /// Returns the double-indirection pointer to the `shape` array, as if by calling
+    /// `getelementptr` on the field.
+    fn ptr_to_shape(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        self.get_type()
+            .get_fields(ctx.ctx, self.llvm_usize)
+            .shape
+            .ptr_by_gep(ctx, self.value, self.name)
+    }
+
+    /// Stores the array of dimension sizes `dims` into this instance.
+    fn store_shape(&self, ctx: &CodeGenContext<'ctx, '_>, dims: PointerValue<'ctx>) {
+        ctx.builder.build_store(self.ptr_to_shape(ctx), dims).unwrap();
+    }
+
+    /// Convenience method for creating a new array storing dimension sizes with the given `size`.
+    pub fn create_shape(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        llvm_usize: IntType<'ctx>,
+        size: IntValue<'ctx>,
+    ) {
+        self.store_shape(ctx, ctx.builder.build_array_alloca(llvm_usize, size, "").unwrap());
+    }
+
+    /// Returns a proxy object to the field storing the size of each dimension of this `NDArray`.
+    #[must_use]
+    pub fn shape(&self) -> NDArrayShapeProxy<'ctx, '_> {
+        NDArrayShapeProxy(self)
+    }
+
+    /// Returns the double-indirection pointer to the `data` array, as if by calling `getelementptr`
+    /// on the field.
+    pub fn ptr_to_data(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        self.get_type()
+            .get_fields(ctx.ctx, self.llvm_usize)
+            .data
+            .ptr_by_gep(ctx, self.value, self.name)
+    }
+
+    /// Stores the array of data elements `data` into this instance.
+    fn store_data(&self, ctx: &CodeGenContext<'ctx, '_>, data: PointerValue<'ctx>) {
+        let data = ctx
+            .builder
+            .build_bit_cast(data, ctx.ctx.i8_type().ptr_type(AddressSpace::default()), "")
+            .unwrap();
+        ctx.builder.build_store(self.ptr_to_data(ctx), data).unwrap();
+    }
+
+    /// Convenience method for creating a new array storing data elements with the given element
+    /// type `elem_ty` and `size`.
+    pub fn create_data(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        elem_ty: BasicTypeEnum<'ctx>,
+        size: IntValue<'ctx>,
+    ) {
+        let itemsize =
+            ctx.builder.build_int_cast(elem_ty.size_of().unwrap(), size.get_type(), "").unwrap();
+        let nbytes = ctx.builder.build_int_mul(size, itemsize, "").unwrap();
+
+        // TODO: What about alignment?
+        self.store_data(
+            ctx,
+            ctx.builder.build_array_alloca(ctx.ctx.i8_type(), nbytes, "").unwrap(),
+        );
+    }
+
+    /// Returns a proxy object to the field storing the data of this `NDArray`.
+    #[must_use]
+    pub fn data(&self) -> NDArrayDataProxy<'ctx, '_> {
+        NDArrayDataProxy(self)
+    }
+}
+
+impl<'ctx> ProxyValue<'ctx> for NDArrayValue<'ctx> {
+    type Base = PointerValue<'ctx>;
+    type Type = NDArrayType<'ctx>;
+
+    fn get_type(&self) -> Self::Type {
+        NDArrayType::from_type(self.as_base_value().get_type(), self.dtype, self.llvm_usize)
+    }
+
+    fn as_base_value(&self) -> Self::Base {
+        self.value
+    }
+}
+
+impl<'ctx> From<NDArrayValue<'ctx>> for PointerValue<'ctx> {
+    fn from(value: NDArrayValue<'ctx>) -> Self {
+        value.as_base_value()
+    }
+}
+
+/// Proxy type for accessing the `dims` array of an `NDArray` instance in LLVM.
+#[derive(Copy, Clone)]
+pub struct NDArrayShapeProxy<'ctx, 'a>(&'a NDArrayValue<'ctx>);
+
+impl<'ctx> ArrayLikeValue<'ctx> for NDArrayShapeProxy<'ctx, '_> {
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> AnyTypeEnum<'ctx> {
+        self.0.shape().base_ptr(ctx, generator).get_type().get_element_type()
+    }
+
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> PointerValue<'ctx> {
+        let var_name = self.0.name.map(|v| format!("{v}.data")).unwrap_or_default();
+
+        ctx.builder
+            .build_load(self.0.ptr_to_shape(ctx), var_name.as_str())
+            .map(BasicValueEnum::into_pointer_value)
+            .unwrap()
+    }
+
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> IntValue<'ctx> {
+        self.0.load_ndims(ctx)
+    }
+}
+
+impl<'ctx> ArrayLikeIndexer<'ctx, IntValue<'ctx>> for NDArrayShapeProxy<'ctx, '_> {
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let var_name = name.map(|v| format!("{v}.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(self.base_ptr(ctx, generator), &[*idx], var_name.as_str())
+                .unwrap()
+        }
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let size = self.size(ctx, generator);
+        let in_range = ctx.builder.build_int_compare(IntPredicate::ULT, *idx, size, "").unwrap();
+        ctx.make_assert(
+            generator,
+            in_range,
+            "0:IndexError",
+            "index {0} is out of bounds for axis 0 with size {1}",
+            [Some(*idx), Some(self.0.load_ndims(ctx)), None],
+            ctx.current_loc,
+        );
+
+        unsafe { self.ptr_offset_unchecked(ctx, generator, idx, name) }
+    }
+}
+
+impl<'ctx> UntypedArrayLikeAccessor<'ctx, IntValue<'ctx>> for NDArrayShapeProxy<'ctx, '_> {}
+impl<'ctx> UntypedArrayLikeMutator<'ctx, IntValue<'ctx>> for NDArrayShapeProxy<'ctx, '_> {}
+
+impl<'ctx> TypedArrayLikeAccessor<'ctx, IntValue<'ctx>> for NDArrayShapeProxy<'ctx, '_> {
+    fn downcast_to_type(
+        &self,
+        _: &mut CodeGenContext<'ctx, '_>,
+        value: BasicValueEnum<'ctx>,
+    ) -> IntValue<'ctx> {
+        value.into_int_value()
+    }
+}
+
+impl<'ctx> TypedArrayLikeMutator<'ctx, IntValue<'ctx>> for NDArrayShapeProxy<'ctx, '_> {
+    fn upcast_from_type(
+        &self,
+        _: &mut CodeGenContext<'ctx, '_>,
+        value: IntValue<'ctx>,
+    ) -> BasicValueEnum<'ctx> {
+        value.into()
+    }
+}
+
+/// Proxy type for accessing the `data` array of an `NDArray` instance in LLVM.
+#[derive(Copy, Clone)]
+pub struct NDArrayDataProxy<'ctx, 'a>(&'a NDArrayValue<'ctx>);
+
+impl<'ctx> ArrayLikeValue<'ctx> for NDArrayDataProxy<'ctx, '_> {
+    fn element_type<G: CodeGenerator + ?Sized>(
+        &self,
+        _: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> AnyTypeEnum<'ctx> {
+        self.0.dtype.as_any_type_enum()
+    }
+
+    fn base_ptr<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        _: &G,
+    ) -> PointerValue<'ctx> {
+        let var_name = self.0.name.map(|v| format!("{v}.data")).unwrap_or_default();
+
+        ctx.builder
+            .build_load(self.0.ptr_to_data(ctx), var_name.as_str())
+            .map(BasicValueEnum::into_pointer_value)
+            .unwrap()
+    }
+
+    fn size<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &CodeGenContext<'ctx, '_>,
+        generator: &G,
+    ) -> IntValue<'ctx> {
+        call_ndarray_calc_size(generator, ctx, &self.as_slice_value(ctx, generator), (None, None))
+    }
+}
+
+impl<'ctx> ArrayLikeIndexer<'ctx> for NDArrayDataProxy<'ctx, '_> {
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let sizeof_elem = ctx
+            .builder
+            .build_int_truncate_or_bit_cast(
+                self.element_type(ctx, generator).size_of().unwrap(),
+                idx.get_type(),
+                "",
+            )
+            .unwrap();
+        let idx = ctx.builder.build_int_mul(*idx, sizeof_elem, "").unwrap();
+        let ptr = unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.base_ptr(ctx, generator),
+                    &[idx],
+                    name.unwrap_or_default(),
+                )
+                .unwrap()
+        };
+
+        // Current implementation is transparent - The returned pointer type is
+        // already cast into the expected type, allowing for immediately
+        // load/store.
+        ctx.builder
+            .build_pointer_cast(
+                ptr,
+                BasicTypeEnum::try_from(self.element_type(ctx, generator))
+                    .unwrap()
+                    .ptr_type(AddressSpace::default()),
+                "",
+            )
+            .unwrap()
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        idx: &IntValue<'ctx>,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let data_sz = self.size(ctx, generator);
+        let in_range = ctx.builder.build_int_compare(IntPredicate::ULT, *idx, data_sz, "").unwrap();
+        ctx.make_assert(
+            generator,
+            in_range,
+            "0:IndexError",
+            "index {0} is out of bounds with size {1}",
+            [Some(*idx), Some(self.0.load_ndims(ctx)), None],
+            ctx.current_loc,
+        );
+
+        let ptr = unsafe { self.ptr_offset_unchecked(ctx, generator, idx, name) };
+
+        // Current implementation is transparent - The returned pointer type is
+        // already cast into the expected type, allowing for immediately
+        // load/store.
+        ctx.builder
+            .build_pointer_cast(
+                ptr,
+                BasicTypeEnum::try_from(self.element_type(ctx, generator))
+                    .unwrap()
+                    .ptr_type(AddressSpace::default()),
+                "",
+            )
+            .unwrap()
+    }
+}
+
+impl<'ctx> UntypedArrayLikeAccessor<'ctx, IntValue<'ctx>> for NDArrayDataProxy<'ctx, '_> {}
+impl<'ctx> UntypedArrayLikeMutator<'ctx, IntValue<'ctx>> for NDArrayDataProxy<'ctx, '_> {}
+
+impl<'ctx, Index: UntypedArrayLikeAccessor<'ctx>> ArrayLikeIndexer<'ctx, Index>
+    for NDArrayDataProxy<'ctx, '_>
+{
+    unsafe fn ptr_offset_unchecked<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        indices: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let llvm_usize = generator.get_size_type(ctx.ctx);
+
+        let indices_elem_ty = indices
+            .ptr_offset(ctx, generator, &llvm_usize.const_zero(), None)
+            .get_type()
+            .get_element_type();
+        let Ok(indices_elem_ty) = IntType::try_from(indices_elem_ty) else {
+            panic!("Expected list[int32] but got {indices_elem_ty}")
+        };
+        assert_eq!(
+            indices_elem_ty.get_bit_width(),
+            32,
+            "Expected list[int32] but got list[int{}]",
+            indices_elem_ty.get_bit_width()
+        );
+
+        let index = call_ndarray_flatten_index(generator, ctx, *self.0, indices);
+        let sizeof_elem = ctx
+            .builder
+            .build_int_truncate_or_bit_cast(
+                self.element_type(ctx, generator).size_of().unwrap(),
+                index.get_type(),
+                "",
+            )
+            .unwrap();
+        let index = ctx.builder.build_int_mul(index, sizeof_elem, "").unwrap();
+
+        let ptr = unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.base_ptr(ctx, generator),
+                    &[index],
+                    name.unwrap_or_default(),
+                )
+                .unwrap()
+        };
+        // TODO: Current implementation is transparent
+        ctx.builder
+            .build_pointer_cast(
+                ptr,
+                BasicTypeEnum::try_from(self.element_type(ctx, generator))
+                    .unwrap()
+                    .ptr_type(AddressSpace::default()),
+                "",
+            )
+            .unwrap()
+    }
+
+    fn ptr_offset<G: CodeGenerator + ?Sized>(
+        &self,
+        ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut G,
+        indices: &Index,
+        name: Option<&str>,
+    ) -> PointerValue<'ctx> {
+        let llvm_usize = generator.get_size_type(ctx.ctx);
+
+        let indices_size = indices.size(ctx, generator);
+        let nidx_leq_ndims = ctx
+            .builder
+            .build_int_compare(IntPredicate::SLE, indices_size, self.0.load_ndims(ctx), "")
+            .unwrap();
+        ctx.make_assert(
+            generator,
+            nidx_leq_ndims,
+            "0:IndexError",
+            "invalid index to scalar variable",
+            [None, None, None],
+            ctx.current_loc,
+        );
+
+        let indices_len = indices.size(ctx, generator);
+        let ndarray_len = self.0.load_ndims(ctx);
+        let len = call_int_umin(ctx, indices_len, ndarray_len, None);
+        gen_for_callback_incrementing(
+            generator,
+            ctx,
+            None,
+            llvm_usize.const_zero(),
+            (len, false),
+            |generator, ctx, _, i| {
+                let (dim_idx, dim_sz) = unsafe {
+                    (
+                        indices.get_unchecked(ctx, generator, &i, None).into_int_value(),
+                        self.0.shape().get_typed_unchecked(ctx, generator, &i, None),
+                    )
+                };
+                let dim_idx = ctx
+                    .builder
+                    .build_int_z_extend_or_bit_cast(dim_idx, dim_sz.get_type(), "")
+                    .unwrap();
+
+                let dim_lt =
+                    ctx.builder.build_int_compare(IntPredicate::SLT, dim_idx, dim_sz, "").unwrap();
+
+                ctx.make_assert(
+                    generator,
+                    dim_lt,
+                    "0:IndexError",
+                    "index {0} is out of bounds for axis 0 with size {1}",
+                    [Some(dim_idx), Some(dim_sz), None],
+                    ctx.current_loc,
+                );
+
+                Ok(())
+            },
+            llvm_usize.const_int(1, false),
+        )
+        .unwrap();
+
+        let ptr = unsafe { self.ptr_offset_unchecked(ctx, generator, indices, name) };
+        // TODO: Current implementation is transparent
+        ctx.builder
+            .build_pointer_cast(
+                ptr,
+                BasicTypeEnum::try_from(self.element_type(ctx, generator))
+                    .unwrap()
+                    .ptr_type(AddressSpace::default()),
+                "",
+            )
+            .unwrap()
+    }
+}
+
+impl<'ctx, Index: UntypedArrayLikeAccessor<'ctx>> UntypedArrayLikeAccessor<'ctx, Index>
+    for NDArrayDataProxy<'ctx, '_>
+{
+}
+impl<'ctx, Index: UntypedArrayLikeAccessor<'ctx>> UntypedArrayLikeMutator<'ctx, Index>
+    for NDArrayDataProxy<'ctx, '_>
+{
+}

nac3core/src/codegen/values/range.rs

@@ -0,0 +1,153 @@
+use inkwell::values::{BasicValueEnum, IntValue, PointerValue};
+
+use super::ProxyValue;
+use crate::codegen::{types::RangeType, CodeGenContext};
+
+/// Proxy type for accessing a `range` value in LLVM.
+#[derive(Copy, Clone)]
+pub struct RangeValue<'ctx> {
+    value: PointerValue<'ctx>,
+    name: Option<&'ctx str>,
+}
+
+impl<'ctx> RangeValue<'ctx> {
+    /// Checks whether `value` is an instance of `range`, returning [Err] if `value` is not an instance.
+    pub fn is_representable(value: PointerValue<'ctx>) -> Result<(), String> {
+        RangeType::is_representable(value.get_type())
+    }
+
+    /// Creates an [`RangeValue`] from a [`PointerValue`].
+    #[must_use]
+    pub fn from_pointer_value(ptr: PointerValue<'ctx>, name: Option<&'ctx str>) -> Self {
+        debug_assert!(Self::is_representable(ptr).is_ok());
+
+        RangeValue { value: ptr, name }
+    }
+
+    fn ptr_to_start(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        let llvm_i32 = ctx.ctx.i32_type();
+        let var_name = self.name.map(|v| format!("{v}.start.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.as_base_value(),
+                    &[llvm_i32.const_zero(), llvm_i32.const_int(0, false)],
+                    var_name.as_str(),
+                )
+                .unwrap()
+        }
+    }
+
+    fn ptr_to_end(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        let llvm_i32 = ctx.ctx.i32_type();
+        let var_name = self.name.map(|v| format!("{v}.end.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.as_base_value(),
+                    &[llvm_i32.const_zero(), llvm_i32.const_int(1, false)],
+                    var_name.as_str(),
+                )
+                .unwrap()
+        }
+    }
+
+    fn ptr_to_step(&self, ctx: &CodeGenContext<'ctx, '_>) -> PointerValue<'ctx> {
+        let llvm_i32 = ctx.ctx.i32_type();
+        let var_name = self.name.map(|v| format!("{v}.step.addr")).unwrap_or_default();
+
+        unsafe {
+            ctx.builder
+                .build_in_bounds_gep(
+                    self.as_base_value(),
+                    &[llvm_i32.const_zero(), llvm_i32.const_int(2, false)],
+                    var_name.as_str(),
+                )
+                .unwrap()
+        }
+    }
+
+    /// Stores the `start` value into this instance.
+    pub fn store_start(&self, ctx: &CodeGenContext<'ctx, '_>, start: IntValue<'ctx>) {
+        debug_assert_eq!(start.get_type().get_bit_width(), 32);
+
+        let pstart = self.ptr_to_start(ctx);
+        ctx.builder.build_store(pstart, start).unwrap();
+    }
+
+    /// Returns the `start` value of this `range`.
+    pub fn load_start(&self, ctx: &CodeGenContext<'ctx, '_>, name: Option<&str>) -> IntValue<'ctx> {
+        let pstart = self.ptr_to_start(ctx);
+        let var_name = name
+            .map(ToString::to_string)
+            .or_else(|| self.name.map(|v| format!("{v}.start")))
+            .unwrap_or_default();
+
+        ctx.builder
+            .build_load(pstart, var_name.as_str())
+            .map(BasicValueEnum::into_int_value)
+            .unwrap()
+    }
+
+    /// Stores the `end` value into this instance.
+    pub fn store_end(&self, ctx: &CodeGenContext<'ctx, '_>, end: IntValue<'ctx>) {
+        debug_assert_eq!(end.get_type().get_bit_width(), 32);
+
+        let pend = self.ptr_to_end(ctx);
+        ctx.builder.build_store(pend, end).unwrap();
+    }
+
+    /// Returns the `end` value of this `range`.
+    pub fn load_end(&self, ctx: &CodeGenContext<'ctx, '_>, name: Option<&str>) -> IntValue<'ctx> {
+        let pend = self.ptr_to_end(ctx);
+        let var_name = name
+            .map(ToString::to_string)
+            .or_else(|| self.name.map(|v| format!("{v}.end")))
+            .unwrap_or_default();
+
+        ctx.builder.build_load(pend, var_name.as_str()).map(BasicValueEnum::into_int_value).unwrap()
+    }
+
+    /// Stores the `step` value into this instance.
+    pub fn store_step(&self, ctx: &CodeGenContext<'ctx, '_>, step: IntValue<'ctx>) {
+        debug_assert_eq!(step.get_type().get_bit_width(), 32);
+
+        let pstep = self.ptr_to_step(ctx);
+        ctx.builder.build_store(pstep, step).unwrap();
+    }
+
+    /// Returns the `step` value of this `range`.
+    pub fn load_step(&self, ctx: &CodeGenContext<'ctx, '_>, name: Option<&str>) -> IntValue<'ctx> {
+        let pstep = self.ptr_to_step(ctx);
+        let var_name = name
+            .map(ToString::to_string)
+            .or_else(|| self.name.map(|v| format!("{v}.step")))
+            .unwrap_or_default();
+
+        ctx.builder
+            .build_load(pstep, var_name.as_str())
+            .map(BasicValueEnum::into_int_value)
+            .unwrap()
+    }
+}
+
+impl<'ctx> ProxyValue<'ctx> for RangeValue<'ctx> {
+    type Base = PointerValue<'ctx>;
+    type Type = RangeType<'ctx>;
+
+    fn get_type(&self) -> Self::Type {
+        RangeType::from_type(self.value.get_type())
+    }
+
+    fn as_base_value(&self) -> Self::Base {
+        self.value
+    }
+}
+
+impl<'ctx> From<RangeValue<'ctx>> for PointerValue<'ctx> {
+    fn from(value: RangeValue<'ctx>) -> Self {
+        value.as_base_value()
+    }
+}

nac3core/src/lib.rs

@@ -1,10 +1,4 @@
-#![deny(
+#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
-    future_incompatible,
-    let_underscore,
-    nonstandard_style,
-    rust_2024_compatibility,
-    clippy::all
-)]
 #![warn(clippy::pedantic)]
 #![allow(
     dead_code,
@@ -19,7 +13,13 @@
     clippy::wildcard_imports
 )]
 
+// users of nac3core need to use the same version of these dependencies, so expose them as nac3core::*
+pub use inkwell;
+pub use nac3parser;
+
 pub mod codegen;
 pub mod symbol_resolver;
 pub mod toplevel;
 pub mod typecheck;
+
+extern crate self as nac3core;

nac3core/src/symbol_resolver.rs

@@ -1,7 +1,15 @@
-use std::fmt::Debug;
+use std::{
-use std::rc::Rc;
+    collections::{HashMap, HashSet},
-use std::sync::Arc;
+    fmt::{Debug, Display},
-use std::{collections::HashMap, collections::HashSet, fmt::Display};
+    rc::Rc,
+    sync::Arc,
+};
+
+use inkwell::values::{BasicValueEnum, FloatValue, IntValue, PointerValue, StructValue};
+use itertools::{chain, izip, Itertools};
+use parking_lot::RwLock;
+
+use nac3parser::ast::{Constant, Expr, Location, StrRef};
 
 use crate::{
     codegen::{CodeGenContext, CodeGenerator},
@@ -11,10 +19,6 @@ use crate::{
         typedef::{Type, TypeEnum, Unifier, VarMap},
     },
 };
-use inkwell::values::{BasicValueEnum, FloatValue, IntValue, PointerValue, StructValue};
-use itertools::{chain, izip, Itertools};
-use nac3parser::ast::{Constant, Expr, Location, StrRef};
-use parking_lot::RwLock;
 
 #[derive(Clone, PartialEq, Debug)]
 pub enum SymbolValue {
@@ -365,6 +369,7 @@ pub trait SymbolResolver {
         &self,
         str: StrRef,
         ctx: &mut CodeGenContext<'ctx, '_>,
+        generator: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>>;
 
     fn get_default_param_value(&self, expr: &Expr) -> Option<SymbolValue>;

nac3core/src/toplevel/builtins.rs

@@ -1,6 +1,5 @@
 use std::iter::once;
 
-use helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails};
 use indexmap::IndexMap;
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -11,20 +10,22 @@ use inkwell::{
 use itertools::Either;
 use strum::IntoEnumIterator;
 
+use super::{
+    helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDef, PrimDefDetails},
+    numpy::make_ndarray_ty,
+    *,
+};
 use crate::{
     codegen::{
         builtin_fns,
-        classes::{ProxyValue, RangeValue},
         numpy::*,
         stmt::exn_constructor,
+        values::{ProxyValue, RangeValue},
     },
     symbol_resolver::SymbolValue,
-    toplevel::{helper::PrimDef, numpy::make_ndarray_ty},
     typecheck::typedef::{into_var_map, iter_type_vars, TypeVar, VarMap},
 };
 
-use super::*;
-
 type BuiltinInfo = Vec<(Arc<RwLock<TopLevelDef>>, Option<Stmt>)>;
 
 pub fn get_exn_constructor(
@@ -709,7 +710,7 @@ impl<'a> BuiltinBuilder<'a> {
                         let (zelf_ty, zelf) = obj.unwrap();
                         let zelf =
                             zelf.to_basic_value_enum(ctx, generator, zelf_ty)?.into_pointer_value();
-                        let zelf = RangeValue::from_ptr_val(zelf, Some("range"));
+                        let zelf = RangeValue::from_pointer_value(zelf, Some("range"));
 
                         let mut start = None;
                         let mut stop = None;

nac3core/src/toplevel/composer.rs

@@ -1,17 +1,17 @@
-use nac3parser::ast::fold::Fold;
 use std::rc::Rc;
 
+use nac3parser::ast::{fold::Fold, ExprKind, Ident};
+
+use super::*;
 use crate::{
     codegen::{expr::get_subst_key, stmt::exn_constructor},
     symbol_resolver::SymbolValue,
     typecheck::{
-        type_inferencer::{FunctionData, Inferencer},
+        type_inferencer::{FunctionData, IdentifierInfo, Inferencer},
         typedef::{TypeVar, VarMap},
     },
 };
 
-use super::*;
-
 pub struct ComposerConfig {
     pub kernel_ann: Option<&'static str>,
     pub kernel_invariant_ann: &'static str,
@@ -23,7 +23,7 @@ impl Default for ComposerConfig {
     }
 }
 
-type DefAst = (Arc<RwLock<TopLevelDef>>, Option<Stmt<()>>);
+pub type DefAst = (Arc<RwLock<TopLevelDef>>, Option<Stmt<()>>);
 pub struct TopLevelComposer {
     // list of top level definitions, same as top level context
     pub definition_ast_list: Vec<DefAst>,
@@ -101,7 +101,8 @@ impl TopLevelComposer {
             .iter()
             .map(|def_ast| match *def_ast.0.read() {
                 TopLevelDef::Class { name, .. } => name.to_string(),
-                TopLevelDef::Function { simple_name, .. } => simple_name.to_string(),
+                TopLevelDef::Function { simple_name, .. }
+                | TopLevelDef::Variable { simple_name, .. } => simple_name.to_string(),
             })
             .collect_vec();
 
@@ -381,13 +382,87 @@ impl TopLevelComposer {
                 ))
             }
 
+            ast::StmtKind::Assign { .. } => {
+                // Assignment statements can assign to (and therefore create) more than one 
+                // variable, but this function only allows returning one set of symbol information.
+                // We want to avoid changing this to return a `Vec` of symbol info, as this would 
+                // require `iter().next().unwrap()` on every variable created from a non-Assign 
+                // statement.
+                //
+                // Make callers use `register_top_level_var` instead, as it provides more
+                // fine-grained control over which symbols to register, while also simplifying the
+                // usage of this function.
+                panic!("Registration of top-level Assign statements must use TopLevelComposer::register_top_level_var (at {})", ast.location);
+            }
+
+            ast::StmtKind::AnnAssign { target, annotation, .. } => {
+                let ExprKind::Name { id: name, .. } = target.node else {
+                    return Err(format!(
+                        "global variable declaration must be an identifier (at {})",
+                        target.location
+                    ));
+                };
+
+                self.register_top_level_var(
+                    name,
+                    Some(annotation.as_ref().clone()),
+                    resolver,
+                    mod_path,
+                    target.location,
+                )
+            }
+
             _ => Err(format!(
-                "registrations of constructs other than top level classes/functions are not supported (at {})",
+                "registrations of constructs other than top level classes/functions/variables are not supported (at {})",
                 ast.location
             )),
         }
     }
 
+    /// Registers a top-level variable with the given `name` into the composer.
+    ///
+    /// `annotation` - The type annotation of the top-level variable, or [`None`] if no type
+    /// annotation is provided.
+    /// `location` - The location of the top-level variable.
+    pub fn register_top_level_var(
+        &mut self,
+        name: Ident,
+        annotation: Option<Expr>,
+        resolver: Option<Arc<dyn SymbolResolver + Send + Sync>>,
+        mod_path: &str,
+        location: Location,
+    ) -> Result<(StrRef, DefinitionId, Option<Type>), String> {
+        if self.keyword_list.contains(&name) {
+            return Err(format!("cannot use keyword `{name}` as a class name (at {location})"));
+        }
+
+        let global_var_name =
+            if mod_path.is_empty() { name.to_string() } else { format!("{mod_path}.{name}") };
+
+        if !self.defined_names.insert(global_var_name.clone()) {
+            return Err(format!(
+                "global variable `{global_var_name}` defined twice (at {location})"
+            ));
+        }
+
+        let ty_to_be_unified = self.unifier.get_dummy_var().ty;
+        self.definition_ast_list.push((
+            RwLock::new(Self::make_top_level_variable_def(
+                global_var_name,
+                name,
+                // dummy here, unify with correct type later,
+                ty_to_be_unified,
+                annotation,
+                resolver,
+                Some(location),
+            ))
+            .into(),
+            None,
+        ));
+
+        Ok((name, DefinitionId(self.definition_ast_list.len() - 1), Some(ty_to_be_unified)))
+    }
+
     pub fn start_analysis(&mut self, inference: bool) -> Result<(), HashSet<String>> {
         self.analyze_top_level_class_type_var()?;
         self.analyze_top_level_class_bases()?;
@@ -396,6 +471,7 @@ impl TopLevelComposer {
         if inference {
             self.analyze_function_instance()?;
         }
+        self.analyze_top_level_variables()?;
         Ok(())
     }
 
@@ -433,7 +509,7 @@ impl TopLevelComposer {
                     // things like `class A(Generic[T, V, ImportedModule.T])` is not supported
                     // i.e. only simple names are allowed in the subscript
                     // should update the TopLevelDef::Class.typevars and the TypeEnum::TObj.params
-                    ast::ExprKind::Subscript { value, slice, .. }
+                    ExprKind::Subscript { value, slice, .. }
                         if {
                             matches!(
                                 &value.node,
@@ -449,9 +525,9 @@ impl TopLevelComposer {
                         }
                         is_generic = true;
 
-                        let type_var_list: Vec<&ast::Expr<()>>;
+                        let type_var_list: Vec<&Expr<()>>;
                         // if `class A(Generic[T, V, G])`
-                        if let ast::ExprKind::Tuple { elts, .. } = &slice.node {
+                        if let ExprKind::Tuple { elts, .. } = &slice.node {
                             type_var_list = elts.iter().collect_vec();
                         // `class A(Generic[T])`
                         } else {
@@ -500,6 +576,7 @@ impl TopLevelComposer {
             }
             Ok(())
         };
+
         let mut errors = HashSet::new();
         for (class_def, class_ast) in def_list.iter().skip(self.builtin_num) {
             if class_ast.is_none() {
@@ -853,7 +930,6 @@ impl TopLevelComposer {
         let unifier = self.unifier.borrow_mut();
         let primitives_store = &self.primitives_ty;
 
-        let mut errors = HashSet::new();
         let mut analyze = |function_def: &Arc<RwLock<TopLevelDef>>, function_ast: &Option<Stmt>| {
             let mut function_def = function_def.write();
             let function_def = &mut *function_def;
@@ -962,18 +1038,18 @@ impl TopLevelComposer {
                     }
                 }
 
-                let arg_with_default: Vec<(&ast::Located<ast::ArgData<()>>, Option<&ast::Expr>)> =
+                let arg_with_default: Vec<(&ast::Located<ast::ArgData<()>>, Option<&Expr>)> = args
-                    args.args
+                    .args
-                        .iter()
+                    .iter()
-                        .rev()
+                    .rev()
-                        .zip(
+                    .zip(
-                            args.defaults
+                        args.defaults
-                                .iter()
+                            .iter()
-                                .rev()
+                            .rev()
-                                .map(|x| -> Option<&ast::Expr> { Some(x) })
+                            .map(|x| -> Option<&Expr> { Some(x) })
-                                .chain(std::iter::repeat(None)),
+                            .chain(std::iter::repeat(None)),
-                        )
+                    )
-                        .collect_vec();
+                    .collect_vec();
 
                 arg_with_default
                     .iter()
@@ -1128,6 +1204,8 @@ impl TopLevelComposer {
             })?;
             Ok(())
         };
+
+        let mut errors = HashSet::new();
         for (function_def, function_ast) in def_list.iter().skip(self.builtin_num) {
             if function_ast.is_none() {
                 continue;
@@ -1229,7 +1307,7 @@ impl TopLevelComposer {
 
                         let arg_with_default: Vec<(
                             &ast::Located<ast::ArgData<()>>,
-                            Option<&ast::Expr>,
+                            Option<&Expr>,
                         )> = args
                             .args
                             .iter()
@@ -1238,7 +1316,7 @@ impl TopLevelComposer {
                                 args.defaults
                                     .iter()
                                     .rev()
-                                    .map(|x| -> Option<&ast::Expr> { Some(x) })
+                                    .map(|x| -> Option<&Expr> { Some(x) })
                                     .chain(std::iter::repeat(None)),
                             )
                             .collect_vec();
@@ -1395,7 +1473,7 @@ impl TopLevelComposer {
                         .map_err(|e| HashSet::from([e.to_display(unifier).to_string()]))?;
                 }
                 ast::StmtKind::AnnAssign { target, annotation, value, .. } => {
-                    if let ast::ExprKind::Name { id: attr, .. } = &target.node {
+                    if let ExprKind::Name { id: attr, .. } = &target.node {
                         if defined_fields.insert(attr.to_string()) {
                             let dummy_field_type = unifier.get_dummy_var().ty;
 
@@ -1403,7 +1481,7 @@ impl TopLevelComposer {
                                 None => {
                                     // handle Kernel[T], KernelInvariant[T]
                                     let (annotation, mutable) = match &annotation.node {
-                                        ast::ExprKind::Subscript { value, slice, .. }
+                                        ExprKind::Subscript { value, slice, .. }
                                             if matches!(
                                                 &value.node,
                                                 ast::ExprKind::Name { id, .. } if id == &core_config.kernel_invariant_ann.into()
@@ -1411,7 +1489,7 @@ impl TopLevelComposer {
                                         {
                                             (slice, false)
                                         }
-                                        ast::ExprKind::Subscript { value, slice, .. }
+                                        ExprKind::Subscript { value, slice, .. }
                                             if matches!(
                                                 &value.node,
                                                 ast::ExprKind::Name { id, .. } if core_config.kernel_ann.map_or(false, |c| id == &c.into())
@@ -1429,13 +1507,13 @@ impl TopLevelComposer {
                                 Some(boxed_expr) => {
                                     // Class attributes are set as immutable regardless
                                     let (annotation, _) = match &annotation.node {
-                                        ast::ExprKind::Subscript { slice, .. } => (slice, false),
+                                        ExprKind::Subscript { slice, .. } => (slice, false),
                                         _ if core_config.kernel_ann.is_none() => (annotation, false),
                                         _ => continue,
                                     };
 
                                     match &**boxed_expr {
-                                        ast::Located {location: _, custom: (), node: ast::ExprKind::Constant { value: v, kind: _ }} => {
+                                        ast::Located {location: _, custom: (), node: ExprKind::Constant { value: v, kind: _ }} => {
                                             // Restricting the types allowed to be defined as class attributes
                                             match v {
                                                 ast::Constant::Bool(_) | ast::Constant::Str(_) | ast::Constant::Int(_) | ast::Constant::Float(_) => {}
@@ -1702,7 +1780,6 @@ impl TopLevelComposer {
             }
         }
 
-        let mut errors = HashSet::new();
         let mut analyze = |i, def: &Arc<RwLock<TopLevelDef>>, ast: &Option<Stmt>| {
             let class_def = def.read();
             if let TopLevelDef::Class {
@@ -1822,7 +1899,12 @@ impl TopLevelComposer {
                         if *name != init_str_id {
                             unreachable!("must be init function here")
                         }
-                        let all_inited = Self::get_all_assigned_field(body.as_slice())?;
+
+                        let all_inited = Self::get_all_assigned_field(
+                            object_id.0,
+                            definition_ast_list,
+                            body.as_slice(),
+                        )?;
                         for (f, _, _) in fields {
                             if !all_inited.contains(f) {
                                 return Err(HashSet::from([
@@ -1840,6 +1922,8 @@ impl TopLevelComposer {
             }
             Ok(())
         };
+
+        let mut errors = HashSet::new();
         for (i, (def, ast)) in definition_ast_list.iter().enumerate().skip(self.builtin_num) {
             if ast.is_none() {
                 continue;
@@ -1877,272 +1961,296 @@ impl TopLevelComposer {
             if ast.is_none() {
                 return Ok(());
             }
-            let mut function_def = def.write();
+
-            if let TopLevelDef::Function {
+            let (name, simple_name, signature, resolver) = {
-                instance_to_stmt,
+                let function_def = def.read();
-                instance_to_symbol,
+                let TopLevelDef::Function { name, simple_name, signature, resolver, .. } =
-                name,
+                    &*function_def
-                simple_name,
-                signature,
-                resolver,
-                ..
-            } = &mut *function_def
-            {
-                let signature_ty_enum = unifier.get_ty(*signature);
-                let TypeEnum::TFunc(FunSignature { args, ret, vars }) = signature_ty_enum.as_ref()
                 else {
-                    unreachable!("must be typeenum::tfunc")
+                    return Ok(());
                 };
 
-                let mut vars = vars.clone();
+                (name.clone(), *simple_name, *signature, resolver.clone())
-                // None if is not class method
+            };
-                let uninst_self_type = {
+
-                    if let Some(class_id) = method_class.get(&DefinitionId(id)) {
+            let signature_ty_enum = unifier.get_ty(signature);
-                        let class_def = definition_ast_list.get(class_id.0).unwrap();
+            let TypeEnum::TFunc(FunSignature { args, ret, vars, .. }) = signature_ty_enum.as_ref()
-                        let class_def = class_def.0.read();
+            else {
-                        let TopLevelDef::Class { type_vars, .. } = &*class_def else {
+                unreachable!("must be typeenum::tfunc")
-                            unreachable!("must be class def")
+            };
+
+            let mut vars = vars.clone();
+            // None if is not class method
+            let uninst_self_type = {
+                if let Some(class_id) = method_class.get(&DefinitionId(id)) {
+                    let class_def = definition_ast_list.get(class_id.0).unwrap();
+                    let class_def = class_def.0.read();
+                    let TopLevelDef::Class { type_vars, .. } = &*class_def else {
+                        unreachable!("must be class def")
+                    };
+
+                    let ty_ann = make_self_type_annotation(type_vars, *class_id);
+                    let self_ty = get_type_from_type_annotation_kinds(
+                        &def_list,
+                        unifier,
+                        primitives_ty,
+                        &ty_ann,
+                        &mut None,
+                    )?;
+                    vars.extend(type_vars.iter().map(|ty| {
+                        let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*ty) else {
+                            unreachable!()
                         };
 
-                        let ty_ann = make_self_type_annotation(type_vars, *class_id);
+                        (*id, *ty)
-                        let self_ty = get_type_from_type_annotation_kinds(
+                    }));
-                            &def_list,
+                    Some((self_ty, type_vars.clone()))
-                            unifier,
+                } else {
-                            primitives_ty,
+                    None
-                            &ty_ann,
+                }
-                            &mut None,
+            };
-                        )?;
+            // carefully handle those with bounds, without bounds and no typevars
-                        vars.extend(type_vars.iter().map(|ty| {
+            // if class methods, `vars` also contains all class typevars here
-                            let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*ty) else {
+            let (type_var_subst_comb, no_range_vars) = {
+                let mut no_ranges: Vec<Type> = Vec::new();
+                let var_combs = vars
+                    .values()
+                    .map(|ty| {
+                        unifier.get_instantiations(*ty).unwrap_or_else(|| {
+                            let TypeEnum::TVar { name, loc, is_const_generic: false, .. } =
+                                &*unifier.get_ty(*ty)
+                            else {
                                 unreachable!()
                             };
 
-                            (*id, *ty)
+                            let rigid = unifier.get_fresh_rigid_var(*name, *loc).ty;
-                        }));
+                            no_ranges.push(rigid);
-                        Some((self_ty, type_vars.clone()))
+                            vec![rigid]
-                    } else {
-                        None
-                    }
-                };
-                // carefully handle those with bounds, without bounds and no typevars
-                // if class methods, `vars` also contains all class typevars here
-                let (type_var_subst_comb, no_range_vars) = {
-                    let mut no_ranges: Vec<Type> = Vec::new();
-                    let var_combs = vars
-                        .values()
-                        .map(|ty| {
-                            unifier.get_instantiations(*ty).unwrap_or_else(|| {
-                                let TypeEnum::TVar { name, loc, is_const_generic: false, .. } =
-                                    &*unifier.get_ty(*ty)
-                                else {
-                                    unreachable!()
-                                };
-
-                                let rigid = unifier.get_fresh_rigid_var(*name, *loc).ty;
-                                no_ranges.push(rigid);
-                                vec![rigid]
-                            })
                         })
-                        .multi_cartesian_product()
+                    })
-                        .collect_vec();
+                    .multi_cartesian_product()
-                    let mut result: Vec<VarMap> = Vec::default();
+                    .collect_vec();
-                    for comb in var_combs {
+                let mut result: Vec<VarMap> = Vec::default();
-                        result.push(vars.keys().copied().zip(comb).collect());
+                for comb in var_combs {
-                    }
+                    result.push(vars.keys().copied().zip(comb).collect());
-                    // NOTE: if is empty, means no type var, append a empty subst, ok to do this?
+                }
-                    if result.is_empty() {
+                // NOTE: if is empty, means no type var, append a empty subst, ok to do this?
-                        result.push(VarMap::new());
+                if result.is_empty() {
-                    }
+                    result.push(VarMap::new());
-                    (result, no_ranges)
+                }
-                };
+                (result, no_ranges)
+            };
 
-                for subst in type_var_subst_comb {
+            for subst in type_var_subst_comb {
-                    // for each instance
+                // for each instance
-                    let inst_ret = unifier.subst(*ret, &subst).unwrap_or(*ret);
+                let inst_ret = unifier.subst(*ret, &subst).unwrap_or(*ret);
-                    let inst_args = {
+                let inst_args = {
-                        args.iter()
+                    args.iter()
-                            .map(|a| FuncArg {
+                        .map(|a| FuncArg {
-                                name: a.name,
+                            name: a.name,
-                                ty: unifier.subst(a.ty, &subst).unwrap_or(a.ty),
+                            ty: unifier.subst(a.ty, &subst).unwrap_or(a.ty),
-                                default_value: a.default_value.clone(),
+                            default_value: a.default_value.clone(),
-                                is_vararg: false,
+                            is_vararg: false,
-                            })
-                            .collect_vec()
-                    };
-                    let self_type = {
-                        uninst_self_type.clone().map(|(self_type, type_vars)| {
-                            let subst_for_self = {
-                                let class_ty_var_ids = type_vars
-                                    .iter()
-                                    .map(|x| {
-                                        if let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*x) {
-                                            *id
-                                        } else {
-                                            unreachable!("must be type var here");
-                                        }
-                                    })
-                                    .collect::<HashSet<_>>();
-                                subst
-                                    .iter()
-                                    .filter_map(|(ty_var_id, ty_var_target)| {
-                                        if class_ty_var_ids.contains(ty_var_id) {
-                                            Some((*ty_var_id, *ty_var_target))
-                                        } else {
-                                            None
-                                        }
-                                    })
-                                    .collect::<VarMap>()
-                            };
-                            unifier.subst(self_type, &subst_for_self).unwrap_or(self_type)
                         })
-                    };
+                        .collect_vec()
-                    let mut identifiers = {
+                };
-                        let mut result: HashSet<_> = HashSet::new();
+                let self_type = {
-                        if self_type.is_some() {
+                    uninst_self_type.clone().map(|(self_type, type_vars)| {
-                            result.insert("self".into());
+                        let subst_for_self = {
+                            let class_ty_var_ids = type_vars
+                                .iter()
+                                .map(|x| {
+                                    if let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*x) {
+                                        *id
+                                    } else {
+                                        unreachable!("must be type var here");
+                                    }
+                                })
+                                .collect::<HashSet<_>>();
+                            subst
+                                .iter()
+                                .filter_map(|(ty_var_id, ty_var_target)| {
+                                    if class_ty_var_ids.contains(ty_var_id) {
+                                        Some((*ty_var_id, *ty_var_target))
+                                    } else {
+                                        None
+                                    }
+                                })
+                                .collect::<VarMap>()
+                        };
+                        unifier.subst(self_type, &subst_for_self).unwrap_or(self_type)
+                    })
+                };
+                let mut identifiers = {
+                    let mut result = HashMap::new();
+                    if self_type.is_some() {
+                        result.insert("self".into(), IdentifierInfo::default());
+                    }
+                    result.extend(inst_args.iter().map(|x| (x.name, IdentifierInfo::default())));
+                    result
+                };
+                let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
+                let mut inferencer = Inferencer {
+                    top_level: ctx.as_ref(),
+                    defined_identifiers: identifiers.clone(),
+                    function_data: &mut FunctionData {
+                        resolver: resolver.as_ref().unwrap().clone(),
+                        return_type: if unifier.unioned(inst_ret, primitives_ty.none) {
+                            None
+                        } else {
+                            Some(inst_ret)
+                        },
+                        // NOTE: allowed type vars
+                        bound_variables: no_range_vars.clone(),
+                    },
+                    unifier,
+                    variable_mapping: {
+                        let mut result: HashMap<StrRef, Type> = HashMap::new();
+                        if let Some(self_ty) = self_type {
+                            result.insert("self".into(), self_ty);
                         }
-                        result.extend(inst_args.iter().map(|x| x.name));
+                        result.extend(inst_args.iter().map(|x| (x.name, x.ty)));
                         result
-                    };
+                    },
-                    let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
+                    primitives: primitives_ty,
-                    let mut inferencer = Inferencer {
+                    virtual_checks: &mut Vec::new(),
-                        top_level: ctx.as_ref(),
+                    calls: &mut calls,
-                        defined_identifiers: identifiers.clone(),
+                    in_handler: false,
-                        function_data: &mut FunctionData {
+                };
-                            resolver: resolver.as_ref().unwrap().clone(),
-                            return_type: if unifier.unioned(inst_ret, primitives_ty.none) {
-                                None
-                            } else {
-                                Some(inst_ret)
-                            },
-                            // NOTE: allowed type vars
-                            bound_variables: no_range_vars.clone(),
-                        },
-                        unifier,
-                        variable_mapping: {
-                            let mut result: HashMap<StrRef, Type> = HashMap::new();
-                            if let Some(self_ty) = self_type {
-                                result.insert("self".into(), self_ty);
-                            }
-                            result.extend(inst_args.iter().map(|x| (x.name, x.ty)));
-                            result
-                        },
-                        primitives: primitives_ty,
-                        virtual_checks: &mut Vec::new(),
-                        calls: &mut calls,
-                        in_handler: false,
-                    };
 
-                    let ast::StmtKind::FunctionDef { body, decorator_list, .. } =
+                let ast::StmtKind::FunctionDef { body, decorator_list, .. } =
-                        ast.clone().unwrap().node
+                    ast.clone().unwrap().node
-                    else {
+                else {
-                        unreachable!("must be function def ast")
+                    unreachable!("must be function def ast")
-                    };
+                };
-                    if !decorator_list.is_empty()
+
-                        && matches!(&decorator_list[0].node,
+                if !decorator_list.is_empty() {
-                            ast::ExprKind::Name{ id, .. } if id == &"extern".into())
+                    if matches!(&decorator_list[0].node, ExprKind::Name { id, .. } if id == &"extern".into())
-                    {
-                        instance_to_symbol.insert(String::new(), simple_name.to_string());
-                        continue;
-                    }
-                    if !decorator_list.is_empty()
-                        && matches!(&decorator_list[0].node,
-                            ast::ExprKind::Name{ id, .. } if id == &"rpc".into())
                     {
+                        let TopLevelDef::Function { instance_to_symbol, .. } = &mut *def.write()
+                        else {
+                            unreachable!()
+                        };
                         instance_to_symbol.insert(String::new(), simple_name.to_string());
                         continue;
                     }
 
-                    let fun_body = body
+                    if matches!(&decorator_list[0].node, ExprKind::Name { id, .. } if id == &"rpc".into())
-                        .into_iter()
+                    {
+                        let TopLevelDef::Function { instance_to_symbol, .. } = &mut *def.write()
+                        else {
+                            unreachable!()
+                        };
+                        instance_to_symbol.insert(String::new(), simple_name.to_string());
+                        continue;
+                    }
+
+                    if let ExprKind::Call { func, .. } = &decorator_list[0].node {
+                        if matches!(&func.node, ExprKind::Name { id, .. } if id == &"rpc".into()) {
+                            let TopLevelDef::Function { instance_to_symbol, .. } =
+                                &mut *def.write()
+                            else {
+                                unreachable!()
+                            };
+                            instance_to_symbol.insert(String::new(), simple_name.to_string());
+                            continue;
+                        }
+                    }
+                }
+
+                let fun_body =
+                    body.into_iter()
                         .map(|b| inferencer.fold_stmt(b))
                         .collect::<Result<Vec<_>, _>>()?;
 
-                    let returned = inferencer.check_block(fun_body.as_slice(), &mut identifiers)?;
+                let returned = inferencer.check_block(fun_body.as_slice(), &mut identifiers)?;
-                    {
+                {
-                        // check virtuals
+                    // check virtuals
-                        let defs = ctx.definitions.read();
+                    let defs = ctx.definitions.read();
-                        for (subtype, base, loc) in &*inferencer.virtual_checks {
+                    for (subtype, base, loc) in &*inferencer.virtual_checks {
-                            let base_id = {
+                        let base_id = {
-                                let base = inferencer.unifier.get_ty(*base);
+                            let base = inferencer.unifier.get_ty(*base);
-                                if let TypeEnum::TObj { obj_id, .. } = &*base {
+                            if let TypeEnum::TObj { obj_id, .. } = &*base {
-                                    *obj_id
+                                *obj_id
-                                } else {
+                            } else {
-                                    return Err(HashSet::from([format!(
+                                return Err(HashSet::from([format!(
-                                        "Base type should be a class (at {loc})"
+                                    "Base type should be a class (at {loc})"
-                                    )]));
+                                )]));
-                                }
+                            }
-                            };
+                        };
-                            let subtype_id = {
+                        let subtype_id = {
-                                let ty = inferencer.unifier.get_ty(*subtype);
+                            let ty = inferencer.unifier.get_ty(*subtype);
-                                if let TypeEnum::TObj { obj_id, .. } = &*ty {
+                            if let TypeEnum::TObj { obj_id, .. } = &*ty {
-                                    *obj_id
+                                *obj_id
-                                } else {
+                            } else {
-                                    let base_repr = inferencer.unifier.stringify(*base);
-                                    let subtype_repr = inferencer.unifier.stringify(*subtype);
-                                    return Err(HashSet::from([format!(
-                                        "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
-                                    ]));
-                                }
-                            };
-                            let subtype_entry = defs[subtype_id.0].read();
-                            let TopLevelDef::Class { ancestors, .. } = &*subtype_entry else {
-                                unreachable!()
-                            };
-
-                            let m = ancestors.iter()
-                                .find(|kind| matches!(kind, TypeAnnotation::CustomClass { id, .. } if *id == base_id));
-                            if m.is_none() {
                                 let base_repr = inferencer.unifier.stringify(*base);
                                 let subtype_repr = inferencer.unifier.stringify(*subtype);
                                 return Err(HashSet::from([format!(
                                     "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
                                 ]));
                             }
+                        };
+                        let subtype_entry = defs[subtype_id.0].read();
+                        let TopLevelDef::Class { ancestors, .. } = &*subtype_entry else {
+                            unreachable!()
+                        };
+
+                        let m = ancestors.iter()
+                            .find(|kind| matches!(kind, TypeAnnotation::CustomClass { id, .. } if *id == base_id));
+                        if m.is_none() {
+                            let base_repr = inferencer.unifier.stringify(*base);
+                            let subtype_repr = inferencer.unifier.stringify(*subtype);
+                            return Err(HashSet::from([format!(
+                                "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
+                            ]));
                         }
                     }
-                    if !unifier.unioned(inst_ret, primitives_ty.none) && !returned {
-                        let def_ast_list = &definition_ast_list;
-                        let ret_str = unifier.internal_stringify(
-                            inst_ret,
-                            &mut |id| {
-                                let TopLevelDef::Class { name, .. } = &*def_ast_list[id].0.read()
-                                else {
-                                    unreachable!("must be class id here")
-                                };
-
-                                name.to_string()
-                            },
-                            &mut |id| format!("typevar{id}"),
-                            &mut None,
-                        );
-                        return Err(HashSet::from([format!(
-                            "expected return type of `{}` in function `{}` (at {})",
-                            ret_str,
-                            name,
-                            ast.as_ref().unwrap().location
-                        )]));
-                    }
-
-                    instance_to_stmt.insert(
-                        get_subst_key(
-                            unifier,
-                            self_type,
-                            &subst,
-                            Some(&vars.keys().copied().collect()),
-                        ),
-                        FunInstance {
-                            body: Arc::new(fun_body),
-                            unifier_id: 0,
-                            calls: Arc::new(calls),
-                            subst,
-                        },
-                    );
                 }
+                if !unifier.unioned(inst_ret, primitives_ty.none) && !returned {
+                    let def_ast_list = &definition_ast_list;
+                    let ret_str = unifier.internal_stringify(
+                        inst_ret,
+                        &mut |id| {
+                            let TopLevelDef::Class { name, .. } = &*def_ast_list[id].0.read()
+                            else {
+                                unreachable!("must be class id here")
+                            };
+
+                            name.to_string()
+                        },
+                        &mut |id| format!("typevar{id}"),
+                        &mut None,
+                    );
+                    return Err(HashSet::from([format!(
+                        "expected return type of `{}` in function `{}` (at {})",
+                        ret_str,
+                        name,
+                        ast.as_ref().unwrap().location
+                    )]));
+                }
+
+                let TopLevelDef::Function { instance_to_stmt, .. } = &mut *def.write() else {
+                    unreachable!()
+                };
+                instance_to_stmt.insert(
+                    get_subst_key(
+                        unifier,
+                        self_type,
+                        &subst,
+                        Some(&vars.keys().copied().collect()),
+                    ),
+                    FunInstance {
+                        body: Arc::new(fun_body),
+                        unifier_id: 0,
+                        calls: Arc::new(calls),
+                        subst,
+                    },
+                );
             }
 
             Ok(())
         };
+
         for (id, (def, ast)) in self.definition_ast_list.iter().enumerate().skip(self.builtin_num) {
             if ast.is_none() {
                 continue;
@@ -2156,4 +2264,59 @@ impl TopLevelComposer {
         }
         Ok(())
     }
+
+    /// Step 6. Analyze and populate the types of global variables.
+    fn analyze_top_level_variables(&mut self) -> Result<(), HashSet<String>> {
+        let def_list = &self.definition_ast_list;
+        let temp_def_list = self.extract_def_list();
+        let unifier = &mut self.unifier;
+        let primitives_store = &self.primitives_ty;
+
+        let mut analyze = |variable_def: &Arc<RwLock<TopLevelDef>>| -> Result<_, HashSet<String>> {
+            let TopLevelDef::Variable { ty: dummy_ty, ty_decl, resolver, loc, .. } =
+                &*variable_def.read()
+            else {
+                // not top level variable def, skip
+                return Ok(());
+            };
+
+            let resolver = &**resolver.as_ref().unwrap();
+
+            if let Some(ty_decl) = ty_decl {
+                let ty_annotation = parse_ast_to_type_annotation_kinds(
+                    resolver,
+                    &temp_def_list,
+                    unifier,
+                    primitives_store,
+                    ty_decl,
+                    HashMap::new(),
+                )?;
+                let ty_from_ty_annotation = get_type_from_type_annotation_kinds(
+                    &temp_def_list,
+                    unifier,
+                    primitives_store,
+                    &ty_annotation,
+                    &mut None,
+                )?;
+
+                unifier.unify(*dummy_ty, ty_from_ty_annotation).map_err(|e| {
+                    HashSet::from([e.at(Some(loc.unwrap())).to_display(unifier).to_string()])
+                })?;
+            }
+
+            Ok(())
+        };
+
+        let mut errors = HashSet::new();
+        for (variable_def, _) in def_list.iter().skip(self.builtin_num) {
+            if let Err(e) = analyze(variable_def) {
+                errors.extend(e);
+            }
+        }
+        if !errors.is_empty() {
+            return Err(errors);
+        }
+
+        Ok(())
+    }
 }

nac3core/src/toplevel/helper.rs

@@ -1,13 +1,15 @@
 use std::convert::TryInto;
 
-use crate::symbol_resolver::SymbolValue;
-use crate::toplevel::numpy::unpack_ndarray_var_tys;
-use crate::typecheck::typedef::{into_var_map, iter_type_vars, Mapping, TypeVarId, VarMap};
-use nac3parser::ast::{Constant, Location};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
-use super::*;
+use nac3parser::ast::{Constant, ExprKind, Location};
+
+use super::{numpy::unpack_ndarray_var_tys, *};
+use crate::{
+    symbol_resolver::SymbolValue,
+    typecheck::typedef::{into_var_map, iter_type_vars, Mapping, TypeVarId, VarMap},
+};
 
 /// All primitive types and functions in nac3core.
 #[derive(Clone, Copy, Debug, EnumIter, PartialEq, Eq)]
@@ -387,6 +389,9 @@ impl TopLevelDef {
                     r
                 }
             ),
+            TopLevelDef::Variable { name, ty, .. } => {
+                format!("Variable {{ name: {name:?}, ty: {:?} }}", unifier.stringify(*ty),)
+            }
         }
     }
 }
@@ -588,6 +593,18 @@ impl TopLevelComposer {
         }
     }
 
+    #[must_use]
+    pub fn make_top_level_variable_def(
+        name: String,
+        simple_name: StrRef,
+        ty: Type,
+        ty_decl: Option<Expr>,
+        resolver: Option<Arc<dyn SymbolResolver + Send + Sync>>,
+        loc: Option<Location>,
+    ) -> TopLevelDef {
+        TopLevelDef::Variable { name, simple_name, ty, ty_decl, resolver, loc }
+    }
+
     #[must_use]
     pub fn make_class_method_name(mut class_name: String, method_name: &str) -> String {
         class_name.push('.');
@@ -733,7 +750,16 @@ impl TopLevelComposer {
         )
     }
 
-    pub fn get_all_assigned_field(stmts: &[Stmt<()>]) -> Result<HashSet<StrRef>, HashSet<String>> {
+    /// This function returns the fields that have been initialized in the `__init__` function of a class
+    /// The function takes as input:
+    ///  * `class_id`: The `object_id` of the class whose function is being evaluated (check `TopLevelDef::Class`)
+    ///  * `definition_ast_list`: A list of ast definitions and statements defined in `TopLevelComposer`
+    ///  * `stmts`: The body of function being parsed. Each statment is analyzed to check varaible initialization statements
+    pub fn get_all_assigned_field(
+        class_id: usize,
+        definition_ast_list: &Vec<DefAst>,
+        stmts: &[Stmt<()>],
+    ) -> Result<HashSet<StrRef>, HashSet<String>> {
         let mut result = HashSet::new();
         for s in stmts {
             match &s.node {
@@ -769,30 +795,138 @@ impl TopLevelComposer {
                 // TODO: do not check for For and While?
                 ast::StmtKind::For { body, orelse, .. }
                 | ast::StmtKind::While { body, orelse, .. } => {
-                    result.extend(Self::get_all_assigned_field(body.as_slice())?);
+                    result.extend(Self::get_all_assigned_field(
-                    result.extend(Self::get_all_assigned_field(orelse.as_slice())?);
+                        class_id,
+                        definition_ast_list,
+                        body.as_slice(),
+                    )?);
+                    result.extend(Self::get_all_assigned_field(
+                        class_id,
+                        definition_ast_list,
+                        orelse.as_slice(),
+                    )?);
                 }
                 ast::StmtKind::If { body, orelse, .. } => {
-                    let inited_for_sure = Self::get_all_assigned_field(body.as_slice())?
+                    let inited_for_sure = Self::get_all_assigned_field(
-                        .intersection(&Self::get_all_assigned_field(orelse.as_slice())?)
+                        class_id,
-                        .copied()
+                        definition_ast_list,
-                        .collect::<HashSet<_>>();
+                        body.as_slice(),
+                    )?
+                    .intersection(&Self::get_all_assigned_field(
+                        class_id,
+                        definition_ast_list,
+                        orelse.as_slice(),
+                    )?)
+                    .copied()
+                    .collect::<HashSet<_>>();
                     result.extend(inited_for_sure);
                 }
                 ast::StmtKind::Try { body, orelse, finalbody, .. } => {
-                    let inited_for_sure = Self::get_all_assigned_field(body.as_slice())?
+                    let inited_for_sure = Self::get_all_assigned_field(
-                        .intersection(&Self::get_all_assigned_field(orelse.as_slice())?)
+                        class_id,
-                        .copied()
+                        definition_ast_list,
-                        .collect::<HashSet<_>>();
+                        body.as_slice(),
+                    )?
+                    .intersection(&Self::get_all_assigned_field(
+                        class_id,
+                        definition_ast_list,
+                        orelse.as_slice(),
+                    )?)
+                    .copied()
+                    .collect::<HashSet<_>>();
                     result.extend(inited_for_sure);
-                    result.extend(Self::get_all_assigned_field(finalbody.as_slice())?);
+                    result.extend(Self::get_all_assigned_field(
+                        class_id,
+                        definition_ast_list,
+                        finalbody.as_slice(),
+                    )?);
                 }
                 ast::StmtKind::With { body, .. } => {
-                    result.extend(Self::get_all_assigned_field(body.as_slice())?);
+                    result.extend(Self::get_all_assigned_field(
+                        class_id,
+                        definition_ast_list,
+                        body.as_slice(),
+                    )?);
+                }
+                // Variables Initialized in function calls
+                ast::StmtKind::Expr { value, .. } => {
+                    let ExprKind::Call { func, .. } = &value.node else {
+                        continue;
+                    };
+                    let ExprKind::Attribute { value, attr, .. } = &func.node else {
+                        continue;
+                    };
+                    let ExprKind::Name { id, .. } = &value.node else {
+                        continue;
+                    };
+                    // Need to consider the two cases:
+                    //  Case 1) Call to class function i.e. id = `self`
+                    //  Case 2) Call to class ancestor function i.e. id = ancestor_name
+                    // We leave checking whether function in case 2 belonged to class ancestor or not to type checker
+                    //
+                    // According to current handling of `self`, function definition are fixed and do not change regardless
+                    // of which object is passed as `self` i.e. virtual polymorphism is not supported
+                    // Therefore, we change class id for case 2 to reflect behavior of our compiler
+
+                    let class_name = if *id == "self".into() {
+                        let ast::StmtKind::ClassDef { name, .. } =
+                            &definition_ast_list[class_id].1.as_ref().unwrap().node
+                        else {
+                            unreachable!()
+                        };
+                        name
+                    } else {
+                        id
+                    };
+
+                    let parent_method = definition_ast_list.iter().find_map(|def| {
+                        let (
+                            class_def,
+                            Some(ast::Located {
+                                node: ast::StmtKind::ClassDef { name, body, .. },
+                                ..
+                            }),
+                        ) = &def
+                        else {
+                            return None;
+                        };
+                        let TopLevelDef::Class { object_id: class_id, .. } = &*class_def.read()
+                        else {
+                            unreachable!()
+                        };
+
+                        if name == class_name {
+                            body.iter().find_map(|m| {
+                                let ast::StmtKind::FunctionDef { name, body, .. } = &m.node else {
+                                    return None;
+                                };
+                                if *name == *attr {
+                                    return Some((body.clone(), class_id.0));
+                                }
+                                None
+                            })
+                        } else {
+                            None
+                        }
+                    });
+
+                    // If method body is none then method does not exist
+                    if let Some((method_body, class_id)) = parent_method {
+                        result.extend(Self::get_all_assigned_field(
+                            class_id,
+                            definition_ast_list,
+                            method_body.as_slice(),
+                        )?);
+                    } else {
+                        return Err(HashSet::from([format!(
+                            "{}.{} not found in class {class_name} at {}",
+                            *id, *attr, value.location
+                        )]));
+                    }
                 }
                 ast::StmtKind::Pass { .. }
                 | ast::StmtKind::Assert { .. }
-                | ast::StmtKind::Expr { .. } => {}
+                | ast::StmtKind::AnnAssign { .. } => {}
 
                 _ => {
                     unimplemented!()
@@ -1000,3 +1134,23 @@ pub fn arraylike_get_ndims(unifier: &mut Unifier, ty: Type) -> u64 {
         _ => 0,
     }
 }
+
+/// Extract an ndarray's `ndims` [type][`Type`] in `u64`. Panic if not possible.
+/// The `ndims` must only contain 1 value.
+#[must_use]
+pub fn extract_ndims(unifier: &Unifier, ndims_ty: Type) -> u64 {
+    let ndims_ty_enum = unifier.get_ty_immutable(ndims_ty);
+    let TypeEnum::TLiteral { values, .. } = &*ndims_ty_enum else {
+        panic!("ndims_ty should be a TLiteral");
+    };
+
+    assert_eq!(values.len(), 1, "ndims_ty TLiteral should only contain 1 value");
+
+    let ndims = values[0].clone();
+    u64::try_from(ndims).unwrap()
+}
+
+/// Return an ndarray's `ndims` as a typechecker [`Type`] from its `u64` value.
+pub fn create_ndims(unifier: &mut Unifier, ndims: u64) -> Type {
+    unifier.get_fresh_literal(vec![SymbolValue::U64(ndims)], None)
+}

nac3core/src/toplevel/mod.rs

@@ -6,36 +6,36 @@ use std::{
     sync::Arc,
 };
 
-use super::codegen::CodeGenContext;
-use super::typecheck::type_inferencer::PrimitiveStore;
-use super::typecheck::typedef::{
-    FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, Unifier, VarMap,
-};
-use crate::{
-    codegen::CodeGenerator,
-    symbol_resolver::{SymbolResolver, ValueEnum},
-    typecheck::{
-        type_inferencer::CodeLocation,
-        typedef::{CallId, TypeVarId},
-    },
-};
 use inkwell::values::BasicValueEnum;
 use itertools::Itertools;
-use nac3parser::ast::{self, Location, Stmt, StrRef};
 use parking_lot::RwLock;
 
-#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
+use nac3parser::ast::{self, Expr, Location, Stmt, StrRef};
-pub struct DefinitionId(pub usize);
+
+use crate::{
+    codegen::{CodeGenContext, CodeGenerator},
+    symbol_resolver::{SymbolResolver, ValueEnum},
+    typecheck::{
+        type_inferencer::{CodeLocation, PrimitiveStore},
+        typedef::{
+            CallId, FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, TypeVarId, Unifier,
+            VarMap,
+        },
+    },
+};
+use composer::*;
+use type_annotation::*;
 
 pub mod builtins;
 pub mod composer;
 pub mod helper;
 pub mod numpy;
-pub mod type_annotation;
-use composer::*;
-use type_annotation::*;
 #[cfg(test)]
 mod test;
+pub mod type_annotation;
+
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
+pub struct DefinitionId(pub usize);
 
 type GenCallCallback = dyn for<'ctx, 'a> Fn(
         &mut CodeGenContext<'ctx, 'a>,
@@ -148,6 +148,25 @@ pub enum TopLevelDef {
         /// Definition location.
         loc: Option<Location>,
     },
+    Variable {
+        /// Qualified name of the global variable, should be unique globally.
+        name: String,
+
+        /// Simple name, the same as in method/function definition.
+        simple_name: StrRef,
+
+        /// Type of the global variable.
+        ty: Type,
+
+        /// The declared type of the global variable, or [`None`] if no type annotation is provided.
+        ty_decl: Option<Expr>,
+
+        /// Symbol resolver of the module defined the class.
+        resolver: Option<Arc<dyn SymbolResolver + Send + Sync>>,
+
+        /// Definition location.
+        loc: Option<Location>,
+    },
 }
 
 pub struct TopLevelContext {

nac3core/src/toplevel/numpy.rs

@@ -1,12 +1,11 @@
-use crate::{
-    toplevel::helper::PrimDef,
-    typecheck::{
-        type_inferencer::PrimitiveStore,
-        typedef::{Type, TypeEnum, TypeVarId, Unifier, VarMap},
-    },
-};
 use itertools::Itertools;
 
+use super::helper::PrimDef;
+use crate::typecheck::{
+    type_inferencer::PrimitiveStore,
+    typedef::{Type, TypeEnum, TypeVarId, Unifier, VarMap},
+};
+
 /// Creates a `ndarray` [`Type`] with the given type arguments.
 ///
 /// * `dtype` - The element type of the `ndarray`, or [`None`] if the type variable is not

nac3core/src/toplevel/test.rs

@@ -1,21 +1,23 @@
-use super::*;
+use std::{collections::HashMap, sync::Arc};
-use crate::toplevel::helper::PrimDef;
+
-use crate::typecheck::typedef::into_var_map;
+use indoc::indoc;
+use parking_lot::Mutex;
+use test_case::test_case;
+
+use nac3parser::{
+    ast::{fold::Fold, FileName},
+    parser::parse_program,
+};
+
+use super::{helper::PrimDef, DefinitionId, *};
 use crate::{
     codegen::CodeGenContext,
     symbol_resolver::{SymbolResolver, ValueEnum},
-    toplevel::DefinitionId,
     typecheck::{
         type_inferencer::PrimitiveStore,
-        typedef::{Type, Unifier},
+        typedef::{into_var_map, Type, Unifier},
     },
 };
-use indoc::indoc;
-use nac3parser::ast::FileName;
-use nac3parser::{ast::fold::Fold, parser::parse_program};
-use parking_lot::Mutex;
-use std::{collections::HashMap, sync::Arc};
-use test_case::test_case;
 
 struct ResolverInternal {
     id_to_type: Mutex<HashMap<StrRef, Type>>,
@@ -62,6 +64,7 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
+        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }

nac3core/src/toplevel/type_annotation.rs

@@ -1,10 +1,13 @@
-use super::*;
-use crate::symbol_resolver::SymbolValue;
-use crate::toplevel::helper::{PrimDef, PrimDefDetails};
-use crate::typecheck::typedef::VarMap;
-use nac3parser::ast::Constant;
 use strum::IntoEnumIterator;
 
+use nac3parser::ast::Constant;
+
+use super::{
+    helper::{PrimDef, PrimDefDetails},
+    *,
+};
+use crate::{symbol_resolver::SymbolValue, typecheck::typedef::VarMap};
+
 #[derive(Clone, Debug)]
 pub enum TypeAnnotation {
     Primitive(Type),

nac3core/src/typecheck/function_check.rs

@@ -1,13 +1,19 @@
-use crate::toplevel::helper::PrimDef;
+use std::{
+    collections::{HashMap, HashSet},
+    iter::once,
+};
 
-use super::type_inferencer::Inferencer;
-use super::typedef::{Type, TypeEnum};
 use nac3parser::ast::{
     self, Constant, Expr, ExprKind,
     Operator::{LShift, RShift},
     Stmt, StmtKind, StrRef,
 };
-use std::{collections::HashSet, iter::once};
+
+use super::{
+    type_inferencer::{DeclarationSource, IdentifierInfo, Inferencer},
+    typedef::{Type, TypeEnum},
+};
+use crate::toplevel::helper::PrimDef;
 
 impl<'a> Inferencer<'a> {
     fn should_have_value(&mut self, expr: &Expr<Option<Type>>) -> Result<(), HashSet<String>> {
@@ -21,15 +27,29 @@ impl<'a> Inferencer<'a> {
     fn check_pattern(
         &mut self,
         pattern: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashSet<StrRef>,
+        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
     ) -> Result<(), HashSet<String>> {
         match &pattern.node {
             ExprKind::Name { id, .. } if id == &"none".into() => {
                 Err(HashSet::from([format!("cannot assign to a `none` (at {})", pattern.location)]))
             }
             ExprKind::Name { id, .. } => {
-                if !defined_identifiers.contains(id) {
+                // If `id` refers to a declared symbol, reject this assignment if it is used in the
-                    defined_identifiers.insert(*id);
+                // context of an (implicit) global variable
+                if let Some(id_info) = defined_identifiers.get(id) {
+                    if matches!(
+                        id_info.source,
+                        DeclarationSource::Global { is_explicit: Some(false) }
+                    ) {
+                        return Err(HashSet::from([format!(
+                            "cannot access local variable '{id}' before it is declared (at {})",
+                            pattern.location
+                        )]));
+                    }
+                }
+
+                if !defined_identifiers.contains_key(id) {
+                    defined_identifiers.insert(*id, IdentifierInfo::default());
                 }
                 self.should_have_value(pattern)?;
                 Ok(())
@@ -69,7 +89,7 @@ impl<'a> Inferencer<'a> {
     fn check_expr(
         &mut self,
         expr: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashSet<StrRef>,
+        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
     ) -> Result<(), HashSet<String>> {
         // there are some cases where the custom field is None
         if let Some(ty) = &expr.custom {
@@ -90,7 +110,7 @@ impl<'a> Inferencer<'a> {
                     return Ok(());
                 }
                 self.should_have_value(expr)?;
-                if !defined_identifiers.contains(id) {
+                if !defined_identifiers.contains_key(id) {
                     match self.function_data.resolver.get_symbol_type(
                         self.unifier,
                         &self.top_level.definitions.read(),
@@ -98,7 +118,22 @@ impl<'a> Inferencer<'a> {
                         *id,
                     ) {
                         Ok(_) => {
-                            self.defined_identifiers.insert(*id);
+                            let is_global = self.is_id_global(*id);
+
+                            defined_identifiers.insert(
+                                *id,
+                                IdentifierInfo {
+                                    source: match is_global {
+                                        Some(true) => {
+                                            DeclarationSource::Global { is_explicit: Some(false) }
+                                        }
+                                        Some(false) => {
+                                            DeclarationSource::Global { is_explicit: None }
+                                        }
+                                        None => DeclarationSource::Local,
+                                    },
+                                },
+                            );
                         }
                         Err(e) => {
                             return Err(HashSet::from([format!(
@@ -171,9 +206,7 @@ impl<'a> Inferencer<'a> {
                 let mut defined_identifiers = defined_identifiers.clone();
                 for arg in &args.args {
                     // TODO: should we check the types here?
-                    if !defined_identifiers.contains(&arg.node.arg) {
+                    defined_identifiers.entry(arg.node.arg).or_default();
-                        defined_identifiers.insert(arg.node.arg);
-                    }
                 }
                 self.check_expr(body, &mut defined_identifiers)?;
             }
@@ -236,7 +269,7 @@ impl<'a> Inferencer<'a> {
     fn check_stmt(
         &mut self,
         stmt: &Stmt<Option<Type>>,
-        defined_identifiers: &mut HashSet<StrRef>,
+        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
     ) -> Result<bool, HashSet<String>> {
         match &stmt.node {
             StmtKind::For { target, iter, body, orelse, .. } => {
@@ -262,9 +295,11 @@ impl<'a> Inferencer<'a> {
                 let body_returned = self.check_block(body, &mut body_identifiers)?;
                 let orelse_returned = self.check_block(orelse, &mut orelse_identifiers)?;
 
-                for ident in &body_identifiers {
+                for ident in body_identifiers.keys() {
-                    if !defined_identifiers.contains(ident) && orelse_identifiers.contains(ident) {
+                    if !defined_identifiers.contains_key(ident)
-                        defined_identifiers.insert(*ident);
+                        && orelse_identifiers.contains_key(ident)
+                    {
+                        defined_identifiers.insert(*ident, IdentifierInfo::default());
                     }
                 }
                 Ok(body_returned && orelse_returned)
@@ -295,7 +330,7 @@ impl<'a> Inferencer<'a> {
                     let mut defined_identifiers = defined_identifiers.clone();
                     let ast::ExcepthandlerKind::ExceptHandler { name, body, .. } = &handler.node;
                     if let Some(name) = name {
-                        defined_identifiers.insert(*name);
+                        defined_identifiers.insert(*name, IdentifierInfo::default());
                     }
                     self.check_block(body, &mut defined_identifiers)?;
                 }
@@ -359,6 +394,44 @@ impl<'a> Inferencer<'a> {
                 }
                 Ok(true)
             }
+            StmtKind::Global { names, .. } => {
+                for id in names {
+                    if let Some(id_info) = defined_identifiers.get(id) {
+                        if id_info.source == DeclarationSource::Local {
+                            return Err(HashSet::from([format!(
+                                "name '{id}' is referenced prior to global declaration at {}",
+                                stmt.location,
+                            )]));
+                        }
+
+                        continue;
+                    }
+
+                    match self.function_data.resolver.get_symbol_type(
+                        self.unifier,
+                        &self.top_level.definitions.read(),
+                        self.primitives,
+                        *id,
+                    ) {
+                        Ok(_) => {
+                            defined_identifiers.insert(
+                                *id,
+                                IdentifierInfo {
+                                    source: DeclarationSource::Global { is_explicit: Some(true) },
+                                },
+                            );
+                        }
+                        Err(e) => {
+                            return Err(HashSet::from([format!(
+                                "type error at identifier `{}` ({}) at {}",
+                                id, e, stmt.location
+                            )]))
+                        }
+                    }
+                }
+
+                Ok(false)
+            }
             // break, raise, etc.
             _ => Ok(false),
         }
@@ -367,7 +440,7 @@ impl<'a> Inferencer<'a> {
     pub fn check_block(
         &mut self,
         block: &[Stmt<Option<Type>>],
-        defined_identifiers: &mut HashSet<StrRef>,
+        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
     ) -> Result<bool, HashSet<String>> {
         let mut ret = false;
         for stmt in block {

nac3core/src/typecheck/magic_methods.rs

@@ -1,17 +1,21 @@
-use crate::symbol_resolver::SymbolValue;
+use std::{cmp::max, collections::HashMap, rc::Rc};
-use crate::toplevel::helper::PrimDef;
+
-use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_var_tys};
+use itertools::{iproduct, Itertools};
-use crate::typecheck::{
+use strum::IntoEnumIterator;
+
+use nac3parser::ast::{Cmpop, Operator, StrRef, Unaryop};
+
+use super::{
     type_inferencer::*,
     typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
 };
-use itertools::{iproduct, Itertools};
+use crate::{
-use nac3parser::ast::StrRef;
+    symbol_resolver::SymbolValue,
-use nac3parser::ast::{Cmpop, Operator, Unaryop};
+    toplevel::{
-use std::cmp::max;
+        helper::PrimDef,
-use std::collections::HashMap;
+        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
-use std::rc::Rc;
+    },
-use strum::IntoEnumIterator;
+};
 
 /// The variant of a binary operator.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -520,6 +524,23 @@ pub fn typeof_binop(
         }
 
         Operator::MatMult => {
+            // NOTE: NumPy matmul's LHS and RHS must both be ndarrays. Scalars are not allowed.
+            match (&*unifier.get_ty(lhs), &*unifier.get_ty(rhs)) {
+                (
+                    TypeEnum::TObj { obj_id: lhs_obj_id, .. },
+                    TypeEnum::TObj { obj_id: rhs_obj_id, .. },
+                ) if *lhs_obj_id == primitives.ndarray.obj_id(unifier).unwrap()
+                    && *rhs_obj_id == primitives.ndarray.obj_id(unifier).unwrap() =>
+                {
+                    // LHS and RHS have valid types
+                }
+                _ => {
+                    let lhs_str = unifier.stringify(lhs);
+                    let rhs_str = unifier.stringify(rhs);
+                    return Err(format!("ndarray.__matmul__ only accepts ndarray operands, but left operand has type {lhs_str}, and right operand has type {rhs_str}"));
+                }
+            }
+
             let (_, lhs_ndims) = unpack_ndarray_var_tys(unifier, lhs);
             let lhs_ndims = match &*unifier.get_ty_immutable(lhs_ndims) {
                 TypeEnum::TLiteral { values, .. } => {

nac3core/src/typecheck/type_error.rs

@@ -1,14 +1,13 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Display};
-use std::fmt::Display;
 
-use crate::typecheck::{magic_methods::HasOpInfo, typedef::TypeEnum};
+use itertools::Itertools;
+
+use nac3parser::ast::{Cmpop, Location, StrRef};
 
 use super::{
-    magic_methods::Binop,
+    magic_methods::{Binop, HasOpInfo},
-    typedef::{RecordKey, Type, Unifier},
+    typedef::{RecordKey, Type, TypeEnum, Unifier},
 };
-use itertools::Itertools;
-use nac3parser::ast::{Cmpop, Location, StrRef};
 
 #[derive(Debug, Clone)]
 pub enum TypeErrorKind {

nac3core/src/typecheck/type_inferencer/mod.rs

@@ -1,14 +1,25 @@
-use std::cmp::max;
+use std::{
-use std::collections::{HashMap, HashSet};
+    cell::RefCell,
-use std::convert::{From, TryInto};
+    cmp::max,
-use std::iter::once;
+    collections::{HashMap, HashSet},
-use std::{cell::RefCell, sync::Arc};
+    convert::{From, TryInto},
+    iter::once,
+    sync::Arc,
+};
+
+use itertools::{izip, Itertools};
+
+use nac3parser::ast::{
+    self,
+    fold::{self, Fold},
+    Arguments, Comprehension, ExprContext, ExprKind, Ident, Located, Location, StrRef,
+};
 
 use super::{
     magic_methods::*,
     type_error::{TypeError, TypeErrorKind},
     typedef::{
-        into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, OperatorInfo,
+        into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, Mapping, OperatorInfo,
         RecordField, RecordKey, Type, TypeEnum, TypeVar, Unifier, VarMap,
     },
 };
@@ -17,15 +28,9 @@ use crate::{
     toplevel::{
         helper::{arraylike_flatten_element_type, arraylike_get_ndims, PrimDef},
         numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
+        type_annotation::TypeAnnotation,
         TopLevelContext, TopLevelDef,
     },
-    typecheck::typedef::Mapping,
-};
-use itertools::{izip, Itertools};
-use nac3parser::ast::{
-    self,
-    fold::{self, Fold},
-    Arguments, Comprehension, ExprContext, ExprKind, Located, Location, StrRef,
 };
 
 #[cfg(test)]
@@ -83,6 +88,40 @@ impl PrimitiveStore {
     }
 }
 
+/// The location where an identifier declaration refers to.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum DeclarationSource {
+    /// Local scope.
+    Local,
+
+    /// Global scope.
+    Global {
+        /// Whether the identifier is declared by the use of `global` statement. This field is
+        /// [`None`] if the identifier does not refer to a variable.
+        is_explicit: Option<bool>,
+    },
+}
+
+/// Information regarding a defined identifier.
+#[derive(Clone, Copy, Debug)]
+pub struct IdentifierInfo {
+    /// Whether this identifier refers to a global variable.
+    pub source: DeclarationSource,
+}
+
+impl Default for IdentifierInfo {
+    fn default() -> Self {
+        IdentifierInfo { source: DeclarationSource::Local }
+    }
+}
+
+impl IdentifierInfo {
+    #[must_use]
+    pub fn new() -> IdentifierInfo {
+        IdentifierInfo::default()
+    }
+}
+
 pub struct FunctionData {
     pub resolver: Arc<dyn SymbolResolver + Send + Sync>,
     pub return_type: Option<Type>,
@@ -91,7 +130,7 @@ pub struct FunctionData {
 
 pub struct Inferencer<'a> {
     pub top_level: &'a TopLevelContext,
-    pub defined_identifiers: HashSet<StrRef>,
+    pub defined_identifiers: HashMap<StrRef, IdentifierInfo>,
     pub function_data: &'a mut FunctionData,
     pub unifier: &'a mut Unifier,
     pub primitives: &'a PrimitiveStore,
@@ -102,6 +141,7 @@ pub struct Inferencer<'a> {
 }
 
 type InferenceError = HashSet<String>;
+type OverrideResult = Result<Option<ast::Expr<Option<Type>>>, InferenceError>;
 
 struct NaiveFolder();
 impl Fold<()> for NaiveFolder {
@@ -222,9 +262,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                                 handler.location,
                             ));
                             if let Some(name) = name {
-                                if !self.defined_identifiers.contains(&name) {
+                                self.defined_identifiers.entry(name).or_default();
-                                    self.defined_identifiers.insert(name);
-                                }
                                 if let Some(old_typ) = self.variable_mapping.insert(name, typ) {
                                     let loc = handler.location;
                                     self.unifier.unify(old_typ, typ).map_err(|e| {
@@ -376,6 +414,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
             | ast::StmtKind::Continue { .. }
             | ast::StmtKind::Expr { .. }
             | ast::StmtKind::For { .. }
+            | ast::StmtKind::Global { .. }
             | ast::StmtKind::Pass { .. }
             | ast::StmtKind::Try { .. } => {}
             ast::StmtKind::If { test, .. } | ast::StmtKind::While { test, .. } => {
@@ -497,9 +536,8 @@ impl<'a> Fold<()> for Inferencer<'a> {
             }
             ast::StmtKind::Assert { test, msg, .. } => {
                 self.unify(test.custom.unwrap(), self.primitives.bool, &test.location)?;
-                match msg {
+                if let Some(m) = msg {
-                    Some(m) => self.unify(m.custom.unwrap(), self.primitives.str, &m.location)?,
+                    self.unify(m.custom.unwrap(), self.primitives.str, &m.location)?;
-                    None => (),
                 }
             }
             _ => return report_error("Unsupported statement type", stmt.location),
@@ -547,7 +585,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                         unreachable!("must be tobj")
                     }
                 } else {
-                    if !self.defined_identifiers.contains(id) {
+                    if !self.defined_identifiers.contains_key(id) {
                         match self.function_data.resolver.get_symbol_type(
                             self.unifier,
                             &self.top_level.definitions.read(),
@@ -555,7 +593,22 @@ impl<'a> Fold<()> for Inferencer<'a> {
                             *id,
                         ) {
                             Ok(_) => {
-                                self.defined_identifiers.insert(*id);
+                                let is_global = self.is_id_global(*id);
+
+                                self.defined_identifiers.insert(
+                                    *id,
+                                    IdentifierInfo {
+                                        source: match is_global {
+                                            Some(true) => DeclarationSource::Global {
+                                                is_explicit: Some(false),
+                                            },
+                                            Some(false) => {
+                                                DeclarationSource::Global { is_explicit: None }
+                                            }
+                                            None => DeclarationSource::Local,
+                                        },
+                                    },
+                                );
                             }
                             Err(e) => {
                                 return report_error(
@@ -620,8 +673,8 @@ impl<'a> Inferencer<'a> {
     fn infer_pattern<T>(&mut self, pattern: &ast::Expr<T>) -> Result<(), InferenceError> {
         match &pattern.node {
             ExprKind::Name { id, .. } => {
-                if !self.defined_identifiers.contains(id) {
+                if !self.defined_identifiers.contains_key(id) {
-                    self.defined_identifiers.insert(*id);
+                    self.defined_identifiers.insert(*id, IdentifierInfo::default());
                 }
                 Ok(())
             }
@@ -730,8 +783,8 @@ impl<'a> Inferencer<'a> {
         let mut defined_identifiers = self.defined_identifiers.clone();
         for arg in &args.args {
             let name = &arg.node.arg;
-            if !defined_identifiers.contains(name) {
+            if !defined_identifiers.contains_key(name) {
-                defined_identifiers.insert(*name);
+                defined_identifiers.insert(*name, IdentifierInfo::default());
             }
         }
         let fn_args: Vec<_> = args
@@ -1548,36 +1601,29 @@ impl<'a> Inferencer<'a> {
         }
         // 2-argument ndarray n-dimensional creation functions
         if id == &"np_full".into() && args.len() == 2 {
-            let ExprKind::List { elts, .. } = &args[0].node else {
+            // Parse arguments
-                return report_error(
+            let shape_expr = args.remove(0);
-                    format!(
+            let (ndims, shape) =
-                        "Expected List literal for first argument of {id}, got {}",
+                self.fold_numpy_function_call_shape_argument(*id, 0, shape_expr)?; // Special handling for `shape`
-                        args[0].node.name()
-                    )
-                    .as_str(),
-                    args[0].location,
-                );
-            };
 
-            let ndims = elts.len() as u64;
+            let fill_value = self.fold_expr(args.remove(0))?;
 
-            let arg0 = self.fold_expr(args.remove(0))?;
+            // Build the return type
-            let arg1 = self.fold_expr(args.remove(0))?;
+            let dtype = fill_value.custom.unwrap();
-
-            let ty = arg1.custom.unwrap();
             let ndims = self.unifier.get_fresh_literal(vec![SymbolValue::U64(ndims)], None);
-            let ret = make_ndarray_ty(self.unifier, self.primitives, Some(ty), Some(ndims));
+            let ret = make_ndarray_ty(self.unifier, self.primitives, Some(dtype), Some(ndims));
+
             let custom = self.unifier.add_ty(TypeEnum::TFunc(FunSignature {
                 args: vec![
                     FuncArg {
                         name: "shape".into(),
-                        ty: arg0.custom.unwrap(),
+                        ty: shape.custom.unwrap(),
                         default_value: None,
                         is_vararg: false,
                     },
                     FuncArg {
                         name: "fill_value".into(),
-                        ty: arg1.custom.unwrap(),
+                        ty: fill_value.custom.unwrap(),
                         default_value: None,
                         is_vararg: false,
                     },
@@ -1595,7 +1641,7 @@ impl<'a> Inferencer<'a> {
                         location: func.location,
                         node: ExprKind::Name { id: *id, ctx: *ctx },
                     }),
-                    args: vec![arg0, arg1],
+                    args: vec![shape, fill_value],
                     keywords: vec![],
                 },
             }));
@@ -1672,6 +1718,86 @@ impl<'a> Inferencer<'a> {
         Ok(None)
     }
 
+    /// Checks whether a class method is calling parent function
+    /// Returns [`None`] if its not a call to parent method, otherwise
+    /// returns a new `func` with class name replaced by `self` and method resolved to its `DefinitionID`
+    ///
+    /// e.g.  A.f1(self, ...) returns Some(self.{DefintionID(f1)})
+    fn check_overriding(&mut self, func: &ast::Expr<()>, args: &[ast::Expr<()>]) -> OverrideResult {
+        // `self` must be first argument for call to parent method
+        if let Some(Located { node: ExprKind::Name { id, .. }, .. }) = &args.first() {
+            if *id != "self".into() {
+                return Ok(None);
+            }
+        } else {
+            return Ok(None);
+        }
+
+        let Located {
+            node: ExprKind::Attribute { value, attr: method_name, ctx }, location, ..
+        } = func
+        else {
+            return Ok(None);
+        };
+        let ExprKind::Name { id: class_name, ctx: class_ctx } = &value.node else {
+            return Ok(None);
+        };
+        let zelf = &self.fold_expr(args[0].clone())?;
+
+        // Check whether the method belongs to class ancestors
+        let def_id = self.unifier.get_ty(zelf.custom.unwrap());
+        let TypeEnum::TObj { obj_id, .. } = def_id.as_ref() else { unreachable!() };
+        let defs = self.top_level.definitions.read();
+        let res = {
+            if let TopLevelDef::Class { ancestors, .. } = &*defs[obj_id.0].read() {
+                let res = ancestors.iter().find_map(|f| {
+                    let TypeAnnotation::CustomClass { id, .. } = f else { unreachable!() };
+                    let TopLevelDef::Class { name, methods, .. } = &*defs[id.0].read() else {
+                        unreachable!()
+                    };
+                    // Class names are stored as `__module__.class`
+                    let name = name.to_string();
+                    let (_, name) = name.rsplit_once('.').unwrap();
+                    if name == class_name.to_string() {
+                        return methods.iter().find_map(|f| {
+                            if f.0 == *method_name {
+                                return Some(*f);
+                            }
+                            None
+                        });
+                    }
+                    None
+                });
+                res
+            } else {
+                None
+            }
+        };
+
+        match res {
+            Some(r) => {
+                let mut new_func = func.clone();
+                let mut new_value = value.clone();
+                new_value.node = ExprKind::Name { id: "self".into(), ctx: *class_ctx };
+                new_func.node =
+                    ExprKind::Attribute { value: new_value.clone(), attr: *method_name, ctx: *ctx };
+
+                let mut new_func = self.fold_expr(new_func)?;
+
+                let ExprKind::Attribute { value, .. } = new_func.node else { unreachable!() };
+                new_func.node =
+                    ExprKind::Attribute { value, attr: r.2 .0.to_string().into(), ctx: *ctx };
+                new_func.custom = Some(r.1);
+
+                Ok(Some(new_func))
+            }
+            None => report_error(
+                format!("Ancestor method [{class_name}.{method_name}] should be defined with same decorator as its overridden version").as_str(),
+                *location,
+            ),
+        }
+    }
+
     fn fold_call(
         &mut self,
         location: Location,
@@ -1685,8 +1811,20 @@ impl<'a> Inferencer<'a> {
             return Ok(spec_call_func);
         }
 
-        let func = Box::new(self.fold_expr(func)?);
+        // Check for call to parent method
-        let args = args.into_iter().map(|v| self.fold_expr(v)).collect::<Result<Vec<_>, _>>()?;
+        let override_res = self.check_overriding(&func, &args)?;
+        let is_override = override_res.is_some();
+        let func = if is_override { override_res.unwrap() } else { self.fold_expr(func)? };
+        let func = Box::new(func);
+
+        let mut args =
+            args.into_iter().map(|v| self.fold_expr(v)).collect::<Result<Vec<_>, _>>()?;
+
+        // TODO: Handle passing of self to functions to allow runtime lookup of functions to be called
+        // Currently removing `self` and using compile time function definitions
+        if is_override {
+            args.remove(0);
+        }
         let keywords = keywords
             .into_iter()
             .map(|v| fold::fold_keyword(self, v))
@@ -2546,4 +2684,22 @@ impl<'a> Inferencer<'a> {
         self.constrain(body.custom.unwrap(), orelse.custom.unwrap(), &body.location)?;
         Ok(body.custom.unwrap())
     }
+
+    /// Determines whether the given `id` refers to a global symbol.
+    ///
+    /// Returns `Some(true)` if `id` refers to a global variable, `Some(false)` if `id` refers to a
+    /// class/function, and `None` if `id` refers to a local symbol.
+    pub(super) fn is_id_global(&self, id: Ident) -> Option<bool> {
+        self.top_level
+            .definitions
+            .read()
+            .iter()
+            .map(|def| match *def.read() {
+                TopLevelDef::Class { name, .. } => (name, false),
+                TopLevelDef::Function { simple_name, .. } => (simple_name, false),
+                TopLevelDef::Variable { simple_name, .. } => (simple_name, true),
+            })
+            .find(|(global, _)| global == &id)
+            .map(|(_, has_explicit_prop)| has_explicit_prop)
+    }
 }

nac3core/src/typecheck/type_inferencer/test.rs

@@ -1,18 +1,20 @@
-use super::super::{magic_methods::with_fields, typedef::*};
+use std::iter::zip;
-use super::*;
+
-use crate::{
-    codegen::CodeGenContext,
-    symbol_resolver::ValueEnum,
-    toplevel::{helper::PrimDef, DefinitionId, TopLevelDef},
-};
 use indexmap::IndexMap;
 use indoc::indoc;
-use nac3parser::ast::FileName;
-use nac3parser::parser::parse_program;
 use parking_lot::RwLock;
-use std::iter::zip;
 use test_case::test_case;
 
+use nac3parser::{ast::FileName, parser::parse_program};
+
+use super::*;
+use crate::{
+    codegen::{CodeGenContext, CodeGenerator},
+    symbol_resolver::ValueEnum,
+    toplevel::{helper::PrimDef, DefinitionId, TopLevelDef},
+    typecheck::{magic_methods::with_fields, typedef::*},
+};
+
 struct Resolver {
     id_to_type: HashMap<StrRef, Type>,
     id_to_def: HashMap<StrRef, DefinitionId>,
@@ -41,6 +43,7 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
+        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }
@@ -517,7 +520,7 @@ impl TestEnvironment {
             primitives: &mut self.primitives,
             virtual_checks: &mut self.virtual_checks,
             calls: &mut self.calls,
-            defined_identifiers: HashSet::default(),
+            defined_identifiers: HashMap::default(),
             in_handler: false,
         }
     }
@@ -593,8 +596,9 @@ fn test_basic(source: &str, mapping: &HashMap<&str, &str>, virtuals: &[(&str, &s
     println!("source:\n{source}");
     let mut env = TestEnvironment::new();
     let id_to_name = std::mem::take(&mut env.id_to_name);
-    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
+    let mut defined_identifiers: HashMap<_, _> =
-    defined_identifiers.insert("virtual".into());
+        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into(), IdentifierInfo::default());
     let mut inferencer = env.get_inferencer();
     inferencer.defined_identifiers.clone_from(&defined_identifiers);
     let statements = parse_program(source, FileName::default()).unwrap();
@@ -739,8 +743,9 @@ fn test_primitive_magic_methods(source: &str, mapping: &HashMap<&str, &str>) {
     println!("source:\n{source}");
     let mut env = TestEnvironment::basic_test_env();
     let id_to_name = std::mem::take(&mut env.id_to_name);
-    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
+    let mut defined_identifiers: HashMap<_, _> =
-    defined_identifiers.insert("virtual".into());
+        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into(), IdentifierInfo::default());
     let mut inferencer = env.get_inferencer();
     inferencer.defined_identifiers.clone_from(&defined_identifiers);
     let statements = parse_program(source, FileName::default()).unwrap();

nac3core/src/typecheck/typedef/mod.rs

@@ -1,21 +1,28 @@
-use super::magic_methods::{Binop, HasOpInfo};
+use std::{
-use super::type_error::{TypeError, TypeErrorKind};
+    borrow::Cow,
-use super::unification_table::{UnificationKey, UnificationTable};
+    cell::RefCell,
-use crate::symbol_resolver::SymbolValue;
+    collections::{HashMap, HashSet},
-use crate::toplevel::helper::PrimDef;
+    fmt::{self, Display},
-use crate::toplevel::{DefinitionId, TopLevelContext, TopLevelDef};
+    iter::{repeat, zip},
-use crate::typecheck::magic_methods::OpInfo;
+    rc::Rc,
-use crate::typecheck::type_inferencer::PrimitiveStore;
+    sync::{Arc, Mutex},
+};
+
 use indexmap::IndexMap;
 use itertools::{repeat_n, Itertools};
+
 use nac3parser::ast::{Cmpop, Location, StrRef, Unaryop};
-use std::cell::RefCell;
+
-use std::collections::HashMap;
+use super::{
-use std::fmt::{self, Display};
+    magic_methods::{Binop, HasOpInfo, OpInfo},
-use std::iter::{repeat, zip};
+    type_error::{TypeError, TypeErrorKind},
-use std::rc::Rc;
+    type_inferencer::PrimitiveStore,
-use std::sync::{Arc, Mutex};
+    unification_table::{UnificationKey, UnificationTable},
-use std::{borrow::Cow, collections::HashSet};
+};
+use crate::{
+    symbol_resolver::SymbolValue,
+    toplevel::{helper::PrimDef, DefinitionId, TopLevelContext, TopLevelDef},
+};
 
 #[cfg(test)]
 mod test;
@@ -670,8 +677,8 @@ impl Unifier {
         let num_args = posargs.len() + kwargs.len();
 
         // Now we check the arguments against the parameters,
-        // and depending on what `call_info` is, we might change how the behavior `unify_call()`
+        // and depending on what `call_info` is, we might change how `unify_call()` behaves
-        // in hopes to improve user error messages when type checking fails.
+        // to improve user error messages when type checking fails.
         match operator_info {
             Some(OperatorInfo::IsBinaryOp { self_type, operator }) => {
                 // The call is written in the form of (say) `a + b`.

nac3core/src/typecheck/typedef/test.rs

@@ -1,10 +1,12 @@
-use super::super::magic_methods::with_fields;
+use std::collections::HashMap;
-use super::*;
+
 use indoc::indoc;
 use itertools::Itertools;
-use std::collections::HashMap;
 use test_case::test_case;
 
+use super::*;
+use crate::typecheck::magic_methods::with_fields;
+
 impl Unifier {
     /// Check whether two types are equal.
     fn eq(&mut self, a: Type, b: Type) -> bool {

nac3ld/src/lib.rs

@@ -1,10 +1,4 @@
-#![deny(
+#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
-    future_incompatible,
-    let_underscore,
-    nonstandard_style,
-    rust_2024_compatibility,
-    clippy::all
-)]
 #![warn(clippy::pedantic)]
 #![allow(
     clippy::cast_possible_truncation,
@@ -21,13 +15,12 @@
     clippy::wildcard_imports
 )]
 
+use std::{collections::HashMap, mem, ptr, slice, str};
+
+use byteorder::{ByteOrder, LittleEndian};
+
 use dwarf::*;
 use elf::*;
-use std::collections::HashMap;
-use std::{mem, ptr, slice, str};
-
-extern crate byteorder;
-use byteorder::{ByteOrder, LittleEndian};
 
 mod dwarf;
 mod elf;

nac3parser/Cargo.toml

@@ -8,15 +8,15 @@ license = "MIT"
 edition = "2021"
 
 [build-dependencies]
-lalrpop = "0.20"
+lalrpop = "0.22"
 
 [dependencies]
 nac3ast = { path = "../nac3ast" }
-lalrpop-util = "0.20"
+lalrpop-util = "0.22"
 log = "0.4"
 unic-emoji-char = "0.9"
 unic-ucd-ident  = "0.9"
-unicode_names2 = "1.2"
+unicode_names2 = "1.3"
 phf = { version = "0.11", features = ["macros"] }
 ahash = "0.8"
 

nac3parser/src/config_comment_helper.rs

@@ -1,8 +1,10 @@
-use crate::ast::Ident;
+use crate::{
-use crate::ast::Location;
+    ast::{Ident, Location},
-use crate::error::*;
+    error::*,
-use crate::token::Tok;
+    token::Tok,
+};
 use lalrpop_util::ParseError;
+
 use nac3ast::*;
 
 pub fn make_config_comment(

nac3parser/src/error.rs

@@ -1,13 +1,12 @@
 //! Define internal parse error types
 //! The goal is to provide a matching and a safe error API, maksing errors from LALR
-use lalrpop_util::ParseError as LalrpopError;
-
-use crate::ast::Location;
-use crate::token::Tok;
-
 use std::error::Error;
 use std::fmt;
 
+use lalrpop_util::ParseError as LalrpopError;
+
+use crate::{ast::Location, token::Tok};
+
 /// Represents an error during lexical scanning.
 #[derive(Debug, PartialEq)]
 pub struct LexicalError {

nac3parser/src/fstring.rs

@@ -1,12 +1,11 @@
-use std::iter;
+use std::{iter, mem, str};
-use std::mem;
-use std::str;
-
-use crate::ast::{Constant, ConversionFlag, Expr, ExprKind, Location};
-use crate::error::{FStringError, FStringErrorType, ParseError};
-use crate::parser::parse_expression;
 
 use self::FStringErrorType::*;
+use crate::{
+    ast::{Constant, ConversionFlag, Expr, ExprKind, Location},
+    error::{FStringError, FStringErrorType, ParseError},
+    parser::parse_expression,
+};
 
 struct FStringParser<'a> {
     chars: iter::Peekable<str::Chars<'a>>,

nac3parser/src/function.rs

@@ -1,8 +1,11 @@
-use ahash::RandomState;
 use std::collections::HashSet;
 
-use crate::ast;
+use ahash::RandomState;
-use crate::error::{LexicalError, LexicalErrorType};
+
+use crate::{
+    ast,
+    error::{LexicalError, LexicalErrorType},
+};
 
 pub struct ArgumentList {
     pub args: Vec<ast::Expr>,

nac3parser/src/lexer.rs

@@ -1,17 +1,17 @@
 //! This module takes care of lexing python source text.
 //!
 //! This means source code is translated into separate tokens.
+use std::{char, cmp::Ordering, num::IntErrorKind, str::FromStr};
 
-pub use super::token::Tok;
-use crate::ast::{FileName, Location};
-use crate::error::{LexicalError, LexicalErrorType};
-use std::char;
-use std::cmp::Ordering;
-use std::num::IntErrorKind;
-use std::str::FromStr;
 use unic_emoji_char::is_emoji_presentation;
 use unic_ucd_ident::{is_xid_continue, is_xid_start};
 
+pub use super::token::Tok;
+use crate::{
+    ast::{FileName, Location},
+    error::{LexicalError, LexicalErrorType},
+};
+
 #[derive(Clone, Copy, PartialEq, Debug, Default)]
 struct IndentationLevel {
     tabs: usize,

nac3parser/src/lib.rs

@@ -15,13 +15,7 @@
 //!
 //! ```
 
-#![deny(
+#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
-    future_incompatible,
-    let_underscore,
-    nonstandard_style,
-    rust_2024_compatibility,
-    clippy::all
-)]
 #![warn(clippy::pedantic)]
 #![allow(
     clippy::enum_glob_use,
@@ -49,11 +43,11 @@ lalrpop_mod!(
         future_incompatible,
         let_underscore,
         nonstandard_style,
-        rust_2024_compatibility,
         unused,
         clippy::all,
         clippy::pedantic
     )]
+    #[warn(rust_2024_compatibility)]
     python
 );
 pub mod config_comment_helper;

nac3parser/src/parser.rs

@@ -5,14 +5,16 @@
 //! parse a whole program, a single statement, or a single
 //! expression.
 
-use nac3ast::Location;
 use std::iter;
 
-use crate::ast::{self, FileName};
+use nac3ast::Location;
-use crate::error::ParseError;
+
-use crate::lexer;
 pub use crate::mode::Mode;
-use crate::python;
+use crate::{
+    ast::{self, FileName},
+    error::ParseError,
+    lexer, python,
+};
 
 /*
  * Parse python code.

nac3parser/src/token.rs

@@ -1,8 +1,9 @@
 //! Different token definitions.
 //! Loosely based on token.h from CPython source:
-use crate::ast;
 use std::fmt::{self, Write};
 
+use crate::ast;
+
 /// Python source code can be tokenized in a sequence of these tokens.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Tok {

nac3standalone/Cargo.toml

@@ -9,14 +9,8 @@ no-escape-analysis = ["nac3core/no-escape-analysis"]
 
 [dependencies]
 parking_lot = "0.12"
-nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 
 [dependencies.clap]
 version = "4.5"
 features = ["derive"]
-
-[dependencies.inkwell]
-version = "0.4"
-default-features = false
-features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]

nac3standalone/demo/demo.c

@@ -66,7 +66,7 @@ struct cslice {
 };
 
 void output_int32_list(struct cslice* slice) {
-    const int32_t* data = reinterpret_cast<int32_t*>(slice->data);
+    const int32_t* data = (int32_t*)slice->data;
 
     putchar('[');
     for (size_t i = 0; i < slice->len; ++i) {
@@ -81,7 +81,7 @@ void output_int32_list(struct cslice* slice) {
 }
 
 void output_str(struct cslice* slice) {
-    const char* data = reinterpret_cast<const char*>(slice->data);
+    const char* data = (const char*)slice->data;
 
     for (size_t i = 0; i < slice->len; ++i) {
         putchar(data[i]);
@@ -95,7 +95,7 @@ void output_strln(struct cslice* slice) {
 
 uint64_t dbg_stack_address(__attribute__((unused)) struct cslice* slice) {
     int i;
-    void* ptr = static_cast<void*>(&i);
+    void* ptr = (void*)&i;
     return (uintptr_t)ptr;
 }
 
@@ -120,10 +120,10 @@ struct Exception {
 uint32_t __nac3_raise(struct Exception* e) {
     printf("__nac3_raise called. Exception details:\n");
     printf("          ID: %" PRIu32 "\n", e->id);
-    printf("    Location: %*s:%" PRIu32 ":%" PRIu32 "\n", static_cast<int>(e->file.len),
+    printf("    Location: %*s:%" PRIu32 ":%" PRIu32 "\n", (int)e->file.len, (const char*)e->file.data, e->line,
-           reinterpret_cast<const char*>(e->file.data), e->line, e->column);
+           e->column);
-    printf("    Function: %*s\n", static_cast<int>(e->function.len), reinterpret_cast<const char*>(e->function.data));
+    printf("    Function: %*s\n", (int)e->function.len, (const char*)e->function.data);
-    printf("     Message: \"%*s\"\n", static_cast<int>(e->message.len), reinterpret_cast<const char*>(e->message.data));
+    printf("     Message: \"%*s\"\n", (int)e->message.len, (const char*)e->message.data);
     printf("      Params: {0}=%" PRId64 ", {1}=%" PRId64 ", {2}=%" PRId64 "\n", e->param[0], e->param[1], e->param[2]);
     exit(101);
     __builtin_unreachable();

nac3standalone/demo/src/assignment.py

@@ -9,6 +9,7 @@ def output_bool(x: bool):
 def example1():
     x, *ys, z = (1, 2, 3, 4, 5)
     output_int32(x)
+    output_int32(len(ys))
     output_int32(ys[0])
     output_int32(ys[1])
     output_int32(ys[2])
@@ -18,12 +19,14 @@ def example2():
     x, y, *zs = (1, 2, 3, 4, 5)
     output_int32(x)
     output_int32(y)
+    output_int32(len(zs))
     output_int32(zs[0])
     output_int32(zs[1])
     output_int32(zs[2])
 
 def example3():
     *xs, y, z = (1, 2, 3, 4, 5)
+    output_int32(len(xs))
     output_int32(xs[0])
     output_int32(xs[1])
     output_int32(xs[2])
@@ -31,6 +34,12 @@ def example3():
     output_int32(z)
 
 def example4():
+    *xs, y, z = (4, 5)
+    output_int32(len(xs))
+    output_int32(y)
+    output_int32(z)
+
+def example5():
     # Example from: https://docs.python.org/3/reference/simple_stmts.html#assignment-statements
     x = [0, 1]
     i = 0
@@ -44,7 +53,7 @@ class A:
     def __init__(self):
         self.value = 1000
 
-def example5():
+def example6():
     ws = [88, 7, 8]
     a = A()
     x, [y, *ys, a.value], ws[0], (ws[0],) = 1, (2, False, 4, 5), 99, (6,)
@@ -63,4 +72,5 @@ def run() -> int32:
     example3()
     example4()
     example5()
+    example6()
     return 0

nac3standalone/demo/src/globals.py

@@ -0,0 +1,31 @@
+@extern
+def output_int32(x: int32):
+    ...
+
+@extern
+def output_int64(x: int64):
+    ...
+
+X: int32 = 0
+Y = int64(1)
+
+def f():
+    global X, Y
+    X = 1
+    Y = int64(2)
+
+def run() -> int32:
+    global X, Y
+
+    output_int32(X)
+    output_int64(Y)
+    f()
+    output_int32(X)
+    output_int64(Y)
+
+    X = 0
+    Y = int64(0)
+    output_int32(X)
+    output_int64(Y)
+
+    return 0

nac3standalone/demo/src/inheritance.py

@@ -10,23 +10,58 @@ class A:
     def __init__(self, a: int32):
         self.a = a
     
-    def f1(self):
+    def output_all_fields(self):
-        self.f2()
-    
-    def f2(self):
         output_int32(self.a)
+    
+    def set_a(self, a: int32):
+        self.a = a
 
 class B(A):
     b: int32
 
     def __init__(self, b: int32):
-        self.a = b + 1
+        A.__init__(self, b + 1)
+        self.set_b(b)
+    
+    def output_parent_fields(self):
+        A.output_all_fields(self)
+
+    def output_all_fields(self):
+        A.output_all_fields(self)
+        output_int32(self.b)
+    
+    def set_b(self, b: int32):
         self.b = b
 
+class C(B):
+    c: int32
+
+    def __init__(self, c: int32):
+        B.__init__(self, c + 1)
+        self.c = c
+    
+    def output_parent_fields(self):
+        B.output_all_fields(self)
+
+    def output_all_fields(self):
+        B.output_all_fields(self)
+        output_int32(self.c)
+    
+    def set_c(self, c: int32):
+        self.c = c
 
 def run() -> int32:
-    aaa = A(5)
+    ccc = C(10)
-    bbb = B(2)
+    ccc.output_all_fields()
-    aaa.f1()
+    ccc.set_a(1)
-    bbb.f1()
+    ccc.set_b(2)
+    ccc.set_c(3)
+    ccc.output_all_fields()
+
+    bbb = B(10)
+    bbb.set_a(9)
+    bbb.set_b(8)
+    bbb.output_all_fields()
+    ccc.output_all_fields()
+
     return 0

nac3standalone/demo/src/ndarray.py

@@ -114,12 +114,22 @@ def test_ndarray_ones():
     n: ndarray[float, 1] = np_ones([1])
     output_ndarray_float_1(n)
 
+    dim = (1,)
+    n_tup: ndarray[float, 1] = np_ones(dim)
+    output_ndarray_float_1(n_tup)
+
 def test_ndarray_full():
     n_float: ndarray[float, 1] = np_full([1], 2.0)
     output_ndarray_float_1(n_float)
     n_i32: ndarray[int32, 1] = np_full([1], 2)
     output_ndarray_int32_1(n_i32)
 
+    dim = (1,)
+    n_float_tup: ndarray[float, 1] = np_full(dim, 2.0)
+    output_ndarray_float_1(n_float_tup)
+    n_i32_tup: ndarray[int32, 1] = np_full(dim, 2)
+    output_ndarray_int32_1(n_i32_tup)
+
 def test_ndarray_eye():
     n: ndarray[float, 2] = np_eye(2)
     output_ndarray_float_2(n)
@@ -134,6 +144,7 @@ def test_ndarray_array():
 
     # Copy
     n2_cpy: ndarray[float, 2] = np_array(n2, copy=False)
+    output_ndarray_float_2(n2_cpy)
     n2_cpy.fill(0.0)
     output_ndarray_float_2(n2_cpy)
 
@@ -1746,7 +1757,7 @@ def run() -> int32:
     test_ndarray_nextafter_broadcast_rhs_scalar()
     test_ndarray_transpose()
     test_ndarray_reshape()
-    
+
     test_ndarray_dot()
     test_ndarray_cholesky()
     test_ndarray_qr()