WIP

2024-08-16 17:20:12 +08:00
74 changed files with 1927 additions and 3447 deletions
--- a/.clang-format
+++ b/.clang-format
@ -1,32 +0,0 @@
 BasedOnStyle: LLVM
 Language: Cpp
 Standard: Cpp11
 AccessModifierOffset: -1
 AlignEscapedNewlines: Left
 AlwaysBreakAfterReturnType: None
 AlwaysBreakTemplateDeclarations: Yes
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: Inline
 BinPackParameters: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ContinuationIndentWidth: 4
 DerivePointerAlignment: false
 IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 PointerAlignment: Left
 ReflowComments: true
 SortIncludes: false
 SortUsingDeclarations: true
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 2
 TabWidth: 4
 UseTab: Never
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -8,17 +8,17 @@ repos:
    hooks:
      - id: nac3-cargo-fmt
        name: nac3 cargo format
-        entry: nix
+        entry: cargo
        language: system
        types: [file, rust]
        pass_filenames: false
        description: Runs cargo fmt on the codebase.
-        args: [develop, -c, cargo, fmt, --all]
+        args: [fmt]
      - id: nac3-cargo-clippy
        name: nac3 cargo clippy
-        entry: nix
+        entry: cargo
        language: system
        types: [file, rust]
        pass_filenames: false
        description: Runs cargo clippy on the codebase.
-        args: [develop, -c, cargo, clippy, --tests]
+        args: [clippy, --tests]
--- a/Cargo.lock
+++ b/Cargo.lock
@ -75,33 +75,33 @@ dependencies = [
 [[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,12 +117,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "cc"
-version = "1.1.30"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
 dependencies = [
 "shlex",
 ]
 [[package]]
 name = "cfg-if"
@ -141,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -151,9 +139,9 @@ dependencies = [
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
 "anstream",
 "anstyle",
@ -163,14 +151,14 @@ 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.79",
+ "syn 2.0.74",
 ]
 [[package]]
@ -197,15 +185,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]
 [[package]]
 name = "cpufeatures"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@ -263,23 +242,30 @@ 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]]
@ -321,9 +307,9 @@ dependencies = [
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 [[package]]
 name = "fixedbitset"
@ -340,16 +326,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"
@ -385,12 +361,6 @@ dependencies = [
 "ahash",
 ]
 [[package]]
 name = "hashbrown"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 [[package]]
 name = "heck"
 version = "0.4.1"
@ -403,15 +373,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"
@ -424,12 +385,12 @@ dependencies = [
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.14.5",
 ]
 [[package]]
@ -440,9 +401,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",
@ -454,13 +415,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.79",
+ "syn 2.0.74",
 ]
 [[package]]
@ -483,6 +444,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"
@ -498,45 +468,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]]
@ -547,9 +507,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 [[package]]
 name = "libloading"
@ -561,6 +521,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"
@ -621,9 +591,11 @@ dependencies = [
 name = "nac3artiq"
 version = "0.1.0"
 dependencies = [
- "itertools",
+ "inkwell",
 "itertools 0.13.0",
 "nac3core",
 "nac3ld",
 "nac3parser",
 "parking_lot",
 "pyo3",
 "tempfile",
@ -644,11 +616,11 @@ name = "nac3core"
 version = "0.1.0"
 dependencies = [
 "crossbeam",
- "indexmap 2.6.0",
+ "indexmap 2.3.0",
 "indoc",
 "inkwell",
 "insta",
- "itertools",
+ "itertools 0.13.0",
 "nac3parser",
 "parking_lot",
 "rayon",
@ -686,7 +658,9 @@ name = "nac3standalone"
 version = "0.1.0"
 dependencies = [
 "clap",
 "inkwell",
 "nac3core",
 "nac3parser",
 "parking_lot",
 ]
@ -698,9 +672,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"
@ -732,7 +706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
 "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.3.0",
 ]
 [[package]]
@ -775,7 +749,7 @@ dependencies = [
 "phf_shared 0.11.2",
 "proc-macro2",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
@ -804,9 +778,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"
@ -825,9 +799,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
 "unicode-ident",
 ]
@ -879,7 +853,7 @@ dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
@ -892,14 +866,14 @@ dependencies = [
 "proc-macro2",
 "pyo3-build-config",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
 "proc-macro2",
 ]
@ -956,18 +930,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.0"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 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",
@ -977,9 +962,9 @@ dependencies = [
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
 "aho-corasick",
 "memchr",
@ -988,9 +973,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"
@ -1001,9 +986,9 @@ dependencies = [
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
 "bitflags",
 "errno",
@ -1014,9 +999,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"
@ -1047,29 +1032,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.206"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.206"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
 name = "serde_json"
-version = "1.0.129"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
+checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d"
 dependencies = [
 "itoa",
 "memchr",
@ -1089,22 +1074,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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 [[package]]
 name = "similar"
 version = "2.6.0"
@ -1169,7 +1138,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
@ -1185,9 +1154,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1202,9 +1171,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
 "cfg-if",
 "fastrand",
@ -1215,12 +1184,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]]
@ -1238,29 +1208,32 @@ dependencies = [
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
 [[package]]
-name = "typenum"
+name = "tiny-keccak"
-version = "1.17.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
 "crunchy",
 ]
 [[package]]
 name = "unic-char-property"
@ -1316,27 +1289,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.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[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",
@ -1344,9 +1317,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",
@ -1388,6 +1361,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"
@ -1397,6 +1386,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"
@ -1506,5 +1501,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.79",
+ "syn 2.0.74",
 ]
--- a/flake.lock
+++ b/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1721924956,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
        "type": "github"
      },
      "original": {
--- a/nac3artiq/Cargo.toml
+++ b/nac3artiq/Cargo.toml
@ -12,10 +12,16 @@ 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"
 nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 nac3ld = { path = "../nac3ld" }
 [dependencies.inkwell]
 version = "0.4"
 default-features = false
 features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 [features]
 init-llvm-profile = []
 no-escape-analysis = ["nac3core/no-escape-analysis"]
--- 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."""
--- a/nac3artiq/src/codegen.rs
+++ b/nac3artiq/src/codegen.rs
@ -1,22 +1,8 @@
 use std::{
    collections::{hash_map::DefaultHasher, HashMap},
    hash::{Hash, Hasher},
    iter::once,
    mem,
    sync::Arc,
 };
 use itertools::Itertools;
 use pyo3::{
    types::{PyDict, PyList},
    PyObject, PyResult, Python,
 };
 use nac3core::{
    codegen::{
        classes::{
            ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayType,
-            NDArrayValue, ProxyType, ProxyValue, RangeValue, UntypedArrayLikeAccessor,
+            NDArrayValue, RangeValue, UntypedArrayLikeAccessor,
        },
        expr::{destructure_range, gen_call},
        irrt::call_ndarray_calc_size,
@ -24,20 +10,36 @@ use nac3core::{
        stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
        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};
+use nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
 use inkwell::{
    context::Context,
    module::Linkage,
    types::{BasicType, IntType},
    values::{BasicValueEnum, PointerValue, StructValue},
    AddressSpace, IntPredicate,
 };
 use pyo3::{
    types::{PyDict, PyList},
    PyObject, PyResult, Python,
 };
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 use itertools::Itertools;
 use std::{
    collections::{hash_map::DefaultHasher, HashMap},
    hash::{Hash, Hasher},
    iter::once,
    mem,
    sync::Arc,
 };
 /// The parallelism mode within a block.
 #[derive(Copy, Clone, Eq, PartialEq)]
@ -458,8 +460,8 @@ fn format_rpc_arg<'ctx>(
            let llvm_usize = generator.get_size_type(ctx.ctx);
            let (elem_ty, _) = unpack_ndarray_var_tys(&mut ctx.unifier, arg_ty);
-            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
+            let llvm_arg_ty =
-            let llvm_arg_ty = NDArrayType::new(generator, ctx.ctx, llvm_elem_ty);
+                NDArrayType::new(generator, ctx.ctx, ctx.get_llvm_type(generator, elem_ty));
            let llvm_arg = NDArrayValue::from_ptr_val(arg.into_pointer_value(), llvm_usize, None);
            let llvm_usize_sizeof = ctx
@ -469,7 +471,7 @@ fn format_rpc_arg<'ctx>(
            let llvm_pdata_sizeof = ctx
                .builder
                .build_int_truncate_or_bit_cast(
-                    llvm_elem_ty.ptr_type(AddressSpace::default()).size_of(),
+                    llvm_arg_ty.element_type().ptr_type(AddressSpace::default()).size_of(),
                    llvm_usize,
                    "",
                )
@ -484,10 +486,14 @@ fn format_rpc_arg<'ctx>(
            let buffer = ctx.builder.build_array_alloca(llvm_i8, buffer_size, "rpc.arg").unwrap();
            let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, Some("rpc.arg"));
            let ppdata =
                generator.gen_var_alloc(ctx, llvm_arg_ty.element_type(), None).unwrap();
            ctx.builder.build_store(ppdata, llvm_arg.data().base_ptr(ctx, generator)).unwrap();
            call_memcpy_generic(
                ctx,
                buffer.base_ptr(ctx, generator),
-                llvm_arg.ptr_to_data(ctx),
+                ppdata,
                llvm_pdata_sizeof,
                llvm_i1.const_zero(),
            );
@ -512,7 +518,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()
        }
@ -523,305 +529,12 @@ fn format_rpc_arg<'ctx>(
    arg_slot
 }
 /// Formats an RPC return value to conform to the expected format required by NAC3.
 fn format_rpc_ret<'ctx>(
    generator: &mut dyn CodeGenerator,
    ctx: &mut CodeGenContext<'ctx, '_>,
    ret_ty: Type,
 ) -> Option<BasicValueEnum<'ctx>> {
    // -- receive value:
    // T result = {
    //   void *ret_ptr = alloca(sizeof(T));
    //   void *ptr = ret_ptr;
    //   loop: int size = rpc_recv(ptr);
    //   // Non-zero: Provide `size` bytes of extra storage for variable-length data.
    //   if(size) { ptr = alloca(size); goto loop; }
    //   else *(T*)ret_ptr
    // }
    let llvm_i8 = ctx.ctx.i8_type();
    let llvm_i32 = ctx.ctx.i32_type();
    let llvm_i8_8 = ctx.ctx.struct_type(&[llvm_i8.array_type(8).into()], false);
    let llvm_pi8 = llvm_i8.ptr_type(AddressSpace::default());
    let rpc_recv = ctx.module.get_function("rpc_recv").unwrap_or_else(|| {
        ctx.module.add_function("rpc_recv", llvm_i32.fn_type(&[llvm_pi8.into()], false), None)
    });
    if ctx.unifier.unioned(ret_ty, ctx.primitives.none) {
        ctx.build_call_or_invoke(rpc_recv, &[llvm_pi8.const_null().into()], "rpc_recv");
        return None;
    }
    let prehead_bb = ctx.builder.get_insert_block().unwrap();
    let current_function = prehead_bb.get_parent().unwrap();
    let head_bb = ctx.ctx.append_basic_block(current_function, "rpc.head");
    let alloc_bb = ctx.ctx.append_basic_block(current_function, "rpc.continue");
    let tail_bb = ctx.ctx.append_basic_block(current_function, "rpc.tail");
    let llvm_ret_ty = ctx.get_llvm_abi_type(generator, ret_ty);
    let result = match &*ctx.unifier.get_ty_immutable(ret_ty) {
        TypeEnum::TObj { obj_id, .. } if *obj_id == PrimDef::NDArray.id() => {
            let llvm_i1 = ctx.ctx.bool_type();
            let llvm_usize = generator.get_size_type(ctx.ctx);
            // Round `val` up to its modulo `power_of_two`
            let round_up = |ctx: &mut CodeGenContext<'ctx, '_>,
                            val: IntValue<'ctx>,
                            power_of_two: IntValue<'ctx>| {
                debug_assert_eq!(
                    val.get_type().get_bit_width(),
                    power_of_two.get_type().get_bit_width()
                );
                let llvm_val_t = val.get_type();
                let max_rem = ctx
                    .builder
                    .build_int_sub(power_of_two, llvm_val_t.const_int(1, false), "")
                    .unwrap();
                ctx.builder
                    .build_and(
                        ctx.builder.build_int_add(val, max_rem, "").unwrap(),
                        ctx.builder.build_not(max_rem, "").unwrap(),
                        "",
                    )
                    .unwrap()
            };
            // Setup types
            let (elem_ty, ndims) = unpack_ndarray_var_tys(&mut ctx.unifier, ret_ty);
            let llvm_elem_ty = ctx.get_llvm_type(generator, elem_ty);
            let llvm_ret_ty = NDArrayType::new(generator, ctx.ctx, llvm_elem_ty);
            // Allocate the resulting ndarray
            // A condition after format_rpc_ret ensures this will not be popped this off.
            let ndarray = llvm_ret_ty.new_value(generator, ctx, Some("rpc.result"));
            // Setup ndims
            let ndims =
                if let TypeEnum::TLiteral { values, .. } = &*ctx.unifier.get_ty_immutable(ndims) {
                    assert_eq!(values.len(), 1);
                    u64::try_from(values[0].clone()).unwrap()
                } else {
                    unreachable!();
                };
            // Set `ndarray.ndims`
            ndarray.store_ndims(ctx, generator, llvm_usize.const_int(ndims, false));
            // Allocate `ndarray.shape` [size_t; ndims]
            ndarray.create_dim_sizes(ctx, llvm_usize, ndarray.load_ndims(ctx));
            /*
                ndarray now:
                  - .ndims: initialized
                  - .shape: allocated but uninitialized .shape
                  - .data: uninitialized
            */
            let llvm_usize_sizeof = ctx
                .builder
                .build_int_truncate_or_bit_cast(llvm_usize.size_of(), llvm_usize, "")
                .unwrap();
            let llvm_pdata_sizeof = ctx
                .builder
                .build_int_truncate_or_bit_cast(
                    llvm_elem_ty.ptr_type(AddressSpace::default()).size_of(),
                    llvm_usize,
                    "",
                )
                .unwrap();
            let llvm_elem_sizeof = ctx
                .builder
                .build_int_truncate_or_bit_cast(llvm_elem_ty.size_of().unwrap(), llvm_usize, "")
                .unwrap();
            // Allocates a buffer for the initial RPC'ed object, which is guaranteed to be
            // (4 + 4 * ndims) bytes with 8-byte alignment
            let sizeof_dims =
                ctx.builder.build_int_mul(ndarray.load_ndims(ctx), llvm_usize_sizeof, "").unwrap();
            let unaligned_buffer_size =
                ctx.builder.build_int_add(sizeof_dims, llvm_pdata_sizeof, "").unwrap();
            let buffer_size = round_up(ctx, unaligned_buffer_size, llvm_usize.const_int(8, false));
            let stackptr = call_stacksave(ctx, None);
            // Just to be absolutely sure, alloca in [i8 x 8] slices to force 8-byte alignment
            let buffer = ctx
                .builder
                .build_array_alloca(
                    llvm_i8_8,
                    ctx.builder
                        .build_int_unsigned_div(buffer_size, llvm_usize.const_int(8, false), "")
                        .unwrap(),
                    "rpc.buffer",
                )
                .unwrap();
            let buffer = ctx
                .builder
                .build_bit_cast(buffer, llvm_pi8, "")
                .map(BasicValueEnum::into_pointer_value)
                .unwrap();
            let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
            // The first call to `rpc_recv` reads the top-level ndarray object: [pdata, shape]
            //
            // The returned value is the number of bytes for `ndarray.data`.
            let ndarray_nbytes = ctx
                .build_call_or_invoke(
                    rpc_recv,
                    &[buffer.base_ptr(ctx, generator).into()], // Reads [usize; ndims]. NOTE: We are allocated [size_t; ndims].
                    "rpc.size.next",
                )
                .map(BasicValueEnum::into_int_value)
                .unwrap();
            // debug_assert(ndarray_nbytes > 0)
            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
                ctx.make_assert(
                    generator,
                    ctx.builder
                        .build_int_compare(
                            IntPredicate::UGT,
                            ndarray_nbytes,
                            ndarray_nbytes.get_type().const_zero(),
                            "",
                        )
                        .unwrap(),
                    "0:AssertionError",
                    "Unexpected RPC termination for ndarray - Expected data buffer next",
                    [None, None, None],
                    ctx.current_loc,
                );
            }
            // Copy shape from the buffer to `ndarray.shape`.
            let pbuffer_dims =
                unsafe { buffer.ptr_offset_unchecked(ctx, generator, &llvm_pdata_sizeof, None) };
            call_memcpy_generic(
                ctx,
                ndarray.dim_sizes().base_ptr(ctx, generator),
                pbuffer_dims,
                sizeof_dims,
                llvm_i1.const_zero(),
            );
            // Restore stack from before allocation of buffer
            call_stackrestore(ctx, stackptr);
            // Allocate `ndarray.data`.
            // `ndarray.shape` must be initialized beforehand in this implementation
            //   (for ndarray.create_data() to know how many elements to allocate)
            let num_elements =
                call_ndarray_calc_size(generator, ctx, &ndarray.dim_sizes(), (None, None));
            // debug_assert(nelems * sizeof(T) >= ndarray_nbytes)
            if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
                let sizeof_data =
                    ctx.builder.build_int_mul(num_elements, llvm_elem_sizeof, "").unwrap();
                ctx.make_assert(
                    generator,
                    ctx.builder.build_int_compare(IntPredicate::UGE,
                        sizeof_data,
                        ndarray_nbytes,
                        "",
                    ).unwrap(),
                    "0:AssertionError",
                    "Unexpected allocation size request for ndarray data - Expected up to {0} bytes, got {1} bytes",
                    [Some(sizeof_data), Some(ndarray_nbytes), None],
                    ctx.current_loc,
                );
            }
            ndarray.create_data(ctx, llvm_elem_ty, num_elements);
            let ndarray_data = ndarray.data().base_ptr(ctx, generator);
            let ndarray_data_i8 =
                ctx.builder.build_pointer_cast(ndarray_data, llvm_pi8, "").unwrap();
            // NOTE: Currently on `prehead_bb`
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
            // Inserting into `head_bb`. Do `rpc_recv` for `data` recursively.
            ctx.builder.position_at_end(head_bb);
            let phi = ctx.builder.build_phi(llvm_pi8, "rpc.ptr").unwrap();
            phi.add_incoming(&[(&ndarray_data_i8, prehead_bb)]);
            let alloc_size = ctx
                .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
                .map(BasicValueEnum::into_int_value)
                .unwrap();
            let is_done = ctx
                .builder
                .build_int_compare(IntPredicate::EQ, llvm_i32.const_zero(), alloc_size, "rpc.done")
                .unwrap();
            ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
            ctx.builder.position_at_end(alloc_bb);
            // Align the allocation to sizeof(T)
            let alloc_size = round_up(ctx, alloc_size, llvm_elem_sizeof);
            let alloc_ptr = ctx
                .builder
                .build_array_alloca(
                    llvm_elem_ty,
                    ctx.builder.build_int_unsigned_div(alloc_size, llvm_elem_sizeof, "").unwrap(),
                    "rpc.alloc",
                )
                .unwrap();
            let alloc_ptr =
                ctx.builder.build_pointer_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
            phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
            ctx.builder.position_at_end(tail_bb);
            ndarray.as_base_value().into()
        }
        _ => {
            let slot = ctx.builder.build_alloca(llvm_ret_ty, "rpc.ret.slot").unwrap();
            let slotgen = ctx.builder.build_bit_cast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
            ctx.builder.position_at_end(head_bb);
            let phi = ctx.builder.build_phi(llvm_pi8, "rpc.ptr").unwrap();
            phi.add_incoming(&[(&slotgen, prehead_bb)]);
            let alloc_size = ctx
                .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
                .unwrap()
                .into_int_value();
            let is_done = ctx
                .builder
                .build_int_compare(IntPredicate::EQ, llvm_i32.const_zero(), alloc_size, "rpc.done")
                .unwrap();
            ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
            ctx.builder.position_at_end(alloc_bb);
            let alloc_ptr =
                ctx.builder.build_array_alloca(llvm_pi8, alloc_size, "rpc.alloc").unwrap();
            let alloc_ptr =
                ctx.builder.build_bit_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
            phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
            ctx.builder.build_unconditional_branch(head_bb).unwrap();
            ctx.builder.position_at_end(tail_bb);
            ctx.builder.build_load(slot, "rpc.result").unwrap()
        }
    };
    Some(result)
 }
 fn rpc_codegen_callback_fn<'ctx>(
    ctx: &mut CodeGenContext<'ctx, '_>,
    obj: Option<(Type, ValueEnum<'ctx>)>,
    fun: (&FunSignature, DefinitionId),
    args: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
    generator: &mut dyn CodeGenerator,
    is_async: bool,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
    let int8 = ctx.ctx.i8_type();
    let int32 = ctx.ctx.i32_type();
@ -930,29 +643,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",
@ -970,24 +660,67 @@ 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 {
+    // -- receive value:
-        // async RPCs do not return any values
+    // T result = {
-        Ok(None)
+    //   void *ret_ptr = alloca(sizeof(T));
-    } else {
+    //   void *ptr = ret_ptr;
-        let result = format_rpc_ret(generator, ctx, fun.0.ret);
+    //   loop: int size = rpc_recv(ptr);
    //   // Non-zero: Provide `size` bytes of extra storage for variable-length data.
    //   if(size) { ptr = alloca(size); goto loop; }
    //   else *(T*)ret_ptr
    // }
    let rpc_recv = ctx.module.get_function("rpc_recv").unwrap_or_else(|| {
        ctx.module.add_function("rpc_recv", int32.fn_type(&[ptr_type.into()], false), None)
    });
-        if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
+    if ctx.unifier.unioned(fun.0.ret, ctx.primitives.none) {
-            // An RPC returning an NDArray would not touch here.
+        ctx.build_call_or_invoke(rpc_recv, &[ptr_type.const_null().into()], "rpc_recv");
        return Ok(None);
    }
    let prehead_bb = ctx.builder.get_insert_block().unwrap();
    let current_function = prehead_bb.get_parent().unwrap();
    let head_bb = ctx.ctx.append_basic_block(current_function, "rpc.head");
    let alloc_bb = ctx.ctx.append_basic_block(current_function, "rpc.continue");
    let tail_bb = ctx.ctx.append_basic_block(current_function, "rpc.tail");
    let ret_ty = ctx.get_llvm_abi_type(generator, fun.0.ret);
    let need_load = !ret_ty.is_pointer_type();
    let slot = ctx.builder.build_alloca(ret_ty, "rpc.ret.slot").unwrap();
    let slotgen = ctx.builder.build_bitcast(slot, ptr_type, "rpc.ret.ptr").unwrap();
    ctx.builder.build_unconditional_branch(head_bb).unwrap();
    ctx.builder.position_at_end(head_bb);
    let phi = ctx.builder.build_phi(ptr_type, "rpc.ptr").unwrap();
    phi.add_incoming(&[(&slotgen, prehead_bb)]);
    let alloc_size = ctx
        .build_call_or_invoke(rpc_recv, &[phi.as_basic_value()], "rpc.size.next")
        .unwrap()
        .into_int_value();
    let is_done = ctx
        .builder
        .build_int_compare(inkwell::IntPredicate::EQ, int32.const_zero(), alloc_size, "rpc.done")
        .unwrap();
    ctx.builder.build_conditional_branch(is_done, tail_bb, alloc_bb).unwrap();
    ctx.builder.position_at_end(alloc_bb);
    let alloc_ptr = ctx.builder.build_array_alloca(ptr_type, alloc_size, "rpc.alloc").unwrap();
    let alloc_ptr = ctx.builder.build_bitcast(alloc_ptr, ptr_type, "rpc.alloc.ptr").unwrap();
    phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
    ctx.builder.build_unconditional_branch(head_bb).unwrap();
    ctx.builder.position_at_end(tail_bb);
    let result = ctx.builder.build_load(slot, "rpc.result").unwrap();
    if need_load {
        call_stackrestore(ctx, stackptr);
    }
-
+    Ok(Some(result))
        Ok(result)
    }
 }
 pub fn attributes_writeback(
@ -1082,7 +815,7 @@ pub fn attributes_writeback(
        let args: Vec<_> =
            values.into_iter().map(|(_, val)| (None, ValueEnum::Dynamic(val))).collect();
        if let Err(e) =
-            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator, false)
+            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator)
        {
            return Ok(Err(e));
        }
@ -1092,9 +825,9 @@ pub fn attributes_writeback(
    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)
    })))
 }
--- a/nac3artiq/src/lib.rs
+++ b/nac3artiq/src/lib.rs
@ -16,30 +16,14 @@
    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 inkwell::{
 use parking_lot::{Mutex, RwLock};
 use pyo3::{
    create_exception, exceptions,
    prelude::*,
    types::{PyBytes, PyDict, PySet},
 };
 use tempfile::{self, TempDir};
 use nac3core::{
    codegen::{
        concrete_type::ConcreteTypeStore, gen_func_impl, irrt::load_irrt, CodeGenLLVMOptions,
        CodeGenTargetMachineOptions, CodeGenTask, WithCall, WorkerRegistry,
    },
    inkwell::{
    context::Context,
    memory_buffer::MemoryBuffer,
    module::{Linkage, Module},
@ -47,34 +31,49 @@ use nac3core::{
    support::is_multithreaded,
    targets::*,
    OptimizationLevel,
-    },
+};
-    nac3parser::{
+use itertools::Itertools;
-        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
 use nac3core::toplevel::builtins::get_exn_constructor;
 use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
 use nac3parser::{
    ast::{ExprKind, Stmt, StmtKind, StrRef},
    parser::parse_program,
-    },
+};
 use pyo3::create_exception;
 use pyo3::prelude::*;
 use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};
 use parking_lot::{Mutex, RwLock};
 use 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,
@ -195,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
                                }
@ -209,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
                        }
@ -446,6 +448,7 @@ impl Nac3 {
                        pyid_to_type: pyid_to_type.clone(),
                        primitive_ids: self.primitive_ids.clone(),
                        global_value_ids: global_value_ids.clone(),
                        class_names: Mutex::default(),
                        name_to_pyid: name_to_pyid.clone(),
                        module: module.clone(),
                        id_to_pyval: RwLock::default(),
@ -476,25 +479,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, .. } => {
@ -502,26 +489,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();
@ -560,6 +540,7 @@ impl Nac3 {
            pyid_to_type: pyid_to_type.clone(),
            primitive_ids: self.primitive_ids.clone(),
            global_value_ids: global_value_ids.clone(),
            class_names: Mutex::default(),
            id_to_pyval: RwLock::default(),
            id_to_primitive: RwLock::default(),
            field_to_val: RwLock::default(),
@ -576,10 +557,6 @@ impl Nac3 {
            .register_top_level(synthesized.pop().unwrap(), Some(resolver.clone()), "", false)
            .unwrap();
        // Process IRRT
        let context = Context::create();
        let irrt = load_irrt(&context, resolver.as_ref());
        let fun_signature =
            FunSignature { args: vec![], ret: self.primitive.none, vars: VarMap::new() };
        let mut store = ConcreteTypeStore::new();
@ -617,12 +594,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();
@ -633,7 +611,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,
@ -648,11 +626,6 @@ impl Nac3 {
                            }
                        }
                    }
                    TopLevelDef::Variable { .. } => {
                        return Err(CompileError::new_err(String::from(
                            "Unsupported @rpc annotation on global variable",
                        )))
                    }
                }
            }
        }
@ -712,7 +685,7 @@ impl Nac3 {
            let buffer = buffer.as_slice().into();
            membuffer.lock().push(buffer);
        })));
-        let size_t = context
+        let size_t = Context::create()
            .ptr_sized_int_type(&self.get_llvm_target_machine().get_target_data(), None)
            .get_bit_width();
        let num_threads = if is_multithreaded() { 4 } else { 1 };
@ -731,7 +704,7 @@ impl Nac3 {
            let mut generator =
                ArtiqCodeGenerator::new("attributes_writeback".to_string(), size_t, self.time_fns);
-            let context = Context::create();
+            let context = inkwell::context::Context::create();
            let module = context.create_module("attributes_writeback");
            let target_machine = self.llvm_options.create_target_machine().unwrap();
            module.set_data_layout(&target_machine.get_target_data().get_data_layout());
@ -754,7 +727,7 @@ impl Nac3 {
            membuffer.lock().push(buffer);
        });
-        // Link all modules into `main`.
+        let context = inkwell::context::Context::create();
        let buffers = membuffers.lock();
        let main = context
            .create_module_from_ir(MemoryBuffer::create_from_memory_range(&buffers[0], "main"))
@ -783,7 +756,8 @@ impl Nac3 {
            )
            .unwrap();
-        main.link_in_module(irrt).map_err(|err| CompileError::new_err(err.to_string()))?;
+        main.link_in_module(load_irrt(&context))
            .map_err(|err| CompileError::new_err(err.to_string()))?;
        let mut function_iter = main.get_first_function();
        while let Some(func) = function_iter {
@ -869,41 +843,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(),
--- a/nac3artiq/src/symbol_resolver.rs
+++ b/nac3artiq/src/symbol_resolver.rs
@ -1,30 +1,14 @@
-use std::{
+use inkwell::{
-    collections::{HashMap, HashSet},
+    types::{BasicType, BasicTypeEnum},
-    sync::{
+    values::BasicValueEnum,
-        atomic::{AtomicBool, Ordering::Relaxed},
+    AddressSpace,
        Arc,
    },
 };
 use itertools::Itertools;
 use parking_lot::RwLock;
 use pyo3::{
    types::{PyDict, PyTuple},
    PyAny, PyObject, PyResult, Python,
 };
 use nac3core::{
    codegen::{
        classes::{NDArrayType, ProxyType},
        CodeGenContext, CodeGenerator,
    },
    inkwell::{
        module::Linkage,
        types::{BasicType, BasicTypeEnum},
        values::BasicValueEnum,
        AddressSpace,
    },
    nac3parser::ast::{self, StrRef},
    symbol_resolver::{StaticValue, SymbolResolver, SymbolValue, ValueEnum},
    toplevel::{
        helper::PrimDef,
@ -36,8 +20,21 @@ use nac3core::{
        typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
    },
 };
 use nac3parser::ast::{self, StrRef};
 use parking_lot::{Mutex, RwLock};
 use pyo3::{
    types::{PyDict, PyTuple},
    PyAny, PyObject, PyResult, Python,
 };
 use std::{
    collections::{HashMap, HashSet},
    sync::{
        atomic::{AtomicBool, Ordering::Relaxed},
        Arc,
    },
 };
-use super::PrimitivePythonId;
+use crate::PrimitivePythonId;
 pub enum PrimitiveValue {
    I32(i32),
@ -82,6 +79,7 @@ pub struct InnerResolver {
    pub id_to_primitive: RwLock<HashMap<u64, PrimitiveValue>>,
    pub field_to_val: RwLock<HashMap<ResolverField, Option<PyFieldHandle>>>,
    pub global_value_ids: Arc<RwLock<HashMap<u64, PyObject>>>,
    pub class_names: Mutex<HashMap<StrRef, Type>>,
    pub pyid_to_def: Arc<RwLock<HashMap<u64, DefinitionId>>>,
    pub pyid_to_type: Arc<RwLock<HashMap<u64, Type>>>,
    pub primitive_ids: PrimitivePythonId,
@ -135,8 +133,6 @@ impl StaticValue for PythonValue {
                        format!("{}_const", self.id).as_str(),
                    );
                    global.set_constant(true);
                    // Set linkage of global to private to avoid name collisions
                    global.set_linkage(Linkage::Private);
                    global.set_initializer(&ctx.ctx.const_struct(
                        &[ctx.ctx.i32_type().const_int(u64::from(id), false).into()],
                        false,
@ -1470,7 +1466,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,12 +1,9 @@
-use itertools::Either;
+use inkwell::{
 use nac3core::{
    codegen::CodeGenContext,
    inkwell::{
    values::{BasicValueEnum, CallSiteValue},
    AddressSpace, AtomicOrdering,
    },
 };
 use itertools::Either;
 use nac3core::codegen::CodeGenContext;
 /// Functions for manipulating the timeline.
 pub trait TimeFns {
@ -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/nac3core/Cargo.toml
+++ b/nac3core/Cargo.toml
@ -10,17 +10,17 @@ 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"
 nac3parser = { path = "../nac3parser" }
-strum = "0.26"
+strum = "0.26.2"
-strum_macros = "0.26"
+strum_macros = "0.26.4"
 [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"]
+features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 [dev-dependencies]
 test-case = "1.2.0"
--- a/nac3core/build.rs
+++ b/nac3core/build.rs
@ -1,3 +1,4 @@
 use regex::Regex;
 use std::{
    env,
    fs::File,
@ -6,53 +7,38 @@ use std::{
    process::{Command, Stdio},
 };
 use regex::Regex;
 fn main() {
-    let out_dir = env::var("OUT_DIR").unwrap();
+    const FILE: &str = "src/codegen/irrt/irrt.cpp";
    let out_dir = Path::new(&out_dir);
    let irrt_dir = Path::new("irrt");
    let irrt_cpp_path = irrt_dir.join("irrt.cpp");
    /*
     * HACK: Sadly, clang doesn't let us emit generic LLVM bitcode.
     * Compiling for WASM32 and filtering the output with regex is the closest we can get.
     */
-    let mut flags: Vec<&str> = vec![
+    let flags: &[&str] = &[
        "--target=wasm32",
        FILE,
        "-x",
        "c++",
        "-std=c++20",
        "-fno-discard-value-names",
        "-fno-exceptions",
        "-fno-rtti",
        match env::var("PROFILE").as_deref() {
            Ok("debug") => "-O0",
            Ok("release") => "-O3",
            flavor => panic!("Unknown or missing build flavor {flavor:?}"),
        },
        "-emit-llvm",
        "-S",
        "-Wall",
        "-Wextra",
        "-o",
        "-",
        "-I",
        irrt_dir.to_str().unwrap(),
        irrt_cpp_path.to_str().unwrap(),
    ];
-    match env::var("PROFILE").as_deref() {
+    println!("cargo:rerun-if-changed={FILE}");
-        Ok("debug") => {
+    let out_dir = env::var("OUT_DIR").unwrap();
-            flags.push("-O0");
+    let out_path = Path::new(&out_dir);
            flags.push("-DIRRT_DEBUG_ASSERT");
        }
        Ok("release") => {
            flags.push("-O3");
        }
        flavor => panic!("Unknown or missing build flavor {flavor:?}"),
    }
    // Tell Cargo to rerun if any file under `irrt_dir` (recursive) changes
    println!("cargo:rerun-if-changed={}", irrt_dir.to_str().unwrap());
    // Compile IRRT and capture the LLVM IR output
    let output = Command::new("clang-irrt")
        .args(flags)
        .output()
@ -66,17 +52,7 @@ fn main() {
    let output = std::str::from_utf8(&output.stdout).unwrap().replace("\r\n", "\n");
    let mut filtered_output = String::with_capacity(output.len());
-    // Filter out irrelevant IR
+    let regex_filter = Regex::new(r"(?ms:^define.*?\}$)|(?m:^declare.*?$)").unwrap();
    //
    // Regex:
    // - `(?ms:^define.*?\}$)` captures LLVM `define` blocks
    // - `(?m:^declare.*?$)` captures LLVM `declare` lines
    // - `(?m:^%.+?=\s*type\s*\{.+?\}$)` captures LLVM `type` declarations
    // - `(?m:^@.+?=.+$)` captures global constants
    let regex_filter = Regex::new(
        r"(?ms:^define.*?\}$)|(?m:^declare.*?$)|(?m:^%.+?=\s*type\s*\{.+?\}$)|(?m:^@.+?=.+$)",
    )
    .unwrap();
    for f in regex_filter.captures_iter(&output) {
        assert_eq!(f.len(), 1);
        filtered_output.push_str(&f[0]);
@ -87,22 +63,18 @@ fn main() {
        .unwrap()
        .replace_all(&filtered_output, "");
-    // For debugging
+    println!("cargo:rerun-if-env-changed=DEBUG_DUMP_IRRT");
-    // Doing `DEBUG_DUMP_IRRT=1 cargo build -p nac3core` dumps the LLVM IR generated
+    if env::var("DEBUG_DUMP_IRRT").is_ok() {
-    const DEBUG_DUMP_IRRT: &str = "DEBUG_DUMP_IRRT";
+        let mut file = File::create(out_path.join("irrt.ll")).unwrap();
    println!("cargo:rerun-if-env-changed={DEBUG_DUMP_IRRT}");
    if env::var(DEBUG_DUMP_IRRT).is_ok() {
        let mut file = File::create(out_dir.join("irrt.ll")).unwrap();
        file.write_all(output.as_bytes()).unwrap();
-
+        let mut file = File::create(out_path.join("irrt-filtered.ll")).unwrap();
        let mut file = File::create(out_dir.join("irrt-filtered.ll")).unwrap();
        file.write_all(filtered_output.as_bytes()).unwrap();
    }
    let mut llvm_as = Command::new("llvm-as-irrt")
        .stdin(Stdio::piped())
        .arg("-o")
-        .arg(out_dir.join("irrt.bc"))
+        .arg(out_path.join("irrt.bc"))
        .spawn()
        .unwrap();
    llvm_as.stdin.as_mut().unwrap().write_all(filtered_output.as_bytes()).unwrap();
--- a/nac3core/irrt/irrt.cpp
+++ b/nac3core/irrt/irrt.cpp
@ -1,6 +0,0 @@
 #include "irrt/exception.hpp"
 #include "irrt/int_types.hpp"
 #include "irrt/list.hpp"
 #include "irrt/math.hpp"
 #include "irrt/ndarray.hpp"
 #include "irrt/slice.hpp"
--- a/nac3core/irrt/irrt/cslice.hpp
+++ b/nac3core/irrt/irrt/cslice.hpp
@ -1,9 +0,0 @@
 #pragma once
 #include "irrt/int_types.hpp"
 template<typename SizeT>
 struct CSlice {
    uint8_t* base;
    SizeT len;
 };
--- a/nac3core/irrt/irrt/debug.hpp
+++ b/nac3core/irrt/irrt/debug.hpp
@ -1,25 +0,0 @@
 #pragma once
 // Set in nac3core/build.rs
 #ifdef IRRT_DEBUG_ASSERT
 #define IRRT_DEBUG_ASSERT_BOOL true
 #else
 #define IRRT_DEBUG_ASSERT_BOOL false
 #endif
 #define raise_debug_assert(SizeT, msg, param1, param2, param3) \
    raise_exception(SizeT, EXN_ASSERTION_ERROR, "IRRT debug assert failed: " msg, param1, param2, param3)
 #define debug_assert_eq(SizeT, lhs, rhs)                                           \
    if constexpr (IRRT_DEBUG_ASSERT_BOOL) {                                        \
        if ((lhs) != (rhs)) {                                                      \
            raise_debug_assert(SizeT, "LHS = {0}. RHS = {1}", lhs, rhs, NO_PARAM); \
        }                                                                          \
    }
 #define debug_assert(SizeT, expr)                                                  \
    if constexpr (IRRT_DEBUG_ASSERT_BOOL) {                                        \
        if (!(expr)) {                                                             \
            raise_debug_assert(SizeT, "Got false.", NO_PARAM, NO_PARAM, NO_PARAM); \
        }                                                                          \
    }
--- a/nac3core/irrt/irrt/exception.hpp
+++ b/nac3core/irrt/irrt/exception.hpp
@ -1,82 +0,0 @@
 #pragma once
 #include "irrt/cslice.hpp"
 #include "irrt/int_types.hpp"
 /**
 * @brief The int type of ARTIQ exception IDs.
 */
 typedef int32_t ExceptionId;
 /*
 * Set of exceptions C++ IRRT can use.
 * Must be synchronized with `setup_irrt_exceptions` in `nac3core/src/codegen/irrt/mod.rs`.
 */
 extern "C" {
 ExceptionId EXN_INDEX_ERROR;
 ExceptionId EXN_VALUE_ERROR;
 ExceptionId EXN_ASSERTION_ERROR;
 ExceptionId EXN_TYPE_ERROR;
 }
 /**
 * @brief Extern function to `__nac3_raise`
 *
 * The parameter `err` could be `Exception<int32_t>` or `Exception<int64_t>`. The caller
 * must make sure to pass `Exception`s with the correct `SizeT` depending on the `size_t` of the runtime.
 */
 extern "C" void __nac3_raise(void* err);
 namespace {
 /**
 * @brief NAC3's Exception struct
 */
 template<typename SizeT>
 struct Exception {
    ExceptionId id;
    CSlice<SizeT> filename;
    int32_t line;
    int32_t column;
    CSlice<SizeT> function;
    CSlice<SizeT> msg;
    int64_t params[3];
 };
 constexpr int64_t NO_PARAM = 0;
 template<typename SizeT>
 void _raise_exception_helper(ExceptionId id,
                             const char* filename,
                             int32_t line,
                             const char* function,
                             const char* msg,
                             int64_t param0,
                             int64_t param1,
                             int64_t param2) {
    Exception<SizeT> e = {
        .id = id,
        .filename = {.base = reinterpret_cast<const uint8_t*>(filename), .len = __builtin_strlen(filename)},
        .line = line,
        .column = 0,
        .function = {.base = reinterpret_cast<const uint8_t*>(function), .len = __builtin_strlen(function)},
        .msg = {.base = reinterpret_cast<const uint8_t*>(msg), .len = __builtin_strlen(msg)},
    };
    e.params[0] = param0;
    e.params[1] = param1;
    e.params[2] = param2;
    __nac3_raise(reinterpret_cast<void*>(&e));
    __builtin_unreachable();
 }
 /**
 * @brief Raise an exception with location details (location in the IRRT source files).
 * @param SizeT The runtime `size_t` type.
 * @param id The ID of the exception to raise.
 * @param msg A global constant C-string of the error message.
 *
 * `param0` to `param2` are optional format arguments of `msg`. They should be set to
 * `NO_PARAM` to indicate they are unused.
 */
 #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
@ -1,22 +0,0 @@
 #pragma once
 #if __STDC_VERSION__ >= 202000
 using int8_t = _BitInt(8);
 using uint8_t = unsigned _BitInt(8);
 using int32_t = _BitInt(32);
 using uint32_t = unsigned _BitInt(32);
 using int64_t = _BitInt(64);
 using uint64_t = unsigned _BitInt(64);
 #else
 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);
 #endif
 // NDArray indices are always `uint32_t`.
 using NDIndex = uint32_t;
 // The type of an index or a value describing the length of a range/slice is always `int32_t`.
 using SliceIndex = int32_t;
--- a/nac3core/irrt/irrt/list.hpp
+++ b/nac3core/irrt/irrt/list.hpp
@ -1,75 +0,0 @@
 #pragma once
 #include "irrt/int_types.hpp"
 #include "irrt/math_util.hpp"
 extern "C" {
 // Handle list assignment and dropping part of the list when
 // both dest_step and src_step are +1.
 // - All the index must *not* be out-of-bound or negative,
 // - The end index is *inclusive*,
 // - The length of src and dest slice size should already
 // be checked: if dest.step == 1 then len(src) <= len(dest) else len(src) == len(dest)
 SliceIndex __nac3_list_slice_assign_var_size(SliceIndex dest_start,
                                             SliceIndex dest_end,
                                             SliceIndex dest_step,
                                             uint8_t* dest_arr,
                                             SliceIndex dest_arr_len,
                                             SliceIndex src_start,
                                             SliceIndex src_end,
                                             SliceIndex src_step,
                                             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 */
    if (dest_arr_len == 0)
        return dest_arr_len;
    /* if both step is 1, memmove directly, handle the dropping of the list, and shrink size */
    if (src_step == dest_step && dest_step == 1) {
        const SliceIndex src_len = (src_end >= src_start) ? (src_end - src_start + 1) : 0;
        const SliceIndex dest_len = (dest_end >= dest_start) ? (dest_end - dest_start + 1) : 0;
        if (src_len > 0) {
            __builtin_memmove(dest_arr + dest_start * size, src_arr + src_start * size, src_len * size);
        }
        if (dest_len > 0) {
            /* dropping */
            __builtin_memmove(dest_arr + (dest_start + src_len) * size, dest_arr + (dest_end + 1) * size,
                              (dest_arr_len - dest_end - 1) * size);
        }
        /* shrink size */
        return dest_arr_len - (dest_len - src_len);
    }
    /* if two range overlaps, need alloca */
    uint8_t need_alloca = (dest_arr == src_arr)
                          && !(max(dest_start, dest_end) < min(src_start, src_end)
                               || max(src_start, src_end) < min(dest_start, dest_end));
    if (need_alloca) {
        uint8_t* tmp = reinterpret_cast<uint8_t*>(__builtin_alloca(src_arr_len * size));
        __builtin_memcpy(tmp, src_arr, src_arr_len * size);
        src_arr = tmp;
    }
    SliceIndex src_ind = src_start;
    SliceIndex dest_ind = dest_start;
    for (; (src_step > 0) ? (src_ind <= src_end) : (src_ind >= src_end); src_ind += src_step, dest_ind += dest_step) {
        /* for constant optimization */
        if (size == 1) {
            __builtin_memcpy(dest_arr + dest_ind, src_arr + src_ind, 1);
        } else if (size == 4) {
            __builtin_memcpy(dest_arr + dest_ind * 4, src_arr + src_ind * 4, 4);
        } else if (size == 8) {
            __builtin_memcpy(dest_arr + dest_ind * 8, src_arr + src_ind * 8, 8);
        } else {
            /* memcpy for var size, cannot overlap after previous alloca */
            __builtin_memcpy(dest_arr + dest_ind * size, src_arr + src_ind * size, size);
        }
    }
    /* only dest_step == 1 can we shrink the dest list. */
    /* size should be ensured prior to calling this function */
    if (dest_step == 1 && dest_end >= dest_start) {
        __builtin_memmove(dest_arr + dest_ind * size, dest_arr + (dest_end + 1) * size,
                          (dest_arr_len - dest_end - 1) * size);
        return dest_arr_len - (dest_end - dest_ind) - 1;
    }
    return dest_arr_len;
 }
 }  // extern "C"
--- a/nac3core/irrt/irrt/math.hpp
+++ b/nac3core/irrt/irrt/math.hpp
@ -1,93 +0,0 @@
 #pragma once
 namespace {
 // adapted from GNU Scientific Library: https://git.savannah.gnu.org/cgit/gsl.git/tree/sys/pow_int.c
 // need to make sure `exp >= 0` before calling this function
 template<typename T>
 T __nac3_int_exp_impl(T base, T exp) {
    T res = 1;
    /* repeated squaring method */
    do {
        if (exp & 1) {
            res *= base; /* for n odd */
        }
        exp >>= 1;
        base *= base;
    } while (exp);
    return res;
 }
 }  // namespace
 #define DEF_nac3_int_exp_(T)                   \
    T __nac3_int_exp_##T(T base, T exp) {      \
        return __nac3_int_exp_impl(base, exp); \
    }
 extern "C" {
 // Putting semicolons here to make clang-format not reformat this into
 // a stair shape.
 DEF_nac3_int_exp_(int32_t);
 DEF_nac3_int_exp_(int64_t);
 DEF_nac3_int_exp_(uint32_t);
 DEF_nac3_int_exp_(uint64_t);
 int32_t __nac3_isinf(double x) {
    return __builtin_isinf(x);
 }
 int32_t __nac3_isnan(double x) {
    return __builtin_isnan(x);
 }
 double tgamma(double arg);
 double __nac3_gamma(double z) {
    // Handling for denormals
    //     | x                 | Python gamma(x) | C tgamma(x) |
    // --- | ----------------- | --------------- | ----------- |
    // (1) | nan               | nan             | nan         |
    // (2) | -inf              | -inf            | inf         |
    // (3) | inf               | inf             | inf         |
    // (4) | 0.0               | inf             | inf         |
    // (5) | {-1.0, -2.0, ...} | inf             | nan         |
    // (1)-(3)
    if (__builtin_isinf(z) || __builtin_isnan(z)) {
        return z;
    }
    double v = tgamma(z);
    // (4)-(5)
    return __builtin_isinf(v) || __builtin_isnan(v) ? __builtin_inf() : v;
 }
 double lgamma(double arg);
 double __nac3_gammaln(double x) {
    // libm's handling of value overflows differs from scipy:
    // - scipy: gammaln(-inf) -> -inf
    // - libm : lgamma(-inf) -> inf
    if (__builtin_isinf(x)) {
        return x;
    }
    return lgamma(x);
 }
 double j0(double x);
 double __nac3_j0(double x) {
    // libm's handling of value overflows differs from scipy:
    // - scipy: j0(inf) -> nan
    // - libm : j0(inf) -> 0.0
    if (__builtin_isinf(x)) {
        return __builtin_nan("");
    }
    return j0(x);
 }
 }
--- a/nac3core/irrt/irrt/math_util.hpp
+++ b/nac3core/irrt/irrt/math_util.hpp
@ -1,13 +0,0 @@
 #pragma once
 namespace {
 template<typename T>
 const T& max(const T& a, const T& b) {
    return a > b ? a : b;
 }
 template<typename T>
 const T& min(const T& a, const T& b) {
    return a > b ? b : a;
 }
 }  // namespace
--- a/nac3core/irrt/irrt/ndarray.hpp
+++ b/nac3core/irrt/irrt/ndarray.hpp
@ -1,144 +0,0 @@
 #pragma once
 #include "irrt/int_types.hpp"
 namespace {
 template<typename SizeT>
 SizeT __nac3_ndarray_calc_size_impl(const SizeT* list_data, SizeT list_len, SizeT begin_idx, SizeT end_idx) {
    __builtin_assume(end_idx <= list_len);
    SizeT num_elems = 1;
    for (SizeT i = begin_idx; i < end_idx; ++i) {
        SizeT val = list_data[i];
        __builtin_assume(val > 0);
        num_elems *= val;
    }
    return num_elems;
 }
 template<typename SizeT>
 void __nac3_ndarray_calc_nd_indices_impl(SizeT index, const SizeT* dims, SizeT num_dims, NDIndex* idxs) {
    SizeT stride = 1;
    for (SizeT dim = 0; dim < num_dims; dim++) {
        SizeT i = num_dims - dim - 1;
        __builtin_assume(dims[i] > 0);
        idxs[i] = (index / stride) % dims[i];
        stride *= dims[i];
    }
 }
 template<typename SizeT>
 SizeT __nac3_ndarray_flatten_index_impl(const SizeT* dims, SizeT num_dims, const NDIndex* indices, SizeT num_indices) {
    SizeT idx = 0;
    SizeT stride = 1;
    for (SizeT i = 0; i < num_dims; ++i) {
        SizeT ri = num_dims - i - 1;
        if (ri < num_indices) {
            idx += stride * indices[ri];
        }
        __builtin_assume(dims[i] > 0);
        stride *= dims[ri];
    }
    return idx;
 }
 template<typename SizeT>
 void __nac3_ndarray_calc_broadcast_impl(const SizeT* lhs_dims,
                                        SizeT lhs_ndims,
                                        const SizeT* rhs_dims,
                                        SizeT rhs_ndims,
                                        SizeT* out_dims) {
    SizeT max_ndims = lhs_ndims > rhs_ndims ? lhs_ndims : rhs_ndims;
    for (SizeT i = 0; i < max_ndims; ++i) {
        const SizeT* lhs_dim_sz = i < lhs_ndims ? &lhs_dims[lhs_ndims - i - 1] : nullptr;
        const SizeT* rhs_dim_sz = i < rhs_ndims ? &rhs_dims[rhs_ndims - i - 1] : nullptr;
        SizeT* out_dim = &out_dims[max_ndims - i - 1];
        if (lhs_dim_sz == nullptr) {
            *out_dim = *rhs_dim_sz;
        } else if (rhs_dim_sz == nullptr) {
            *out_dim = *lhs_dim_sz;
        } else if (*lhs_dim_sz == 1) {
            *out_dim = *rhs_dim_sz;
        } else if (*rhs_dim_sz == 1) {
            *out_dim = *lhs_dim_sz;
        } else if (*lhs_dim_sz == *rhs_dim_sz) {
            *out_dim = *lhs_dim_sz;
        } else {
            __builtin_unreachable();
        }
    }
 }
 template<typename SizeT>
 void __nac3_ndarray_calc_broadcast_idx_impl(const SizeT* src_dims,
                                            SizeT src_ndims,
                                            const NDIndex* in_idx,
                                            NDIndex* out_idx) {
    for (SizeT i = 0; i < src_ndims; ++i) {
        SizeT src_i = src_ndims - i - 1;
        out_idx[src_i] = src_dims[src_i] == 1 ? 0 : in_idx[src_i];
    }
 }
 }  // namespace
 extern "C" {
 uint32_t __nac3_ndarray_calc_size(const uint32_t* list_data, uint32_t list_len, uint32_t begin_idx, uint32_t end_idx) {
    return __nac3_ndarray_calc_size_impl(list_data, list_len, begin_idx, end_idx);
 }
 uint64_t
 __nac3_ndarray_calc_size64(const uint64_t* list_data, uint64_t list_len, uint64_t begin_idx, uint64_t end_idx) {
    return __nac3_ndarray_calc_size_impl(list_data, list_len, begin_idx, end_idx);
 }
 void __nac3_ndarray_calc_nd_indices(uint32_t index, const uint32_t* dims, uint32_t num_dims, NDIndex* idxs) {
    __nac3_ndarray_calc_nd_indices_impl(index, dims, num_dims, idxs);
 }
 void __nac3_ndarray_calc_nd_indices64(uint64_t index, const uint64_t* dims, uint64_t num_dims, NDIndex* idxs) {
    __nac3_ndarray_calc_nd_indices_impl(index, dims, num_dims, idxs);
 }
 uint32_t
 __nac3_ndarray_flatten_index(const uint32_t* dims, uint32_t num_dims, const NDIndex* indices, uint32_t num_indices) {
    return __nac3_ndarray_flatten_index_impl(dims, num_dims, indices, num_indices);
 }
 uint64_t
 __nac3_ndarray_flatten_index64(const uint64_t* dims, uint64_t num_dims, const NDIndex* indices, uint64_t num_indices) {
    return __nac3_ndarray_flatten_index_impl(dims, num_dims, indices, num_indices);
 }
 void __nac3_ndarray_calc_broadcast(const uint32_t* lhs_dims,
                                   uint32_t lhs_ndims,
                                   const uint32_t* rhs_dims,
                                   uint32_t rhs_ndims,
                                   uint32_t* out_dims) {
    return __nac3_ndarray_calc_broadcast_impl(lhs_dims, lhs_ndims, rhs_dims, rhs_ndims, out_dims);
 }
 void __nac3_ndarray_calc_broadcast64(const uint64_t* lhs_dims,
                                     uint64_t lhs_ndims,
                                     const uint64_t* rhs_dims,
                                     uint64_t rhs_ndims,
                                     uint64_t* out_dims) {
    return __nac3_ndarray_calc_broadcast_impl(lhs_dims, lhs_ndims, rhs_dims, rhs_ndims, out_dims);
 }
 void __nac3_ndarray_calc_broadcast_idx(const uint32_t* src_dims,
                                       uint32_t src_ndims,
                                       const NDIndex* in_idx,
                                       NDIndex* out_idx) {
    __nac3_ndarray_calc_broadcast_idx_impl(src_dims, src_ndims, in_idx, out_idx);
 }
 void __nac3_ndarray_calc_broadcast_idx64(const uint64_t* src_dims,
                                         uint64_t src_ndims,
                                         const NDIndex* in_idx,
                                         NDIndex* out_idx) {
    __nac3_ndarray_calc_broadcast_idx_impl(src_dims, src_ndims, in_idx, out_idx);
 }
 }
--- a/nac3core/irrt/irrt/slice.hpp
+++ b/nac3core/irrt/irrt/slice.hpp
@ -1,28 +0,0 @@
 #pragma once
 #include "irrt/int_types.hpp"
 extern "C" {
 SliceIndex __nac3_slice_index_bound(SliceIndex i, const SliceIndex len) {
    if (i < 0) {
        i = len + i;
    }
    if (i < 0) {
        return 0;
    } else if (i > len) {
        return len;
    }
    return i;
 }
 SliceIndex __nac3_range_slice_len(const SliceIndex start, const SliceIndex end, const SliceIndex step) {
    SliceIndex diff = end - start;
    if (diff > 0 && step > 0) {
        return ((diff - 1) / step) + 1;
    } else if (diff < 0 && step < 0) {
        return ((diff + 1) / step) + 1;
    } else {
        return 0;
    }
 }
 }
--- a/nac3core/src/codegen/builtin_fns.rs
+++ b/nac3core/src/codegen/builtin_fns.rs
@ -1,36 +1,26 @@
-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::{
    classes::{
    ArrayLikeValue, NDArrayValue, ProxyValue, RangeValue, TypedArrayLikeAccessor,
    UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
    },
    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,
    CodeGenContext, CodeGenerator,
 };
 use crate::{
    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys},
    typecheck::typedef::{Type, TypeEnum},
 };
 use crate::codegen::expr::destructure_range;
 use crate::codegen::irrt::calculate_len_for_slice_range;
 use crate::codegen::numpy::ndarray_elementwise_unaryop_impl;
 use crate::codegen::stmt::gen_for_callback_incrementing;
 use crate::codegen::{extern_fns, irrt, llvm_intrinsics, numpy, CodeGenContext, CodeGenerator};
 use crate::toplevel::helper::PrimDef;
 use crate::toplevel::numpy::unpack_ndarray_var_tys;
 use crate::typecheck::typedef::{Type, TypeEnum};
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.
 ///
 /// The generated message will contain the function name and the name of the unsupported type.
 fn unsupported_type(ctx: &CodeGenContext<'_, '_>, fn_name: &str, tys: &[Type]) -> ! {
-    codegen_unreachable!(
+    unreachable!(
        ctx,
        "{fn_name}() not supported for '{}'",
        tys.iter().map(|ty| format!("'{}'", ctx.unifier.stringify(*ty))).join(", "),
    )
@ -92,7 +82,7 @@ pub fn call_len<'ctx, G: CodeGenerator + ?Sized>(
                ctx.builder.build_int_truncate_or_bit_cast(len, llvm_i32, "len").unwrap()
            }
-            _ => codegen_unreachable!(ctx),
+            _ => unreachable!(),
        }
    })
 }
@ -794,7 +784,7 @@ pub fn call_numpy_minimum<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -898,7 +888,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
            match fn_name {
                "np_argmin" | "np_argmax" => llvm_int64.const_zero().into(),
                "np_max" | "np_min" => a,
-                _ => codegen_unreachable!(ctx),
+                _ => unreachable!(),
            }
        }
        BasicValueEnum::PointerValue(n)
@ -953,7 +943,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
                        "np_argmax" | "np_max" => {
                            call_max(ctx, (elem_ty, accumulator), (elem_ty, elem))
                        }
-                        _ => codegen_unreachable!(ctx),
+                        _ => unreachable!(),
                    };
                    let updated_idx = match (accumulator, result) {
@ -990,7 +980,7 @@ pub fn call_numpy_max_min<'ctx, G: CodeGenerator + ?Sized>(
            match fn_name {
                "np_argmin" | "np_argmax" => ctx.builder.build_load(res_idx, "").unwrap(),
                "np_max" | "np_min" => ctx.builder.build_load(accumulator_addr, "").unwrap(),
-                _ => codegen_unreachable!(ctx),
+                _ => unreachable!(),
            }
        }
@ -1056,7 +1046,7 @@ pub fn call_numpy_maximum<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1496,7 +1486,7 @@ pub fn call_numpy_arctan2<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1563,7 +1553,7 @@ pub fn call_numpy_copysign<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1630,7 +1620,7 @@ pub fn call_numpy_fmax<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1697,7 +1687,7 @@ pub fn call_numpy_fmin<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1820,7 +1810,7 @@ pub fn call_numpy_hypot<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
@ -1887,7 +1877,7 @@ pub fn call_numpy_nextafter<'ctx, G: CodeGenerator + ?Sized>(
            } else if is_ndarray2 {
                unpack_ndarray_var_tys(&mut ctx.unifier, x2_ty).0
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let x1_scalar_ty = if is_ndarray1 { dtype } else { x1_ty };
--- a/nac3core/src/codegen/classes.rs
+++ b/nac3core/src/codegen/classes.rs
@ -1,16 +1,17 @@
-use inkwell::{
+use crate::codegen::{
    context::Context,
    types::{AnyTypeEnum, ArrayType, BasicType, BasicTypeEnum, IntType, PointerType, StructType},
    values::{ArrayValue, BasicValue, BasicValueEnum, IntValue, PointerValue, StructValue},
    AddressSpace, IntPredicate,
 };
 use super::{
    irrt::{call_ndarray_calc_size, call_ndarray_flatten_index},
    llvm_intrinsics::call_int_umin,
    stmt::gen_for_callback_incrementing,
    CodeGenContext, CodeGenerator,
 };
 use inkwell::context::Context;
 use inkwell::types::{ArrayType, BasicType, StructType};
 use inkwell::values::{ArrayValue, BasicValue, StructValue};
 use inkwell::{
    types::{AnyTypeEnum, BasicTypeEnum, IntType, PointerType},
    values::{BasicValueEnum, IntValue, PointerValue},
    AddressSpace, IntPredicate,
 };
 /// A LLVM type that is used to represent a non-primitive type in NAC3.
 pub trait ProxyType<'ctx>: Into<Self::Base> {
@ -1249,13 +1250,11 @@ impl<'ctx> NDArrayType<'ctx> {
    /// Returns the element type of this `ndarray` type.
    #[must_use]
-    pub fn element_type(&self) -> AnyTypeEnum<'ctx> {
+    pub fn element_type(&self) -> BasicTypeEnum<'ctx> {
        self.as_base_type()
            .get_element_type()
            .into_struct_type()
            .get_field_type_at_index(2)
            .map(BasicTypeEnum::into_pointer_type)
            .map(PointerType::get_element_type)
            .unwrap()
    }
 }
@ -1405,7 +1404,7 @@ impl<'ctx> NDArrayValue<'ctx> {
    /// 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> {
+    fn ptr_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();
--- 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,44 +1,23 @@
-use std::{
+use crate::{
-    cmp::min,
+    codegen::{
    collections::HashMap,
    convert::TryInto,
    iter::{once, repeat, repeat_with, zip},
 };
 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::{
        classes::{
-        ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayValue, ProxyType, ProxyValue,
+            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayValue, ProxyType,
-        RangeValue, TypedArrayLikeAccessor, UntypedArrayLikeAccessor,
+            ProxyValue, RangeValue, TypedArrayLikeAccessor, UntypedArrayLikeAccessor,
        },
        concrete_type::{ConcreteFuncArg, ConcreteTypeEnum, ConcreteTypeStore},
        gen_in_range_check, get_llvm_abi_type, get_llvm_type, get_va_count_arg_name,
        irrt::*,
        llvm_intrinsics::{
            call_expect, call_float_floor, call_float_pow, call_float_powi, call_int_smax,
-        call_int_umin, call_memcpy_generic,
+            call_memcpy_generic,
        },
    macros::codegen_unreachable,
        need_sret, numpy,
        stmt::{
            gen_for_callback_incrementing, gen_if_callback, gen_if_else_expr_callback, gen_raise,
            gen_var,
        },
        CodeGenContext, CodeGenTask, CodeGenerator,
-};
+    },
 use crate::{
    symbol_resolver::{SymbolValue, ValueEnum},
    toplevel::{
        helper::PrimDef,
@ -50,6 +29,19 @@ 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::iter::{repeat, repeat_with};
 use std::{collections::HashMap, convert::TryInto, iter::once, iter::zip};
 pub fn get_subst_key(
    unifier: &mut Unifier,
@ -119,7 +111,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
        let obj_id = match &*self.unifier.get_ty(ty) {
            TypeEnum::TObj { obj_id, .. } => *obj_id,
            // we cannot have other types, virtual type should be handled by function calls
-            _ => codegen_unreachable!(self),
+            _ => unreachable!(),
        };
        let def = &self.top_level.definitions.read()[obj_id.0];
        let (index, value) = if let TopLevelDef::Class { fields, attributes, .. } = &*def.read() {
@ -130,7 +122,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                (attribute_index.0, Some(attribute_index.1 .2.clone()))
            }
        } else {
-            codegen_unreachable!(self)
+            unreachable!()
        };
        (index, value)
    }
@ -140,7 +132,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
            TypeEnum::TObj { fields, .. } => {
                fields.iter().find_position(|x| *x.0 == attr).unwrap().0
            }
-            _ => codegen_unreachable!(self),
+            _ => unreachable!(),
        }
    }
@ -195,7 +187,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                    {
                        *params.iter().next().unwrap().1
                    }
-                    _ => codegen_unreachable!(self, "must be option type"),
+                    _ => unreachable!("must be option type"),
                };
                let val = self.gen_symbol_val(generator, v, ty);
                let ptr = generator
@ -211,7 +203,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                    {
                        *params.iter().next().unwrap().1
                    }
-                    _ => codegen_unreachable!(self, "must be option type"),
+                    _ => unreachable!("must be option type"),
                };
                let actual_ptr_type =
                    self.get_llvm_type(generator, ty).ptr_type(AddressSpace::default());
@ -278,7 +270,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                {
                    self.ctx.i64_type()
                } else {
-                    codegen_unreachable!(self)
+                    unreachable!()
                };
                Some(ty.const_int(*val as u64, false).into())
            }
@ -292,7 +284,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                let (types, is_vararg_ctx) = if let TypeEnum::TTuple { ty, is_vararg_ctx } = &*ty {
                    (ty.clone(), *is_vararg_ctx)
                } else {
-                    codegen_unreachable!(self)
+                    unreachable!()
                };
                let values = zip(types, v.iter())
                    .map_while(|(ty, v)| self.gen_const(generator, v, ty))
@ -337,7 +329,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                None
            }
-            _ => codegen_unreachable!(self),
+            _ => unreachable!(),
        }
    }
@ -351,7 +343,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
        signed: bool,
    ) -> BasicValueEnum<'ctx> {
        let (BasicValueEnum::IntValue(lhs), BasicValueEnum::IntValue(rhs)) = (lhs, rhs) else {
-            codegen_unreachable!(self)
+            unreachable!()
        };
        let float = self.ctx.f64_type();
        match (op, signed) {
@ -426,7 +418,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                        .build_right_shift(lhs, rhs, signed, "rshift")
                        .map(Into::into)
                        .unwrap(),
-                    _ => codegen_unreachable!(self),
+                    _ => unreachable!(),
                }
            }
@ -438,7 +430,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
            }
            (Operator::Pow, s) => integer_power(generator, self, lhs, rhs, s).into(),
            // special implementation?
-            (Operator::MatMult, _) => codegen_unreachable!(self),
+            (Operator::MatMult, _) => unreachable!(),
        }
    }
@ -450,8 +442,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
        rhs: BasicValueEnum<'ctx>,
    ) -> BasicValueEnum<'ctx> {
        let (BasicValueEnum::FloatValue(lhs), BasicValueEnum::FloatValue(rhs)) = (lhs, rhs) else {
-            codegen_unreachable!(
+            unreachable!(
                self,
                "Expected (FloatValue, FloatValue), got ({}, {})",
                lhs.get_type(),
                rhs.get_type()
@ -557,7 +548,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,
            })
@ -695,7 +686,7 @@ pub fn gen_constructor<'ctx, 'a, G: CodeGenerator>(
    def: &TopLevelDef,
    params: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
 ) -> Result<BasicValueEnum<'ctx>, String> {
-    let TopLevelDef::Class { methods, .. } = def else { codegen_unreachable!(ctx) };
+    let TopLevelDef::Class { methods, .. } = def else { unreachable!() };
    // TODO: what about other fields that require alloca?
    let fun_id = methods.iter().find(|method| method.0 == "__init__".into()).map(|method| method.2);
@ -727,7 +718,7 @@ pub fn gen_func_instance<'ctx>(
        key,
    ) = fun
    else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    };
    if let Some(sym) = instance_to_symbol.get(&key) {
@ -759,7 +750,7 @@ pub fn gen_func_instance<'ctx>(
        .collect();
    let mut signature = store.from_signature(&mut ctx.unifier, &ctx.primitives, sign, &mut cache);
-    let ConcreteTypeEnum::TFunc { args, .. } = &mut signature else { codegen_unreachable!(ctx) };
+    let ConcreteTypeEnum::TFunc { args, .. } = &mut signature else { unreachable!() };
    if let Some(obj) = &obj {
        let zelf = store.from_unifier_type(&mut ctx.unifier, &ctx.primitives, obj.0, &mut cache);
@ -977,7 +968,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| {
@ -1126,7 +1116,7 @@ pub fn gen_comprehension<'ctx, G: CodeGenerator>(
    ctx: &mut CodeGenContext<'ctx, '_>,
    expr: &Expr<Option<Type>>,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
-    let ExprKind::ListComp { elt, generators } = &expr.node else { codegen_unreachable!(ctx) };
+    let ExprKind::ListComp { elt, generators } = &expr.node else { unreachable!() };
    let current = ctx.builder.get_insert_block().unwrap().get_parent().unwrap();
@ -1385,13 +1375,13 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                    if let TypeEnum::TObj { params, .. } = &*ctx.unifier.get_ty_immutable(ty1) {
                        ctx.unifier.get_representative(*params.iter().next().unwrap().1)
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                let elem_ty2 =
                    if let TypeEnum::TObj { params, .. } = &*ctx.unifier.get_ty_immutable(ty2) {
                        ctx.unifier.get_representative(*params.iter().next().unwrap().1)
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                debug_assert!(ctx.unifier.unioned(elem_ty1, elem_ty2));
@ -1464,7 +1454,7 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                        {
                            *params.iter().next().unwrap().1
                        } else {
-                            codegen_unreachable!(ctx)
+                            unreachable!()
                        };
                        (elem_ty, left_val, right_val)
@ -1474,12 +1464,12 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
                        {
                            *params.iter().next().unwrap().1
                        } else {
-                            codegen_unreachable!(ctx)
+                            unreachable!()
                        };
                        (elem_ty, right_val, left_val)
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                let list_val =
                    ListValue::from_ptr_val(list_val.into_pointer_value(), llvm_usize, None);
@ -1646,7 +1636,7 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
    } else {
        let left_ty_enum = ctx.unifier.get_ty_immutable(left_ty.unwrap());
        let TypeEnum::TObj { fields, obj_id, .. } = left_ty_enum.as_ref() else {
-            codegen_unreachable!(ctx, "must be tobj")
+            unreachable!("must be tobj")
        };
        let (op_name, id) = {
            let normal_method_name = Binop::normal(op.base).op_info().method_name;
@ -1667,19 +1657,19 @@ pub fn gen_binop_expr_with_values<'ctx, G: CodeGenerator>(
        } else {
            let left_enum_ty = ctx.unifier.get_ty_immutable(left_ty.unwrap());
            let TypeEnum::TObj { fields, .. } = left_enum_ty.as_ref() else {
-                codegen_unreachable!(ctx, "must be tobj")
+                unreachable!("must be tobj")
            };
            let fn_ty = fields.get(&op_name).unwrap().0;
            let fn_ty_enum = ctx.unifier.get_ty_immutable(fn_ty);
-            let TypeEnum::TFunc(sig) = fn_ty_enum.as_ref() else { codegen_unreachable!(ctx) };
+            let TypeEnum::TFunc(sig) = fn_ty_enum.as_ref() else { unreachable!() };
            sig.clone()
        };
        let fun_id = {
            let defs = ctx.top_level.definitions.read();
            let obj_def = defs.get(id.0).unwrap().read();
-            let TopLevelDef::Class { methods, .. } = &*obj_def else { codegen_unreachable!(ctx) };
+            let TopLevelDef::Class { methods, .. } = &*obj_def else { unreachable!() };
            methods.iter().find(|method| method.0 == op_name).unwrap().2
        };
@ -1810,8 +1800,7 @@ pub fn gen_unaryop_expr_with_values<'ctx, G: CodeGenerator>(
            if op == ast::Unaryop::Invert {
                ast::Unaryop::Not
            } else {
-                codegen_unreachable!(
+                unreachable!(
                    ctx,
                    "ufunc {} not supported for ndarray[bool, N]",
                    op.op_info().method_name,
                )
@ -1878,8 +1867,8 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
        {
            let llvm_usize = generator.get_size_type(ctx.ctx);
-            let (Some(left_ty), lhs) = left else { codegen_unreachable!(ctx) };
+            let (Some(left_ty), lhs) = left else { unreachable!() };
-            let (Some(right_ty), rhs) = comparators[0] else { codegen_unreachable!(ctx) };
+            let (Some(right_ty), rhs) = comparators[0] else { unreachable!() };
            let op = ops[0];
            let is_ndarray1 =
@ -1986,7 +1975,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                let op = match op {
                    ast::Cmpop::Eq | ast::Cmpop::Is => IntPredicate::EQ,
                    ast::Cmpop::NotEq => IntPredicate::NE,
-                    _ if left_ty == ctx.primitives.bool => codegen_unreachable!(ctx),
+                    _ if left_ty == ctx.primitives.bool => unreachable!(),
                    ast::Cmpop::Lt => {
                        if use_unsigned_ops {
                            IntPredicate::ULT
@ -2015,7 +2004,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                            IntPredicate::SGE
                        }
                    }
-                    _ => codegen_unreachable!(ctx),
+                    _ => unreachable!(),
                };
                ctx.builder.build_int_compare(op, lhs, rhs, "cmp").unwrap()
@ -2032,118 +2021,9 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                    ast::Cmpop::LtE => inkwell::FloatPredicate::OLE,
                    ast::Cmpop::Gt => inkwell::FloatPredicate::OGT,
                    ast::Cmpop::GtE => inkwell::FloatPredicate::OGE,
-                    _ => codegen_unreachable!(ctx),
+                    _ => unreachable!(),
                };
                ctx.builder.build_float_compare(op, lhs, rhs, "cmp").unwrap()
            } else if left_ty == ctx.primitives.str {
                assert!(ctx.unifier.unioned(left_ty, right_ty));
                let llvm_i1 = ctx.ctx.bool_type();
                let llvm_i32 = ctx.ctx.i32_type();
                let llvm_usize = generator.get_size_type(ctx.ctx);
                let lhs = lhs.into_struct_value();
                let rhs = rhs.into_struct_value();
                let plhs = generator.gen_var_alloc(ctx, lhs.get_type().into(), None).unwrap();
                ctx.builder.build_store(plhs, lhs).unwrap();
                let prhs = generator.gen_var_alloc(ctx, lhs.get_type().into(), None).unwrap();
                ctx.builder.build_store(prhs, rhs).unwrap();
                let lhs_len = ctx.build_in_bounds_gep_and_load(
                    plhs,
                    &[llvm_i32.const_zero(), llvm_i32.const_int(1, false)],
                    None,
                ).into_int_value();
                let rhs_len = ctx.build_in_bounds_gep_and_load(
                    prhs,
                    &[llvm_i32.const_zero(), llvm_i32.const_int(1, false)],
                    None,
                ).into_int_value();
                let len = call_int_umin(ctx, lhs_len, rhs_len, None);
                let current_bb = ctx.builder.get_insert_block().unwrap();
                let post_foreach_cmp = ctx.ctx.insert_basic_block_after(current_bb, "foreach.cmp.end");
                ctx.builder.position_at_end(post_foreach_cmp);
                let cmp_phi = ctx.builder.build_phi(llvm_i1, "").unwrap();
                ctx.builder.position_at_end(current_bb);
                gen_for_callback_incrementing(
                    generator,
                    ctx,
                    None,
                    llvm_usize.const_zero(),
                    (len, false),
                    |generator, ctx, _, i| {
                        let lhs_char = {
                            let plhs_data = ctx.build_in_bounds_gep_and_load(
                                plhs,
                                &[llvm_i32.const_zero(), llvm_i32.const_zero()],
                                None,
                            ).into_pointer_value();
                            ctx.build_in_bounds_gep_and_load(
                                plhs_data,
                                &[i],
                                None
                            ).into_int_value()
                        };
                        let rhs_char = {
                            let prhs_data = ctx.build_in_bounds_gep_and_load(
                                prhs,
                                &[llvm_i32.const_zero(), llvm_i32.const_zero()],
                                None,
                            ).into_pointer_value();
                            ctx.build_in_bounds_gep_and_load(
                                prhs_data,
                                &[i],
                                None
                            ).into_int_value()
                        };
                        gen_if_callback(
                            generator,
                            ctx,
                            |_, ctx| {
                                Ok(ctx.builder.build_int_compare(IntPredicate::NE, lhs_char, rhs_char, "").unwrap())
                            },
                            |_, ctx| {
                                let bb = ctx.builder.get_insert_block().unwrap();
                                cmp_phi.add_incoming(&[(&llvm_i1.const_zero(), bb)]);
                                ctx.builder.build_unconditional_branch(post_foreach_cmp).unwrap();
                                Ok(())
                            },
                            |_, _| Ok(()),
                        )?;
                        Ok(())
                    },
                    llvm_usize.const_int(1, false),
                )?;
                let bb = ctx.builder.get_insert_block().unwrap();
                let is_len_eq = ctx.builder.build_int_compare(
                    IntPredicate::EQ,
                    lhs_len,
                    rhs_len,
                    "",
                ).unwrap();
                cmp_phi.add_incoming(&[(&is_len_eq, bb)]);
                ctx.builder.build_unconditional_branch(post_foreach_cmp).unwrap();
                ctx.builder.position_at_end(post_foreach_cmp);
                let cmp_phi = cmp_phi.as_basic_value().into_int_value();
                // Invert the final value if __ne__
                if *op == Cmpop::NotEq {
                    ctx.builder.build_not(cmp_phi, "").unwrap()
                } else {
                    cmp_phi
                }
            } else if [left_ty, right_ty]
                .iter()
                .any(|ty| ty.obj_id(&ctx.unifier).is_some_and(|id| id == PrimDef::List.id()))
@ -2164,7 +2044,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                        match (op, val) {
                            (Cmpop::Eq, true) | (Cmpop::NotEq, false) => llvm_i1.const_all_ones(),
                            (Cmpop::Eq, false) | (Cmpop::NotEq, true) => llvm_i1.const_zero(),
-                            (_, _) => codegen_unreachable!(ctx),
+                            (_, _) => unreachable!(),
                        }
                    };
@ -2177,14 +2057,14 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                    {
                        *params.iter().next().unwrap().1
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                    let right_elem_ty = if let TypeEnum::TObj { params, .. } =
                        &*ctx.unifier.get_ty_immutable(right_ty)
                    {
                        *params.iter().next().unwrap().1
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                    if !ctx.unifier.unioned(left_elem_ty, right_elem_ty) {
@ -2314,124 +2194,8 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                };
                gen_list_cmpop(generator, ctx)?
            } else if [left_ty, right_ty].iter().any(|ty| matches!(&*ctx.unifier.get_ty_immutable(*ty), TypeEnum::TTuple { .. })) {
                let TypeEnum::TTuple { ty: left_tys, .. } = &*ctx.unifier.get_ty_immutable(left_ty) else {
                    return Err(format!("'{}' not supported between instances of '{}' and '{}'", op.op_info().symbol, ctx.unifier.stringify(left_ty), ctx.unifier.stringify(right_ty)))
                };
                let TypeEnum::TTuple { ty: right_tys, .. } = &*ctx.unifier.get_ty_immutable(right_ty) else {
                    return Err(format!("'{}' not supported between instances of '{}' and '{}'", op.op_info().symbol, ctx.unifier.stringify(left_ty), ctx.unifier.stringify(right_ty)))
                };
                if ![Cmpop::Eq, Cmpop::NotEq].contains(op) {
                    todo!("Only __eq__ and __ne__ is implemented for tuples")
                }
                let llvm_i1 = ctx.ctx.bool_type();
                let llvm_i32 = ctx.ctx.i32_type();
                // Assume `true` by default
                let cmp_addr = generator.gen_var_alloc(ctx, llvm_i1.into(), None).unwrap();
                ctx.builder.build_store(cmp_addr, llvm_i1.const_all_ones()).unwrap();
                let current_bb = ctx.builder.get_insert_block().unwrap();
                let post_foreach_cmp = ctx.ctx.insert_basic_block_after(current_bb, "foreach.cmp.end");
                ctx.builder.position_at_end(post_foreach_cmp);
                let cmp_phi = ctx.builder.build_phi(llvm_i1, "").unwrap();
                ctx.builder.position_at_end(current_bb);
                // Generate comparison between each element
                let min_len = min(left_tys.len(), right_tys.len());
                for i in 0..min_len {
                    let current_bb = ctx.builder.get_insert_block().unwrap();
                    let bb = ctx.ctx.insert_basic_block_after(current_bb, &format!("foreach.cmp.tuple.{i}e"));
                    ctx.builder.build_unconditional_branch(bb).unwrap();
                    ctx.builder.position_at_end(bb);
                    let left_ty = left_tys[i];
                    let left_elem = {
                        let plhs = generator.gen_var_alloc(ctx, lhs.get_type(), None).unwrap();
                        ctx.builder.build_store(plhs, *lhs).unwrap();
                        ctx.build_in_bounds_gep_and_load(
                            plhs,
                            &[llvm_i32.const_zero(), llvm_i32.const_int(i as u64, false)],
                            None,
                        )
                    };
                    let right_ty = right_tys[i];
                    let right_elem = {
                        let prhs = generator.gen_var_alloc(ctx, rhs.get_type(), None).unwrap();
                        ctx.builder.build_store(prhs, *rhs).unwrap();
                        ctx.build_in_bounds_gep_and_load(
                            prhs,
                            &[llvm_i32.const_zero(), llvm_i32.const_int(i as u64, false)],
                            None,
                        )
                    };
                    gen_if_callback(
                        generator,
                        ctx,
                        |generator, ctx| {
                            // Defer the `not` operation until the end - a != b <=> !(a == b)
                            let op = if *op == Cmpop::NotEq { Cmpop::Eq } else { *op };
                            let cmp = gen_cmpop_expr_with_values(
                                generator,
                                ctx,
                                (Some(left_ty), left_elem),
                                &[op],
                                &[(Some(right_ty), right_elem)],
                            )
                                .transpose()
                                .unwrap()
                                .and_then(|v| {
                                    v.to_basic_value_enum(ctx, generator, ctx.primitives.bool)
                                })
                                .map(BasicValueEnum::into_int_value)?;
                            Ok(ctx.builder.build_not(
                                generator.bool_to_i1(ctx, cmp),
                                "",
                            ).unwrap())
                        },
                        |_, ctx| {
                            let bb = ctx.builder.get_insert_block().unwrap();
                            cmp_phi.add_incoming(&[(&llvm_i1.const_zero(), bb)]);
                            ctx.builder.build_unconditional_branch(post_foreach_cmp).unwrap();
                            Ok(())
                        },
                        |_, _| Ok(()),
                    )?;
                }
                // Length of tuples is checked last as operators do not short-circuit by tuple
                // length in Python:
                //
                // >>> (1, 2) < ("a",)
                // TypeError: '<' not supported between instances of 'int' and 'str'
                let bb = ctx.builder.get_insert_block().unwrap();
                let is_len_eq = llvm_i1.const_int(
                    u64::from(left_tys.len() == right_tys.len()),
                    false,
                );
                cmp_phi.add_incoming(&[(&is_len_eq, bb)]);
                ctx.builder.build_unconditional_branch(post_foreach_cmp).unwrap();
                ctx.builder.position_at_end(post_foreach_cmp);
                let cmp_phi = cmp_phi.as_basic_value().into_int_value();
                // Invert the final value if __ne__
                if *op == Cmpop::NotEq {
                    ctx.builder.build_not(cmp_phi, "").unwrap()
                } else {
                    cmp_phi
                }
            } else if [left_ty, right_ty].iter().any(|ty| matches!(&*ctx.unifier.get_ty_immutable(*ty), TypeEnum::TVar { .. })) {
-                if ctx.registry.llvm_options.opt_level == OptimizationLevel::None {
+                if ctx.registry.llvm_options.opt_level != OptimizationLevel::None {
                    ctx.make_assert(
                        generator,
                        ctx.ctx.bool_type().const_all_ones(),
@ -2444,10 +2208,7 @@ pub fn gen_cmpop_expr_with_values<'ctx, G: CodeGenerator>(
                ctx.ctx.bool_type().get_poison()
            } else {
-                return Err(format!("'{}' not supported between instances of '{}' and '{}'",
+                unimplemented!()
                                   op.op_info().symbol,
                                   ctx.unifier.stringify(left_ty),
                                   ctx.unifier.stringify(right_ty)))
            };
            Ok(prev?.map(|v| ctx.builder.build_and(v, current, "cmp").unwrap()).or(Some(current)))
@ -2524,7 +2285,7 @@ fn gen_ndarray_subscript_expr<'ctx, G: CodeGenerator>(
    let llvm_usize = generator.get_size_type(ctx.ctx);
    let TypeEnum::TLiteral { values, .. } = &*ctx.unifier.get_ty_immutable(ndims) else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    };
    let ndims = values
@ -2876,7 +2637,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                        .const_null()
                        .into()
                }
-                _ => codegen_unreachable!(ctx, "must be option type"),
+                _ => unreachable!("must be option type"),
            }
        }
        ExprKind::Name { id, .. } => match ctx.var_assignment.get(id) {
@ -2886,30 +2647,28 @@ 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();
+                if let Some(res) = resolver.get_symbol_value(*id, ctx) {
-
+                    res
                let globals = ctx
                    .top_level
                    .definitions
                    .read()
                    .iter()
                    .filter_map(|def| {
                        if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
                            Some((*simple_name, *ty))
                } else {
-                            None
+                    // Allow "raise Exception" short form
                    let def_id = resolver.get_identifier_def(*id).map_err(|e| {
                        format!("{} (at {})", e.iter().next().unwrap(), expr.location)
                    })?;
                    let def = ctx.top_level.definitions.read();
                    if let TopLevelDef::Class { constructor, .. } = *def[def_id.0].read() {
                        let TypeEnum::TFunc(signature) =
                            ctx.unifier.get_ty(constructor.unwrap()).as_ref().clone()
                        else {
                            return Err(format!(
                                "Failed to resolve symbol {} (at {})",
                                id, expr.location
                            ));
                        };
                        return Ok(generator
                            .gen_call(ctx, None, (&signature, def_id), Vec::default())?
                            .map(Into::into));
                    }
-                    })
+                    return Err(format!("Failed to resolve symbol {} (at {})", id, expr.location));
                    .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
                }
            }
        },
@ -2939,7 +2698,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                    *params.iter().next().unwrap().1
                } else {
-                    codegen_unreachable!(ctx)
+                    unreachable!()
                };
                if let TypeEnum::TVar { .. } = &*ctx.unifier.get_ty_immutable(ty) {
@ -3033,9 +2792,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                            return generator.gen_expr(ctx, &modified_expr);
                        }
-                        None => {
+                        None => unreachable!("Function Type should not have attributes"),
                            codegen_unreachable!(ctx, "Function Type should not have attributes")
                        }
                    }
                } else if let TypeEnum::TObj { obj_id, fields, params } = &*ctx.unifier.get_ty(c) {
                    if fields.is_empty() && params.is_empty() {
@ -3057,7 +2814,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                                return generator.gen_expr(ctx, &modified_expr);
                            }
-                            None => codegen_unreachable!(ctx),
+                            None => unreachable!(),
                        }
                    }
                }
@ -3159,7 +2916,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                }
                (Some(a), None) => a.into(),
                (None, Some(b)) => b.into(),
-                (None, None) => codegen_unreachable!(ctx),
+                (None, None) => unreachable!(),
            }
        }
        ExprKind::BinOp { op, left, right } => {
@ -3249,9 +3006,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                ctx.unifier.get_call_signature(*call).unwrap()
            } else {
                let ty = func.custom.unwrap();
-                let TypeEnum::TFunc(sign) = &*ctx.unifier.get_ty(ty) else {
+                let TypeEnum::TFunc(sign) = &*ctx.unifier.get_ty(ty) else { unreachable!() };
                    codegen_unreachable!(ctx)
                };
                sign.clone()
            };
@ -3273,23 +3028,19 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                    // The attribute will be `DefinitionId` of the method if the call is to one of the parent methods
                    let func_id = attr.to_string().parse::<usize>(); 
-                    let id = if let TypeEnum::TObj { obj_id, .. } =
+                    let id = if let TypeEnum::TObj { obj_id, .. } = &*ctx.unifier.get_ty(value.custom.unwrap()) {
                        &*ctx.unifier.get_ty(value.custom.unwrap())
                    {
                        *obj_id
                    } else {
-                        codegen_unreachable!(ctx)
+                        unreachable!()
                    };
                    // Use the `DefinitionID` from attribute if it is available
-                    let fun_id = if let Ok(func_id) = func_id {
+                    let fun_id = if func_id.is_ok() {
-                        DefinitionId(func_id)
+                        DefinitionId(func_id.unwrap())
                    } else {
                        let defs = ctx.top_level.definitions.read();
                        let obj_def = defs.get(id.0).unwrap().read();
-                        let TopLevelDef::Class { methods, .. } = &*obj_def else {
+                        let TopLevelDef::Class { methods, .. } = &*obj_def else { unreachable!() };
                            codegen_unreachable!(ctx)
                        };
                        methods.iter().find(|method| method.0 == *attr).unwrap().2
                    };
@ -3360,9 +3111,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                                        .unwrap(),
                                ));
                            }
-                            ValueEnum::Dynamic(_) => {
+                            ValueEnum::Dynamic(_) => unreachable!("option must be static or ptr"),
                                codegen_unreachable!(ctx, "option must be static or ptr")
                            }
                        }
                    }
@ -3511,10 +3260,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                        if let ExprKind::Constant { value: Constant::Int(v), .. } = &slice.node {
                            (*v).try_into().unwrap()
                        } else {
-                            codegen_unreachable!(
+                            unreachable!("tuple subscript must be const int after type check");
                                ctx,
                                "tuple subscript must be const int after type check"
                            );
                        };
                    match generator.gen_expr(ctx, value)? {
                        Some(ValueEnum::Dynamic(v)) => {
@ -3537,10 +3283,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
                        None => return Ok(None),
                    }
                }
-                _ => codegen_unreachable!(
+                _ => unreachable!("should not be other subscriptable types after type check"),
                    ctx,
                    "should not be other subscriptable types after type check"
                ),
            }
        }
        ExprKind::ListComp { .. } => {
--- 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`
@ -15,8 +13,8 @@ use super::CodeGenContext;
 /// * `$extern_fn:literal`: Name of underlying extern function
 ///
 /// Optional Arguments:
-/// * `$(,$attributes:literal)*)`: Attributes linked with the extern function.
+/// * `$(,$attributes:literal)*)`: Attributes linked with the extern function
-///   The default attributes are "mustprogress", "nofree", "nounwind", "willreturn", and "writeonly".
+/// The default attributes are "mustprogress", "nofree", "nounwind", "willreturn", and "writeonly"
 /// These will be used unless other attributes are specified
 /// * `$(,$args:ident)*`: Operands of the extern function
 /// The data type of these operands will be set to `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, classes::ArraySliceValue, expr::*, stmt::*, 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;
@ -59,7 +57,6 @@ pub trait CodeGenerator {
    /// - fun: Function signature, definition ID and the substitution key.
    /// - params: Function parameters. Note that this does not include the object even if the
    ///   function is a class method.
    ///
    /// Note that this function should check if the function is generated in another thread (due to
    /// possible race condition), see the default implementation for an example.
    fn gen_func_instance<'ctx>(
--- a/nac3core/src/codegen/irrt/irrt.cpp
+++ b/nac3core/src/codegen/irrt/irrt.cpp
@ -0,0 +1,414 @@
 using int8_t = _BitInt(8);
 using uint8_t = unsigned _BitInt(8);
 using int32_t = _BitInt(32);
 using uint32_t = unsigned _BitInt(32);
 using int64_t = _BitInt(64);
 using uint64_t = unsigned _BitInt(64);
 // NDArray indices are always `uint32_t`.
 using NDIndex = uint32_t;
 // The type of an index or a value describing the length of a range/slice is always `int32_t`.
 using SliceIndex = int32_t;
 namespace {
 template <typename T>
 const T& max(const T& a, const T& b) {
    return a > b ? a : b;
 }
 template <typename T>
 const T& min(const T& a, const T& b) {
    return a > b ? b : a;
 }
 // adapted from GNU Scientific Library: https://git.savannah.gnu.org/cgit/gsl.git/tree/sys/pow_int.c
 // need to make sure `exp >= 0` before calling this function
 template <typename T>
 T __nac3_int_exp_impl(T base, T exp) {
    T res = 1;
    /* repeated squaring method */
    do {
        if (exp & 1) {
            res *= base; /* for n odd */
        }
        exp >>= 1;
        base *= base;
    } while (exp);
    return res;
 }
 template <typename SizeT>
 SizeT __nac3_ndarray_calc_size_impl(
    const SizeT* list_data,
    SizeT list_len,
    SizeT begin_idx,
    SizeT end_idx
 ) {
    __builtin_assume(end_idx <= list_len);
    SizeT num_elems = 1;
    for (SizeT i = begin_idx; i < end_idx; ++i) {
        SizeT val = list_data[i];
        __builtin_assume(val > 0);
        num_elems *= val;
    }
    return num_elems;
 }
 template <typename SizeT>
 void __nac3_ndarray_calc_nd_indices_impl(
    SizeT index,
    const SizeT* dims,
    SizeT num_dims,
    NDIndex* idxs
 ) {
    SizeT stride = 1;
    for (SizeT dim = 0; dim < num_dims; dim++) {
        SizeT i = num_dims - dim - 1;
        __builtin_assume(dims[i] > 0);
        idxs[i] = (index / stride) % dims[i];
        stride *= dims[i];
    }
 }
 template <typename SizeT>
 SizeT __nac3_ndarray_flatten_index_impl(
    const SizeT* dims,
    SizeT num_dims,
    const NDIndex* indices,
    SizeT num_indices
 ) {
    SizeT idx = 0;
    SizeT stride = 1;
    for (SizeT i = 0; i < num_dims; ++i) {
        SizeT ri = num_dims - i - 1;
        if (ri < num_indices) {
            idx += stride * indices[ri];
        }
        __builtin_assume(dims[i] > 0);
        stride *= dims[ri];
    }
    return idx;
 }
 template <typename SizeT>
 void __nac3_ndarray_calc_broadcast_impl(
    const SizeT* lhs_dims,
    SizeT lhs_ndims,
    const SizeT* rhs_dims,
    SizeT rhs_ndims,
    SizeT* out_dims
 ) {
    SizeT max_ndims = lhs_ndims > rhs_ndims ? lhs_ndims : rhs_ndims;
    for (SizeT i = 0; i < max_ndims; ++i) {
        const SizeT* lhs_dim_sz = i < lhs_ndims ? &lhs_dims[lhs_ndims - i - 1] : nullptr;
        const SizeT* rhs_dim_sz = i < rhs_ndims ? &rhs_dims[rhs_ndims - i - 1] : nullptr;
        SizeT* out_dim = &out_dims[max_ndims - i - 1];
        if (lhs_dim_sz == nullptr) {
            *out_dim = *rhs_dim_sz;
        } else if (rhs_dim_sz == nullptr) {
            *out_dim = *lhs_dim_sz;
        } else if (*lhs_dim_sz == 1) {
            *out_dim = *rhs_dim_sz;
        } else if (*rhs_dim_sz == 1) {
            *out_dim = *lhs_dim_sz;
        } else if (*lhs_dim_sz == *rhs_dim_sz) {
            *out_dim = *lhs_dim_sz;
        } else {
            __builtin_unreachable();
        }
    }
 }
 template <typename SizeT>
 void __nac3_ndarray_calc_broadcast_idx_impl(
    const SizeT* src_dims,
    SizeT src_ndims,
    const NDIndex* in_idx,
    NDIndex* out_idx
 ) {
    for (SizeT i = 0; i < src_ndims; ++i) {
        SizeT src_i = src_ndims - i - 1;
        out_idx[src_i] = src_dims[src_i] == 1 ? 0 : in_idx[src_i];
    }
 }
 }  // namespace
 extern "C" {
 #define DEF_nac3_int_exp_(T) \
    T __nac3_int_exp_##T(T base, T exp) {\
        return __nac3_int_exp_impl(base, exp);\
    }
 DEF_nac3_int_exp_(int32_t)
 DEF_nac3_int_exp_(int64_t)
 DEF_nac3_int_exp_(uint32_t)
 DEF_nac3_int_exp_(uint64_t)
 SliceIndex __nac3_slice_index_bound(SliceIndex i, const SliceIndex len) {
    if (i < 0) {
        i = len + i;
    }
    if (i < 0) {
        return 0;
    } else if (i > len) {
        return len;
    }
    return i;
 }
 SliceIndex __nac3_range_slice_len(
    const SliceIndex start,
    const SliceIndex end,
    const SliceIndex step
 ) {
    SliceIndex diff = end - start;
    if (diff > 0 && step > 0) {
        return ((diff - 1) / step) + 1;
    } else if (diff < 0 && step < 0) {
        return ((diff + 1) / step) + 1;
    } else {
        return 0;
    }
 }
 // Handle list assignment and dropping part of the list when
 // both dest_step and src_step are +1.
 // - All the index must *not* be out-of-bound or negative,
 // - The end index is *inclusive*,
 // - The length of src and dest slice size should already
 // be checked: if dest.step == 1 then len(src) <= len(dest) else len(src) == len(dest)
 SliceIndex __nac3_list_slice_assign_var_size(
    SliceIndex dest_start,
    SliceIndex dest_end,
    SliceIndex dest_step,
    uint8_t* dest_arr,
    SliceIndex dest_arr_len,
    SliceIndex src_start,
    SliceIndex src_end,
    SliceIndex src_step,
    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 */
    if (dest_arr_len == 0) return dest_arr_len;
    /* if both step is 1, memmove directly, handle the dropping of the list, and shrink size */
    if (src_step == dest_step && dest_step == 1) {
        const SliceIndex src_len = (src_end >= src_start) ? (src_end - src_start + 1) : 0;
        const SliceIndex dest_len = (dest_end >= dest_start) ? (dest_end - dest_start + 1) : 0;
        if (src_len > 0) {
            __builtin_memmove(
                dest_arr + dest_start * size,
                src_arr + src_start * size,
                src_len * size
            );
        }
        if (dest_len > 0) {
            /* dropping */
            __builtin_memmove(
                dest_arr + (dest_start + src_len) * size,
                dest_arr + (dest_end + 1) * size,
                (dest_arr_len - dest_end - 1) * size
            );
        }
        /* shrink size */
        return dest_arr_len - (dest_len - src_len);
    }
    /* if two range overlaps, need alloca */
    uint8_t need_alloca =
        (dest_arr == src_arr)
        && !(
            max(dest_start, dest_end) < min(src_start, src_end)
            || max(src_start, src_end) < min(dest_start, dest_end)
        );
    if (need_alloca) {
        uint8_t* tmp = reinterpret_cast<uint8_t *>(__builtin_alloca(src_arr_len * size));
        __builtin_memcpy(tmp, src_arr, src_arr_len * size);
        src_arr = tmp;
    }
    SliceIndex src_ind = src_start;
    SliceIndex dest_ind = dest_start;
    for (;
        (src_step > 0) ? (src_ind <= src_end) : (src_ind >= src_end);
        src_ind += src_step, dest_ind += dest_step
    ) {
        /* for constant optimization */
        if (size == 1) {
            __builtin_memcpy(dest_arr + dest_ind, src_arr + src_ind, 1);
        } else if (size == 4) {
            __builtin_memcpy(dest_arr + dest_ind * 4, src_arr + src_ind * 4, 4);
        } else if (size == 8) {
            __builtin_memcpy(dest_arr + dest_ind * 8, src_arr + src_ind * 8, 8);
        } else {
            /* memcpy for var size, cannot overlap after previous alloca */
            __builtin_memcpy(dest_arr + dest_ind * size, src_arr + src_ind * size, size);
        }
    }
    /* only dest_step == 1 can we shrink the dest list. */
    /* size should be ensured prior to calling this function */
    if (dest_step == 1 && dest_end >= dest_start) {
        __builtin_memmove(
            dest_arr + dest_ind * size,
            dest_arr + (dest_end + 1) * size,
            (dest_arr_len - dest_end - 1) * size
        );
        return dest_arr_len - (dest_end - dest_ind) - 1;
    }
    return dest_arr_len;
 }
 int32_t __nac3_isinf(double x) {
    return __builtin_isinf(x);
 }
 int32_t __nac3_isnan(double x) {
    return __builtin_isnan(x);
 }
 double tgamma(double arg);
 double __nac3_gamma(double z) {
    // Handling for denormals
    //     | x                 | Python gamma(x) | C tgamma(x) |
    // --- | ----------------- | --------------- | ----------- |
    // (1) | nan               | nan             | nan         |
    // (2) | -inf              | -inf            | inf         |
    // (3) | inf               | inf             | inf         |
    // (4) | 0.0               | inf             | inf         |
    // (5) | {-1.0, -2.0, ...} | inf             | nan         |
    // (1)-(3)
    if (__builtin_isinf(z) || __builtin_isnan(z)) {
        return z;
    }
    double v = tgamma(z);
    // (4)-(5)
    return __builtin_isinf(v) || __builtin_isnan(v) ? __builtin_inf() : v;
 }
 double lgamma(double arg);
 double __nac3_gammaln(double x) {
    // libm's handling of value overflows differs from scipy:
    // - scipy: gammaln(-inf) -> -inf
    // - libm : lgamma(-inf) -> inf
    if (__builtin_isinf(x)) {
        return x;
    }
    return lgamma(x);
 }
 double j0(double x);
 double __nac3_j0(double x) {
    // libm's handling of value overflows differs from scipy:
    // - scipy: j0(inf) -> nan
    // - libm : j0(inf) -> 0.0
    if (__builtin_isinf(x)) {
        return __builtin_nan("");
    }
    return j0(x);
 }
 uint32_t __nac3_ndarray_calc_size(
    const uint32_t* list_data,
    uint32_t list_len,
    uint32_t begin_idx,
    uint32_t end_idx
 ) {
    return __nac3_ndarray_calc_size_impl(list_data, list_len, begin_idx, end_idx);
 }
 uint64_t __nac3_ndarray_calc_size64(
    const uint64_t* list_data,
    uint64_t list_len,
    uint64_t begin_idx,
    uint64_t end_idx
 ) {
    return __nac3_ndarray_calc_size_impl(list_data, list_len, begin_idx, end_idx);
 }
 void __nac3_ndarray_calc_nd_indices(
    uint32_t index,
    const uint32_t* dims,
    uint32_t num_dims,
    NDIndex* idxs
 ) {
    __nac3_ndarray_calc_nd_indices_impl(index, dims, num_dims, idxs);
 }
 void __nac3_ndarray_calc_nd_indices64(
    uint64_t index,
    const uint64_t* dims,
    uint64_t num_dims,
    NDIndex* idxs
 ) {
    __nac3_ndarray_calc_nd_indices_impl(index, dims, num_dims, idxs);
 }
 uint32_t __nac3_ndarray_flatten_index(
    const uint32_t* dims,
    uint32_t num_dims,
    const NDIndex* indices,
    uint32_t num_indices
 ) {
    return __nac3_ndarray_flatten_index_impl(dims, num_dims, indices, num_indices);
 }
 uint64_t __nac3_ndarray_flatten_index64(
    const uint64_t* dims,
    uint64_t num_dims,
    const NDIndex* indices,
    uint64_t num_indices
 ) {
    return __nac3_ndarray_flatten_index_impl(dims, num_dims, indices, num_indices);
 }
 void __nac3_ndarray_calc_broadcast(
    const uint32_t* lhs_dims,
    uint32_t lhs_ndims,
    const uint32_t* rhs_dims,
    uint32_t rhs_ndims,
    uint32_t* out_dims
 ) {
    return __nac3_ndarray_calc_broadcast_impl(lhs_dims, lhs_ndims, rhs_dims, rhs_ndims, out_dims);
 }
 void __nac3_ndarray_calc_broadcast64(
    const uint64_t* lhs_dims,
    uint64_t lhs_ndims,
    const uint64_t* rhs_dims,
    uint64_t rhs_ndims,
    uint64_t* out_dims
 ) {
    return __nac3_ndarray_calc_broadcast_impl(lhs_dims, lhs_ndims, rhs_dims, rhs_ndims, out_dims);
 }
 void __nac3_ndarray_calc_broadcast_idx(
    const uint32_t* src_dims,
    uint32_t src_ndims,
    const NDIndex* in_idx,
    NDIndex* out_idx
 ) {
    __nac3_ndarray_calc_broadcast_idx_impl(src_dims, src_ndims, in_idx, out_idx);
 }
 void __nac3_ndarray_calc_broadcast_idx64(
    const uint64_t* src_dims,
    uint64_t src_ndims,
    const NDIndex* in_idx,
    NDIndex* out_idx
 ) {
    __nac3_ndarray_calc_broadcast_idx_impl(src_dims, src_ndims, in_idx, out_idx);
 }
 }  // extern "C"
--- a/nac3core/src/codegen/irrt/mod.rs
+++ b/nac3core/src/codegen/irrt/mod.rs
@ -1,30 +1,28 @@
 use crate::typecheck::typedef::Type;
 use super::{
    classes::{
        ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayValue,
        TypedArrayLikeAdapter, UntypedArrayLikeAccessor,
    },
    llvm_intrinsics, CodeGenContext, CodeGenerator,
 };
 use crate::codegen::classes::TypedArrayLikeAccessor;
 use crate::codegen::stmt::gen_for_callback_incrementing;
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
    context::Context,
    memory_buffer::MemoryBuffer,
    module::Module,
    types::{BasicTypeEnum, IntType},
-    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue},
    AddressSpace, IntPredicate,
 };
 use itertools::Either;
 use nac3parser::ast::Expr;
 use super::{
    classes::{
        ArrayLikeIndexer, ArrayLikeValue, ArraySliceValue, ListValue, NDArrayValue,
        TypedArrayLikeAccessor, TypedArrayLikeAdapter, UntypedArrayLikeAccessor,
    },
    llvm_intrinsics,
    macros::codegen_unreachable,
    stmt::gen_for_callback_incrementing,
    CodeGenContext, CodeGenerator,
 };
 use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
 #[must_use]
-pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver) -> Module<'ctx> {
+pub fn load_irrt(ctx: &Context) -> Module {
    let bitcode_buf = MemoryBuffer::create_from_memory_range(
        include_bytes!(concat!(env!("OUT_DIR"), "/irrt.bc")),
        "irrt_bitcode_buffer",
@ -40,25 +38,6 @@ pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver)
        let function = irrt_mod.get_function(symbol).unwrap();
        function.add_attribute(AttributeLoc::Function, ctx.create_enum_attribute(inline_attr, 0));
    }
    // Initialize all global `EXN_*` exception IDs in IRRT with the [`SymbolResolver`].
    let exn_id_type = ctx.i32_type();
    let errors = &[
        ("EXN_INDEX_ERROR", "0:IndexError"),
        ("EXN_VALUE_ERROR", "0:ValueError"),
        ("EXN_ASSERTION_ERROR", "0:AssertionError"),
        ("EXN_TYPE_ERROR", "0:TypeError"),
    ];
    for (irrt_name, symbol_name) in errors {
        let exn_id = symbol_resolver.get_string_id(symbol_name);
        let exn_id = exn_id_type.const_int(exn_id as u64, false).as_basic_value_enum();
        let global = irrt_mod.get_global(irrt_name).unwrap_or_else(|| {
            panic!("Exception symbol name '{irrt_name}' should exist in the IRRT LLVM module")
        });
        global.set_initializer(&exn_id);
    }
    irrt_mod
 }
@ -76,7 +55,7 @@ pub fn integer_power<'ctx, G: CodeGenerator + ?Sized>(
        (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),
+        _ => unreachable!(),
    };
    let base_type = base.get_type();
    let pow_fun = ctx.module.get_function(symbol).unwrap_or_else(|| {
@ -462,7 +441,7 @@ pub fn list_slice_assignment<'ctx, G: CodeGenerator + ?Sized>(
                    BasicTypeEnum::IntType(t) => t.size_of(),
                    BasicTypeEnum::PointerType(t) => t.size_of(),
                    BasicTypeEnum::StructType(t) => t.size_of().unwrap(),
-                    _ => codegen_unreachable!(ctx),
+                    _ => unreachable!(),
                };
                ctx.builder.build_int_truncate_or_bit_cast(s, int32, "size").unwrap()
            }
@ -589,8 +568,7 @@ pub fn call_j0<'ctx>(ctx: &CodeGenContext<'ctx, '_>, v: FloatValue<'ctx>) -> Flo
 ///
 /// * `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
+/// or [`None`] if starting from the first dimension and ending at the last dimension respectively.
 ///   respectively.
 pub fn call_ndarray_calc_size<'ctx, G, Dims>(
    generator: &G,
    ctx: &CodeGenContext<'ctx, '_>,
@ -607,7 +585,7 @@ where
    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),
+        bw => unreachable!("Unsupported size type bit width: {}", bw),
    };
    let ndarray_calc_size_fn_t = llvm_usize.fn_type(
        &[llvm_pusize.into(), llvm_usize.into(), llvm_usize.into(), llvm_usize.into()],
@ -658,7 +636,7 @@ pub fn call_ndarray_calc_nd_indices<'ctx, G: CodeGenerator + ?Sized>(
    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),
+        bw => unreachable!("Unsupported size type bit width: {}", bw),
    };
    let ndarray_calc_nd_indices_fn =
        ctx.module.get_function(ndarray_calc_nd_indices_fn_name).unwrap_or_else(|| {
@ -727,7 +705,7 @@ where
    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),
+        bw => unreachable!("Unsupported size type bit width: {}", bw),
    };
    let ndarray_flatten_index_fn =
        ctx.module.get_function(ndarray_flatten_index_fn_name).unwrap_or_else(|| {
@ -795,7 +773,7 @@ pub fn call_ndarray_calc_broadcast<'ctx, G: CodeGenerator + ?Sized>(
    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),
+        bw => unreachable!("Unsupported size type bit width: {}", bw),
    };
    let ndarray_calc_broadcast_fn =
        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
@ -915,7 +893,7 @@ pub fn call_ndarray_calc_broadcast_index<
    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),
+        bw => unreachable!("Unsupported size type bit width: {}", bw),
    };
    let ndarray_calc_broadcast_fn =
        ctx.module.get_function(ndarray_calc_broadcast_fn_name).unwrap_or_else(|| {
--- 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()
    };
@ -207,9 +205,8 @@ pub fn call_memcpy_generic<'ctx>(
 /// * `$ctx:ident`: Reference to the current Code Generation Context
 /// * `$name:ident`: Optional name to be assigned to the llvm build call (Option<&str>)
 /// * `$llvm_name:literal`: Name of underlying llvm intrinsic function
-/// * `$map_fn:ident`: Mapping function to be applied on `BasicValue` (`BasicValue` -> Function Return Type).
+/// * `$map_fn:ident`: Mapping function to be applied on `BasicValue` (`BasicValue` -> Function Return Type)
-///   Use `BasicValueEnum::into_int_value` for Integer return type and
+/// Use `BasicValueEnum::into_int_value` for Integer return type and `BasicValueEnum::into_float_value` for Float return type
 ///   `BasicValueEnum::into_float_value` for Float return type
 /// * `$llvm_ty:ident`: Type of first operand
 /// * `,($val:ident)*`: Comma separated list of operands
 macro_rules! generate_llvm_intrinsic_fn_body {
@ -225,7 +222,7 @@ macro_rules! generate_llvm_intrinsic_fn_body {
 /// Arguments:
 /// * `float/int`: Indicates the return and argument type of the function
 /// * `$fn_name:ident`: The identifier of the rust function to be generated
-/// * `$llvm_name:literal`: Name of underlying llvm intrinsic function.
+/// * `$llvm_name:literal`: Name of underlying llvm intrinsic function
 /// Omit "llvm." prefix from the function name i.e. use "ceil" instead of "llvm.ceil"
 /// * `$val:ident`: The operand for unary operations
 /// * `$val1:ident`, `$val2:ident`: The operands for binary operations
--- 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,21 +24,14 @@ 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 classes::{ListType, NDArrayType, ProxyType, RangeType};
+use std::thread;
 use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
 pub use generator::{CodeGenerator, DefaultCodeGenerator};
 pub mod builtin_fns;
 pub mod classes;
@ -54,21 +47,8 @@ pub mod stmt;
 #[cfg(test)]
 mod test;
-mod macros {
+use concrete_type::{ConcreteType, ConcreteTypeEnum, ConcreteTypeStore};
-    /// Codegen-variant of [`std::unreachable`] which accepts an instance of [`CodeGenContext`] as
+pub use generator::{CodeGenerator, DefaultCodeGenerator};
    /// its first argument to provide Python source information to indicate the codegen location
    /// causing the assertion.
    macro_rules! codegen_unreachable {
        ($ctx:expr $(,)?) => {
            std::unreachable!("unreachable code while processing {}", &$ctx.current_loc)
        };
        ($ctx:expr, $($arg:tt)*) => {
            std::unreachable!("unreachable code while processing {}: {}", &$ctx.current_loc, std::format!("{}", std::format_args!($($arg)+)))
        };
    }
    pub(crate) use codegen_unreachable;
 }
 #[derive(Default)]
 pub struct StaticValueStore {
@ -600,11 +580,11 @@ fn get_llvm_abi_type<'ctx, G: CodeGenerator + ?Sized>(
 ) -> BasicTypeEnum<'ctx> {
    // If the type is used in the definition of a function, return `i1` instead of `i8` for ABI
    // consistency.
-    if unifier.unioned(ty, primitives.bool) {
+    return if unifier.unioned(ty, primitives.bool) {
        ctx.bool_type().into()
    } else {
        get_llvm_type(ctx, module, generator, unifier, top_level, type_cache, ty)
-    }
+    };
 }
 /// Whether `sret` is needed for a return value with type `ty`.
@ -852,9 +832,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,12 +1,5 @@
-use inkwell::{
+use crate::{
-    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
+    codegen::{
    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
    AddressSpace, IntPredicate, OptimizationLevel,
 };
 use nac3parser::ast::{Operator, StrRef};
 use super::{
        classes::{
            ArrayLikeIndexer, ArrayLikeValue, ListType, ListValue, NDArrayType, NDArrayValue,
            ProxyType, ProxyValue, TypedArrayLikeAccessor, TypedArrayLikeAdapter,
@ -15,14 +8,13 @@ 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},
        CodeGenContext, CodeGenerator,
-};
+    },
 use crate::{
    symbol_resolver::ValueEnum,
    toplevel::{
        helper::PrimDef,
@ -34,6 +26,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>(
@ -257,7 +259,7 @@ fn ndarray_zero_value<'ctx, G: CodeGenerator + ?Sized>(
    } else if ctx.unifier.unioned(elem_ty, ctx.primitives.str) {
        ctx.gen_string(generator, "").into()
    } else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    }
 }
@ -285,7 +287,7 @@ fn ndarray_one_value<'ctx, G: CodeGenerator + ?Sized>(
    } else if ctx.unifier.unioned(elem_ty, ctx.primitives.str) {
        ctx.gen_string(generator, "1").into()
    } else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    }
 }
@ -353,7 +355,7 @@ fn call_ndarray_empty_impl<'ctx, G: CodeGenerator + ?Sized>(
            create_ndarray_const_shape(generator, ctx, elem_ty, &[shape_int])
        }
-        _ => codegen_unreachable!(ctx),
+        _ => unreachable!(),
    }
 }
@ -624,7 +626,7 @@ fn call_ndarray_full_impl<'ctx, G: CodeGenerator + ?Sized>(
        } else if fill_value.is_int_value() || fill_value.is_float_value() {
            fill_value
        } else {
-            codegen_unreachable!(ctx)
+            unreachable!()
        };
        Ok(value)
@ -939,7 +941,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();
@ -961,7 +963,7 @@ 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 = ListValue::from_ptr_val(this_dim, llvm_usize, None);
@ -980,9 +982,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();
@ -2020,7 +2020,7 @@ pub fn gen_ndarray_fill<'ctx>(
            } else if value_arg.is_int_value() || value_arg.is_float_value() {
                value_arg
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            Ok(value)
@ -2129,8 +2129,7 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
        Ok(out.as_base_value().into())
    } else {
-        codegen_unreachable!(
+        unreachable!(
            ctx,
            "{FN_NAME}() not supported for '{}'",
            format!("'{}'", ctx.unifier.stringify(x1_ty))
        )
@ -2145,8 +2144,7 @@ pub fn ndarray_transpose<'ctx, G: CodeGenerator + ?Sized>(
 ///   1. A list of `int32`;   e.g., `np.reshape(arr, [600, -1, 3])`
 ///   2. A tuple of `int32`;  e.g., `np.reshape(arr, (-1, 800, 3))`
 ///   3. A scalar `int32`;     e.g., `np.reshape(arr, 3)`
-///
+/// Note that unlike other generating functions, one of the dimesions in the shape can be negative
 /// Note that unlike other generating functions, one of the dimensions in the shape can be negative.
 pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
    generator: &mut G,
    ctx: &mut CodeGenContext<'ctx, '_>,
@ -2372,7 +2370,7 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
                .into_int_value();
                create_ndarray_const_shape(generator, ctx, elem_ty, &[shape_int])
            }
-            _ => codegen_unreachable!(ctx),
+            _ => unreachable!(),
        }
        .unwrap();
@ -2416,8 +2414,7 @@ pub fn ndarray_reshape<'ctx, G: CodeGenerator + ?Sized>(
        Ok(out.as_base_value().into())
    } else {
-        codegen_unreachable!(
+        unreachable!(
            ctx,
            "{FN_NAME}() not supported for '{}'",
            format!("'{}'", ctx.unifier.stringify(x1_ty))
        )
@ -2485,7 +2482,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),
+                        _ => unreachable!(),
                    };
                    let acc_val = ctx.builder.build_load(acc, "").unwrap();
                    let acc_val = match acc_val {
@ -2499,7 +2496,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),
+                        _ => unreachable!(),
                    };
                    ctx.builder.build_store(acc, acc_val).unwrap();
@ -2516,8 +2513,7 @@ pub fn ndarray_dot<'ctx, G: CodeGenerator + ?Sized>(
        (BasicValueEnum::FloatValue(e1), BasicValueEnum::FloatValue(e2)) => {
            Ok(ctx.builder.build_float_mul(e1, e2, "").unwrap().as_basic_value_enum())
        }
-        _ => codegen_unreachable!(
+        _ => unreachable!(
            ctx,
            "{FN_NAME}() not supported for '{}'",
            format!("'{}'", ctx.unifier.stringify(x1_ty))
        ),
--- a/nac3core/src/codegen/stmt.rs
+++ b/nac3core/src/codegen/stmt.rs
@ -1,3 +1,21 @@
 use super::{
    super::symbol_resolver::ValueEnum,
    expr::destructure_range,
    irrt::{handle_slice_indices, list_slice_assignment},
    CodeGenContext, CodeGenerator,
 };
 use crate::{
    codegen::{
        classes::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
        expr::gen_binop_expr,
        gen_in_range_check,
    },
    toplevel::{DefinitionId, TopLevelDef},
    typecheck::{
        magic_methods::Binop,
        typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
    },
 };
 use inkwell::{
    attributes::{Attribute, AttributeLoc},
    basic_block::BasicBlock,
@ -6,28 +24,10 @@ use inkwell::{
    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,
    CodeGenContext, CodeGenerator,
 };
 use crate::{
    symbol_resolver::ValueEnum,
    toplevel::{DefinitionId, TopLevelDef},
    typecheck::{
        magic_methods::Binop,
        typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
    },
 };
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
    ctx: &mut CodeGenContext<'ctx, '_>,
@ -121,7 +121,7 @@ pub fn gen_store_target<'ctx, G: CodeGenerator>(
                return Ok(None);
            };
            let BasicValueEnum::PointerValue(ptr) = val else {
-                codegen_unreachable!(ctx);
+                unreachable!();
            };
            unsafe {
                ctx.builder.build_in_bounds_gep(
@ -135,7 +135,7 @@ pub fn gen_store_target<'ctx, G: CodeGenerator>(
            }
            .unwrap()
        }
-        _ => codegen_unreachable!(ctx),
+        _ => unreachable!(),
    }))
 }
@ -176,14 +176,6 @@ pub fn gen_assign<'ctx, G: CodeGenerator>(
                }
            }
            let val = value.to_basic_value_enum(ctx, generator, target.custom.unwrap())?;
            // Perform i1 <-> i8 conversion as needed
            let val = if ctx.unifier.unioned(target.custom.unwrap(), ctx.primitives.bool) {
                generator.bool_to_i8(ctx, val.into_int_value()).into()
            } else {
                val
            };
            ctx.builder.build_store(ptr, val).unwrap();
        }
    };
@ -201,12 +193,12 @@ pub fn gen_assign_target_list<'ctx, G: CodeGenerator>(
    // Deconstruct the tuple `value`
    let BasicValueEnum::StructValue(tuple) = value.to_basic_value_enum(ctx, generator, value_ty)?
    else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    };
    // NOTE: Currently, RHS's type is forced to be a Tuple by the type inferencer.
    let TypeEnum::TTuple { ty: tuple_tys, .. } = &*ctx.unifier.get_ty(value_ty) else {
-        codegen_unreachable!(ctx);
+        unreachable!();
    };
    assert_eq!(tuple.get_type().count_fields() as usize, tuple_tys.len());
@ -266,7 +258,7 @@ pub fn gen_assign_target_list<'ctx, G: CodeGenerator>(
            // Now assign with that sub-tuple to the starred target.
            generator.gen_assign(ctx, target, ValueEnum::Dynamic(sub_tuple_val), sub_tuple_ty)?;
        } else {
-            codegen_unreachable!(ctx) // The typechecker ensures this
+            unreachable!() // The typechecker ensures this
        }
        // Handle assignment after the starred target
@ -314,9 +306,7 @@ pub fn gen_setitem<'ctx, G: CodeGenerator>(
            if let ExprKind::Slice { .. } = &key.node {
                // Handle assigning to a slice
-                let ExprKind::Slice { lower, upper, step } = &key.node else {
+                let ExprKind::Slice { lower, upper, step } = &key.node else { unreachable!() };
                    codegen_unreachable!(ctx)
                };
                let Some((start, end, step)) = handle_slice_indices(
                    lower,
                    upper,
@ -426,9 +416,7 @@ pub fn gen_for<G: CodeGenerator>(
    ctx: &mut CodeGenContext<'_, '_>,
    stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::For { iter, target, body, orelse, .. } = &stmt.node else {
+    let StmtKind::For { iter, target, body, orelse, .. } = &stmt.node else { unreachable!() };
        codegen_unreachable!(ctx)
    };
    // var_assignment static values may be changed in another branch
    // if so, remove the static value as it may not be correct in this branch
@ -470,7 +458,7 @@ pub fn gen_for<G: CodeGenerator>(
            let Some(target_i) =
                generator.gen_store_target(ctx, target, Some("for.target.addr"))?
            else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
            let (start, stop, step) = destructure_range(ctx, iter_val);
@ -650,12 +638,8 @@ where
    I: Clone,
    InitFn: FnOnce(&mut G, &mut CodeGenContext<'ctx, 'a>) -> Result<I, String>,
    CondFn: FnOnce(&mut G, &mut CodeGenContext<'ctx, 'a>, I) -> Result<IntValue<'ctx>, String>,
-    BodyFn: FnOnce(
+    BodyFn:
-        &mut G,
+        FnOnce(&mut G, &mut CodeGenContext<'ctx, 'a>, BreakContinueHooks, I) -> Result<(), String>,
        &mut CodeGenContext<'ctx, 'a>,
        BreakContinueHooks<'ctx>,
        I,
    ) -> Result<(), String>,
    UpdateFn: FnOnce(&mut G, &mut CodeGenContext<'ctx, 'a>, I) -> Result<(), String>,
 {
    let label = label.unwrap_or("for");
@ -735,7 +719,7 @@ where
    BodyFn: FnOnce(
        &mut G,
        &mut CodeGenContext<'ctx, 'a>,
-        BreakContinueHooks<'ctx>,
+        BreakContinueHooks,
        IntValue<'ctx>,
    ) -> Result<(), String>,
 {
@ -815,7 +799,7 @@ where
    BodyFn: FnOnce(
        &mut G,
        &mut CodeGenContext<'ctx, 'a>,
-        BreakContinueHooks<'ctx>,
+        BreakContinueHooks,
        IntValue<'ctx>,
    ) -> Result<(), String>,
 {
@ -913,7 +897,7 @@ pub fn gen_while<G: CodeGenerator>(
    ctx: &mut CodeGenContext<'_, '_>,
    stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::While { test, body, orelse, .. } = &stmt.node else { codegen_unreachable!(ctx) };
+    let StmtKind::While { test, body, orelse, .. } = &stmt.node else { unreachable!() };
    // var_assignment static values may be changed in another branch
    // if so, remove the static value as it may not be correct in this branch
@ -943,7 +927,7 @@ pub fn gen_while<G: CodeGenerator>(
        return Ok(());
    };
-    let BasicValueEnum::IntValue(test) = test else { codegen_unreachable!(ctx) };
+    let BasicValueEnum::IntValue(test) = test else { unreachable!() };
    ctx.builder
        .build_conditional_branch(generator.bool_to_i1(ctx, test), body_bb, orelse_bb)
@ -1091,7 +1075,7 @@ pub fn gen_if<G: CodeGenerator>(
    ctx: &mut CodeGenContext<'_, '_>,
    stmt: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
-    let StmtKind::If { test, body, orelse, .. } = &stmt.node else { codegen_unreachable!(ctx) };
+    let StmtKind::If { test, body, orelse, .. } = &stmt.node else { unreachable!() };
    // var_assignment static values may be changed in another branch
    // if so, remove the static value as it may not be correct in this branch
@ -1214,11 +1198,11 @@ pub fn exn_constructor<'ctx>(
    let zelf_id = if let TypeEnum::TObj { obj_id, .. } = &*ctx.unifier.get_ty(zelf_ty) {
        obj_id.0
    } else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    };
    let defs = ctx.top_level.definitions.read();
    let def = defs[zelf_id].read();
-    let TopLevelDef::Class { name: zelf_name, .. } = &*def else { codegen_unreachable!(ctx) };
+    let TopLevelDef::Class { name: zelf_name, .. } = &*def else { unreachable!() };
    let exception_name = format!("{}:{}", ctx.resolver.get_exception_id(zelf_id), zelf_name);
    unsafe {
        let id_ptr = ctx.builder.build_in_bounds_gep(zelf, &[zero, zero], "exn.id").unwrap();
@ -1326,7 +1310,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
    target: &Stmt<Option<Type>>,
 ) -> Result<(), String> {
    let StmtKind::Try { body, handlers, orelse, finalbody, .. } = &target.node else {
-        codegen_unreachable!(ctx)
+        unreachable!()
    };
    // if we need to generate anything related to exception, we must have personality defined
@ -1403,7 +1387,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>(
            if let TypeEnum::TObj { obj_id, .. } = &*ctx.unifier.get_ty(type_.custom.unwrap()) {
                *obj_id
            } else {
-                codegen_unreachable!(ctx)
+                unreachable!()
            };
        let exception_name = format!("{}:{}", ctx.resolver.get_exception_id(obj_id.0), exn_name);
        let exn_id = ctx.resolver.get_string_id(&exception_name);
@ -1675,23 +1659,6 @@ pub fn gen_return<G: CodeGenerator>(
    } else {
        None
    };
    // Remap boolean return type into i1
    let value = value.map(|ret_val| {
        // The "return type" of a sret function is in the first parameter
        let expected_ty = if ctx.need_sret {
            func.get_type().get_param_types()[0]
        } else {
            func.get_type().get_return_type().unwrap()
        };
        if matches!(expected_ty, BasicTypeEnum::IntType(ty) if ty.get_bit_width() == 1) {
            generator.bool_to_i1(ctx, ret_val.into_int_value()).into()
        } else {
            ret_val
        }
    });
    if let Some(return_target) = ctx.return_target {
        if let Some(value) = value {
            ctx.builder.build_store(ctx.return_buffer.unwrap(), value).unwrap();
@ -1702,6 +1669,25 @@ pub fn gen_return<G: CodeGenerator>(
        ctx.builder.build_store(ctx.return_buffer.unwrap(), value.unwrap()).unwrap();
        ctx.builder.build_return(None).unwrap();
    } else {
        // Remap boolean return type into i1
        let value = value.map(|v| {
            let expected_ty = func.get_type().get_return_type().unwrap();
            let ret_val = v.as_basic_value_enum();
            if expected_ty.is_int_type() && ret_val.is_int_value() {
                let ret_type = expected_ty.into_int_type();
                let ret_val = ret_val.into_int_value();
                if ret_type.get_bit_width() == 1 && ret_val.get_type().get_bit_width() != 1 {
                    generator.bool_to_i1(ctx, ret_val)
                } else {
                    ret_val
                }
                .into()
            } else {
                ret_val
            }
        });
        let value = value.as_ref().map(|v| v as &dyn BasicValue);
        ctx.builder.build_return(value).unwrap();
    }
@ -1770,30 +1756,7 @@ pub fn gen_stmt<G: CodeGenerator>(
        StmtKind::Try { .. } => gen_try(generator, ctx, stmt)?,
        StmtKind::Raise { exc, .. } => {
            if let Some(exc) = exc {
-                let exn = if let ExprKind::Name { id, .. } = &exc.node {
+                let exc = if let Some(v) = generator.gen_expr(ctx, exc)? {
                    // Handle "raise Exception" short form
                    let def_id = ctx.resolver.get_identifier_def(*id).map_err(|e| {
                        format!("{} (at {})", e.iter().next().unwrap(), exc.location)
                    })?;
                    let def = ctx.top_level.definitions.read();
                    let TopLevelDef::Class { constructor, .. } = *def[def_id.0].read() else {
                        return Err(format!("Failed to resolve symbol {id} (at {})", exc.location));
                    };
                    let TypeEnum::TFunc(signature) =
                        ctx.unifier.get_ty(constructor.unwrap()).as_ref().clone()
                    else {
                        return Err(format!("Failed to resolve symbol {id} (at {})", exc.location));
                    };
                    generator
                        .gen_call(ctx, None, (&signature, def_id), Vec::default())?
                        .map(Into::into)
                } else {
                    generator.gen_expr(ctx, exc)?
                };
                let exc = if let Some(v) = exn {
                    v.to_basic_value_enum(ctx, generator, exc.custom.unwrap())?
                } else {
                    return Ok(());
@ -1828,37 +1791,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::{
+use crate::{
-    collections::{HashMap, HashSet},
+    codegen::{
    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::{
        classes::{ListType, NDArrayType, ProxyType, RangeType},
        concrete_type::ConcreteTypeStore,
-    CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask, CodeGenerator,
+        CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask,
-    DefaultCodeGenerator, WithCall, WorkerRegistry,
+        CodeGenerator, DefaultCodeGenerator, WithCall, WorkerRegistry,
-};
+    },
 use crate::{
    symbol_resolver::{SymbolResolver, ValueEnum},
    toplevel::{
        composer::{ComposerConfig, TopLevelComposer},
        DefinitionId, FunInstance, TopLevelContext, TopLevelDef,
    },
    typecheck::{
-        type_inferencer::{FunctionData, IdentifierInfo, Inferencer, PrimitiveStore},
+        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,
--- a/nac3core/src/lib.rs
+++ b/nac3core/src/lib.rs
@ -19,10 +19,6 @@
    clippy::wildcard_imports
 )]
 // users of nac3core need to use the same version of these dependencies, so expose them as nac3core::*
 pub use inkwell;
 pub use nac3parser;
 pub mod codegen;
 pub mod symbol_resolver;
 pub mod toplevel;
--- 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,11 +11,6 @@ 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,
@ -23,9 +19,12 @@ use crate::{
        stmt::exn_constructor,
    },
    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(
--- 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 {
@ -1899,9 +1822,12 @@ impl TopLevelComposer {
                        if *name != init_str_id {
                            unreachable!("must be init function here")
                        }
                        // Since AST stores class names without prepending `__module__.`, we split the name for search purposes
                        let class_name_only = class_name.to_string();
                        let (_, class_name_only) = class_name_only.split_once('.').unwrap();
                        let all_inited = Self::get_all_assigned_field(
-                            object_id.0,
+                            class_name_only.into(),
                            definition_ast_list,
                            body.as_slice(),
                        )?;
@ -1922,8 +1848,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 +1885,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 +2005,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 +2046,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 +2132,6 @@ impl TopLevelComposer {
                        )]));
                    }
                let TopLevelDef::Function { instance_to_stmt, .. } = &mut *def.write() else {
                    unreachable!()
                };
                    instance_to_stmt.insert(
                        get_subst_key(
                            unifier,
@ -2247,10 +2147,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 +2164,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('.');
@ -750,14 +734,9 @@ impl TopLevelComposer {
        )
    }
    /// This function returns the fields that have been initialized in the `__init__` function of a class
    /// The function takes as input:
    ///  * `class_id`: The `object_id` of the class whose function is being evaluated (check `TopLevelDef::Class`)
    ///  * `definition_ast_list`: A list of ast definitions and statements defined in `TopLevelComposer`
    ///  * `stmts`: The body of function being parsed. Each statment is analyzed to check varaible initialization statements
    pub fn get_all_assigned_field(
-        class_id: usize,
+        class_name: StrRef,
-        definition_ast_list: &Vec<DefAst>,
+        ast: &Vec<DefAst>,
        stmts: &[Stmt<()>],
    ) -> Result<HashSet<StrRef>, HashSet<String>> {
        let mut result = HashSet::new();
@ -795,26 +774,19 @@ impl TopLevelComposer {
                // TODO: do not check for For and While?
                ast::StmtKind::For { body, orelse, .. }
                | ast::StmtKind::While { body, orelse, .. } => {
                    result.extend(Self::get_all_assigned_field(class_name, ast, body.as_slice())?);
                    result.extend(Self::get_all_assigned_field(
-                        class_id,
+                        class_name,
-                        definition_ast_list,
+                        ast,
                        body.as_slice(),
                    )?);
                    result.extend(Self::get_all_assigned_field(
                        class_id,
                        definition_ast_list,
                        orelse.as_slice(),
                    )?);
                }
                ast::StmtKind::If { body, orelse, .. } => {
-                    let inited_for_sure = Self::get_all_assigned_field(
+                    let inited_for_sure =
-                        class_id,
+                        Self::get_all_assigned_field(class_name, ast, body.as_slice())?
                        definition_ast_list,
                        body.as_slice(),
                    )?
                            .intersection(&Self::get_all_assigned_field(
-                        class_id,
+                                class_name,
-                        definition_ast_list,
+                                ast,
                                orelse.as_slice(),
                            )?)
                            .copied()
@ -822,33 +794,26 @@ impl TopLevelComposer {
                    result.extend(inited_for_sure);
                }
                ast::StmtKind::Try { body, orelse, finalbody, .. } => {
-                    let inited_for_sure = Self::get_all_assigned_field(
+                    let inited_for_sure =
-                        class_id,
+                        Self::get_all_assigned_field(class_name, ast, body.as_slice())?
                        definition_ast_list,
                        body.as_slice(),
                    )?
                            .intersection(&Self::get_all_assigned_field(
-                        class_id,
+                                class_name,
-                        definition_ast_list,
+                                ast,
                                orelse.as_slice(),
                            )?)
                            .copied()
                            .collect::<HashSet<_>>();
                    result.extend(inited_for_sure);
                    result.extend(Self::get_all_assigned_field(
-                        class_id,
+                        class_name,
-                        definition_ast_list,
+                        ast,
                        finalbody.as_slice(),
                    )?);
                }
                ast::StmtKind::With { body, .. } => {
-                    result.extend(Self::get_all_assigned_field(
+                    result.extend(Self::get_all_assigned_field(class_name, ast, body.as_slice())?);
                        class_id,
                        definition_ast_list,
                        body.as_slice(),
                    )?);
                }
-                // Variables Initialized in function calls
+                // Variables Initiated in function calls
                ast::StmtKind::Expr { value, .. } => {
                    let ExprKind::Call { func, .. } = &value.node else {
                        continue;
@ -859,49 +824,31 @@ impl TopLevelComposer {
                    let ExprKind::Name { id, .. } = &value.node else {
                        continue;
                    };
-                    // Need to consider the two cases:
+                    // Need to conside the two cases:
                    //  Case 1) Call to class function i.e. id = `self`
                    //  Case 2) Call to class ancestor function i.e. id = ancestor_name
                    // We leave checking whether function in case 2 belonged to class ancestor or not to type checker
                    //
                    // According to current handling of `self`, function definition are fixed and do not change regardless
                    // of which object is passed as `self` i.e. virtual polymorphism is not supported
-                    // Therefore, we change class id for case 2 to reflect behavior of our compiler
+                    // Therefore, we change class name for case 2 to reflect behavior of our compiler
                    let new_class_name = if *id == "self".into() { class_name } else { *id };
-                    let class_name = if *id == "self".into() {
+                    let method_body = ast.iter().find_map(|def| {
-                        let ast::StmtKind::ClassDef { name, .. } =
+                        let Some(ast::Located {
                            &definition_ast_list[class_id].1.as_ref().unwrap().node
                        else {
                            unreachable!()
                        };
                        name
                    } else {
                        id
                    };
                    let parent_method = definition_ast_list.iter().find_map(|def| {
                        let (
                            class_def,
                            Some(ast::Located {
                            node: ast::StmtKind::ClassDef { name, body, .. },
                            ..
-                            }),
+                        }) = &def.1
                        ) = &def
                        else {
                            return None;
                        };
-                        let TopLevelDef::Class { object_id: class_id, .. } = &*class_def.read()
+                        if *name == new_class_name {
                        else {
                            unreachable!()
                        };
                        if name == class_name {
                            body.iter().find_map(|m| {
                                let ast::StmtKind::FunctionDef { name, body, .. } = &m.node else {
                                    return None;
                                };
                                if *name == *attr {
-                                    return Some((body.clone(), class_id.0));
+                                    return Some(body.clone());
                                }
                                None
                            })
@ -911,15 +858,15 @@ impl TopLevelComposer {
                    });
                    // If method body is none then method does not exist
-                    if let Some((method_body, class_id)) = parent_method {
+                    if let Some(method_body) = method_body {
                        result.extend(Self::get_all_assigned_field(
-                            class_id,
+                            new_class_name,
-                            definition_ast_list,
+                            ast,
                            method_body.as_slice(),
                        )?);
                    } else {
                        return Err(HashSet::from([format!(
-                            "{}.{} not found in class {class_name} at {}",
+                            "{}.{} not found in class {new_class_name} at {}",
                            *id, *attr, value.location
                        )]));
                    }
--- 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)]
@ -524,23 +520,6 @@ pub fn typeof_binop(
        }
        Operator::MatMult => {
            // NOTE: NumPy matmul's LHS and RHS must both be ndarrays. Scalars are not allowed.
            match (&*unifier.get_ty(lhs), &*unifier.get_ty(rhs)) {
                (
                    TypeEnum::TObj { obj_id: lhs_obj_id, .. },
                    TypeEnum::TObj { obj_id: rhs_obj_id, .. },
                ) if *lhs_obj_id == primitives.ndarray.obj_id(unifier).unwrap()
                    && *rhs_obj_id == primitives.ndarray.obj_id(unifier).unwrap() =>
                {
                    // LHS and RHS have valid types
                }
                _ => {
                    let lhs_str = unifier.stringify(lhs);
                    let rhs_str = unifier.stringify(rhs);
                    return Err(format!("ndarray.__matmul__ only accepts ndarray operands, but left operand has type {lhs_str}, and right operand has type {rhs_str}"));
                }
            }
            let (_, lhs_ndims) = unpack_ndarray_var_tys(unifier, lhs);
            let lhs_ndims = match &*unifier.get_ty_immutable(lhs_ndims) {
                TypeEnum::TLiteral { values, .. } => {
@ -701,7 +680,6 @@ pub fn set_primitives_magic_methods(store: &PrimitiveStore, unifier: &mut Unifie
        bool: bool_t,
        uint32: uint32_t,
        uint64: uint64_t,
        str: str_t,
        list: list_t,
        ndarray: ndarray_t,
        ..
@ -747,9 +725,6 @@ pub fn set_primitives_magic_methods(store: &PrimitiveStore, unifier: &mut Unifie
    impl_sign(unifier, store, bool_t, Some(int32_t));
    impl_eq(unifier, store, bool_t, &[bool_t, ndarray_bool_t], None);
    /* str ========= */
    impl_cmpop(unifier, store, str_t, &[str_t], &[Cmpop::Eq, Cmpop::NotEq], Some(bool_t));
    /* list ======== */
    impl_binop(unifier, store, list_t, &[list_t], Some(list_t), &[Operator::Add]);
    impl_binop(unifier, store, list_t, &[int32_t, int64_t], Some(list_t), &[Operator::Mult]);
--- 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, .. } => {
@ -586,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(),
@ -594,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(
@ -674,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(())
            }
@ -784,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
@ -1602,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,
                    },
@ -1642,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![],
                },
            }));
@ -1723,7 +1678,7 @@ impl<'a> Inferencer<'a> {
    /// Returns [`None`] if its not a call to parent method, otherwise
    /// returns a new `func` with class name replaced by `self` and method resolved to its `DefinitionID`
    ///
-    /// e.g.  A.f1(self, ...) returns Some(self.{DefintionID(f1)})
+    /// e.g.  A.f1(self, ...) returns Some(self.DefintionID(f1))
    fn check_overriding(&mut self, func: &ast::Expr<()>, args: &[ast::Expr<()>]) -> OverrideResult {
        // `self` must be first argument for call to parent method
        if let Some(Located { node: ExprKind::Name { id, .. }, .. }) = &args.first() {
@ -1758,7 +1713,7 @@ impl<'a> Inferencer<'a> {
                    };
                    // Class names are stored as `__module__.class`
                    let name = name.to_string();
-                    let (_, name) = name.rsplit_once('.').unwrap();
+                    let (_, name) = name.split_once('.').unwrap();
                    if name == class_name.to_string() {
                        return methods.iter().find_map(|f| {
                            if f.0 == *method_name {
@ -1777,6 +1732,7 @@ impl<'a> Inferencer<'a> {
        match res {
            Some(r) => {
                let mut new_func = func.clone();
                let mut new_value = value.clone();
                new_value.node = ExprKind::Name { id: "self".into(), ctx: *class_ctx };
@ -1786,14 +1742,13 @@ impl<'a> Inferencer<'a> {
                let mut new_func = self.fold_expr(new_func)?;
                let ExprKind::Attribute { value, .. } = new_func.node else { unreachable!() };
-                new_func.node =
+                new_func.node = ExprKind::Attribute { value, attr: r.2.0.to_string().into(), ctx: *ctx };
                    ExprKind::Attribute { value, attr: r.2 .0.to_string().into(), ctx: *ctx };
                new_func.custom = Some(r.1);
                Ok(Some(new_func))
            }
            None => report_error(
-                format!("Ancestor method [{class_name}.{method_name}] should be defined with same decorator as its overridden version").as_str(),
+                format!("Method {class_name}.{method_name} not found in ancestor list").as_str(),
                *location,
            ),
        }
@ -2685,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,22 @@
 use std::{
    borrow::Cow,
    cell::RefCell,
    collections::{HashMap, HashSet},
    fmt::{self, Display},
    iter::{repeat, zip},
    rc::Rc,
    sync::{Arc, Mutex},
 };
 use indexmap::IndexMap;
 use itertools::{repeat_n, Itertools};
 use nac3parser::ast::{Cmpop, Location, StrRef, Unaryop};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::fmt::{self, Display};
 use std::iter::{repeat, zip};
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use std::{borrow::Cow, collections::HashSet};
-use super::{
+use super::magic_methods::Binop;
-    magic_methods::{Binop, HasOpInfo, OpInfo},
+use super::type_error::{TypeError, TypeErrorKind};
-    type_error::{TypeError, TypeErrorKind},
+use super::unification_table::{UnificationKey, UnificationTable};
-    type_inferencer::PrimitiveStore,
+use crate::symbol_resolver::SymbolValue;
-    unification_table::{UnificationKey, UnificationTable},
+use crate::toplevel::helper::PrimDef;
-};
+use crate::toplevel::{DefinitionId, TopLevelContext, TopLevelDef};
-use crate::{
+use crate::typecheck::magic_methods::OpInfo;
-    symbol_resolver::SymbolValue,
+use crate::typecheck::type_inferencer::PrimitiveStore;
    toplevel::{helper::PrimDef, DefinitionId, TopLevelContext, TopLevelDef},
 };
 #[cfg(test)]
 mod test;
@ -677,8 +671,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`.
@ -1014,18 +1008,8 @@ impl Unifier {
                            self.unify_impl(v.ty, ty[ind as usize], false)
                                .map_err(|e| e.at(v.loc))?;
                        }
-                        RecordKey::Str(s) => {
+                        RecordKey::Str(_) => {
-                            let tuple_fns = [
+                            return Err(TypeError::new(TypeErrorKind::NoSuchField(*k, b), v.loc))
                                Cmpop::Eq.op_info().method_name,
                                Cmpop::NotEq.op_info().method_name,
                            ];
                            if !tuple_fns.into_iter().any(|op| s.to_string() == op) {
                                return Err(TypeError::new(
                                    TypeErrorKind::NoSuchField(*k, b),
                                    v.loc,
                                ));
                            }
                        }
                    }
                }
--- 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/dwarf.rs
+++ b/nac3ld/src/dwarf.rs
@ -238,7 +238,7 @@ impl<'a> EH_Frame<'a> {
 /// From the [specification](https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html):
 ///
 /// > Each CFI record contains a Common Information Entry (CIE) record followed by 1 or more Frame
-/// > Description Entry (FDE) records.
+/// Description Entry (FDE) records.
 pub struct CFI_Record<'a> {
    // It refers to the augmentation data that corresponds to 'R' in the augmentation string
    fde_pointer_encoding: u8,
--- a/nac3ld/src/lib.rs
+++ b/nac3ld/src/lib.rs
@ -21,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/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/Cargo.toml
+++ b/nac3standalone/Cargo.toml
@ -9,8 +9,14 @@ no-escape-analysis = ["nac3core/no-escape-analysis"]
 [dependencies]
 parking_lot = "0.12"
 nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
 [dependencies.clap]
 version = "4.5"
 features = ["derive"]
 [dependencies.inkwell]
 version = "0.4"
 default-features = false
 features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
--- a/nac3standalone/demo/demo.c
+++ b/nac3standalone/demo/demo.c
@ -120,8 +120,7 @@ struct Exception {
 uint32_t __nac3_raise(struct Exception* e) {
    printf("__nac3_raise called. Exception details:\n");
    printf("          ID: %"PRIu32"\n", e->id);
-    printf("    Location: %*s:%" PRIu32 ":%" PRIu32 "\n", (int)e->file.len, (const char*)e->file.data, e->line,
+    printf("    Location: %*s:%"PRIu32":%"PRIu32"\n" , (int) e->file.len, (const char*) e->file.data, e->line, e->column);
           e->column);
    printf("    Function: %*s\n" , (int) e->function.len, (const char*) e->function.data);
    printf("     Message: \"%*s\"\n" , (int) e->message.len, (const char*) e->message.data);
    printf("      Params: {0}=%"PRId64", {1}=%"PRId64", {2}=%"PRId64"\n", e->param[0], e->param[1], e->param[2]);
--- a/nac3standalone/demo/src/assignment.py
+++ b/nac3standalone/demo/src/assignment.py
@ -9,7 +9,6 @@ def output_bool(x: bool):
 def example1():
    x, *ys, z = (1, 2, 3, 4, 5)
    output_int32(x)
    output_int32(len(ys))
    output_int32(ys[0])
    output_int32(ys[1])
    output_int32(ys[2])
@ -19,14 +18,12 @@ def example2():
    x, y, *zs = (1, 2, 3, 4, 5)
    output_int32(x)
    output_int32(y)
    output_int32(len(zs))
    output_int32(zs[0])
    output_int32(zs[1])
    output_int32(zs[2])
 def example3():
    *xs, y, z = (1, 2, 3, 4, 5)
    output_int32(len(xs))
    output_int32(xs[0])
    output_int32(xs[1])
    output_int32(xs[2])
@ -34,12 +31,6 @@ def example3():
    output_int32(z)
 def example4():
    *xs, y, z = (4, 5)
    output_int32(len(xs))
    output_int32(y)
    output_int32(z)
 def example5():
    # Example from: https://docs.python.org/3/reference/simple_stmts.html#assignment-statements
    x = [0, 1]
    i = 0
@ -53,7 +44,7 @@ class A:
    def __init__(self):
        self.value = 1000
-def example6():
+def example5():
    ws = [88, 7, 8]
    a = A()
    x, [y, *ys, a.value], ws[0], (ws[0],) = 1, (2, False, 4, 5), 99, (6,)
@ -72,5 +63,4 @@ def run() -> int32:
    example3()
    example4()
    example5()
    example6()
    return 0
--- 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)
@ -1679,7 +1669,6 @@ def run() -> int32:
    test_ndarray_round()
    test_ndarray_floor()
    test_ndarray_ceil()
    test_ndarray_min()
    test_ndarray_minimum()
    test_ndarray_minimum_broadcast()
--- a/nac3standalone/demo/src/str.py
+++ b/nac3standalone/demo/src/str.py
@ -1,30 +0,0 @@
@extern
 def output_bool(x: bool):
    ...
 def str_eq():
    output_bool("" == "")
    output_bool("a" == "")
    output_bool("a" == "b")
    output_bool("b" == "a")
    output_bool("a" == "a")
    output_bool("test string" == "test string")
    output_bool("test string1" == "test string2")
 def str_ne():
    output_bool("" != "")
    output_bool("a" != "")
    output_bool("a" != "b")
    output_bool("b" != "a")
    output_bool("a" != "a")
    output_bool("test string" != "test string")
    output_bool("test string1" != "test string2")
 def run() -> int32:
    str_eq()
    str_ne()
    return 0
--- a/nac3standalone/demo/src/tuple.py
+++ b/nac3standalone/demo/src/tuple.py
@ -1,7 +1,3 @@
@extern
 def output_bool(b: bool):
    ...
@extern
 def output_int32_list(x: list[int32]):
    ...
@ -17,41 +13,6 @@ class A:
        self.a = a
        self.b = b
 def test_tuple_eq():
    # 0-len
    output_bool(() == ())
    # 1-len
    output_bool((1,) == ())
    output_bool(() == (1,))
    output_bool((1,) == (1,))
    output_bool((1,) == (2,))
    # # 2-len
    output_bool((1, 2) == ())
    output_bool(() == (1, 2))
    output_bool((1,) == (1, 2))
    output_bool((1, 2) == (1,))
    output_bool((2, 2) == (1, 2))
    output_bool((1, 2) == (2, 2))
 def test_tuple_ne():
    # 0-len
    output_bool(() != ())
    # 1-len
    output_bool((1,) != ())
    output_bool(() != (1,))
    output_bool((1,) != (1,))
    output_bool((1,) != (2,))
    # 2-len
    output_bool((1, 2) != ())
    output_bool(() != (1, 2))
    output_bool((1,) != (1, 2))
    output_bool((1, 2) != (1,))
    output_bool((2, 2) != (1, 2))
    output_bool((1, 2) != (2, 2))
 def run() -> int32:
    data = [0, 1, 2, 3]
@ -72,7 +33,4 @@ def run() -> int32:
    output_int32(len((1, 2, 3, 4)))
    output_int32(len((1, 2, 3, 4, 5)))
    test_tuple_eq()
    test_tuple_ne()
    return 0
--- a/nac3standalone/src/basic_symbol_resolver.rs
+++ b/nac3standalone/src/basic_symbol_resolver.rs
@ -1,14 +1,5 @@
 use std::{
    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,10 +7,15 @@ use nac3core::{
        typedef::{Type, Unifier},
    },
 };
 use nac3parser::ast::{self, StrRef};
 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>>,
    pub id_to_def: Mutex<HashMap<StrRef, DefinitionId>>,
    pub class_names: Mutex<HashMap<StrRef, Type>>,
    pub module_globals: Mutex<HashMap<StrRef, SymbolValue>>,
    pub str_store: Mutex<HashMap<String, i32>>,
 }
@ -50,51 +46,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
@ -8,30 +8,17 @@
 #![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 inkwell::context::Context;
-
+use inkwell::{
    memory_buffer::MemoryBuffer, passes::PassBuilderOptions, support::is_multithreaded, targets::*,
    OptimizationLevel,
 };
 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},
@ -44,10 +31,17 @@ use nac3core::{
        typedef::{FunSignature, Type, Unifier, VarMap},
    },
 };
-
+use nac3parser::{
-use basic_symbol_resolver::*;
+    ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
    parser,
 };
 use parking_lot::{Mutex, RwLock};
 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)]
@ -175,49 +169,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 {
@ -227,9 +218,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(())
@ -247,39 +240,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 } =
@ -320,19 +280,22 @@ fn main() {
        reloc_mode: RelocMode::PIC,
        ..host_target_machine
    };
-    let target_machine = target_machine_options
+
    let size_t = Context::create()
        .ptr_sized_int_type(
            &target_machine_options
                .create_target_machine(opt_level)
-        .expect("couldn't create target machine");
+                .map(|tm| tm.get_target_data())
-
+                .unwrap(),
-    let context = nac3core::inkwell::context::Context::create();
+            None,
-
+        )
-    let size_t =
+        .get_bit_width();
        context.ptr_sized_int_type(&target_machine.get_target_data(), None).get_bit_width();
    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;
        }
    };
@ -343,6 +306,7 @@ fn main() {
    let internal_resolver: Arc<ResolverInternal> = ResolverInternal {
        id_to_type: builtins_ty.into(),
        id_to_def: builtins_def.into(),
        class_names: Mutex::default(),
        module_globals: Mutex::default(),
        str_store: Mutex::default(),
    }
@ -350,41 +314,27 @@ fn main() {
    let resolver =
        Arc::new(Resolver(internal_resolver.clone())) as Arc<dyn SymbolResolver + Send + Sync>;
    // Process IRRT
    let irrt = load_irrt(&context, resolver.as_ref());
    if emit_llvm {
        irrt.write_bitcode_to_path(Path::new("irrt.bc"));
    }
    // Process the Python script
    let parser_result = parser::parse_program(&program, file_name.into()).unwrap();
    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())
@ -468,8 +418,8 @@ fn main() {
    registry.add_task(task);
    registry.wait_tasks_complete(handles);
    // Link all modules together into `main`
    let buffers = membuffers.lock();
    let context = inkwell::context::Context::create();
    let main = context
        .create_module_from_ir(MemoryBuffer::create_from_memory_range(&buffers[0], "main"))
        .unwrap();
@ -489,18 +439,25 @@ fn main() {
        main.link_in_module(other).unwrap();
    }
    let irrt = load_irrt(&context);
    if emit_llvm {
        irrt.write_bitcode_to_path(Path::new("irrt.bc"));
    }
    main.link_in_module(irrt).unwrap();
    // Private all functions except "run"
    let mut function_iter = main.get_first_function();
    while let Some(func) = function_iter {
        if func.count_basic_blocks() > 0 && func.get_name().to_str().unwrap() != "run" {
-            func.set_linkage(Linkage::Private);
+            func.set_linkage(inkwell::module::Linkage::Private);
        }
        function_iter = func.get_next_function();
    }
-    // Optimize `main`
+    let target_machine = llvm_options
        .target
        .create_target_machine(llvm_options.opt_level)
        .expect("couldn't create target machine");
    let pass_options = PassBuilderOptions::create();
    pass_options.set_merge_functions(true);
    let passes = format!("default<O{}>", opt_level as u32);
@ -509,7 +466,6 @@ fn main() {
        panic!("Failed to run optimization for module `main`: {}", err.to_string());
    }
    // Write output
    target_machine
        .write_to_file(&main, FileType::Object, Path::new("module.o"))
        .expect("couldn't write module to file");
--- a/nix/windows/PKGBUILD
+++ b/nix/windows/PKGBUILD
@ -21,6 +21,6 @@ build() {
 }
 package() {
-  mkdir -p $pkgdir/clang64/lib/python3.12/site-packages
+  mkdir -p $pkgdir/clang64/lib/python3.11/site-packages
-  cp ${srcdir}/nac3artiq.pyd $pkgdir/clang64/lib/python3.12/site-packages
+  cp ${srcdir}/nac3artiq.pyd $pkgdir/clang64/lib/python3.11/site-packages
 }
--- a/nix/windows/default.nix
+++ b/nix/windows/default.nix
@ -21,10 +21,10 @@ let
    text =
      ''
      implementation=CPython
-      version=3.12
+      version=3.11
      shared=true
      abi3=false
-      lib_name=python3.12
+      lib_name=python3.11
      lib_dir=${msys2-env}/clang64/lib
      pointer_width=64
      build_flags=WITH_THREAD
--- a/nix/windows/make_msys2_packages.sh
+++ b/nix/windows/make_msys2_packages.sh
@ -6,11 +6,11 @@ cd $(dirname $0)
 MSYS2DIR=`pwd`/msys2
 mkdir -p $MSYS2DIR/var/lib/pacman $MSYS2DIR/msys/etc
-curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
+curl -L https://mirror.msys2.org/msys/x86_64/pacman-mirrors-20220205-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
 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.11 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/nix/windows/msys2_packages.nix
+++ b/nix/windows/msys2_packages.nix
@ -1,15 +1,15 @@
 { pkgs } : [
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-2-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst";
-  sha256 = "0f9m76dx40iy794nfks0360gvjhdg6yngb2lyhwp4xd76rn5081m";
+  sha256 = "1v8zkfcbf1ga2ndpd1j0dwv5s1rassxs2b5pjhcsmqwjcvczba1m";
-  name = "mingw-w64-clang-x86_64-libunwind-18.1.8-2-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-libunwind-18.1.8-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-2-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst";
-  sha256 = "17savj9wys9my2ji7vyba7wwqkvzdjwnkb3k4858wxrjbzbfa6lk";
+  sha256 = "0mfd8wrmgx12j5gf354j7pk1l3lg9ykxvq75xdk3jipsr6hbn846";
-  name = "mingw-w64-clang-x86_64-libc++-18.1.8-2-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-libc++-18.1.8-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -43,9 +43,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
-  sha256 = "0cjz2vj9yz6k5xj601cp0yk631rrr0z94ciamwqrvclb0yhakf25";
+  sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b";
-  name = "mingw-w64-clang-x86_64-libxml2-2.12.9-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -79,15 +79,15 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
-  sha256 = "0163jzjlvq7inpafy3h48pkwag3ysk6x56xm84yfcz5q52fnfzq5";
+  sha256 = "1h3cdcajz29iq7vja908kkijz1vb9xn0f7w1lw1ima0q0zhinv4q";
-  name = "mingw-w64-clang-x86_64-headers-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
-  sha256 = "00cn1mi29mfys7qy4hvgnjd0smqvnkdn3ibnrr6a3wy1h2vaykgq";
+  sha256 = "15kamyi3b0j6f5zxin4i2jgzjc7lzvwl4z5cz3dx0i8hg91aq0n7";
-  name = "mingw-w64-clang-x86_64-crt-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -97,15 +97,15 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
-  sha256 = "1zkzqqd31xpkv817wja3qssjjx891bsdxw07037hv2sk0qr4ffn9";
+  sha256 = "0qdvgs1rmjjhn9klf9kpw7l0ydz36rr5fasn4q9gpby2lgl11bkb";
-  name = "mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
-  sha256 = "02ynia88ad3l03r08nyldmnajwqkyxcjd191lyamkbj4d6zck323";
+  sha256 = "0rh2mn078cifcmr4as4k57jxjln5lbnsmpx47h9d0s5d2i8sf2rc";
-  name = "mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r250.gc6bf4bdf6-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -115,15 +115,15 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.33.1-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.29.0-1-any.pkg.tar.zst";
-  sha256 = "14r6jjsvfbapbkv2zqp2yglva4vz4srzkgk7f186ri3kcafjspgq";
+  sha256 = "01xg1h1a8kda0kq2921w25ybvm1ms7lfdzday0hv93f3myq7briq";
-  name = "mingw-w64-clang-x86_64-c-ares-1.33.1-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-c-ares-1.29.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-2-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-1-any.pkg.tar.zst";
-  sha256 = "1q01lz9lcyrjmkhv9rddgjazmk7warlcmwhc4qkq9y6h0yfsb71n";
+  sha256 = "113mha41q53cx0hw13cq1xdf7zbsd58sh8cl1cd7xzg1q69n60w2";
-  name = "mingw-w64-clang-x86_64-brotli-1.1.0-2-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-brotli-1.1.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -163,9 +163,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.2-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst";
-  sha256 = "1djgpcz447yvhdy1yq5wh8l5d0821izxklx9afyszbw0pbr7f24y";
+  sha256 = "0ywhwm4kw3qjzv0872qwabnsq2rzbmqjb9m69q3fykjl0m9gigsa";
-  name = "mingw-w64-clang-x86_64-openssl-3.3.2-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -175,39 +175,39 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.63.0-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.61.0-2-any.pkg.tar.zst";
-  sha256 = "0lfqrlmapsc7ilxjmhr7hxi578vclqlhpqimbvzq0c70c0iwk864";
+  sha256 = "07bkk98126gy4k6lb9rrqqnzjfz9j2rsr5dzr2djmzdkw0h4dr95";
-  name = "mingw-w64-clang-x86_64-nghttp2-1.63.0-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-nghttp2-1.61.0-2-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.5.0-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.4.0-1-any.pkg.tar.zst";
-  sha256 = "1ljl9kdasf91bxkqcmbbjchp5g00ahv8jn2zab38899z6j3x43nz";
+  sha256 = "007w2252nzn274j4wjc1vf56xyzzh5vg3blj1hil7mlmffgvc923";
-  name = "mingw-w64-clang-x86_64-nghttp3-1.5.0-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-nghttp3-1.4.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.9.1-2-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-10-any.pkg.tar.zst";
-  sha256 = "1zr6kgqp9i4qqrfckh3kfmz4x1cwv4xis9sfqsx7xji88priax64";
+  sha256 = "024z5b1achkf448gxqy1i3gcw371x54kfl6igv08b5wb3rrw35a4";
-  name = "mingw-w64-clang-x86_64-curl-8.9.1-2-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-curl-8.8.0-10-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-rust-1.80.1-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-rust-1.79.0-1-any.pkg.tar.zst";
-  sha256 = "1dm4vlrfi9m6xl09zpn0yjr7qcjjr4x738z1rjfwysfnc0awq4x8";
+  sha256 = "0i7s88hj8m4920xifkj7i4b4sq8cqq7p5cypp3jqx3dc44pwm19a";
-  name = "mingw-w64-clang-x86_64-rust-1.80.1-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-rust-1.79.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-cppdap-1.65-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pkgconf-1~2.2.0-1-any.pkg.tar.zst";
-  sha256 = "0phhwkcqp30dsyj5vr6w99sgm1jfm5rzg0w5x5mv9md4x7lm9lmh";
+  sha256 = "1y44ijg3y8p80f1yn9972nshrnyrd06a9sh984ajhxg8bi8s5xyl";
-  name = "mingw-w64-clang-x86_64-cppdap-1.65-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-pkgconf-12.2.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.3-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
-  sha256 = "19xfl1q78q1k8j0lr5aspcf668pmfg01fgib73zq7ff7y5y5fcyi";
+  sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38";
-  name = "mingw-w64-clang-x86_64-expat-2.6.3-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -229,9 +229,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lz4-1.10.0-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lz4-1.9.4-1-any.pkg.tar.zst";
-  sha256 = "0kznnw9z9zqxkmn8qbypm2rpsfaapbgls1ks3zzpfnfjz9cpw8py";
+  sha256 = "0nn7cy25j53q5ckkx4n4f77w00xdwwf5wjswm374shvvs58nlln0";
-  name = "mingw-w64-clang-x86_64-lz4-1.10.0-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-lz4-1.9.4-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -264,12 +264,6 @@
  name = "mingw-w64-clang-x86_64-ninja-1.12.1-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pkgconf-1~2.3.0-1-any.pkg.tar.zst";
  sha256 = "15i7x6akkgs7aa7aa804k93p2iipnvygsy7z8hsafskka3h150fa";
  name = "mingw-w64-clang-x86_64-pkgconf-12.3.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-rhash-1.4.4-3-any.pkg.tar.zst";
  sha256 = "1ysbxirpfr0yf7pvyps75lnwc897w2a2kcid3nb4j6ilw6n64jmc";
@ -277,9 +271,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-cmake-3.30.3-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-cmake-3.30.0-1-any.pkg.tar.zst";
-  sha256 = "0fjwf6xxzli6rcsbzr1razldmm538ibkyf5kw132lpaz5wma9bj8";
+  sha256 = "07b7132hwhiqrf0l2lgw3g4zw9i2lln3kqc9kg2qijvkapbkmwqb";
-  name = "mingw-w64-clang-x86_64-cmake-3.30.3-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-cmake-3.30.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -301,9 +295,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
-  sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr";
+  sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v";
-  name = "mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -313,9 +307,9 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst";
-  sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq";
+  sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2";
-  name = "mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
@ -330,12 +324,6 @@
  name = "mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python3.12-3.12.1-2-any.pkg.tar.zst";
  sha256 = "0wmd39wl9z237w093a7c6hl5pclca9yvwxn0kiw6i2njk3sjv51a";
  name = "mingw-w64-clang-x86_64-python3.12-3.12.1-2-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst";
  sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c";
@ -349,20 +337,20 @@
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
-  sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq";
+  sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k";
-  name = "mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-2.0.1-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
-  sha256 = "0ks6q8v58h4wmr2pzsjl2xm4f63g0psvfm0jwlz24mqfxp8gqfcc";
+  sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf";
-  name = "mingw-w64-clang-x86_64-python-numpy-2.0.1-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst";
 })
 (pkgs.fetchurl {
-  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-74.0.0-1-any.pkg.tar.zst";
+  url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-70.2.0-1-any.pkg.tar.zst";
-  sha256 = "0xc95z5jzzjf5lw35bs4yn5rlwkrkmrh78yi5rranqpz5nn0wsa0";
+  sha256 = "1q4r9bg2hn3jmshvq81xm5zvy9wn35yf0z2ayksrkwph1zzdkvkm";
-  name = "mingw-w64-clang-x86_64-python-setuptools-74.0.0-1-any.pkg.tar.zst";
+  name = "mingw-w64-clang-x86_64-python-setuptools-70.2.0-1-any.pkg.tar.zst";
 })
 ]