meta: Use mold as linker

2024-09-11 16:38:37 +08:00
92 changed files with 3966 additions and 5964 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -0,0 +1,2 @@
 [target.x86_64-unknown-linux-gnu]
 rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-default_stages: [pre-commit]
+default_stages: [commit]
 repos:
  - repo: local
--- a/Cargo.lock
+++ b/Cargo.lock
@ -26,9 +26,9 @@ dependencies = [
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@ -41,67 +41,67 @@ dependencies = [
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
 "utf8parse",
 ]
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
 "anstyle",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
 name = "ascii-canvas"
-version = "4.0.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
 dependencies = [
 "term",
 ]
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 [[package]]
 name = "bit-set"
-version = "0.8.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
 "bit-vec",
 ]
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 [[package]]
 name = "bitflags"
@ -109,15 +109,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
 "generic-array",
 ]
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@ -126,9 +117,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "cc"
-version = "1.2.1"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
 dependencies = [
 "shlex",
 ]
@ -141,9 +132,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -151,9 +142,9 @@ dependencies = [
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
 "anstream",
 "anstyle",
@ -163,27 +154,27 @@ dependencies = [
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
 name = "clap_lex"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 [[package]]
 name = "console"
@ -197,15 +188,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "cpufeatures"
 version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@ -263,31 +245,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 [[package]]
-name = "crypto-common"
+name = "crunchy"
-version = "0.1.6"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "generic-array",
+ "cfg-if",
- "typenum",
+ "dirs-sys-next",
 ]
 [[package]]
-name = "digest"
+name = "dirs-sys-next"
-version = "0.10.7"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
- "block-buffer",
+ "libc",
- "crypto-common",
+ "redox_users",
 "winapi",
 ]
 [[package]]
 name = "dissimilar"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
 [[package]]
 name = "either"
 version = "1.13.0"
@ -327,9 +310,9 @@ dependencies = [
 [[package]]
 name = "fastrand"
-version = "2.2.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 [[package]]
 name = "fixedbitset"
@ -346,16 +329,6 @@ dependencies = [
 "byteorder",
 ]
 [[package]]
 name = "generic-array"
 version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
 "typenum",
 "version_check",
 ]
 [[package]]
 name = "getopts"
 version = "0.2.21"
@ -376,12 +349,6 @@ dependencies = [
 "wasi",
 ]
 [[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@ -397,12 +364,6 @@ dependencies = [
 "ahash",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 [[package]]
 name = "heck"
 version = "0.4.1"
@ -415,15 +376,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "home"
 version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@ -436,12 +388,12 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.1",
+ "hashbrown 0.14.5",
 ]
 [[package]]
@ -452,9 +404,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 [[package]]
 name = "inkwell"
-version = "0.5.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2"
+checksum = "b597a7b2cdf279aeef6d7149071e35e4bc87c2cf05a5b7f2d731300bffe587ea"
 dependencies = [
 "either",
 "inkwell_internals",
@ -466,13 +418,13 @@ dependencies = [
 [[package]]
 name = "inkwell_internals"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44"
+checksum = "4fa4d8d74483041a882adaa9a29f633253a66dde85055f0495c121620ac484b2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
@ -495,6 +447,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 [[package]]
 name = "itertools"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
 "either",
 ]
 [[package]]
 name = "itertools"
 version = "0.13.0"
@ -510,45 +471,35 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 [[package]]
 name = "keccak"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
 "cpufeatures",
 ]
 [[package]]
 name = "lalrpop"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06093b57658c723a21da679530e061a8c25340fa5a6f98e313b542268c7e2a1f"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
 "ascii-canvas",
 "bit-set",
 "ena",
- "itertools",
+ "itertools 0.11.0",
 "lalrpop-util",
 "petgraph",
 "pico-args",
 "regex",
 "regex-syntax",
 "sha3",
 "string_cache",
 "term",
 "tiny-keccak",
 "unicode-xid",
 "walkdir",
 ]
 [[package]]
 name = "lalrpop-util"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feee752d43abd0f4807a921958ab4131f692a44d4d599733d4419c5d586176ce"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
 "regex-automata",
 "rustversion",
 ]
 [[package]]
@ -559,9 +510,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 [[package]]
 name = "libc"
-version = "0.2.164"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 [[package]]
 name = "libloading"
@ -573,6 +524,16 @@ dependencies = [
 "windows-targets",
 ]
 [[package]]
 name = "libredox"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
 "bitflags",
 "libc",
 ]
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@ -633,7 +594,7 @@ dependencies = [
 name = "nac3artiq"
 version = "0.1.0"
 dependencies = [
- "itertools",
+ "itertools 0.13.0",
 "nac3core",
 "nac3ld",
 "parking_lot",
@ -646,6 +607,7 @@ name = "nac3ast"
 version = "0.1.0"
 dependencies = [
 "fxhash",
 "lazy_static",
 "parking_lot",
 "string-interner",
 ]
@ -655,12 +617,11 @@ name = "nac3core"
 version = "0.1.0"
 dependencies = [
 "crossbeam",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
 "indoc",
 "inkwell",
 "insta",
- "itertools",
+ "itertools 0.13.0",
 "nac3core_derive",
 "nac3parser",
 "parking_lot",
 "rayon",
@ -670,18 +631,6 @@ dependencies = [
 "test-case",
 ]
 [[package]]
 name = "nac3core_derive"
 version = "0.1.0"
 dependencies = [
 "nac3core",
 "proc-macro-error",
 "proc-macro2",
 "quote",
 "syn 2.0.87",
 "trybuild",
 ]
 [[package]]
 name = "nac3ld"
 version = "0.1.0"
@ -722,9 +671,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 [[package]]
 name = "parking_lot"
@ -756,7 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
 "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
 ]
 [[package]]
@ -799,7 +748,7 @@ dependencies = [
 "phf_shared 0.11.2",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
@ -828,9 +777,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 [[package]]
 name = "ppv-lite86"
@ -847,35 +796,11 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
 "version_check",
 ]
 [[package]]
 name = "proc-macro-error-attr"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
 "proc-macro2",
 "quote",
 "version_check",
 ]
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
 "unicode-ident",
 ]
@ -927,7 +852,7 @@ dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
@ -940,7 +865,7 @@ dependencies = [
 "proc-macro2",
 "pyo3-build-config",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
@ -1004,18 +929,29 @@ dependencies = [
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
 "bitflags",
 ]
 [[package]]
-name = "regex"
+name = "redox_users"
-version = "1.11.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
 "getrandom",
 "libredox",
 "thiserror",
 ]
 [[package]]
 name = "regex"
 version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -1025,9 +961,9 @@ dependencies = [
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -1036,9 +972,9 @@ dependencies = [
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 [[package]]
 name = "runkernel"
@ -1049,9 +985,9 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "0.38.41"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
 "bitflags",
 "errno",
@ -1062,9 +998,9 @@ dependencies = [
 [[package]]
 name = "rustversion"
-version = "1.0.18"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 [[package]]
 name = "ryu"
@ -1095,29 +1031,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
 "itoa",
 "memchr",
@ -1125,15 +1061,6 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde_spanned"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde_yaml"
 version = "0.8.26"
@ -1146,16 +1073,6 @@ dependencies = [
 "yaml-rust",
 ]
 [[package]]
 name = "sha3"
 version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
 "digest",
 "keccak",
 ]
 [[package]]
 name = "shlex"
 version = "1.3.0"
@ -1226,7 +1143,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
@ -1242,9 +1159,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1257,17 +1174,11 @@ version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 [[package]]
 name = "target-triple"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
 "cfg-if",
 "fastrand",
@ -1278,21 +1189,13 @@ dependencies = [
 [[package]]
 name = "term"
-version = "1.0.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4175de05129f31b80458c6df371a15e7fc3fd367272e6bf938e5c351c7ea0"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
 dependencies = [
- "home",
+ "dirs-next",
- "windows-sys 0.52.0",
+ "rustversion",
-]
+ "winapi",
 [[package]]
 name = "termcolor"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
 "winapi-util",
 ]
 [[package]]
@ -1310,80 +1213,33 @@ dependencies = [
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
 [[package]]
-name = "toml"
+name = "tiny-keccak"
-version = "0.8.19"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
- "serde",
+ "crunchy",
 "serde_spanned",
 "toml_datetime",
 "toml_edit",
 ]
 [[package]]
 name = "toml_datetime"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
 "indexmap 2.6.0",
 "serde",
 "serde_spanned",
 "toml_datetime",
 "winnow",
 ]
 [[package]]
 name = "trybuild"
 version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4"
 dependencies = [
 "dissimilar",
 "glob",
 "serde",
 "serde_derive",
 "serde_json",
 "target-triple",
 "termcolor",
 "toml",
 ]
 [[package]]
 name = "typenum"
 version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@ -1438,27 +1294,27 @@ dependencies = [
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 [[package]]
 name = "unicode_names2"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd"
+checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
 dependencies = [
 "phf",
 "unicode_names2_generator",
@ -1466,9 +1322,9 @@ dependencies = [
 [[package]]
 name = "unicode_names2_generator"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e"
+checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0"
 dependencies = [
 "getopts",
 "log",
@ -1510,6 +1366,22 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 [[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
 "winapi-i686-pc-windows-gnu",
 "winapi-x86_64-pc-windows-gnu",
 ]
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@ -1519,6 +1391,12 @@ dependencies = [
 "windows-sys 0.59.0",
 ]
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@ -1601,15 +1479,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 [[package]]
 name = "winnow"
 version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
 "memchr",
 ]
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@ -1637,5 +1506,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.77",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -4,7 +4,6 @@ members = [
  "nac3ast",
  "nac3parser",
  "nac3core",
  "nac3core/nac3core_derive",
  "nac3standalone",
  "nac3artiq",
  "runkernel",
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1731319897,
+        "lastModified": 1725432240,
-        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -41,9 +41,9 @@
              lockFile = ./Cargo.lock;
            };
            passthru.cargoLock = cargoLock;
-            nativeBuildInputs = [ pkgs.python3 (pkgs.wrapClangMulti pkgs.llvmPackages_14.clang) llvm-tools-irrt pkgs.llvmPackages_14.llvm.out llvm-nac3 ];
+            nativeBuildInputs = [ pkgs.python3 pkgs.mold-wrapped (pkgs.wrapClangMulti pkgs.llvmPackages_14.clang) llvm-tools-irrt pkgs.llvmPackages_14.llvm.out llvm-nac3 ];
-            buildInputs = [ pkgs.python3 llvm-nac3 ];
+            buildInputs = [ pkgs.python3 pkgs.mold-wrapped llvm-nac3 ];
-            checkInputs = [ (pkgs.python3.withPackages(ps: [ ps.numpy ps.scipy ])) ];
+            checkInputs = [ (pkgs.python3.withPackages(ps: [ ps.numpy ps.scipy ])) pkgs.mold-wrapped ];
            checkPhase =
              ''
              echo "Checking nac3standalone demos..."
@ -68,6 +68,7 @@
              mkdir -p $standalone/bin
              cp target/x86_64-unknown-linux-gnu/release/nac3standalone $standalone/bin
              '';
            stdenv = [ pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv ];
          }
        );
        python3-mimalloc = pkgs.python3 // rec {
@ -86,7 +87,7 @@
            src = self;
            inherit (nac3artiq) cargoLock;
            nativeBuildInputs = [ pkgs.python3 packages.x86_64-linux.llvm-tools-irrt llvm-nac3-instrumented ];
-            buildInputs = [ pkgs.python3 llvm-nac3-instrumented ];
+            buildInputs = [ pkgs.python3 pkgs.mold-wrapped llvm-nac3-instrumented ];
            cargoBuildFlags = [ "--package" "nac3artiq" "--features" "init-llvm-profile" ];
            doCheck = false;
            configurePhase =
@ -99,6 +100,7 @@
              mkdir -p $TARGET_DIR
              cp target/x86_64-unknown-linux-gnu/release/libnac3artiq.so $TARGET_DIR/nac3artiq.so
              '';
            stdenv = [ pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv ];
          }
        );
        nac3artiq-profile = pkgs.stdenvNoCC.mkDerivation {
@ -107,18 +109,18 @@
            (pkgs.fetchFromGitHub {
              owner = "m-labs";
              repo = "sipyco";
-              rev = "094a6cd63ffa980ef63698920170e50dc9ba77fd";
+              rev = "939f84f9b5eef7efbf7423c735d1834783b6140e";
-              sha256 = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=";
+              sha256 = "sha256-15Nun4EY35j+6SPZkjzZtyH/ncxLS60KuGJjFh5kSTc=";
            })
            (pkgs.fetchFromGitHub {
              owner = "m-labs";
              repo = "artiq";
-              rev = "28c9de3e251daa89a8c9fd79d5ab64a3ec03bac6";
+              rev = "923ca3377d42c815f979983134ec549dc39d3ca0";
-              sha256 = "sha256-vAvpbHc5B+1wtG8zqN7j9dQE1ON+i22v+uqA+tw6Gak=";
+              sha256 = "sha256-oJoEeNEeNFSUyh6jXG8Tzp6qHVikeHS0CzfE+mODPgw=";
            })
          ];
          buildInputs = [
-            (python3-mimalloc.withPackages(ps: [ ps.numpy ps.scipy ps.jsonschema ps.lmdb ps.platformdirs nac3artiq-instrumented ]))
+            (python3-mimalloc.withPackages(ps: [ ps.numpy ps.scipy ps.jsonschema ps.lmdb nac3artiq-instrumented ]))
            pkgs.llvmPackages_14.llvm.out
          ];
          phases = [ "buildPhase" "installPhase" ];
@ -148,7 +150,7 @@
            src = self;
            inherit (nac3artiq) cargoLock;
            nativeBuildInputs = [ pkgs.python3 packages.x86_64-linux.llvm-tools-irrt llvm-nac3-pgo ];
-            buildInputs = [ pkgs.python3 llvm-nac3-pgo ];
+            buildInputs = [ pkgs.python3 pkgs.mold-wrapped llvm-nac3-pgo ];
            cargoBuildFlags = [ "--package" "nac3artiq" ];
            cargoTestFlags = [ "--package" "nac3ast" "--package" "nac3parser" "--package" "nac3core" "--package" "nac3artiq" ];
            installPhase =
@ -157,6 +159,7 @@
              mkdir -p $TARGET_DIR
              cp target/x86_64-unknown-linux-gnu/release/libnac3artiq.so $TARGET_DIR/nac3artiq.so
              '';
            stdenv = [ pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv ];
          }
        );
      };
@ -172,6 +175,7 @@
          packages.x86_64-linux.llvm-tools-irrt
          cargo
          rustc
          mold-wrapped
          # runtime dependencies
          lld_14                           # for running kernels on the host
          (packages.x86_64-linux.python3-mimalloc.withPackages(ps: [ ps.numpy ps.scipy ]))
@ -186,6 +190,7 @@
          export DEMO_LINALG_STUB=${packages.x86_64-linux.demo-linalg-stub}/lib/liblinalg.a
          export DEMO_LINALG_STUB32=${packages.x86_64-linux.demo-linalg-stub32}/lib/liblinalg.a
          '';
        stdenv = [ pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv ];
      };
      devShells.x86_64-linux.msys2 = pkgs.mkShell {
        name = "nac3-dev-shell-msys2";
--- a/nac3artiq/Cargo.toml
+++ b/nac3artiq/Cargo.toml
@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 itertools = "0.13"
 pyo3 = { version = "0.21", features = ["extension-module", "gil-refs"] }
 parking_lot = "0.12"
-tempfile = "3.13"
+tempfile = "3.10"
 nac3core = { path = "../nac3core" }
 nac3ld = { path = "../nac3ld" }
--- a/nac3artiq/demo/min_artiq.py
+++ b/nac3artiq/demo/min_artiq.py
@ -112,15 +112,10 @@ def extern(function):
    register_function(function)
    return function
-
+def rpc(function):
-def rpc(arg=None, flags={}):
+    """Decorates a function declaration defined by the core device runtime."""
-    """Decorates a function or method to be executed on the host interpreter."""
+    register_function(function)
-    if arg is None:
+    return function
        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."""
@ -206,7 +201,7 @@ class Core:
        embedding = EmbeddingMap()
        if allow_registration:
-            compiler.analyze(registered_functions, registered_classes, set())
+            compiler.analyze(registered_functions, registered_classes)
            allow_registration = False
        if hasattr(method, "__self__"):
--- a/nac3artiq/src/codegen.rs
+++ b/nac3artiq/src/codegen.rs
@ -1,3 +1,39 @@
 use nac3core::{
    codegen::{
        classes::{
            ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayType,
            NDArrayValue, ProxyType, ProxyValue, 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 nac3core::nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
 use nac3core::inkwell::{
    context::Context,
    module::Linkage,
    types::{BasicType, IntType},
    values::{BasicValueEnum, PointerValue, StructValue},
    AddressSpace, IntPredicate, OptimizationLevel,
 };
 use pyo3::{
    types::{PyDict, PyList},
    PyObject, PyResult, Python,
 };
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 use itertools::Itertools;
 use nac3core::inkwell::values::IntValue;
 use std::{
    collections::{hash_map::DefaultHasher, HashMap},
    hash::{Hash, Hasher},
@ -6,40 +42,6 @@ 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 {
@ -461,7 +463,7 @@ fn format_rpc_arg<'ctx>(
            let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, arg_ty);
            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
            let llvm_arg_ty = NDArrayType::new(generator, ctx.ctx, llvm_elem_ty);
-            let llvm_arg = llvm_arg_ty.map_value(arg.into_pointer_value(), None);
+            let llvm_arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), llvm_usize, None);
            let llvm_usize_sizeof = ctx
                .builder
@ -498,7 +500,7 @@ fn format_rpc_arg<'ctx>(
            call_memcpy_generic(
                ctx,
                pbuffer_dims_begin,
-                llvm_arg.shape().base_ptr(ctx, generator),
+                llvm_arg.dim_sizes().base_ptr(ctx, generator),
                dims_buf_sz,
                llvm_i1.const_zero(),
            );
@ -513,7 +515,7 @@ fn format_rpc_arg<'ctx>(
            ctx.builder.build_store(arg_slot, arg).unwrap();
            ctx.builder
-                .build_bit_cast(arg_slot, llvm_pi8, "rpc.arg")
+                .build_bitcast(arg_slot, llvm_pi8, "rpc.arg")
                .map(BasicValueEnum::into_pointer_value)
                .unwrap()
        }
@ -612,7 +614,7 @@ fn format_rpc_ret<'ctx>(
            // 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.create_dim_sizes(ctx, llvm_usize, ndarray.load_ndims(ctx));
            /*
                ndarray now:
@ -660,7 +662,7 @@ fn format_rpc_ret<'ctx>(
                .unwrap();
            let buffer = ctx
                .builder
-                .build_bit_cast(buffer, llvm_pi8, "")
+                .build_bitcast(buffer, llvm_pi8, "")
                .map(BasicValueEnum::into_pointer_value)
                .unwrap();
            let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
@ -702,7 +704,7 @@ fn format_rpc_ret<'ctx>(
            call_memcpy_generic(
                ctx,
-                ndarray.shape().base_ptr(ctx, generator),
+                ndarray.dim_sizes().base_ptr(ctx, generator),
                pbuffer_dims,
                sizeof_dims,
                llvm_i1.const_zero(),
@ -714,7 +716,7 @@ fn format_rpc_ret<'ctx>(
            // `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));
+                call_ndarray_calc_size(generator, ctx, &ndarray.dim_sizes(), (None, None));
            // debug_assert(nelems * sizeof(T) >= ndarray_nbytes)
            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
@ -783,7 +785,7 @@ fn format_rpc_ret<'ctx>(
        _ => {
            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();
+            let slotgen = ctx.builder.build_bitcast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
            ctx.builder.position_at_end(head_bb);
@ -804,7 +806,7 @@ fn format_rpc_ret<'ctx>(
            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();
+                ctx.builder.build_bitcast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
            phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
@ -822,7 +824,6 @@ fn rpc_codegen_callback_fn<'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();
@ -931,29 +932,6 @@ fn rpc_codegen_callback_fn<'ctx>(
    }
    // call
    if is_async {
        let rpc_send_async = ctx.module.get_function("rpc_send_async").unwrap_or_else(|| {
            ctx.module.add_function(
                "rpc_send_async",
                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_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",
@ -971,15 +949,10 @@ fn rpc_codegen_callback_fn<'ctx>(
    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);
    if is_async {
        // async RPCs do not return any values
        Ok(None)
    } else {
    let result = format_rpc_ret(generator, ctx, fun.0.ret);
    if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
@ -989,14 +962,12 @@ fn rpc_codegen_callback_fn<'ctx>(
    Ok(result)
 }
 }
-pub fn attributes_writeback<'ctx>(
+pub fn attributes_writeback(
-    ctx: &mut CodeGenContext<'ctx, '_>,
+    ctx: &mut CodeGenContext<'_, '_>,
    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)?;
@ -1006,11 +977,6 @@ pub fn attributes_writeback<'ctx>(
        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(
@ -1089,7 +1055,7 @@ pub fn attributes_writeback<'ctx>(
        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, true)
+            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator)
        {
            return Ok(Err(e));
        }
@ -1099,9 +1065,9 @@ pub fn attributes_writeback<'ctx>(
    Ok(())
 }
-pub fn rpc_codegen_callback(is_async: bool) -> Arc<GenCall> {
+pub fn rpc_codegen_callback() -> Arc<GenCall> {
-    Arc::new(GenCall::new(Box::new(move |ctx, obj, fun, args, generator| {
+    Arc::new(GenCall::new(Box::new(|ctx, obj, fun, args, generator| {
-        rpc_codegen_callback_fn(ctx, obj, fun, args, generator, is_async)
+        rpc_codegen_callback_fn(ctx, obj, fun, args, generator)
    })))
 }
@ -1315,8 +1281,7 @@ fn polymorphic_print<'ctx>(
                fmt.push('[');
                flush(ctx, generator, &mut fmt, &mut args);
-                let val =
+                let val = ListValue::from_ptr_val(value.into_pointer_value(), llvm_usize, None);
                    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();
@ -1368,18 +1333,12 @@ 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_pointer_value(
+                let val = NDArrayValue::from_ptr_val(value.into_pointer_value(), llvm_usize, None);
-                    value.into_pointer_value(),
+                let len = call_ndarray_calc_size(generator, ctx, &val.dim_sizes(), (None, None));
                    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();
@ -1432,7 +1391,7 @@ fn polymorphic_print<'ctx>(
                fmt.push_str("range(");
                flush(ctx, generator, &mut fmt, &mut args);
-                let val = RangeValue::from_pointer_value(value.into_pointer_value(), None);
+                let val = RangeValue::from_ptr_val(value.into_pointer_value(), None);
                let (start, stop, step) = destructure_range(ctx, val);
--- a/nac3artiq/src/lib.rs
+++ b/nac3artiq/src/lib.rs
@ -1,4 +1,10 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(
    unsafe_op_in_unsafe_fn,
@ -10,65 +16,64 @@
    clippy::wildcard_imports
 )]
-use std::{
+use std::collections::{HashMap, HashSet};
-    collections::{HashMap, HashSet},
+use std::fs;
-    fs,
+use std::io::Write;
-    io::Write,
+use std::process::Command;
-    process::Command,
+use std::rc::Rc;
-    rc::Rc,
+use std::sync::Arc;
    sync::Arc,
 };
 use itertools::Itertools;
-use parking_lot::{Mutex, RwLock};
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
-use pyo3::{
+use nac3core::inkwell::{
    create_exception, exceptions,
    prelude::*,
    types::{PyBytes, PyDict, PyNone, PySet},
 };
 use tempfile::{self, TempDir};
 use nac3core::{
    codegen::{
        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},
+    module::{Linkage, Module},
    passes::PassBuilderOptions,
    support::is_multithreaded,
    targets::*,
    OptimizationLevel,
-    },
+};
-    nac3parser::{
+use nac3core::nac3parser::{
-        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
+    ast::{ExprKind, Stmt, StmtKind, StrRef},
    parser::parse_program,
-    },
+};
 use nac3core::toplevel::builtins::get_exn_constructor;
 use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
 use pyo3::create_exception;
 use pyo3::prelude::*;
 use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};
 use parking_lot::{Mutex, RwLock};
 use nac3core::{
    codegen::irrt::load_irrt,
    codegen::{concrete_type::ConcreteTypeStore, CodeGenTask, WithCall, WorkerRegistry},
    symbol_resolver::SymbolResolver,
    toplevel::{
        builtins::get_exn_constructor,
        composer::{BuiltinFuncCreator, BuiltinFuncSpec, ComposerConfig, TopLevelComposer},
        DefinitionId, GenCall, TopLevelDef,
    },
-    typecheck::{
+    typecheck::typedef::{FunSignature, FuncArg},
-        type_inferencer::PrimitiveStore,
+    typecheck::{type_inferencer::PrimitiveStore, typedef::Type},
        typedef::{into_var_map, FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
    },
 };
 use nac3ld::Linker;
-use codegen::{
+use crate::{
    codegen::{
        attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
    },
    symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver},
 };
-use symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver};
+use tempfile::{self, TempDir};
 use timeline::TimeFns;
 mod codegen;
 mod symbol_resolver;
 mod timeline;
 use timeline::TimeFns;
 #[derive(PartialEq, Clone, Copy)]
 enum Isa {
    Host,
@ -142,32 +147,14 @@ impl Nac3 {
        module: &PyObject,
        registered_class_ids: &HashSet<u64>,
    ) -> PyResult<()> {
-        let (module_name, source_file, source) =
+        let (module_name, source_file) = Python::with_gil(|py| -> PyResult<(String, String)> {
            Python::with_gil(|py| -> PyResult<(String, String, String)> {
            let module: &PyAny = module.extract(py)?;
-                let source_file = module.getattr("__file__");
+            Ok((module.getattr("__name__")?.extract()?, module.getattr("__file__")?.extract()?))
                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}")))?;
@ -207,8 +194,10 @@ impl Nac3 {
                    body.retain(|stmt| {
                        if let StmtKind::FunctionDef { ref decorator_list, .. } = stmt.node {
                            decorator_list.iter().any(|decorator| {
-                                if let Some(id) = decorator_id_string(decorator) {
+                                if let ExprKind::Name { id, .. } = decorator.node {
-                                    id == "kernel" || id == "portable" || id == "rpc"
+                                    id.to_string() == "kernel"
                                        || id.to_string() == "portable"
                                        || id.to_string() == "rpc"
                                } else {
                                    false
                                }
@ -221,8 +210,9 @@ impl Nac3 {
                }
                StmtKind::FunctionDef { ref decorator_list, .. } => {
                    decorator_list.iter().any(|decorator| {
-                        if let Some(id) = decorator_id_string(decorator) {
+                        if let ExprKind::Name { id, .. } = decorator.node {
-                            id == "extern" || id == "kernel" || id == "portable" || id == "rpc"
+                            let id = id.to_string();
                            id == "extern" || id == "portable" || id == "kernel" || id == "rpc"
                        } else {
                            false
                        }
@ -488,25 +478,9 @@ impl Nac3 {
            match &stmt.node {
                StmtKind::FunctionDef { decorator_list, .. } => {
-                    if decorator_list
+                    if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
-                        .iter()
+                        store_fun.call1(py, (def_id.0.into_py(py), module.getattr(py, name.to_string().as_str()).unwrap())).unwrap();
-                        .any(|decorator| decorator_id_string(decorator) == Some("rpc".to_string()))
+                        rpc_ids.push((None, def_id));
                    {
                        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, .. } => {
@ -514,26 +488,19 @@ 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| {
+                            if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
                                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, is_async));
+                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id));
                            }
                        }
                    }
                }
-                _ => (),
+                _ => ()
            }
            let id = *name_to_pyid.get(&name).unwrap();
@ -629,12 +596,13 @@ 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, is_async) in &rpc_ids {
+            for (class_data, id) in &rpc_ids {
                let mut def = defs[id.0].write();
                match &mut *def {
                    TopLevelDef::Function { codegen_callback, .. } => {
-                        *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                        *codegen_callback = Some(rpc_codegen.clone());
                    }
                    TopLevelDef::Class { methods, .. } => {
                        let (class_def, method_name) = class_data.as_ref().unwrap();
@ -645,7 +613,7 @@ impl Nac3 {
                            if let TopLevelDef::Function { codegen_callback, .. } =
                                &mut *defs[id.0].write()
                            {
-                                *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                                *codegen_callback = Some(rpc_codegen.clone());
                                store_fun
                                    .call1(
                                        py,
@ -660,11 +628,6 @@ impl Nac3 {
                            }
                        }
                    }
                    TopLevelDef::Variable { .. } => {
                        return Err(CompileError::new_err(String::from(
                            "Unsupported @rpc annotation on global variable",
                        )))
                    }
                }
            }
        }
@ -685,12 +648,33 @@ 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: instance.calls,
+            calls: Arc::new(HashMap::default()),
            id: 0,
        };
@ -714,27 +698,19 @@ 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 = ArtiqCodeGenerator::new("main".to_string(), size_t, self.time_fns);
+            let mut generator =
                ArtiqCodeGenerator::new("attributes_writeback".to_string(), size_t, self.time_fns);
            let 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,
@ -742,27 +718,9 @@ impl Nac3 {
                &registry,
                builder,
                module,
-                task,
+                attributes_writeback_task,
                |generator, ctx| {
-                    assert_eq!(instance.body.len(), 1, "toplevel module should have 1 statement");
+                    attributes_writeback(ctx, generator, inner_resolver.as_ref(), &host_attributes)
                    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();
@ -771,23 +729,35 @@ 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(
+            .create_module_from_ir(MemoryBuffer::create_from_memory_range(&buffers[0], "main"))
                buffers.last().unwrap(),
                "main",
            ))
            .unwrap();
-        for buffer in buffers.iter().rev().skip(1) {
+        for buffer in buffers.iter().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();
@ -874,41 +844,6 @@ 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(),
@ -1090,12 +1025,7 @@ impl Nac3 {
        })
    }
-    fn analyze(
+    fn analyze(&mut self, functions: &PySet, classes: &PySet) -> PyResult<()> {
        &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();
@ -1105,22 +1035,14 @@ impl Nac3 {
                let getmodule_fn = PyModule::import(py, "inspect")?.getattr("getmodule")?;
                for function in functions {
-                    let module: PyObject = getmodule_fn.call1((function,))?.extract()?;
+                    let module = getmodule_fn.call1((function,))?.extract()?;
                    if !module.is_none(py) {
                    modules.insert(id_fn.call1((&module,))?.extract()?, module);
                }
                }
                for class in classes {
-                    let module: PyObject = getmodule_fn.call1((class,))?.extract()?;
+                    let module = getmodule_fn.call1((class,))?.extract()?;
                    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);
                }
                Ok((modules, class_ids))
            })?;
--- a/nac3artiq/src/symbol_resolver.rs
+++ b/nac3artiq/src/symbol_resolver.rs
@ -1,30 +1,17 @@
-use std::{
+use crate::PrimitivePythonId;
    collections::{HashMap, HashSet},
    sync::{
        atomic::{AtomicBool, Ordering::Relaxed},
        Arc,
    },
 };
 use itertools::Itertools;
-use parking_lot::RwLock;
+use nac3core::inkwell::{
 use pyo3::{
    types::{PyDict, PyTuple},
    PyAny, PyObject, PyResult, Python,
 };
 use nac3core::{
    codegen::{
        types::{NDArrayType, ProxyType},
        CodeGenContext, CodeGenerator,
    },
    inkwell::{
    module::Linkage,
    types::{BasicType, BasicTypeEnum},
    values::BasicValueEnum,
    AddressSpace,
 };
 use nac3core::nac3parser::ast::{self, StrRef};
 use nac3core::{
    codegen::{
        classes::{NDArrayType, ProxyType},
        CodeGenContext, CodeGenerator,
    },
    nac3parser::ast::{self, StrRef},
    symbol_resolver::{StaticValue, SymbolResolver, SymbolValue, ValueEnum},
    toplevel::{
        helper::PrimDef,
@ -36,8 +23,18 @@ use nac3core::{
        typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
    },
 };
-
+use parking_lot::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),
@ -1096,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_base_type().get_element_type().into_struct_type(),
+                            ndarray_llvm_ty.as_underlying_type(),
                            Some(AddressSpace::default()),
                            &id_str,
                        )
@ -1190,11 +1187,7 @@ impl InnerResolver {
            data_global.set_initializer(&data);
            // create a global for the ndarray object and initialize it
-            let value = ndarray_llvm_ty
+            let value = ndarray_llvm_ty.as_underlying_type().const_named_struct(&[
                .as_base_type()
                .get_element_type()
                .into_struct_type()
                .const_named_struct(&[
                llvm_usize.const_int(ndarray_ndims, false).into(),
                shape_global
                    .as_pointer_value()
@ -1207,7 +1200,7 @@ impl InnerResolver {
            ]);
            let ndarray = ctx.module.add_global(
-                ndarray_llvm_ty.as_base_type().get_element_type().into_struct_type(),
+                ndarray_llvm_ty.as_underlying_type(),
                Some(AddressSpace::default()),
                &id_str,
            );
@ -1474,7 +1467,6 @@ 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();
--- a/nac3artiq/src/timeline.rs
+++ b/nac3artiq/src/timeline.rs
@ -1,11 +1,8 @@
 use itertools::Either;
-
+use nac3core::codegen::CodeGenContext;
-use nac3core::{
+use nac3core::inkwell::{
    codegen::CodeGenContext,
    inkwell::{
    values::{BasicValueEnum, CallSiteValue},
    AddressSpace, AtomicOrdering,
    },
 };
 /// Functions for manipulating the timeline.
@ -34,7 +31,7 @@ impl TimeFns for NowPinningTimeFns64 {
            .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
        let now_hiptr = ctx
            .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap();
@ -83,7 +80,7 @@ impl TimeFns for NowPinningTimeFns64 {
            .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
        let now_hiptr = ctx
            .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap();
@ -112,7 +109,7 @@ impl TimeFns for NowPinningTimeFns64 {
            .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
        let now_hiptr = ctx
            .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap();
@ -210,7 +207,7 @@ impl TimeFns for NowPinningTimeFns {
            .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
        let now_hiptr = ctx
            .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap();
@ -261,7 +258,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_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap();
--- a/nac3ast/Cargo.toml
+++ b/nac3ast/Cargo.toml
@ -10,6 +10,7 @@ constant-optimization = ["fold"]
 fold = []
 [dependencies]
 lazy_static = "1.5"
 parking_lot = "0.12"
 string-interner = "0.17"
 fxhash = "0.2"
--- a/nac3ast/src/ast_gen.rs
+++ b/nac3ast/src/ast_gen.rs
@ -5,12 +5,14 @@ pub use crate::location::Location;
 use fxhash::FxBuildHasher;
 use parking_lot::{Mutex, MutexGuard};
-use std::{cell::RefCell, collections::HashMap, fmt, sync::LazyLock};
+use std::{cell::RefCell, collections::HashMap, fmt};
 use string_interner::{symbol::SymbolU32, DefaultBackend, StringInterner};
 pub type Interner = StringInterner<DefaultBackend, FxBuildHasher>;
-static INTERNER: LazyLock<Mutex<Interner>> =
+lazy_static! {
-    LazyLock::new(|| Mutex::new(StringInterner::with_hasher(FxBuildHasher::default())));
+    static ref INTERNER: Mutex<Interner> =
        Mutex::new(StringInterner::with_hasher(FxBuildHasher::default()));
 }
 thread_local! {
    static LOCAL_INTERNER: RefCell<HashMap<String, StrRef>> = RefCell::default();
--- a/nac3ast/src/lib.rs
+++ b/nac3ast/src/lib.rs
@ -1,4 +1,10 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(
    clippy::missing_errors_doc,
@ -8,6 +14,9 @@
    clippy::wildcard_imports
 )]
 #[macro_use]
 extern crate lazy_static;
 mod ast_gen;
 mod constant;
 #[cfg(feature = "fold")]
--- a/nac3core/Cargo.toml
+++ b/nac3core/Cargo.toml
@ -5,23 +5,20 @@ authors = ["M-Labs"]
 edition = "2021"
 [features]
 default = ["derive"]
 derive = ["dep:nac3core_derive"]
 no-escape-analysis = []
 [dependencies]
 itertools = "0.13"
 crossbeam = "0.8"
-indexmap = "2.6"
+indexmap = "2.2"
 parking_lot = "0.12"
-rayon = "1.10"
+rayon = "1.8"
 nac3core_derive = { path = "nac3core_derive", optional = true }
 nac3parser = { path = "../nac3parser" }
 strum = "0.26"
 strum_macros = "0.26"
 [dependencies.inkwell]
-version = "0.5"
+version = "0.4"
 default-features = false
 features = ["llvm14-0-prefer-dynamic", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
--- a/nac3core/build.rs
+++ b/nac3core/build.rs
@ -1,3 +1,4 @@
 use regex::Regex;
 use std::{
    env,
    fs::File,
@ -6,8 +7,6 @@ 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);
@ -56,8 +55,9 @@ fn main() {
    let output = Command::new("clang-irrt")
        .args(flags)
        .output()
-        .inspect(|o| {
+        .map(|o| {
            assert!(o.status.success(), "{}", std::str::from_utf8(&o.stderr).unwrap());
            o
        })
        .unwrap();
--- a/nac3core/irrt/irrt.cpp
+++ b/nac3core/irrt/irrt.cpp
@ -1,4 +1,5 @@
 #include "irrt/exception.hpp"
 #include "irrt/int_types.hpp"
 #include "irrt/list.hpp"
 #include "irrt/math.hpp"
 #include "irrt/ndarray.hpp"
--- a/nac3core/irrt/irrt/cslice.hpp
+++ b/nac3core/irrt/irrt/cslice.hpp
@ -4,6 +4,6 @@
 template<typename SizeT>
 struct CSlice {
-    void* base;
+    uint8_t* base;
    SizeT len;
 };
--- a/nac3core/irrt/irrt/exception.hpp
+++ b/nac3core/irrt/irrt/exception.hpp
@ -6,7 +6,7 @@
 /**
 * @brief The int type of ARTIQ exception IDs.
 */
-using ExceptionId = int32_t;
+typedef int32_t ExceptionId;
 /*
 * Set of exceptions C++ IRRT can use.
@ -55,14 +55,11 @@ void _raise_exception_helper(ExceptionId id,
                             int64_t param2) {
    Exception<SizeT> e = {
        .id = id,
-        .filename = {.base = reinterpret_cast<void*>(const_cast<char*>(filename)),
+        .filename = {.base = reinterpret_cast<const uint8_t*>(filename), .len = __builtin_strlen(filename)},
                     .len = static_cast<SizeT>(__builtin_strlen(filename))},
        .line = line,
        .column = 0,
-        .function = {.base = reinterpret_cast<void*>(const_cast<char*>(function)),
+        .function = {.base = reinterpret_cast<const uint8_t*>(function), .len = __builtin_strlen(function)},
-                     .len = static_cast<SizeT>(__builtin_strlen(function))},
+        .msg = {.base = reinterpret_cast<const uint8_t*>(msg), .len = __builtin_strlen(msg)},
        .msg = {.base = reinterpret_cast<void*>(const_cast<char*>(msg)),
                .len = static_cast<SizeT>(__builtin_strlen(msg))},
    };
    e.params[0] = param0;
    e.params[1] = param1;
@ -70,7 +67,6 @@ 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).
@ -83,3 +79,4 @@ 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
--- a/nac3core/irrt/irrt/int_types.hpp
+++ b/nac3core/irrt/irrt/int_types.hpp
@ -8,17 +8,12 @@ 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`.
--- a/nac3core/irrt/irrt/list.hpp
+++ b/nac3core/irrt/irrt/list.hpp
@ -13,12 +13,12 @@ extern "C" {
 SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
                                             SliceIndex dest_end,
                                             SliceIndex dest_step,
-                                             void* dest_arr,
+                                             uint8_t* dest_arr,
                                             SliceIndex dest_arr_len,
                                             SliceIndex src_start,
                                             SliceIndex src_end,
                                             SliceIndex src_step,
-                                             void* src_arr,
+                                             uint8_t* src_arr,
                                             SliceIndex src_arr_len,
                                             const SliceIndex size) {
    /* if dest_arr_len == 0, do nothing since we do not support extending list */
@ -29,13 +29,11 @@ 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(static_cast<uint8_t*>(dest_arr) + dest_start * size,
+            __builtin_memmove(dest_arr + dest_start * size, src_arr + src_start * size, src_len * size);
                              static_cast<uint8_t*>(src_arr) + src_start * size, src_len * size);
        }
        if (dest_len > 0) {
            /* dropping */
-            __builtin_memmove(static_cast<uint8_t*>(dest_arr) + (dest_start + src_len) * size,
+            __builtin_memmove(dest_arr + (dest_start + src_len) * size, dest_arr + (dest_end + 1) * size,
                              static_cast<uint8_t*>(dest_arr) + (dest_end + 1) * size,
                              (dest_arr_len - dest_end - 1) * size);
        }
        /* shrink size */
@ -46,7 +44,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) {
-        void* tmp = __builtin_alloca(src_arr_len * size);
+        uint8_t* tmp = reinterpret_cast<uint8_t*>(__builtin_alloca(src_arr_len * size));
        __builtin_memcpy(tmp, src_arr, src_arr_len * size);
        src_arr = tmp;
    }
@ -55,24 +53,20 @@ 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(static_cast<uint8_t*>(dest_arr) + dest_ind, static_cast<uint8_t*>(src_arr) + src_ind, 1);
+            __builtin_memcpy(dest_arr + dest_ind, src_arr + src_ind, 1);
        } else if (size == 4) {
-            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * 4,
+            __builtin_memcpy(dest_arr + dest_ind * 4, src_arr + src_ind * 4, 4);
                             static_cast<uint8_t*>(src_arr) + src_ind * 4, 4);
        } else if (size == 8) {
-            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * 8,
+            __builtin_memcpy(dest_arr + dest_ind * 8, src_arr + src_ind * 8, 8);
                             static_cast<uint8_t*>(src_arr) + src_ind * 8, 8);
        } else {
            /* memcpy for var size, cannot overlap after previous alloca */
-            __builtin_memcpy(static_cast<uint8_t*>(dest_arr) + dest_ind * size,
+            __builtin_memcpy(dest_arr + dest_ind * size, src_arr + src_ind * size, 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(static_cast<uint8_t*>(dest_arr) + dest_ind * size,
+        __builtin_memmove(dest_arr + dest_ind * size, dest_arr + (dest_end + 1) * 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;
    }
--- a/nac3core/irrt/irrt/math.hpp
+++ b/nac3core/irrt/irrt/math.hpp
@ -90,4 +90,4 @@ double __nac3_j0(double x) {
    return j0(x);
 }
-}  // namespace
+}
--- a/nac3core/irrt/irrt/ndarray.hpp
+++ b/nac3core/irrt/irrt/ndarray.hpp
@ -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
+}
--- a/nac3core/irrt/irrt/slice.hpp
+++ b/nac3core/irrt/irrt/slice.hpp
@ -25,4 +25,4 @@ SliceIndex __nac3_range_slice_len(const SliceIndex start, const SliceIndex end,
        return 0;
    }
 }
-}  // namespace
+}
--- a/nac3core/nac3core_derive/Cargo.toml
+++ b/nac3core/nac3core_derive/Cargo.toml
@ -1,21 +0,0 @@
 [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"
--- a/nac3core/nac3core_derive/src/lib.rs
+++ b/nac3core/nac3core_derive/src/lib.rs
@ -1,320 +0,0 @@
 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()
 }
--- a/nac3core/nac3core_derive/tests/structfields_empty.rs
+++ b/nac3core/nac3core_derive/tests/structfields_empty.rs
@ -1,9 +0,0 @@
 use nac3core_derive::StructFields;
 use std::marker::PhantomData;
 #[derive(PartialEq, Eq, Clone, Copy, StructFields)]
 pub struct EmptyValue<'ctx> {
    _phantom: PhantomData<&'ctx ()>,
 }
 fn main() {}
--- a/nac3core/nac3core_derive/tests/structfields_ndarray.rs
+++ b/nac3core/nac3core_derive/tests/structfields_ndarray.rs
@ -1,20 +0,0 @@
 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() {}
--- a/nac3core/nac3core_derive/tests/structfields_slice.rs
+++ b/nac3core/nac3core_derive/tests/structfields_slice.rs
@ -1,18 +0,0 @@
 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() {}
--- a/nac3core/nac3core_derive/tests/structfields_slice_context.rs
+++ b/nac3core/nac3core_derive/tests/structfields_slice_context.rs
@ -1,18 +0,0 @@
 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() {}
--- a/nac3core/nac3core_derive/tests/structfields_slice_ctx.rs
+++ b/nac3core/nac3core_derive/tests/structfields_slice_ctx.rs
@ -1,18 +0,0 @@
 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() {}
--- a/nac3core/nac3core_derive/tests/structfields_slice_sizet.rs
+++ b/nac3core/nac3core_derive/tests/structfields_slice_sizet.rs
@ -1,18 +0,0 @@
 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() {}
--- a/nac3core/nac3core_derive/tests/structfields_test.rs
+++ b/nac3core/nac3core_derive/tests/structfields_test.rs
@ -1,10 +0,0 @@
 #[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");
 }
--- a/nac3core/src/codegen/builtin_fns.rs
+++ b/nac3core/src/codegen/builtin_fns.rs
@ -1,32 +1,21 @@
-use inkwell::{
+use inkwell::types::BasicTypeEnum;
-    types::BasicTypeEnum,
+use inkwell::values::{BasicValue, BasicValueEnum, IntValue, PointerValue};
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
+use inkwell::{FloatPredicate, IntPredicate, OptimizationLevel};
    FloatPredicate, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
-use super::{
+use crate::codegen::classes::{
    expr::destructure_range,
    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::macros::codegen_unreachable;
 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.
 ///
@ -50,7 +39,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_pointer_value(arg.into_pointer_value(), Some("range"));
+        let arg = RangeValue::from_ptr_val(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 {
@ -68,17 +57,11 @@ 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_pointer_value(
+                let arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), llvm_usize, None);
                    arg.into_pointer_value(),
                    ctx.get_llvm_type(generator, elem_ty),
                    llvm_usize,
                    None,
                );
-                let ndims = arg.shape().size(ctx, generator);
+                let ndims = arg.dim_sizes().size(ctx, generator);
                ctx.make_assert(
                    generator,
                    ctx.builder
@ -91,7 +74,12 @@ pub fn call_len<'ctx, G: CodeGenerator + ?Sized>(
                );
                let len = unsafe {
-                    arg.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                    arg.dim_sizes().get_typed_unchecked(
                        ctx,
                        generator,
                        &llvm_usize.const_zero(),
                        None,
                    )
                };
                ctx.builder.build_int_truncate_or_bit_cast(len, llvm_i32, "len").unwrap()
@ -146,14 +134,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_int32(generator, ctx, (elem_ty, val)),
            )?;
@ -209,14 +196,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_int64(generator, ctx, (elem_ty, val)),
            )?;
@ -288,14 +274,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_uint32(generator, ctx, (elem_ty, val)),
            )?;
@ -356,14 +341,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_uint64(generator, ctx, (elem_ty, val)),
            )?;
@ -423,14 +407,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_float(generator, ctx, (elem_ty, val)),
            )?;
@ -470,14 +453,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_round(generator, ctx, (elem_ty, val), ret_elem_ty),
            )?;
@ -511,14 +493,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_numpy_round(generator, ctx, (elem_ty, val)),
            )?;
@ -577,14 +558,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| {
                    let elem = call_bool(generator, ctx, (elem_ty, val))?;
@ -632,14 +612,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_floor(generator, ctx, (elem_ty, val), ret_elem_ty),
            )?;
@ -683,14 +662,13 @@ 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_pointer_value(n, llvm_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(n, llvm_usize, None),
                |generator, ctx, val| call_ceil(generator, ctx, (elem_ty, val), ret_elem_ty),
            )?;
@ -819,8 +797,8 @@ pub fn call_numpy_minimum<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_minimum(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -919,10 +897,10 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
            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_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+            let llvm_ndarray_ty = ctx.get_llvm_type(generator, elem_ty);
-            let n = NDArrayValue::from_pointer_value(n, llvm_elem_ty, llvm_usize, None);
+            let n = NDArrayValue::from_ptr_val(n, llvm_usize, None);
-            let n_sz = irrt::call_ndarray_calc_size(generator, ctx, &n.shape(), (None, None));
+            let n_sz = irrt::call_ndarray_calc_size(generator, ctx, &n.dim_sizes(), (None, None));
            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
                let n_sz_eqz = ctx
                    .builder
@ -939,7 +917,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
                );
            }
-            let accumulator_addr = generator.gen_var_alloc(ctx, llvm_elem_ty, None)?;
+            let accumulator_addr = generator.gen_var_alloc(ctx, llvm_ndarray_ty, None)?;
            let res_idx = generator.gen_var_alloc(ctx, llvm_int64.into(), None)?;
            unsafe {
@ -1081,8 +1059,8 @@ pub fn call_numpy_maximum<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_maximum(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1127,7 +1105,6 @@ 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(
@ -1135,7 +1112,7 @@ where
                ctx,
                ret_elem_ty,
                None,
-                NDArrayValue::from_pointer_value(x, llvm_arg_elem_ty, llvm_usize, None),
+                NDArrayValue::from_ptr_val(x, llvm_usize, None),
                |generator, ctx, elem_val| {
                    helper_call_numpy_unary_elementwise(
                        generator,
@ -1522,8 +1499,8 @@ pub fn call_numpy_arctan2<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_arctan2(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1589,8 +1566,8 @@ pub fn call_numpy_copysign<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_copysign(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1656,8 +1633,8 @@ pub fn call_numpy_fmax<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_fmax(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1723,8 +1700,8 @@ pub fn call_numpy_fmin<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_fmin(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1779,8 +1756,8 @@ pub fn call_numpy_ldexp<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_ldexp(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1846,8 +1823,8 @@ pub fn call_numpy_hypot<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_hypot(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1913,8 +1890,8 @@ pub fn call_numpy_nextafter<'ctx, G: CodeGenerator + ?Sized>(
                ctx,
                dtype,
                None,
-                (x1_ty, x1, !is_ndarray1),
+                (x1, !is_ndarray1),
-                (x2_ty, x2, !is_ndarray2),
+                (x2, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    call_numpy_nextafter(generator, ctx, (x1_scalar_ty, lhs), (x2_scalar_ty, rhs))
                },
@ -1974,14 +1951,14 @@ pub fn call_np_linalg_cholesky<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2016,14 +1993,14 @@ pub fn call_np_linalg_qr<'ctx, G: CodeGenerator + ?Sized>(
            unimplemented!("{FN_NAME} operates on float type NdArrays only");
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2066,15 +2043,15 @@ pub fn call_np_linalg_svd<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2121,14 +2098,14 @@ pub fn call_np_linalg_inv<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2163,15 +2140,15 @@ pub fn call_np_linalg_pinv<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2206,15 +2183,15 @@ pub fn call_sp_linalg_lu<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let dim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2259,7 +2236,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_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        // Changing second parameter to a `NDArray` for uniformity in function call
        let n2_array = numpy::create_ndarray_const_shape(
            generator,
@ -2279,12 +2256,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.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
        let outdim1 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
                .into_int_value()
        };
@ -2354,10 +2331,10 @@ pub fn call_sp_linalg_schur<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
@ -2397,10 +2374,10 @@ pub fn call_sp_linalg_hessenberg<'ctx, G: CodeGenerator + ?Sized>(
            unsupported_type(ctx, FN_NAME, &[x1_ty]);
        };
-        let n1 = NDArrayValue::from_pointer_value(n1, n1_elem_ty, llvm_usize, None);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
        let dim0 = unsafe {
-            n1.shape()
+            n1.dim_sizes()
                .get_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
                .into_int_value()
        };
--- a/nac3core/src/codegen/classes.rs
+++ b/nac3core/src/codegen/classes.rs
--- a/nac3core/src/codegen/concrete_type.rs
+++ b/nac3core/src/codegen/concrete_type.rs
@ -1,9 +1,3 @@
 use std::collections::HashMap;
 use indexmap::IndexMap;
 use nac3parser::ast::StrRef;
 use crate::{
    symbol_resolver::SymbolValue,
    toplevel::DefinitionId,
@ -15,6 +9,10 @@ use crate::{
    },
 };
 use indexmap::IndexMap;
 use nac3parser::ast::StrRef;
 use std::collections::HashMap;
 pub struct ConcreteTypeStore {
    store: Vec<ConcreteTypeEnum>,
 }
--- a/nac3core/src/codegen/expr.rs
+++ b/nac3core/src/codegen/expr.rs
@ -1,24 +1,9 @@
-use std::{
+use crate::{
-    cmp::min,
+    codegen::{
-    collections::HashMap,
+        classes::{
-    convert::TryInto,
+            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayValue, ProxyType,
-    iter::{once, repeat, repeat_with, zip},
+            ProxyValue, RangeValue, TypedArrayLikeAccessor, UntypedArrayLikeAccessor,
-};
+        },
 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 super::{
        concrete_type::{ConcreteFuncArg, ConcreteTypeEnum, ConcreteTypeStore},
        gen_in_range_check, get_llvm_abi_type, get_llvm_type, get_va_count_arg_name,
        irrt::*,
@ -32,14 +17,8 @@ use super::{
            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,
@ -51,6 +30,20 @@ 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,
@ -558,7 +551,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                            && val_ty.get_element_type().is_struct_type()
                    } =>
                {
-                    self.builder.build_bit_cast(*val, arg_ty, "call_arg_cast").unwrap()
+                    self.builder.build_bitcast(*val, arg_ty, "call_arg_cast").unwrap()
                }
                _ => *val,
            })
@ -978,7 +971,6 @@ 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| {
@ -1168,8 +1160,7 @@ 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 =
+            let iter_val = RangeValue::from_ptr_val(iter_val.into_pointer_value(), Some("range"));
                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
@ -1400,10 +1391,8 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty1);
                let sizeof_elem = llvm_elem_ty.size_of().unwrap();
-                let lhs =
+                let lhs = ListValue::from_ptr_val(left_val.into_pointer_value(), llvm_usize, None);
-                    ListValue::from_pointer_value(left_val.into_pointer_value(), llvm_usize, None);
+                let rhs = ListValue::from_ptr_val(right_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
@ -1486,7 +1475,7 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                        codegen_unreachable!(ctx)
                    };
                let list_val =
-                    ListValue::from_pointer_value(list_val.into_pointer_value(), llvm_usize, None);
+                    ListValue::from_ptr_val(list_val.into_pointer_value(), llvm_usize, None);
                let int_val = ctx
                    .builder
                    .build_int_s_extend(int_val.into_int_value(), llvm_usize, "")
@ -1564,21 +1553,10 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
            assert!(ctx.unifier.unioned(ndarray_dtype1, ndarray_dtype2));
-            let llvm_ndarray_dtype1 = ctx.get_llvm_type(generator, ndarray_dtype1);
+            let left_val =
-            let llvm_ndarray_dtype2 = ctx.get_llvm_type(generator, ndarray_dtype2);
+                NDArrayValue::from_ptr_val(left_val.into_pointer_value(), llvm_usize, None);
-
+            let right_val =
-            let left_val = NDArrayValue::from_pointer_value(
+                NDArrayValue::from_ptr_val(right_val.into_pointer_value(), llvm_usize, None);
                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
@ -1602,8 +1580,8 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                        BinopVariant::Normal => None,
                        BinopVariant::AugAssign => Some(left_val),
                    },
-                    (ty1, left_val.as_base_value().into(), false),
+                    (left_val.as_base_value().into(), false),
-                    (ty2, right_val.as_base_value().into(), false),
+                    (right_val.as_base_value().into(), false),
                    |generator, ctx, (lhs, rhs)| {
                        gen_binop_expr_with_values(
                            generator,
@ -1627,10 +1605,8 @@ 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 llvm_ndarray_dtype = ctx.get_llvm_type(generator, ndarray_dtype);
+            let ndarray_val = NDArrayValue::from_ptr_val(
            let ndarray_val = NDArrayValue::from_pointer_value(
                if is_ndarray1 { left_val } else { right_val }.into_pointer_value(),
                llvm_ndarray_dtype,
                llvm_usize,
                None,
            );
@ -1642,8 +1618,8 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                    BinopVariant::Normal => None,
                    BinopVariant::AugAssign => Some(ndarray_val),
                },
-                (ty1, left_val, !is_ndarray1),
+                (left_val, !is_ndarray1),
-                (ty2, right_val, !is_ndarray2),
+                (right_val, !is_ndarray2),
                |generator, ctx, (lhs, rhs)| {
                    gen_binop_expr_with_values(
                        generator,
@ -1794,12 +1770,7 @@ 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_int_compare(
+                .build_xor(val, val.get_type().const_all_ones(), "not")
                    inkwell::IntPredicate::EQ,
                    val,
                    val.get_type().const_zero(),
                    "not",
                )
                .map(Into::into)
                .unwrap(),
            ast::Unaryop::UAdd => val.into(),
@ -1823,14 +1794,8 @@ 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_pointer_value(
+        let val = NDArrayValue::from_ptr_val(val.into_pointer_value(), llvm_usize, None);
            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
@ -1921,21 +1886,15 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                assert!(ctx.unifier.unioned(ndarray_dtype1, ndarray_dtype2));
-                let llvm_ndarray_dtype1 = ctx.get_llvm_type(generator, ndarray_dtype1);
+                let left_val =
-
+                    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_ty, left_val.as_base_value().into(), false),
+                    (left_val.as_base_value().into(), false),
-                    (right_ty, rhs, false),
+                    (rhs, false),
                    |generator, ctx, (lhs, rhs)| {
                        let val = gen_cmpop_expr_with_values(
                            generator,
@ -1966,8 +1925,8 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                    ctx,
                    ctx.primitives.bool,
                    None,
-                    (left_ty, lhs, !is_ndarray1),
+                    (lhs, !is_ndarray1),
-                    (right_ty, rhs, !is_ndarray2),
+                    (rhs, !is_ndarray2),
                    |generator, ctx, (lhs, rhs)| {
                        let val = gen_cmpop_expr_with_values(
                            generator,
@ -2230,9 +2189,9 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                    }
                    let left_val =
-                        ListValue::from_pointer_value(lhs.into_pointer_value(), llvm_usize, None);
+                        ListValue::from_ptr_val(lhs.into_pointer_value(), llvm_usize, None);
                    let right_val =
-                        ListValue::from_pointer_value(rhs.into_pointer_value(), llvm_usize, None);
+                        ListValue::from_ptr_val(rhs.into_pointer_value(), llvm_usize, None);
                    Ok(gen_if_else_expr_callback(
                        generator,
@ -2631,7 +2590,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                let llvm_i32 = ctx.ctx.i32_type();
                let len = unsafe {
-                    v.shape().get_typed_unchecked(
+                    v.dim_sizes().get_typed_unchecked(
                        ctx,
                        generator,
                        &llvm_usize.const_int(dim, true),
@ -2672,7 +2631,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
            ExprKind::Slice { lower, upper, step } => {
                let dim_sz = unsafe {
-                    v.shape().get_typed_unchecked(
+                    v.dim_sizes().get_typed_unchecked(
                        ctx,
                        generator,
                        &llvm_usize.const_int(dim, false),
@ -2796,12 +2755,7 @@ 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_pointer_value(
+                let ndarray = NDArrayValue::from_ptr_val(subscripted_ndarray, llvm_usize, None);
                    subscripted_ndarray,
                    llvm_ndarray_data_t,
                    llvm_usize,
                    None,
                );
                let num_dims = v.load_ndims(ctx);
                ndarray.store_ndims(
@ -2813,7 +2767,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                );
                let ndarray_num_dims = ndarray.load_ndims(ctx);
-                ndarray.create_shape(ctx, llvm_usize, ndarray_num_dims);
+                ndarray.create_dim_sizes(ctx, llvm_usize, ndarray_num_dims);
                let ndarray_num_dims = ctx
                    .builder
@ -2824,7 +2778,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                    )
                    .unwrap();
                let v_dims_src_ptr = unsafe {
-                    v.shape().ptr_offset_unchecked(
+                    v.dim_sizes().ptr_offset_unchecked(
                        ctx,
                        generator,
                        &llvm_usize.const_int(1, false),
@ -2833,7 +2787,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                };
                call_memcpy_generic(
                    ctx,
-                    ndarray.shape().base_ptr(ctx, generator),
+                    ndarray.dim_sizes().base_ptr(ctx, generator),
                    v_dims_src_ptr,
                    ctx.builder
                        .build_int_mul(ndarray_num_dims, llvm_usize.size_of(), "")
@ -2845,7 +2799,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
                let ndarray_num_elems = call_ndarray_calc_size(
                    generator,
                    ctx,
-                    &ndarray.shape().as_slice_value(ctx, generator),
+                    &ndarray.dim_sizes().as_slice_value(ctx, generator),
                    (None, None),
                );
                let ndarray_num_elems = ctx
@ -2925,31 +2879,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
            Some((_, Some(static_value), _)) => ValueEnum::Static(static_value.clone()),
            None => {
                let resolver = ctx.resolver.clone();
-                let value = resolver.get_symbol_value(*id, ctx, generator).unwrap();
+                resolver.get_symbol_value(*id, ctx).unwrap()
                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 {
                    value
                }
            }
        },
        ExprKind::List { elts, .. } => {
@ -3142,53 +3072,48 @@ 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_begin_bb = ctx.ctx.append_basic_block(current, "a_begin");
+            let a_bb = ctx.ctx.append_basic_block(current, "a");
-            let a_end_bb = ctx.ctx.append_basic_block(current, "a_end");
+            let b_bb = ctx.ctx.append_basic_block(current, "b");
            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_begin_bb, b_begin_bb).unwrap();
+            ctx.builder.build_conditional_branch(left, a_bb, b_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_begin_bb);
+                    ctx.builder.position_at_end(a_bb);
                    let a = ctx.ctx.i8_type().const_int(1, false);
-                    ctx.builder.build_unconditional_branch(a_end_bb).unwrap();
+                    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
-                    ctx.builder.position_at_end(b_begin_bb);
+                    ctx.builder.position_at_end(b_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_begin_bb);
+                    ctx.builder.position_at_end(a_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_begin_bb);
+                    ctx.builder.position_at_end(b_bb);
                    let b = ctx.ctx.i8_type().const_zero();
-                    ctx.builder.build_unconditional_branch(b_end_bb).unwrap();
+                    ctx.builder.build_unconditional_branch(cont_bb).unwrap();
                    (a, Some(b))
                }
@ -3198,7 +3123,7 @@ 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_end_bb), (&b, b_end_bb)]);
+                    phi.add_incoming(&[(&a, a_bb), (&b, b_bb)]);
                    phi.as_basic_value().into()
                }
                (Some(a), None) => a.into(),
@ -3436,7 +3361,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                    } else {
                        return Ok(None);
                    };
-                    let v = ListValue::from_pointer_value(v, usize, Some("arr"));
+                    let v = ListValue::from_ptr_val(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);
@ -3539,7 +3464,6 @@ 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())?
@ -3547,7 +3471,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                    } else {
                        return Ok(None);
                    };
-                    let v = NDArrayValue::from_pointer_value(v, llvm_ty, usize, None);
+                    let v = NDArrayValue::from_ptr_val(v, usize, None);
                    return gen_ndarray_subscript_expr(generator, ctx, *ty, *ndims, v, slice);
                }
--- a/nac3core/src/codegen/extern_fns.rs
+++ b/nac3core/src/codegen/extern_fns.rs
@ -1,10 +1,8 @@
-use inkwell::{
+use inkwell::attributes::{Attribute, AttributeLoc};
-    attributes::{Attribute, AttributeLoc},
+use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue};
    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue},
 };
 use itertools::Either;
-use super::CodeGenContext;
+use crate::codegen::CodeGenContext;
 /// Macro to generate extern function
 /// Both function return type and function parameter type are `FloatValue`
--- a/nac3core/src/codegen/generator.rs
+++ b/nac3core/src/codegen/generator.rs
@ -1,18 +1,16 @@
 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;
--- a/nac3core/src/codegen/irrt/list.rs
+++ b/nac3core/src/codegen/irrt/list.rs
@ -1,162 +0,0 @@
 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);
 }
--- a/nac3core/src/codegen/irrt/math.rs
+++ b/nac3core/src/codegen/irrt/math.rs
@ -1,152 +0,0 @@
 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()
 }
--- a/nac3core/src/codegen/irrt/mod.rs
+++ b/nac3core/src/codegen/irrt/mod.rs
@ -1,26 +1,27 @@
 use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
 use super::{
    classes::{
        ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayValue,
        TypedArrayLikeAccessor, TypedArrayLikeAdapter, UntypedArrayLikeAccessor,
    },
    llvm_intrinsics,
    macros::codegen_unreachable,
    stmt::gen_for_callback_incrementing,
    CodeGenContext, CodeGenerator,
 };
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
    context::Context,
    memory_buffer::MemoryBuffer,
    module::Module,
-    values::{BasicValue, BasicValueEnum, IntValue},
+    types::{BasicTypeEnum, IntType},
-    IntPredicate,
+    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
    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,6 +61,88 @@ 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",
        _ => 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()
 }
 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.
@ -225,3 +308,644 @@ 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(),
                    _ => 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);
 }
 /// 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 => 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.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 => 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.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 => 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.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 => 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.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()),
    )
 }
--- a/nac3core/src/codegen/irrt/ndarray.rs
+++ b/nac3core/src/codegen/irrt/ndarray.rs
@ -1,384 +0,0 @@
 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()),
    )
 }
--- a/nac3core/src/codegen/irrt/slice.rs
+++ b/nac3core/src/codegen/irrt/slice.rs
@ -1,76 +0,0 @@
 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()
 }
--- a/nac3core/src/codegen/llvm_intrinsics.rs
+++ b/nac3core/src/codegen/llvm_intrinsics.rs
@ -1,14 +1,12 @@
-use inkwell::{
+use crate::codegen::CodeGenContext;
-    context::Context,
+use inkwell::context::Context;
-    intrinsics::Intrinsic,
+use inkwell::intrinsics::Intrinsic;
-    types::{AnyTypeEnum::IntType, FloatType},
+use inkwell::types::AnyTypeEnum::IntType;
-    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue},
+use inkwell::types::FloatType;
-    AddressSpace,
+use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue};
-};
+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 {
@ -185,7 +183,7 @@ pub fn call_memcpy_generic<'ctx>(
        dest
    } else {
        ctx.builder
-            .build_bit_cast(dest, llvm_p0i8, "")
+            .build_bitcast(dest, llvm_p0i8, "")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap()
    };
@ -193,7 +191,7 @@ pub fn call_memcpy_generic<'ctx>(
        src
    } else {
        ctx.builder
-            .build_bit_cast(src, llvm_p0i8, "")
+            .build_bitcast(src, llvm_p0i8, "")
            .map(BasicValueEnum::into_pointer_value)
            .unwrap()
    };
--- a/nac3core/src/codegen/mod.rs
+++ b/nac3core/src/codegen/mod.rs
@ -1,12 +1,12 @@
-use std::{
+use crate::{
-    collections::{HashMap, HashSet},
+    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
-    sync::{
+    symbol_resolver::{StaticValue, SymbolResolver},
-        atomic::{AtomicBool, Ordering},
+    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
-        Arc,
+    typecheck::{
        type_inferencer::{CodeLocation, PrimitiveStore},
        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
    },
    thread,
 };
 use crossbeam::channel::{unbounded, Receiver, Sender};
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
@ -24,23 +24,17 @@ use inkwell::{
    AddressSpace, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
 use parking_lot::{Condvar, Mutex};
 use nac3parser::ast::{Location, Stmt, StrRef};
-
+use parking_lot::{Condvar, Mutex};
-use crate::{
+use std::collections::{HashMap, HashSet};
-    symbol_resolver::{StaticValue, SymbolResolver},
+use std::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},
    },
 };
-use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
+use std::thread;
 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;
@ -49,12 +43,13 @@ pub mod irrt;
 pub mod llvm_intrinsics;
 pub mod numpy;
 pub mod stmt;
 pub mod types;
 pub mod values;
 #[cfg(test)]
 mod test;
 use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
 pub use generator::{CodeGenerator, DefaultCodeGenerator};
 mod macros {
    /// 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
@ -853,9 +848,10 @@ 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(
--- a/nac3core/src/codegen/numpy.rs
+++ b/nac3core/src/codegen/numpy.rs
@ -1,32 +1,24 @@
-use inkwell::{
+use crate::{
-    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
+    codegen::{
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
+        classes::{
-    AddressSpace, IntPredicate, OptimizationLevel,
+            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayType, NDArrayValue,
-};
+            ProxyType, ProxyValue, TypedArrayLikeAccessor, TypedArrayLikeAdapter,
-
+            TypedArrayLikeMutator, UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
-use nac3parser::ast::{Operator, StrRef};
+        },
 use super::{
        expr::gen_binop_expr_with_values,
        irrt::{
            calculate_len_for_slice_range, call_ndarray_calc_broadcast,
-        call_ndarray_calc_broadcast_index, call_ndarray_calc_nd_indices, call_ndarray_calc_size,
+            call_ndarray_calc_broadcast_index, call_ndarray_calc_nd_indices,
            call_ndarray_calc_size,
        },
        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::{arraylike_flatten_element_type, PrimDef},
+        helper::PrimDef,
        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
        DefinitionId,
    },
@ -35,6 +27,16 @@ 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>(
@ -42,7 +44,6 @@ 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 +56,7 @@ fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
    let ndarray = generator.gen_var_alloc(ctx, llvm_ndarray_t.into(), None)?;
-    Ok(NDArrayValue::from_pointer_value(ndarray, llvm_elem_ty, llvm_usize, None))
+    Ok(NDArrayValue::from_ptr_val(ndarray, llvm_usize, None))
 }
 /// Creates an `NDArray` instance from a dynamic shape.
@ -128,7 +129,7 @@ where
    ndarray.store_ndims(ctx, generator, num_dims);
    let ndarray_num_dims = ndarray.load_ndims(ctx);
-    ndarray.create_shape(ctx, llvm_usize, ndarray_num_dims);
+    ndarray.create_dim_sizes(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 +145,7 @@ where
            let shape_dim = ctx.builder.build_int_z_extend(shape_dim, llvm_usize, "").unwrap();
            let ndarray_pdim =
-                unsafe { ndarray.shape().ptr_offset_unchecked(ctx, generator, &i, None) };
+                unsafe { ndarray.dim_sizes().ptr_offset_unchecked(ctx, generator, &i, None) };
            ctx.builder.build_store(ndarray_pdim, shape_dim).unwrap();
@ -195,12 +196,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_shape(ctx, llvm_usize, ndarray_num_dims);
+    ndarray.create_dim_sizes(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.shape().ptr_offset_unchecked(
+            ndarray.dim_sizes().ptr_offset_unchecked(
                ctx,
                generator,
                &llvm_usize.const_int(i as u64, true),
@ -229,7 +230,7 @@ fn ndarray_init_data<'ctx, G: CodeGenerator + ?Sized>(
    let ndarray_num_elems = call_ndarray_calc_size(
        generator,
        ctx,
-        &ndarray.shape().as_slice_value(ctx, generator),
+        &ndarray.dim_sizes().as_slice_value(ctx, generator),
        (None, None),
    );
    ndarray.create_data(ctx, llvm_ndarray_data_t, ndarray_num_elems);
@ -315,11 +316,11 @@ fn call_ndarray_empty_impl<'ctx, G: CodeGenerator + ?Sized>(
    match shape {
        BasicValueEnum::PointerValue(shape_list_ptr)
-            if ListValue::is_representable(shape_list_ptr, llvm_usize).is_ok() =>
+            if ListValue::is_instance(shape_list_ptr, llvm_usize).is_ok() =>
        {
            // 1. A list of ints; e.g., `np.empty([600, 800, 3])`
-            let shape_list = ListValue::from_pointer_value(shape_list_ptr, llvm_usize, None);
+            let shape_list = ListValue::from_ptr_val(shape_list_ptr, llvm_usize, None);
            create_ndarray_dyn_shape(
                generator,
                ctx,
@ -380,7 +381,7 @@ where
    let ndarray_num_elems = call_ndarray_calc_size(
        generator,
        ctx,
-        &ndarray.shape().as_slice_value(ctx, generator),
+        &ndarray.dim_sizes().as_slice_value(ctx, generator),
        (None, None),
    );
@ -474,8 +475,8 @@ fn ndarray_broadcast_fill<'ctx, 'a, G, ValueFn>(
    generator: &mut G,
    ctx: &mut CodeGenContext<'ctx, 'a>,
    res: NDArrayValue<'ctx>,
-    lhs: (Type, BasicValueEnum<'ctx>, bool),
+    lhs: (BasicValueEnum<'ctx>, bool),
-    rhs: (Type, BasicValueEnum<'ctx>, bool),
+    rhs: (BasicValueEnum<'ctx>, bool),
    value_fn: ValueFn,
 ) -> Result<NDArrayValue<'ctx>, String>
 where
@ -488,8 +489,8 @@ where
 {
    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let (lhs_ty, lhs_val, lhs_scalar) = lhs;
+    let (lhs_val, lhs_scalar) = lhs;
-    let (rhs_ty, rhs_val, rhs_scalar) = rhs;
+    let (rhs_val, rhs_scalar) = rhs;
    assert!(
        !(lhs_scalar && rhs_scalar),
@ -500,26 +501,12 @@ where
    // Assert that all ndarray operands are broadcastable to the target size
    if !lhs_scalar {
-        let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
+        let lhs_val = 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 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_dtype = arraylike_flatten_element_type(&mut ctx.unifier, rhs_ty);
+        let rhs_val = NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
        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);
    }
@ -527,14 +514,7 @@ where
        let lhs_elem = if lhs_scalar {
            lhs_val
        } else {
-            let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
+            let lhs = 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 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) }
@ -543,14 +523,7 @@ where
        let rhs_elem = if rhs_scalar {
            rhs_val
        } else {
-            let rhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, rhs_ty);
+            let rhs = NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
            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) }
@ -676,15 +649,11 @@ 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)
+        AnyTypeEnum::PointerType(ptr_ty) if ListType::is_type(ptr_ty, llvm_usize).is_ok() => {
            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)
+        AnyTypeEnum::PointerType(ptr_ty) if NDArrayType::is_type(ptr_ty, llvm_usize).is_ok() => {
            if NDArrayType::is_representable(ptr_ty, llvm_usize).is_ok() =>
        {
            todo!("Getting ndims for list[ndarray] not supported")
        }
@ -696,20 +665,16 @@ 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, '_>,
-    (ty, value): (Type, BasicValueEnum<'ctx>),
+    value: BasicValueEnum<'ctx>,
 ) -> IntValue<'ctx> {
    let llvm_usize = generator.get_size_type(ctx.ctx);
    match value {
-        BasicValueEnum::PointerValue(v)
+        BasicValueEnum::PointerValue(v) if NDArrayValue::is_instance(v, llvm_usize).is_ok() => {
-            if NDArrayValue::is_representable(v, llvm_usize).is_ok() =>
+            NDArrayValue::from_ptr_val(v, llvm_usize, None).load_ndims(ctx)
        {
            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_representable(v, llvm_usize).is_ok() => {
+        BasicValueEnum::PointerValue(v) if ListValue::is_instance(v, llvm_usize).is_ok() => {
            llvm_ndlist_get_ndims(generator, ctx, v.get_type())
        }
@ -721,6 +686,7 @@ 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,
@ -731,15 +697,13 @@ 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)
+        AnyTypeEnum::PointerType(ptr_ty) if ListType::is_type(ptr_ty, llvm_usize).is_ok() => {
            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.shape(),
+                &dst_arr.dim_sizes(),
                (Some(llvm_usize.const_int(dim + 1, false)), None),
            );
@ -753,25 +717,11 @@ 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_pointer_value(
+                    let nested_lst_elem = ListValue::from_ptr_val(
                        unsafe { src_lst.data().get_unchecked(ctx, generator, &i, None) }
                            .into_pointer_value(),
                        llvm_usize,
@ -781,6 +731,7 @@ 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,
@ -791,15 +742,13 @@ fn ndarray_from_ndlist_impl<'ctx, G: CodeGenerator + ?Sized>(
            )?;
        }
-        AnyTypeEnum::PointerType(ptr_ty)
+        AnyTypeEnum::PointerType(ptr_ty) if NDArrayType::is_type(ptr_ty, llvm_usize).is_ok() => {
            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 = dst_arr.get_type().element_type().size_of().unwrap();
+            let sizeof_elem = ctx.get_llvm_type(generator, elem_ty).size_of().unwrap();
            let sizeof_elem = ctx.builder.build_int_cast(sizeof_elem, llvm_usize, "").unwrap();
            let cpy_len = ctx
@ -854,9 +803,8 @@ 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_representable(object, llvm_usize).is_ok() {
+    if NDArrayValue::is_instance(object, llvm_usize).is_ok() {
-        let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+        let object = NDArrayValue::from_ptr_val(object, llvm_usize, None);
        let object = NDArrayValue::from_pointer_value(object, llvm_elem_ty, llvm_usize, None);
        let ndarray = gen_if_else_expr_callback(
            generator,
@ -918,6 +866,7 @@ 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,
@ -929,17 +878,16 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
            |_, _| Ok(Some(object.as_base_value())),
        )?;
-        return Ok(NDArrayValue::from_pointer_value(
+        return Ok(NDArrayValue::from_ptr_val(
            ndarray.map(BasicValueEnum::into_pointer_value).unwrap(),
            llvm_elem_ty,
            llvm_usize,
            None,
        ));
    }
    // Remaining case: TList
-    assert!(ListValue::is_representable(object, llvm_usize).is_ok());
+    assert!(ListValue::is_instance(object, llvm_usize).is_ok());
-    let object = ListValue::from_pointer_value(object, llvm_usize, None);
+    let object = ListValue::from_ptr_val(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());
@ -994,7 +942,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                        .build_store(
                            lst,
                            ctx.builder
-                                .build_bit_cast(object.as_base_value(), llvm_plist_i8, "")
+                                .build_bitcast(object.as_base_value(), llvm_plist_i8, "")
                                .unwrap(),
                        )
                        .unwrap();
@ -1016,11 +964,10 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                                .builder
                                .build_load(lst, "")
                                .map(BasicValueEnum::into_pointer_value)
-                                .map(|v| ctx.builder.build_bit_cast(v, plist_plist_i8, "").unwrap())
+                                .map(|v| ctx.builder.build_bitcast(v, plist_plist_i8, "").unwrap())
                                .map(BasicValueEnum::into_pointer_value)
                                .unwrap();
-                            let this_dim =
+                            let this_dim = ListValue::from_ptr_val(this_dim, llvm_usize, None);
                                ListValue::from_pointer_value(this_dim, llvm_usize, None);
                            // TODO: Assert this_dim.sz != 0
@ -1036,9 +983,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                            ctx.builder
                                .build_store(
                                    lst,
-                                    ctx.builder
+                                    ctx.builder.build_bitcast(next_dim, llvm_plist_i8, "").unwrap(),
                                        .build_bit_cast(next_dim, llvm_plist_i8, "")
                                        .unwrap(),
                                )
                                .unwrap();
@ -1046,7 +991,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                        },
                    )?;
-                    let lst = ListValue::from_pointer_value(
+                    let lst = ListValue::from_ptr_val(
                        ctx.builder
                            .build_load(lst, "")
                            .map(BasicValueEnum::into_pointer_value)
@ -1066,6 +1011,7 @@ 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,
@ -1138,6 +1084,7 @@ 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,
@ -1146,16 +1093,14 @@ 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.shape(),
+            &src_arr.dim_sizes(),
            (Some(llvm_usize.const_int(dim, false)), None),
        );
        let stride =
@ -1173,13 +1118,13 @@ fn ndarray_sliced_copyto_impl<'ctx, G: CodeGenerator + ?Sized>(
    let src_stride = call_ndarray_calc_size(
        generator,
        ctx,
-        &src_arr.shape(),
+        &src_arr.dim_sizes(),
        (Some(llvm_usize.const_int(dim + 1, false)), None),
    );
    let dst_stride = call_ndarray_calc_size(
        generator,
        ctx,
-        &dst_arr.shape(),
+        &dst_arr.dim_sizes(),
        (Some(llvm_usize.const_int(dim + 1, false)), None),
    );
@ -1202,29 +1147,9 @@ 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 {
                (
@ -1236,6 +1161,7 @@ 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,
@ -1278,7 +1204,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.shape().get_typed_unchecked(ctx, generator, &idx, None))
+                Ok(shape.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
            },
        )?
    } else {
@ -1286,7 +1212,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_shape(ctx, llvm_usize, ndims);
+        ndarray.create_dim_sizes(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() {
@ -1318,7 +1244,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.shape().set_typed_unchecked(
+                ndarray.dim_sizes().set_typed_unchecked(
                    ctx,
                    generator,
                    &llvm_usize.const_int(i as u64, false),
@ -1336,8 +1262,8 @@ pub fn ndarray_sliced_copy<'ctx, G: CodeGenerator + ?Sized>(
            (this.load_ndims(ctx), false),
            |generator, ctx, _, idx| {
                unsafe {
-                    let dim_sz = this.shape().get_typed_unchecked(ctx, generator, &idx, None);
+                    let dim_sz = this.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None);
-                    ndarray.shape().set_typed_unchecked(ctx, generator, &idx, dim_sz);
+                    ndarray.dim_sizes().set_typed_unchecked(ctx, generator, &idx, dim_sz);
                }
                Ok(())
@ -1352,6 +1278,7 @@ 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,
@ -1397,7 +1324,7 @@ where
            &operand,
            |_, ctx, v| Ok(v.load_ndims(ctx)),
            |generator, ctx, v, idx| unsafe {
-                Ok(v.shape().get_typed_unchecked(ctx, generator, &idx, None))
+                Ok(v.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
            },
        )
        .unwrap()
@ -1434,8 +1361,8 @@ pub fn ndarray_elementwise_binop_impl<'ctx, 'a, G, ValueFn>(
    ctx: &mut CodeGenContext<'ctx, 'a>,
    elem_ty: Type,
    res: Option<NDArrayValue<'ctx>>,
-    lhs: (Type, BasicValueEnum<'ctx>, bool),
+    lhs: (BasicValueEnum<'ctx>, bool),
-    rhs: (Type, BasicValueEnum<'ctx>, bool),
+    rhs: (BasicValueEnum<'ctx>, bool),
    value_fn: ValueFn,
 ) -> Result<NDArrayValue<'ctx>, String>
 where
@ -1448,8 +1375,8 @@ where
 {
    let llvm_usize = generator.get_size_type(ctx.ctx);
-    let (lhs_ty, lhs_val, lhs_scalar) = lhs;
+    let (lhs_val, lhs_scalar) = lhs;
-    let (rhs_ty, rhs_val, rhs_scalar) = rhs;
+    let (rhs_val, rhs_scalar) = rhs;
    assert!(
        !(lhs_scalar && rhs_scalar),
@ -1460,22 +1387,10 @@ where
    let ndarray = res.unwrap_or_else(|| {
        if lhs_scalar && rhs_scalar {
-            let lhs_dtype = arraylike_flatten_element_type(&mut ctx.unifier, lhs_ty);
+            let lhs_val =
-            let llvm_lhs_elem_ty = ctx.get_llvm_type(generator, lhs_dtype);
+                NDArrayValue::from_ptr_val(lhs_val.into_pointer_value(), llvm_usize, None);
-            let lhs_val = NDArrayValue::from_pointer_value(
+            let rhs_val =
-                lhs_val.into_pointer_value(),
+                NDArrayValue::from_ptr_val(rhs_val.into_pointer_value(), llvm_usize, None);
                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);
@ -1491,14 +1406,8 @@ where
            )
            .unwrap()
        } else {
-            let dtype = arraylike_flatten_element_type(
+            let ndarray = NDArrayValue::from_ptr_val(
                &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,
            );
@ -1510,7 +1419,7 @@ where
                &ndarray,
                |_, ctx, v| Ok(v.load_ndims(ctx)),
                |generator, ctx, v, idx| unsafe {
-                    Ok(v.shape().get_typed_unchecked(ctx, generator, &idx, None))
+                    Ok(v.dim_sizes().get_typed_unchecked(ctx, generator, &idx, None))
                },
            )
            .unwrap()
@ -1571,10 +1480,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.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                res.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
            };
            let res_dim1 = unsafe {
-                res.shape().get_typed_unchecked(
+                res.dim_sizes().get_typed_unchecked(
                    ctx,
                    generator,
                    &llvm_usize.const_int(1, false),
@ -1582,10 +1491,10 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                )
            };
            let lhs_dim0 = unsafe {
-                lhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                lhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
            };
            let rhs_dim1 = unsafe {
-                rhs.shape().get_typed_unchecked(
+                rhs.dim_sizes().get_typed_unchecked(
                    ctx,
                    generator,
                    &llvm_usize.const_int(1, false),
@ -1634,10 +1543,15 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
    if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
        let lhs_dim1 = unsafe {
-            lhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_int(1, false), None)
+            lhs.dim_sizes().get_typed_unchecked(
                ctx,
                generator,
                &llvm_usize.const_int(1, false),
                None,
            )
        };
        let rhs_dim0 = unsafe {
-            rhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+            rhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
        };
        // lhs.dims[1] == rhs.dims[0]
@ -1676,7 +1590,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                    },
                    |generator, ctx| {
                        Ok(Some(unsafe {
-                            lhs.shape().get_typed_unchecked(
+                            lhs.dim_sizes().get_typed_unchecked(
                                ctx,
                                generator,
                                &llvm_usize.const_zero(),
@ -1686,7 +1600,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                    },
                    |generator, ctx| {
                        Ok(Some(unsafe {
-                            rhs.shape().get_typed_unchecked(
+                            rhs.dim_sizes().get_typed_unchecked(
                                ctx,
                                generator,
                                &llvm_usize.const_int(1, false),
@ -1713,7 +1627,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
        let common_dim = {
            let lhs_idx1 = unsafe {
-                lhs.shape().get_typed_unchecked(
+                lhs.dim_sizes().get_typed_unchecked(
                    ctx,
                    generator,
                    &llvm_usize.const_int(1, false),
@ -1721,7 +1635,7 @@ pub fn ndarray_matmul_2d<'ctx, G: CodeGenerator>(
                )
            };
            let rhs_idx0 = unsafe {
-                rhs.shape().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
+                rhs.dim_sizes().get_typed_unchecked(ctx, generator, &llvm_usize.const_zero(), None)
            };
            let idx = llvm_intrinsics::call_expect(ctx, rhs_idx0, lhs_idx1, None);
@ -2052,18 +1966,11 @@ 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_pointer_value(
+        NDArrayValue::from_ptr_val(this_arg.into_pointer_value(), llvm_usize, None),
            this_arg.into_pointer_value(),
            llvm_elem_ty,
            llvm_usize,
            None,
        ),
    )
    .map(NDArrayValue::into)
 }
@ -2082,7 +1989,6 @@ 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()
@ -2093,12 +1999,10 @@ 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_pointer_value(this_arg, llvm_elem_ty, llvm_usize, None),
+        NDArrayValue::from_ptr_val(this_arg, llvm_usize, None),
        |generator, ctx, _| {
            let value = if value_arg.is_pointer_value() {
                let llvm_i1 = ctx.ctx.bool_type();
@ -2139,9 +2043,8 @@ 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 llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
-        let n1 = NDArrayValue::from_pointer_value(n1, llvm_elem_ty, llvm_usize, None);
+        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, 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(
@ -2156,7 +2059,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.shape().get_typed_unchecked(ctx, generator, &new_idx, None)) }
+                unsafe { Ok(n.dim_sizes().get_typed_unchecked(ctx, generator, &new_idx, None)) }
            },
        )
        .unwrap();
@ -2193,7 +2096,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.shape().get_typed_unchecked(ctx, generator, &ndim_rev, None)
+                            n1.dim_sizes().get_typed_unchecked(ctx, generator, &ndim_rev, None)
                        };
                        let rem_idx_val =
@ -2259,9 +2162,8 @@ 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 llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+        let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
-        let n1 = NDArrayValue::from_pointer_value(n1, llvm_elem_ty, llvm_usize, None);
+        let n_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, 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)?;
@ -2270,11 +2172,11 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
        let out = match shape {
            BasicValueEnum::PointerValue(shape_list_ptr)
-                if ListValue::is_representable(shape_list_ptr, llvm_usize).is_ok() =>
+                if ListValue::is_instance(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_pointer_value(shape_list_ptr, llvm_usize, None);
+                let shape_list = ListValue::from_ptr_val(shape_list_ptr, llvm_usize, None);
                // Check for -1 in dimensions
                gen_for_callback_incrementing(
                    generator,
@ -2489,7 +2391,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.shape(), (None, None));
+        let out_sz = call_ndarray_calc_size(generator, ctx, &out.dim_sizes(), (None, None));
        ctx.make_assert(
            generator,
            ctx.builder.build_int_compare(IntPredicate::EQ, out_sz, n_sz, "").unwrap(),
@ -2537,22 +2439,17 @@ 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_ty, x2) = x2;
+    let (_, x2) = x2;
    let llvm_usize = generator.get_size_type(ctx.ctx);
    match (x1, x2) {
        (BasicValueEnum::PointerValue(n1), BasicValueEnum::PointerValue(n2)) => {
-            let n1_dtype = arraylike_flatten_element_type(&mut ctx.unifier, x1_ty);
+            let n1 = NDArrayValue::from_ptr_val(n1, llvm_usize, None);
-            let n2_dtype = arraylike_flatten_element_type(&mut ctx.unifier, x2_ty);
+            let n2 = NDArrayValue::from_ptr_val(n2, llvm_usize, None);
            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 = NDArrayValue::from_pointer_value(n1, llvm_n1_data_ty, llvm_usize, None);
+            let n1_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 n2_sz = call_ndarray_calc_size(generator, ctx, &n1.dim_sizes(), (None, 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,
@ -2589,7 +2486,7 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
                            .build_float_mul(e1, elem2.into_float_value(), "")
                            .unwrap()
                            .as_basic_value_enum(),
-                        _ => codegen_unreachable!(ctx, "product: {}", elem1.get_type()),
+                        _ => codegen_unreachable!(ctx),
                    };
                    let acc_val = ctx.builder.build_load(acc, "").unwrap();
                    let acc_val = match acc_val {
@ -2603,7 +2500,7 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
                            .build_float_add(e1, product.into_float_value(), "")
                            .unwrap()
                            .as_basic_value_enum(),
-                        _ => codegen_unreachable!(ctx, "acc_val: {}", acc_val.get_type()),
+                        _ => codegen_unreachable!(ctx),
                    };
                    ctx.builder.build_store(acc, acc_val).unwrap();
--- a/nac3core/src/codegen/stmt.rs
+++ b/nac3core/src/codegen/stmt.rs
@ -1,22 +1,9 @@
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
    basic_block::BasicBlock,
    types::{BasicType, BasicTypeEnum},
    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
    IntPredicate,
 };
 use itertools::{izip, Itertools};
 use nac3parser::ast::{
    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
 };
 use super::{
    classes::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
    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::{
@ -27,6 +14,17 @@ use crate::{
        typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
    },
 };
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
    basic_block::BasicBlock,
    types::{BasicType, BasicTypeEnum},
    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
    IntPredicate,
 };
 use itertools::{izip, Itertools};
 use nac3parser::ast::{
    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
 };
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
@ -310,7 +308,7 @@ pub fn gen_setitem<'ctx, G: CodeGenerator>(
                .unwrap()
                .to_basic_value_enum(ctx, generator, target_ty)?
                .into_pointer_value();
-            let target = ListValue::from_pointer_value(target, llvm_usize, None);
+            let target = ListValue::from_ptr_val(target, llvm_usize, None);
            if let ExprKind::Slice { .. } = &key.node {
                // Handle assigning to a slice
@ -331,7 +329,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_pointer_value(value, llvm_usize, None);
+                let value = ListValue::from_ptr_val(value, llvm_usize, None);
                let target_item_ty = ctx.get_llvm_type(generator, target_item_ty);
                let Some(src_ind) = handle_slice_indices(
@ -463,8 +461,7 @@ pub fn gen_for<G: CodeGenerator>(
        TypeEnum::TObj { obj_id, .. }
            if *obj_id == ctx.primitives.range.obj_id(&ctx.unifier).unwrap() =>
        {
-            let iter_val =
+            let iter_val = RangeValue::from_ptr_val(iter_val.into_pointer_value(), Some("range"));
                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
@ -1829,37 +1826,6 @@ 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(())
--- a/nac3core/src/codegen/test.rs
+++ b/nac3core/src/codegen/test.rs
@ -1,37 +1,34 @@
 use std::{
    collections::{HashMap, HashSet},
    sync::Arc,
 };
 use indexmap::IndexMap;
 use indoc::indoc;
 use inkwell::{
    targets::{InitializationConfig, Target},
    OptimizationLevel,
 };
 use nac3parser::{
    ast::{fold::Fold, FileName, StrRef},
    parser::parse_program,
 };
 use parking_lot::RwLock;
 use super::{
    concrete_type::ConcreteTypeStore,
    types::{ListType, NDArrayType, ProxyType, RangeType},
    CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask, CodeGenerator,
    DefaultCodeGenerator, WithCall, WorkerRegistry,
 };
 use crate::{
    codegen::{
        classes::{ListType, NDArrayType, ProxyType, RangeType},
        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, IdentifierInfo, Inferencer, PrimitiveStore},
+        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},
    parser::parse_program,
 };
 use parking_lot::RwLock;
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 struct Resolver {
    id_to_type: HashMap<StrRef, Type>,
@ -67,7 +64,6 @@ impl SymbolResolver for Resolver {
        &self,
        _: StrRef,
        _: &mut CodeGenContext<'ctx, '_>,
        _: &mut dyn CodeGenerator,
    ) -> Option<ValueEnum<'ctx>> {
        unimplemented!()
    }
@ -142,8 +138,7 @@ fn test_primitives() {
    };
    let mut virtual_checks = Vec::new();
    let mut calls = HashMap::new();
-    let mut identifiers: HashMap<_, _> =
+    let mut identifiers: HashSet<_> = ["a".into(), "b".into()].into();
        ["a".into(), "b".into()].map(|id| (id, IdentifierInfo::default())).into();
    let mut inferencer = Inferencer {
        top_level: &top_level,
        function_data: &mut function_data,
@ -322,8 +317,7 @@ fn test_simple_call() {
    };
    let mut virtual_checks = Vec::new();
    let mut calls = HashMap::new();
-    let mut identifiers: HashMap<_, _> =
+    let mut identifiers: HashSet<_> = ["a".into(), "foo".into()].into();
        ["a".into(), "foo".into()].map(|id| (id, IdentifierInfo::default())).into();
    let mut inferencer = Inferencer {
        top_level: &top_level,
        function_data: &mut function_data,
@ -452,7 +446,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_representable(llvm_list.as_base_type(), llvm_usize).is_ok());
+    assert!(ListType::is_type(llvm_list.as_base_type(), llvm_usize).is_ok());
 }
 #[test]
@ -460,7 +454,7 @@ fn test_classes_range_type_new() {
    let ctx = inkwell::context::Context::create();
    let llvm_range = RangeType::new(&ctx);
-    assert!(RangeType::is_representable(llvm_range.as_base_type()).is_ok());
+    assert!(RangeType::is_type(llvm_range.as_base_type()).is_ok());
 }
 #[test]
@ -472,5 +466,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_representable(llvm_ndarray.as_base_type(), llvm_usize).is_ok());
+    assert!(NDArrayType::is_type(llvm_ndarray.as_base_type(), llvm_usize).is_ok());
 }
--- a/nac3core/src/codegen/types/list.rs
+++ b/nac3core/src/codegen/types/list.rs
@ -1,192 +0,0 @@
 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()
    }
 }
--- a/nac3core/src/codegen/types/mod.rs
+++ b/nac3core/src/codegen/types/mod.rs
@ -1,64 +0,0 @@
 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;
 }
--- a/nac3core/src/codegen/types/ndarray.rs
+++ b/nac3core/src/codegen/types/ndarray.rs
@ -1,258 +0,0 @@
 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()
    }
 }
--- a/nac3core/src/codegen/types/range.rs
+++ b/nac3core/src/codegen/types/range.rs
@ -1,159 +0,0 @@
 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()
    }
 }
--- a/nac3core/src/codegen/types/structure.rs
+++ b/nac3core/src/codegen/types/structure.rs
@ -1,203 +0,0 @@
 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
    }
 }
--- a/nac3core/src/codegen/values/array.rs
+++ b/nac3core/src/codegen/values/array.rs
@ -1,426 +0,0 @@
 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> {}
--- a/nac3core/src/codegen/values/list.rs
+++ b/nac3core/src/codegen/values/list.rs
@ -1,241 +0,0 @@
 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, '_> {}
--- a/nac3core/src/codegen/values/mod.rs
+++ b/nac3core/src/codegen/values/mod.rs
@ -1,47 +0,0 @@
 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;
 }
--- a/nac3core/src/codegen/values/ndarray.rs
+++ b/nac3core/src/codegen/values/ndarray.rs
@ -1,523 +0,0 @@
 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, '_>
 {
 }
--- a/nac3core/src/codegen/values/range.rs
+++ b/nac3core/src/codegen/values/range.rs
@ -1,153 +0,0 @@
 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()
    }
 }
--- a/nac3core/src/lib.rs
+++ b/nac3core/src/lib.rs
@ -1,4 +1,10 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(
    dead_code,
@ -21,5 +27,3 @@ pub mod codegen;
 pub mod symbol_resolver;
 pub mod toplevel;
 pub mod typecheck;
 extern crate self as nac3core;
--- a/nac3core/src/symbol_resolver.rs
+++ b/nac3core/src/symbol_resolver.rs
@ -1,15 +1,7 @@
-use std::{
+use std::fmt::Debug;
-    collections::{HashMap, HashSet},
+use std::rc::Rc;
-    fmt::{Debug, Display},
+use std::sync::Arc;
-    rc::Rc,
+use std::{collections::HashMap, collections::HashSet, fmt::Display};
    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},
@ -19,6 +11,10 @@ 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 {
@ -369,7 +365,6 @@ 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>;
--- a/nac3core/src/toplevel/builtins.rs
+++ b/nac3core/src/toplevel/builtins.rs
@ -1,5 +1,6 @@
 use std::iter::once;
 use helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails};
 use indexmap::IndexMap;
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
@ -10,22 +11,20 @@ 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(
@ -710,7 +709,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_pointer_value(zelf, Some("range"));
+                        let zelf = RangeValue::from_ptr_val(zelf, Some("range"));
                        let mut start = None;
                        let mut stop = None;
--- a/nac3core/src/toplevel/composer.rs
+++ b/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, IdentifierInfo, Inferencer},
+        type_inferencer::{FunctionData, Inferencer},
        typedef::{TypeVar, VarMap},
    },
 };
 use super::*;
 pub struct ComposerConfig {
    pub kernel_ann: Option<&'static str>,
    pub kernel_invariant_ann: &'static str,
@ -101,8 +101,7 @@ impl TopLevelComposer {
            .iter()
            .map(|def_ast| match *def_ast.0.read() {
                TopLevelDef::Class { name, .. } => name.to_string(),
-                TopLevelDef::Function { simple_name, .. }
+                TopLevelDef::Function { simple_name, .. } => simple_name.to_string(),
                | TopLevelDef::Variable { simple_name, .. } => simple_name.to_string(),
            })
            .collect_vec();
@ -382,87 +381,13 @@ 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/variables are not supported (at {})",
+                "registrations of constructs other than top level classes/functions 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()?;
@ -471,7 +396,6 @@ impl TopLevelComposer {
        if inference {
            self.analyze_function_instance()?;
        }
        self.analyze_top_level_variables()?;
        Ok(())
    }
@ -509,7 +433,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
-                    ExprKind::Subscript { value, slice, .. }
+                    ast::ExprKind::Subscript { value, slice, .. }
                        if {
                            matches!(
                                &value.node,
@ -525,9 +449,9 @@ impl TopLevelComposer {
                        }
                        is_generic = true;
-                        let type_var_list: Vec<&Expr<()>>;
+                        let type_var_list: Vec<&ast::Expr<()>>;
                        // if `class A(Generic[T, V, G])`
-                        if let ExprKind::Tuple { elts, .. } = &slice.node {
+                        if let ast::ExprKind::Tuple { elts, .. } = &slice.node {
                            type_var_list = elts.iter().collect_vec();
                        // `class A(Generic[T])`
                        } else {
@ -576,7 +500,6 @@ 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() {
@ -930,6 +853,7 @@ 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;
@ -1038,15 +962,15 @@ impl TopLevelComposer {
                    }
                }
-                let arg_with_default: Vec<(&ast::Located<ast::ArgData<()>>, Option<&Expr>)> = args
+                let arg_with_default: Vec<(&ast::Located<ast::ArgData<()>>, Option<&ast::Expr>)> =
-                    .args
+                    args.args
                        .iter()
                        .rev()
                        .zip(
                            args.defaults
                                .iter()
                                .rev()
-                            .map(|x| -> Option<&Expr> { Some(x) })
+                                .map(|x| -> Option<&ast::Expr> { Some(x) })
                                .chain(std::iter::repeat(None)),
                        )
                        .collect_vec();
@ -1204,8 +1128,6 @@ 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;
@ -1307,7 +1229,7 @@ impl TopLevelComposer {
                        let arg_with_default: Vec<(
                            &ast::Located<ast::ArgData<()>>,
-                            Option<&Expr>,
+                            Option<&ast::Expr>,
                        )> = args
                            .args
                            .iter()
@ -1316,7 +1238,7 @@ impl TopLevelComposer {
                                args.defaults
                                    .iter()
                                    .rev()
-                                    .map(|x| -> Option<&Expr> { Some(x) })
+                                    .map(|x| -> Option<&ast::Expr> { Some(x) })
                                    .chain(std::iter::repeat(None)),
                            )
                            .collect_vec();
@ -1473,7 +1395,7 @@ impl TopLevelComposer {
                        .map_err(|e| HashSet::from([e.to_display(unifier).to_string()]))?;
                }
                ast::StmtKind::AnnAssign { target, annotation, value, .. } => {
-                    if let ExprKind::Name { id: attr, .. } = &target.node {
+                    if let ast::ExprKind::Name { id: attr, .. } = &target.node {
                        if defined_fields.insert(attr.to_string()) {
                            let dummy_field_type = unifier.get_dummy_var().ty;
@ -1481,7 +1403,7 @@ impl TopLevelComposer {
                                None => {
                                    // handle Kernel[T], KernelInvariant[T]
                                    let (annotation, mutable) = match &annotation.node {
-                                        ExprKind::Subscript { value, slice, .. }
+                                        ast::ExprKind::Subscript { value, slice, .. }
                                            if matches!(
                                                &value.node,
                                                ast::ExprKind::Name { id, .. } if id == &core_config.kernel_invariant_ann.into()
@ -1489,7 +1411,7 @@ impl TopLevelComposer {
                                        {
                                            (slice, false)
                                        }
-                                        ExprKind::Subscript { value, slice, .. }
+                                        ast::ExprKind::Subscript { value, slice, .. }
                                            if matches!(
                                                &value.node,
                                                ast::ExprKind::Name { id, .. } if core_config.kernel_ann.map_or(false, |c| id == &c.into())
@ -1507,13 +1429,13 @@ impl TopLevelComposer {
                                Some(boxed_expr) => {
                                    // Class attributes are set as immutable regardless
                                    let (annotation, _) = match &annotation.node {
-                                        ExprKind::Subscript { slice, .. } => (slice, false),
+                                        ast::ExprKind::Subscript { slice, .. } => (slice, false),
                                        _ if core_config.kernel_ann.is_none() => (annotation, false),
                                        _ => continue,
                                    };
                                    match &**boxed_expr {
-                                        ast::Located {location: _, custom: (), node: ExprKind::Constant { value: v, kind: _ }} => {
+                                        ast::Located {location: _, custom: (), node: ast::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(_) => {}
@ -1780,6 +1702,7 @@ 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 {
@ -1922,8 +1845,6 @@ 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;
@ -1961,20 +1882,19 @@ impl TopLevelComposer {
            if ast.is_none() {
                return Ok(());
            }
-
+            let mut function_def = def.write();
-            let (name, simple_name, signature, resolver) = {
+            if let TopLevelDef::Function {
-                let function_def = def.read();
+                instance_to_stmt,
-                let TopLevelDef::Function { name, simple_name, signature, resolver, .. } =
+                instance_to_symbol,
-                    &*function_def
+                name,
-                else {
+                simple_name,
-                    return Ok(());
+                signature,
-                };
+                resolver,
-
+                ..
-                (name.clone(), *simple_name, *signature, resolver.clone())
+            } = &mut *function_def
-            };
+            {
-
+                let signature_ty_enum = unifier.get_ty(*signature);
-            let signature_ty_enum = unifier.get_ty(signature);
+                let TypeEnum::TFunc(FunSignature { args, ret, vars }) = signature_ty_enum.as_ref()
            let TypeEnum::TFunc(FunSignature { args, ret, vars, .. }) = signature_ty_enum.as_ref()
                else {
                    unreachable!("must be typeenum::tfunc")
                };
@ -2082,11 +2002,11 @@ impl TopLevelComposer {
                        })
                    };
                    let mut identifiers = {
-                    let mut result = HashMap::new();
+                        let mut result: HashSet<_> = HashSet::new();
                        if self_type.is_some() {
-                        result.insert("self".into(), IdentifierInfo::default());
+                            result.insert("self".into());
                        }
-                    result.extend(inst_args.iter().map(|x| (x.name, IdentifierInfo::default())));
+                        result.extend(inst_args.iter().map(|x| x.name));
                        result
                    };
                    let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
@ -2123,43 +2043,23 @@ impl TopLevelComposer {
                    else {
                        unreachable!("must be function def ast")
                    };
-
+                    if !decorator_list.is_empty()
-                if !decorator_list.is_empty() {
+                        && matches!(&decorator_list[0].node,
-                    if matches!(&decorator_list[0].node, ExprKind::Name { id, .. } if id == &"extern".into())
+                            ast::ExprKind::Name{ id, .. } if id == &"extern".into())
                    {
                        let TopLevelDef::Function { instance_to_symbol, .. } = &mut *def.write()
                        else {
                            unreachable!()
                        };
                        instance_to_symbol.insert(String::new(), simple_name.to_string());
                        continue;
                    }
-
+                    if !decorator_list.is_empty()
-                    if matches!(&decorator_list[0].node, ExprKind::Name { id, .. } if id == &"rpc".into())
+                        && 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;
                    }
-                    if let ExprKind::Call { func, .. } = &decorator_list[0].node {
+                    let fun_body = body
-                        if matches!(&func.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;
                        }
                    }
                }
                let fun_body =
                    body.into_iter()
                        .map(|b| inferencer.fold_stmt(b))
                        .collect::<Result<Vec<_>, _>>()?;
@ -2229,9 +2129,6 @@ impl TopLevelComposer {
                        )]));
                    }
                let TopLevelDef::Function { instance_to_stmt, .. } = &mut *def.write() else {
                    unreachable!()
                };
                    instance_to_stmt.insert(
                        get_subst_key(
                            unifier,
@ -2247,10 +2144,10 @@ impl TopLevelComposer {
                        },
                    );
                }
            }
            Ok(())
        };
        for (id, (def, ast)) in self.definition_ast_list.iter().enumerate().skip(self.builtin_num) {
            if ast.is_none() {
                continue;
@ -2264,59 +2161,4 @@ 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(())
    }
 }
--- a/nac3core/src/toplevel/helper.rs
+++ b/nac3core/src/toplevel/helper.rs
@ -1,15 +1,14 @@
 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 ast::ExprKind;
 use nac3parser::ast::{Constant, Location};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
-use nac3parser::ast::{Constant, ExprKind, Location};
+use super::*;
 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)]
@ -389,9 +388,6 @@ impl TopLevelDef {
                    r
                }
            ),
            TopLevelDef::Variable { name, ty, .. } => {
                format!("Variable {{ name: {name:?}, ty: {:?} }}", unifier.stringify(*ty),)
            }
        }
    }
 }
@ -593,18 +589,6 @@ 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('.');
@ -1134,23 +1118,3 @@ 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)
 }
--- a/nac3core/src/toplevel/mod.rs
+++ b/nac3core/src/toplevel/mod.rs
@ -6,36 +6,36 @@ use std::{
    sync::Arc,
 };
-use inkwell::values::BasicValueEnum;
+use super::codegen::CodeGenContext;
-use itertools::Itertools;
+use super::typecheck::type_inferencer::PrimitiveStore;
-use parking_lot::RwLock;
+use super::typecheck::typedef::{
-
+    FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, Unifier, VarMap,
-use nac3parser::ast::{self, Expr, Location, Stmt, StrRef};
+};
 use crate::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenerator,
    symbol_resolver::{SymbolResolver, ValueEnum},
    typecheck::{
-        type_inferencer::{CodeLocation, PrimitiveStore},
+        type_inferencer::CodeLocation,
-        typedef::{
+        typedef::{CallId, TypeVarId},
            CallId, FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, TypeVarId, Unifier,
            VarMap,
        },
    },
 };
-use composer::*;
+use inkwell::values::BasicValueEnum;
-use type_annotation::*;
+use itertools::Itertools;
 use nac3parser::ast::{self, Location, Stmt, StrRef};
 use parking_lot::RwLock;
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
 pub struct DefinitionId(pub usize);
 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,25 +148,6 @@ 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 {
--- a/nac3core/src/toplevel/numpy.rs
+++ b/nac3core/src/toplevel/numpy.rs
@ -1,10 +1,11 @@
-use itertools::Itertools;
+use crate::{
-
+    toplevel::helper::PrimDef,
-use super::helper::PrimDef;
+    typecheck::{
 use crate::typecheck::{
        type_inferencer::PrimitiveStore,
        typedef::{Type, TypeEnum, TypeVarId, Unifier, VarMap},
    },
 };
 use itertools::Itertools;
 /// Creates a `ndarray` [`Type`] with the given type arguments.
 ///
--- a/nac3core/src/toplevel/test.rs
+++ b/nac3core/src/toplevel/test.rs
@ -1,23 +1,21 @@
-use std::{collections::HashMap, sync::Arc};
+use super::*;
-
+use crate::toplevel::helper::PrimDef;
-use indoc::indoc;
+use crate::typecheck::typedef::into_var_map;
 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::{into_var_map, Type, Unifier},
+        typedef::{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>>,
@ -64,7 +62,6 @@ impl SymbolResolver for Resolver {
        &self,
        _: StrRef,
        _: &mut CodeGenContext<'ctx, '_>,
        _: &mut dyn CodeGenerator,
    ) -> Option<ValueEnum<'ctx>> {
        unimplemented!()
    }
--- a/nac3core/src/toplevel/type_annotation.rs
+++ b/nac3core/src/toplevel/type_annotation.rs
@ -1,12 +1,9 @@
-use strum::IntoEnumIterator;
+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 super::{
    helper::{PrimDef, PrimDefDetails},
    *,
 };
 use crate::{symbol_resolver::SymbolValue, typecheck::typedef::VarMap};
 #[derive(Clone, Debug)]
 pub enum TypeAnnotation {
--- a/nac3core/src/typecheck/function_check.rs
+++ b/nac3core/src/typecheck/function_check.rs
@ -1,19 +1,13 @@
-use std::{
+use crate::toplevel::helper::PrimDef;
    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>> {
@ -27,29 +21,15 @@ impl<'a> Inferencer<'a> {
    fn check_pattern(
        &mut self,
        pattern: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
    ) -> 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 `id` refers to a declared symbol, reject this assignment if it is used in the
+                if !defined_identifiers.contains(id) {
-                // context of an (implicit) global variable
+                    defined_identifiers.insert(*id);
                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(())
@ -89,7 +69,7 @@ impl<'a> Inferencer<'a> {
    fn check_expr(
        &mut self,
        expr: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
    ) -> Result<(), HashSet<String>> {
        // there are some cases where the custom field is None
        if let Some(ty) = &expr.custom {
@ -110,7 +90,7 @@ impl<'a> Inferencer<'a> {
                    return Ok(());
                }
                self.should_have_value(expr)?;
-                if !defined_identifiers.contains_key(id) {
+                if !defined_identifiers.contains(id) {
                    match self.function_data.resolver.get_symbol_type(
                        self.unifier,
                        &self.top_level.definitions.read(),
@ -118,22 +98,7 @@ impl<'a> Inferencer<'a> {
                        *id,
                    ) {
                        Ok(_) => {
-                            let is_global = self.is_id_global(*id);
+                            self.defined_identifiers.insert(*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!(
@ -206,7 +171,9 @@ impl<'a> Inferencer<'a> {
                let mut defined_identifiers = defined_identifiers.clone();
                for arg in &args.args {
                    // TODO: should we check the types here?
-                    defined_identifiers.entry(arg.node.arg).or_default();
+                    if !defined_identifiers.contains(&arg.node.arg) {
                        defined_identifiers.insert(arg.node.arg);
                    }
                }
                self.check_expr(body, &mut defined_identifiers)?;
            }
@ -269,7 +236,7 @@ impl<'a> Inferencer<'a> {
    fn check_stmt(
        &mut self,
        stmt: &Stmt<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
    ) -> Result<bool, HashSet<String>> {
        match &stmt.node {
            StmtKind::For { target, iter, body, orelse, .. } => {
@ -295,11 +262,9 @@ 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.keys() {
+                for ident in &body_identifiers {
-                    if !defined_identifiers.contains_key(ident)
+                    if !defined_identifiers.contains(ident) && orelse_identifiers.contains(ident) {
-                        && orelse_identifiers.contains_key(ident)
+                        defined_identifiers.insert(*ident);
                    {
                        defined_identifiers.insert(*ident, IdentifierInfo::default());
                    }
                }
                Ok(body_returned && orelse_returned)
@ -330,7 +295,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, IdentifierInfo::default());
+                        defined_identifiers.insert(*name);
                    }
                    self.check_block(body, &mut defined_identifiers)?;
                }
@ -394,44 +359,6 @@ 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),
        }
@ -440,7 +367,7 @@ impl<'a> Inferencer<'a> {
    pub fn check_block(
        &mut self,
        block: &[Stmt<Option<Type>>],
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
    ) -> Result<bool, HashSet<String>> {
        let mut ret = false;
        for stmt in block {
--- a/nac3core/src/typecheck/magic_methods.rs
+++ b/nac3core/src/typecheck/magic_methods.rs
@ -1,21 +1,17 @@
-use std::{cmp::max, collections::HashMap, rc::Rc};
+use crate::symbol_resolver::SymbolValue;
-
+use crate::toplevel::helper::PrimDef;
-use itertools::{iproduct, Itertools};
+use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_var_tys};
-use strum::IntoEnumIterator;
+use crate::typecheck::{
 use nac3parser::ast::{Cmpop, Operator, StrRef, Unaryop};
 use super::{
    type_inferencer::*,
    typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
 };
-use crate::{
+use itertools::{iproduct, Itertools};
-    symbol_resolver::SymbolValue,
+use nac3parser::ast::StrRef;
-    toplevel::{
+use nac3parser::ast::{Cmpop, Operator, Unaryop};
-        helper::PrimDef,
+use std::cmp::max;
-        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
+use std::collections::HashMap;
-    },
+use std::rc::Rc;
-};
+use strum::IntoEnumIterator;
 /// The variant of a binary operator.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
--- a/nac3core/src/typecheck/type_error.rs
+++ b/nac3core/src/typecheck/type_error.rs
@ -1,13 +1,14 @@
-use std::{collections::HashMap, fmt::Display};
+use std::collections::HashMap;
 use std::fmt::Display;
-use itertools::Itertools;
+use crate::typecheck::{magic_methods::HasOpInfo, typedef::TypeEnum};
 use nac3parser::ast::{Cmpop, Location, StrRef};
 use super::{
-    magic_methods::{Binop, HasOpInfo},
+    magic_methods::Binop,
-    typedef::{RecordKey, Type, TypeEnum, Unifier},
+    typedef::{RecordKey, Type, Unifier},
 };
 use itertools::Itertools;
 use nac3parser::ast::{Cmpop, Location, StrRef};
 #[derive(Debug, Clone)]
 pub enum TypeErrorKind {
--- a/nac3core/src/typecheck/type_inferencer/mod.rs
+++ b/nac3core/src/typecheck/type_inferencer/mod.rs
@ -1,36 +1,32 @@
-use std::{
+use std::cmp::max;
-    cell::RefCell,
+use std::collections::{HashMap, HashSet};
-    cmp::max,
+use std::convert::{From, TryInto};
-    collections::{HashMap, HashSet},
+use std::iter::once;
-    convert::{From, TryInto},
+use std::{cell::RefCell, sync::Arc};
    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, Mapping, OperatorInfo,
+        into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, OperatorInfo,
        RecordField, RecordKey, Type, TypeEnum, TypeVar, Unifier, VarMap,
    },
 };
 use crate::toplevel::type_annotation::TypeAnnotation;
 use crate::{
    symbol_resolver::{SymbolResolver, SymbolValue},
    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)]
@ -88,40 +84,6 @@ 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>,
@ -130,7 +92,7 @@ pub struct FunctionData {
 pub struct Inferencer<'a> {
    pub top_level: &'a TopLevelContext,
-    pub defined_identifiers: HashMap<StrRef, IdentifierInfo>,
+    pub defined_identifiers: HashSet<StrRef>,
    pub function_data: &'a mut FunctionData,
    pub unifier: &'a mut Unifier,
    pub primitives: &'a PrimitiveStore,
@ -262,7 +224,9 @@ impl<'a> Fold<()> for Inferencer<'a> {
                                handler.location,
                            ));
                            if let Some(name) = name {
-                                self.defined_identifiers.entry(name).or_default();
+                                if !self.defined_identifiers.contains(&name) {
                                    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| {
@ -414,7 +378,6 @@ 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, .. } => {
@ -536,8 +499,9 @@ impl<'a> Fold<()> for Inferencer<'a> {
            }
            ast::StmtKind::Assert { test, msg, .. } => {
                self.unify(test.custom.unwrap(), self.primitives.bool, &test.location)?;
-                if let Some(m) = msg {
+                match msg {
-                    self.unify(m.custom.unwrap(), self.primitives.str, &m.location)?;
+                    Some(m) => self.unify(m.custom.unwrap(), self.primitives.str, &m.location)?,
                    None => (),
                }
            }
            _ => return report_error("Unsupported statement type", stmt.location),
@ -585,7 +549,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                        unreachable!("must be tobj")
                    }
                } else {
-                    if !self.defined_identifiers.contains_key(id) {
+                    if !self.defined_identifiers.contains(id) {
                        match self.function_data.resolver.get_symbol_type(
                            self.unifier,
                            &self.top_level.definitions.read(),
@ -593,22 +557,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                            *id,
                        ) {
                            Ok(_) => {
-                                let is_global = self.is_id_global(*id);
+                                self.defined_identifiers.insert(*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(
@ -673,8 +622,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_key(id) {
+                if !self.defined_identifiers.contains(id) {
-                    self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                    self.defined_identifiers.insert(*id);
                }
                Ok(())
            }
@ -783,8 +732,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_key(name) {
+            if !defined_identifiers.contains(name) {
-                defined_identifiers.insert(*name, IdentifierInfo::default());
+                defined_identifiers.insert(*name);
            }
        }
        let fn_args: Vec<_> = args
@ -1601,29 +1550,36 @@ impl<'a> Inferencer<'a> {
        }
        // 2-argument ndarray n-dimensional creation functions
        if id == &"np_full".into() && args.len() == 2 {
-            // Parse arguments
+            let ExprKind::List { elts, .. } = &args[0].node else {
-            let shape_expr = args.remove(0);
+                return report_error(
-            let (ndims, shape) =
+                    format!(
-                self.fold_numpy_function_call_shape_argument(*id, 0, shape_expr)?; // Special handling for `shape`
+                        "Expected List literal for first argument of {id}, got {}",
                        args[0].node.name()
                    )
                    .as_str(),
                    args[0].location,
                );
            };
-            let fill_value = self.fold_expr(args.remove(0))?;
+            let ndims = elts.len() as u64;
-            // Build the return type
+            let arg0 = self.fold_expr(args.remove(0))?;
-            let dtype = fill_value.custom.unwrap();
+            let arg1 = self.fold_expr(args.remove(0))?;
            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(dtype), Some(ndims));
+            let ret = make_ndarray_ty(self.unifier, self.primitives, Some(ty), Some(ndims));
            let custom = self.unifier.add_ty(TypeEnum::TFunc(FunSignature {
                args: vec![
                    FuncArg {
                        name: "shape".into(),
-                        ty: shape.custom.unwrap(),
+                        ty: arg0.custom.unwrap(),
                        default_value: None,
                        is_vararg: false,
                    },
                    FuncArg {
                        name: "fill_value".into(),
-                        ty: fill_value.custom.unwrap(),
+                        ty: arg1.custom.unwrap(),
                        default_value: None,
                        is_vararg: false,
                    },
@ -1641,7 +1597,7 @@ impl<'a> Inferencer<'a> {
                        location: func.location,
                        node: ExprKind::Name { id: *id, ctx: *ctx },
                    }),
-                    args: vec![shape, fill_value],
+                    args: vec![arg0, arg1],
                    keywords: vec![],
                },
            }));
@ -2684,22 +2640,4 @@ 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)
    }
 }
--- a/nac3core/src/typecheck/type_inferencer/test.rs
+++ b/nac3core/src/typecheck/type_inferencer/test.rs
@ -1,19 +1,17 @@
-use std::iter::zip;
+use super::super::{magic_methods::with_fields, typedef::*};
 use indexmap::IndexMap;
 use indoc::indoc;
 use parking_lot::RwLock;
 use test_case::test_case;
 use nac3parser::{ast::FileName, parser::parse_program};
 use super::*;
 use crate::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenContext,
    symbol_resolver::ValueEnum,
    toplevel::{helper::PrimDef, DefinitionId, TopLevelDef},
    typecheck::{magic_methods::with_fields, typedef::*},
 };
 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;
 struct Resolver {
    id_to_type: HashMap<StrRef, Type>,
@ -43,7 +41,6 @@ impl SymbolResolver for Resolver {
        &self,
        _: StrRef,
        _: &mut CodeGenContext<'ctx, '_>,
        _: &mut dyn CodeGenerator,
    ) -> Option<ValueEnum<'ctx>> {
        unimplemented!()
    }
@ -520,7 +517,7 @@ impl TestEnvironment {
            primitives: &mut self.primitives,
            virtual_checks: &mut self.virtual_checks,
            calls: &mut self.calls,
-            defined_identifiers: HashMap::default(),
+            defined_identifiers: HashSet::default(),
            in_handler: false,
        }
    }
@ -596,9 +593,8 @@ 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: HashMap<_, _> =
+    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
-        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into());
    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();
@ -743,9 +739,8 @@ 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: HashMap<_, _> =
+    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
-        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into());
    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();
--- a/nac3core/src/typecheck/typedef/mod.rs
+++ b/nac3core/src/typecheck/typedef/mod.rs
@ -1,28 +1,21 @@
-use std::{
+use super::magic_methods::{Binop, HasOpInfo};
-    borrow::Cow,
+use super::type_error::{TypeError, TypeErrorKind};
-    cell::RefCell,
+use super::unification_table::{UnificationKey, UnificationTable};
-    collections::{HashMap, HashSet},
+use crate::symbol_resolver::SymbolValue;
-    fmt::{self, Display},
+use crate::toplevel::helper::PrimDef;
-    iter::{repeat, zip},
+use crate::toplevel::{DefinitionId, TopLevelContext, TopLevelDef};
-    rc::Rc,
+use crate::typecheck::magic_methods::OpInfo;
-    sync::{Arc, Mutex},
+use crate::typecheck::type_inferencer::PrimitiveStore;
 };
 use indexmap::IndexMap;
 use itertools::{repeat_n, Itertools};
 use nac3parser::ast::{Cmpop, Location, StrRef, Unaryop};
-
+use std::cell::RefCell;
-use super::{
+use std::collections::HashMap;
-    magic_methods::{Binop, HasOpInfo, OpInfo},
+use std::fmt::{self, Display};
-    type_error::{TypeError, TypeErrorKind},
+use std::iter::{repeat, zip};
-    type_inferencer::PrimitiveStore,
+use std::rc::Rc;
-    unification_table::{UnificationKey, UnificationTable},
+use std::sync::{Arc, Mutex};
-};
+use std::{borrow::Cow, collections::HashSet};
 use crate::{
    symbol_resolver::SymbolValue,
    toplevel::{helper::PrimDef, DefinitionId, TopLevelContext, TopLevelDef},
 };
 #[cfg(test)]
 mod test;
@ -677,8 +670,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 `unify_call()` behaves
+        // and depending on what `call_info` is, we might change how the behavior `unify_call()`
-        // to improve user error messages when type checking fails.
+        // in hopes 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`.
--- a/nac3core/src/typecheck/typedef/test.rs
+++ b/nac3core/src/typecheck/typedef/test.rs
@ -1,12 +1,10 @@
-use std::collections::HashMap;
+use super::super::magic_methods::with_fields;
-
+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 {
--- a/nac3ld/src/lib.rs
+++ b/nac3ld/src/lib.rs
@ -1,4 +1,10 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(
    clippy::cast_possible_truncation,
@ -15,12 +21,13 @@
    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;
--- a/nac3parser/Cargo.toml
+++ b/nac3parser/Cargo.toml
@ -8,15 +8,15 @@ license = "MIT"
 edition = "2021"
 [build-dependencies]
-lalrpop = "0.22"
+lalrpop = "0.20"
 [dependencies]
 nac3ast = { path = "../nac3ast" }
-lalrpop-util = "0.22"
+lalrpop-util = "0.20"
 log = "0.4"
 unic-emoji-char = "0.9"
 unic-ucd-ident  = "0.9"
-unicode_names2 = "1.3"
+unicode_names2 = "1.2"
 phf = { version = "0.11", features = ["macros"] }
 ahash = "0.8"
--- a/nac3parser/src/config_comment_helper.rs
+++ b/nac3parser/src/config_comment_helper.rs
@ -1,10 +1,8 @@
-use crate::{
+use crate::ast::Ident;
-    ast::{Ident, Location},
+use crate::ast::Location;
-    error::*,
+use crate::error::*;
-    token::Tok,
+use crate::token::Tok;
 };
 use lalrpop_util::ParseError;
 use nac3ast::*;
 pub fn make_config_comment(
--- a/nac3parser/src/error.rs
+++ b/nac3parser/src/error.rs
@ -1,11 +1,12 @@
 //! Define internal parse error types
 //! The goal is to provide a matching and a safe error API, maksing errors from LALR
 use std::error::Error;
 use std::fmt;
 use lalrpop_util::ParseError as LalrpopError;
-use crate::{ast::Location, token::Tok};
+use crate::ast::Location;
 use crate::token::Tok;
 use std::error::Error;
 use std::fmt;
 /// Represents an error during lexical scanning.
 #[derive(Debug, PartialEq)]
--- a/nac3parser/src/fstring.rs
+++ b/nac3parser/src/fstring.rs
@ -1,11 +1,12 @@
-use std::{iter, mem, str};
+use std::iter;
 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>>,
--- a/nac3parser/src/function.rs
+++ b/nac3parser/src/function.rs
@ -1,11 +1,8 @@
 use ahash::RandomState;
 use std::collections::HashSet;
-use ahash::RandomState;
+use crate::ast;
-
+use crate::error::{LexicalError, LexicalErrorType};
 use crate::{
    ast,
    error::{LexicalError, LexicalErrorType},
 };
 pub struct ArgumentList {
    pub args: Vec<ast::Expr>,
--- a/nac3parser/src/lexer.rs
+++ b/nac3parser/src/lexer.rs
@ -1,16 +1,16 @@
 //! 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};
 use unic_emoji_char::is_emoji_presentation;
 use unic_ucd_ident::{is_xid_continue, is_xid_start};
 pub use super::token::Tok;
-use crate::{
+use crate::ast::{FileName, Location};
-    ast::{FileName, Location},
+use crate::error::{LexicalError, LexicalErrorType};
-    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};
 #[derive(Clone, Copy, PartialEq, Debug, Default)]
 struct IndentationLevel {
--- a/nac3parser/src/lib.rs
+++ b/nac3parser/src/lib.rs
@ -15,7 +15,13 @@
 //!
 //! ```
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(
    clippy::enum_glob_use,
@ -43,11 +49,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;
--- a/nac3parser/src/parser.rs
+++ b/nac3parser/src/parser.rs
@ -5,16 +5,14 @@
 //! parse a whole program, a single statement, or a single
 //! expression.
 use nac3ast::Location;
 use std::iter;
-use nac3ast::Location;
+use crate::ast::{self, FileName};
-
+use crate::error::ParseError;
 use crate::lexer;
 pub use crate::mode::Mode;
-use crate::{
+use crate::python;
    ast::{self, FileName},
    error::ParseError,
    lexer, python,
 };
 /*
 * Parse python code.
--- a/nac3parser/src/token.rs
+++ b/nac3parser/src/token.rs
@ -1,8 +1,7 @@
 //! Different token definitions.
 //! Loosely based on token.h from CPython source:
 use std::fmt::{self, Write};
 use crate::ast;
 use std::fmt::{self, Write};
 /// Python source code can be tokenized in a sequence of these tokens.
 #[derive(Clone, Debug, PartialEq)]
--- a/nac3standalone/demo/src/globals.py
+++ b/nac3standalone/demo/src/globals.py
@ -1,31 +0,0 @@
@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
--- a/nac3standalone/demo/src/ndarray.py
+++ b/nac3standalone/demo/src/ndarray.py
@ -114,22 +114,12 @@ 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)
@ -144,7 +134,6 @@ 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)
--- a/nac3standalone/src/basic_symbol_resolver.rs
+++ b/nac3standalone/src/basic_symbol_resolver.rs
@ -1,14 +1,6 @@
-use std::{
+use nac3core::nac3parser::ast::{self, StrRef};
    collections::{HashMap, HashSet},
    sync::Arc,
 };
 use parking_lot::{Mutex, RwLock};
 use nac3core::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenContext,
    inkwell::{module::Linkage, values::BasicValue},
    nac3parser::ast::{self, StrRef},
    symbol_resolver::{SymbolResolver, SymbolValue, ValueEnum},
    toplevel::{DefinitionId, TopLevelDef},
    typecheck::{
@ -16,6 +8,9 @@ use nac3core::{
        typedef::{Type, Unifier},
    },
 };
 use parking_lot::{Mutex, RwLock};
 use std::collections::HashSet;
 use std::{collections::HashMap, sync::Arc};
 pub struct ResolverInternal {
    pub id_to_type: Mutex<HashMap<StrRef, Type>>,
@ -50,51 +45,20 @@ impl SymbolResolver for Resolver {
    fn get_symbol_type(
        &self,
-        unifier: &mut Unifier,
+        _: &mut Unifier,
        _: &[Arc<RwLock<TopLevelDef>>],
-        primitives: &PrimitiveStore,
+        _: &PrimitiveStore,
        str: StrRef,
    ) -> Result<Type, String> {
-        self.0
+        self.0.id_to_type.lock().get(&str).copied().ok_or(format!("cannot get type of {str}"))
            .id_to_type
            .lock()
            .get(&str)
            .copied()
            .or_else(|| {
                self.0
                    .module_globals
                    .lock()
                    .get(&str)
                    .cloned()
                    .map(|v| v.get_type(primitives, unifier))
            })
            .ok_or(format!("cannot get type of {str}"))
    }
    fn get_symbol_value<'ctx>(
        &self,
-        str: StrRef,
+        _: StrRef,
-        ctx: &mut CodeGenContext<'ctx, '_>,
+        _: &mut CodeGenContext<'ctx, '_>,
        generator: &mut dyn CodeGenerator,
    ) -> Option<ValueEnum<'ctx>> {
-        self.0.module_globals.lock().get(&str).cloned().map(|v| {
+        unimplemented!()
            ctx.module
                .get_global(&str.to_string())
                .unwrap_or_else(|| {
                    let ty = v.get_type(&ctx.primitives, &mut ctx.unifier);
                    let init_val = ctx.gen_symbol_val(generator, &v, ty);
                    let llvm_ty = init_val.get_type();
                    let global = ctx.module.add_global(llvm_ty, None, &str.to_string());
                    global.set_linkage(Linkage::LinkOnceAny);
                    global.set_initializer(&init_val);
                    global
                })
                .as_basic_value_enum()
                .into()
        })
    }
    fn get_identifier_def(&self, id: StrRef) -> Result<DefinitionId, HashSet<String>> {
--- a/nac3standalone/src/main.rs
+++ b/nac3standalone/src/main.rs
@ -1,31 +1,27 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(clippy::too_many_lines, clippy::wildcard_imports)]
 use std::{
    collections::{HashMap, HashSet},
    fs,
    num::NonZeroUsize,
    path::Path,
    sync::Arc,
 };
 use clap::Parser;
-use parking_lot::{Mutex, RwLock};
+use nac3core::inkwell::{
-
+    memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
    support::is_multithreaded, targets::*, OptimizationLevel,
 };
 use nac3core::nac3parser::{
    ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
    parser,
 };
 use nac3core::{
    codegen::{
        concrete_type::ConcreteTypeStore, irrt::load_irrt, CodeGenLLVMOptions,
        CodeGenTargetMachineOptions, CodeGenTask, DefaultCodeGenerator, WithCall, WorkerRegistry,
    },
    inkwell::{
        memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
        support::is_multithreaded, targets::*, OptimizationLevel,
    },
    nac3parser::{
        ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
        parser,
    },
    symbol_resolver::SymbolResolver,
    toplevel::{
        composer::{ComposerConfig, TopLevelComposer},
@ -38,10 +34,13 @@ use nac3core::{
        typedef::{FunSignature, Type, Unifier, VarMap},
    },
 };
-
+use parking_lot::{Mutex, RwLock};
-use basic_symbol_resolver::*;
+use std::collections::HashSet;
 use std::num::NonZeroUsize;
 use std::{collections::HashMap, fs, path::Path, sync::Arc};
 mod basic_symbol_resolver;
 use basic_symbol_resolver::*;
 /// Command-line argument parser definition.
 #[derive(Parser)]
@ -169,49 +168,46 @@ fn handle_typevar_definition(
 fn handle_assignment_pattern(
    targets: &[Expr],
    value: &Expr,
-    resolver: Arc<dyn SymbolResolver + Send + Sync>,
+    resolver: &(dyn SymbolResolver + Send + Sync),
    internal_resolver: &ResolverInternal,
-    composer: &mut TopLevelComposer,
+    def_list: &[Arc<RwLock<TopLevelDef>>],
    unifier: &mut Unifier,
    primitives: &PrimitiveStore,
 ) -> Result<(), String> {
    if targets.len() == 1 {
-        let target = &targets[0];
+        match &targets[0].node {
        match &target.node {
            ExprKind::Name { id, .. } => {
                let def_list = composer.extract_def_list();
                let unifier = &mut composer.unifier;
                let primitives = &composer.primitives_ty;
                if let Ok(var) =
-                    handle_typevar_definition(value, &*resolver, &def_list, unifier, primitives)
+                    handle_typevar_definition(value, resolver, def_list, unifier, primitives)
                {
                    internal_resolver.add_id_type(*id, var);
                    Ok(())
-                } else if let Ok(val) = parse_parameter_default_value(value, &*resolver) {
+                } else if let Ok(val) = parse_parameter_default_value(value, resolver) {
                    internal_resolver.add_module_global(*id, val);
                    let (name, def_id, _) = composer
                        .register_top_level_var(
                            *id,
                            None,
                            Some(resolver.clone()),
                            "__main__",
                            target.location,
                        )
                        .unwrap();
                    internal_resolver.add_id_def(name, def_id);
                    Ok(())
                } else {
                    Err(format!("fails to evaluate this expression `{:?}` as a constant or generic parameter at {}",
-                        target.node,
+                        targets[0].node,
-                        target.location,
+                        targets[0].location,
                    ))
                }
            }
            ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
-                handle_assignment_pattern(elts, value, resolver, internal_resolver, composer)?;
+                handle_assignment_pattern(
                    elts,
                    value,
                    resolver,
                    internal_resolver,
                    def_list,
                    unifier,
                    primitives,
                )?;
                Ok(())
            }
-            _ => Err(format!("assignment to {target:?} is not supported at {}", target.location)),
+            _ => Err(format!(
                "assignment to {:?} is not supported at {}",
                targets[0], targets[0].location
            )),
        }
    } else {
        match &value.node {
@ -221,9 +217,11 @@ fn handle_assignment_pattern(
                        handle_assignment_pattern(
                            std::slice::from_ref(tar),
                            val,
-                            resolver.clone(),
+                            resolver,
                            internal_resolver,
-                            composer,
+                            def_list,
                            unifier,
                            primitives,
                        )?;
                    }
                    Ok(())
@ -241,39 +239,6 @@ fn handle_assignment_pattern(
    }
 }
 fn handle_global_var(
    target: &Expr,
    value: Option<&Expr>,
    resolver: &Arc<dyn SymbolResolver + Send + Sync>,
    internal_resolver: &ResolverInternal,
    composer: &mut TopLevelComposer,
 ) -> Result<(), String> {
    let ExprKind::Name { id, .. } = target.node else {
        return Err(format!(
            "global variable declaration must be an identifier (at {})",
            target.location,
        ));
    };
    let Some(value) = value else {
        return Err(format!("global variable `{id}` must be initialized in its definition"));
    };
    if let Ok(val) = parse_parameter_default_value(value, &**resolver) {
        internal_resolver.add_module_global(id, val);
        let (name, def_id, _) = composer
            .register_top_level_var(id, None, Some(resolver.clone()), "__main__", target.location)
            .unwrap();
        internal_resolver.add_id_def(name, def_id);
        Ok(())
    } else {
        Err(format!(
            "failed to evaluate this expression `{:?}` as a constant at {}",
            target.node, target.location,
        ))
    }
 }
 fn main() {
    let cli = CommandLineArgs::parse();
    let CommandLineArgs { file_name, threads, opt_level, emit_llvm, triple, mcpu, target_features } =
@ -326,7 +291,8 @@ fn main() {
    let program = match fs::read_to_string(file_name.clone()) {
        Ok(program) => program,
        Err(err) => {
-            panic!("Cannot open input file: {err}");
+            println!("Cannot open input file: {err}");
            return;
        }
    };
@ -356,29 +322,22 @@ fn main() {
    for stmt in parser_result {
        match &stmt.node {
            StmtKind::Assign { targets, value, .. } => {
                let def_list = composer.extract_def_list();
                let unifier = &mut composer.unifier;
                let primitives = &composer.primitives_ty;
                if let Err(err) = handle_assignment_pattern(
                    targets,
                    value,
-                    resolver.clone(),
+                    resolver.as_ref(),
                    internal_resolver.as_ref(),
-                    &mut composer,
+                    &def_list,
                    unifier,
                    primitives,
                ) {
-                    panic!("{err}");
+                    eprintln!("{err}");
                    return;
                }
            }
            StmtKind::AnnAssign { target, value, .. } => {
                if let Err(err) = handle_global_var(
                    target,
                    value.as_ref().map(Box::as_ref),
                    &resolver,
                    internal_resolver.as_ref(),
                    &mut composer,
                ) {
                    panic!("{err}");
                }
            }
            // allow (and ignore) "from __future__ import annotations"
            StmtKind::ImportFrom { module, names, .. }
                if module == &Some("__future__".into())
--- a/nix/windows/make_msys2_packages.sh
+++ b/nix/windows/make_msys2_packages.sh
@ -10,7 +10,7 @@ curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar
 curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | sed "s|SigLevel    = Required|SigLevel    = Never|g" | sed "s|/etc/pacman.d|$MSYS2DIR/etc/pacman.d|g" > $MSYS2DIR/etc/pacman.conf
 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
-pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python3.12 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
 echo "{ pkgs } : [" > msys2_packages.nix
 while read package; do
--- a/runkernel/src/main.rs
+++ b/runkernel/src/main.rs
@ -1,4 +1,10 @@
-#![deny(future_incompatible, let_underscore, nonstandard_style, clippy::all)]
+#![deny(
    future_incompatible,
    let_underscore,
    nonstandard_style,
    rust_2024_compatibility,
    clippy::all
 )]
 #![warn(clippy::pedantic)]
 #![allow(clippy::semicolon_if_nothing_returned, clippy::uninlined_format_args)]
@ -6,47 +12,47 @@ use std::env;
 static mut NOW: i64 = 0;
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn now_mu() -> i64 {
    unsafe { NOW }
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn at_mu(t: i64) {
    unsafe { NOW = t }
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn delay_mu(dt: i64) {
    unsafe { NOW += dt }
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn rtio_init() {
    println!("rtio_init");
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn rtio_get_counter() -> i64 {
    0
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn rtio_output(target: i32, data: i32) {
    println!("rtio_output @{} target={target:04x} data={data}", unsafe { NOW });
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn print_int32(x: i32) {
    println!("print_int32: {x}");
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn print_int64(x: i64) {
    println!("print_int64: {x}");
 }
-#[unsafe(no_mangle)]
+#[no_mangle]
 pub extern "C" fn __nac3_personality(_state: u32, _exception_object: u32, _context: u32) -> u32 {
    unimplemented!();
 }
		`@ -0,0 +1,2 @@`
							`[target.x86_64-unknown-linux-gnu]`
							`rustflags = ["-C", "link-arg=-fuse-ld=mold"]`