standalone/ndarray: improve {reshape,broadcast_to,transpose} tests

Print their shapes and exhaustively print all contents.

.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]

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,9 +117,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
 dependencies = [
  "shlex",
 ]
@@ -141,9 +132,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.19"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -151,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.19"
+version = "4.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
 dependencies = [
  "anstream",
  "anstyle",
@@ -163,14 +154,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.76",
 ]
 
 [[package]]
@@ -197,15 +188,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 +245,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]]
@@ -340,16 +329,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -385,12 +364,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 +376,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -424,12 +388,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -440,9 +404,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "inkwell"
-version = "0.5.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2"
+checksum = "b597a7b2cdf279aeef6d7149071e35e4bc87c2cf05a5b7f2d731300bffe587ea"
 dependencies = [
  "either",
  "inkwell_internals",
@@ -454,13 +418,13 @@ dependencies = [
 
 [[package]]
 name = "inkwell_internals"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44"
+checksum = "4fa4d8d74483041a882adaa9a29f633253a66dde85055f0495c121620ac484b2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -483,6 +447,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -498,45 +471,35 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "keccak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
-dependencies = [
- "cpufeatures",
-]
-
 [[package]]
 name = "lalrpop"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06093b57658c723a21da679530e061a8c25340fa5a6f98e313b542268c7e2a1f"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
  "bit-set",
  "ena",
- "itertools",
+ "itertools 0.11.0",
  "lalrpop-util",
  "petgraph",
  "pico-args",
  "regex",
  "regex-syntax",
- "sha3",
  "string_cache",
  "term",
+ "tiny-keccak",
  "unicode-xid",
  "walkdir",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feee752d43abd0f4807a921958ab4131f692a44d4d599733d4419c5d586176ce"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
  "regex-automata",
- "rustversion",
 ]
 
 [[package]]
@@ -547,9 +510,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
@@ -561,6 +524,16 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -621,9 +594,11 @@ dependencies = [
 name = "nac3artiq"
 version = "0.1.0"
 dependencies = [
- "itertools",
+ "inkwell",
+ "itertools 0.13.0",
  "nac3core",
  "nac3ld",
+ "nac3parser",
  "parking_lot",
  "pyo3",
  "tempfile",
@@ -644,11 +619,11 @@ name = "nac3core"
 version = "0.1.0"
 dependencies = [
  "crossbeam",
- "indexmap 2.6.0",
+ "indexmap 2.4.0",
  "indoc",
  "inkwell",
  "insta",
- "itertools",
+ "itertools 0.13.0",
  "nac3parser",
  "parking_lot",
  "rayon",
@@ -686,7 +661,9 @@ name = "nac3standalone"
 version = "0.1.0"
 dependencies = [
  "clap",
+ "inkwell",
  "nac3core",
+ "nac3parser",
  "parking_lot",
 ]
 
@@ -698,12 +675,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-dependencies = [
- "portable-atomic",
-]
 
 [[package]]
 name = "parking_lot"
@@ -735,7 +709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.4.0",
 ]
 
 [[package]]
@@ -778,7 +752,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -807,9 +781,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"
@@ -882,7 +856,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -895,7 +869,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -959,18 +933,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.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -980,9 +965,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",
@@ -991,9 +976,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"
@@ -1004,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
 dependencies = [
  "bitflags",
  "errno",
@@ -1050,29 +1035,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "itoa",
  "memchr",
@@ -1092,16 +1077,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"
@@ -1172,7 +1147,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1188,9 +1163,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1205,9 +1180,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",
@@ -1218,12 +1193,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]]
@@ -1241,29 +1217,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.76",
 ]
 
 [[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"
@@ -1319,27 +1298,27 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
 [[package]]
 name = "unicode_names2"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd"
+checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
 dependencies = [
  "phf",
  "unicode_names2_generator",
@@ -1347,9 +1326,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",
@@ -1391,6 +1370,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"
@@ -1400,6 +1395,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"
@@ -1509,5 +1510,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.76",
 ]

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1723637854,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {

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"]

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."""

nac3artiq/src/codegen.rs

@@ -1,17 +1,3 @@
-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::{
@@ -24,21 +10,38 @@ 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 nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
+
+use inkwell::{
+    context::Context,
+    module::Linkage,
+    types::{BasicType, IntType},
+    values::{BasicValueEnum, PointerValue, StructValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+
+use pyo3::{
+    types::{PyDict, PyList},
+    PyObject, PyResult, Python,
+};
+
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 
+use inkwell::values::IntValue;
+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)]
 enum ParallelMode {
@@ -458,8 +461,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 +472,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,
                     "",
                 )
@@ -512,7 +515,7 @@ fn format_rpc_arg<'ctx>(
             ctx.builder.build_store(arg_slot, arg).unwrap();
 
             ctx.builder
-                .build_bit_cast(arg_slot, llvm_pi8, "rpc.arg")
+                .build_bitcast(arg_slot, llvm_pi8, "rpc.arg")
                 .map(BasicValueEnum::into_pointer_value)
                 .unwrap()
         }
@@ -627,7 +630,7 @@ fn format_rpc_ret<'ctx>(
             let llvm_pdata_sizeof = ctx
                 .builder
                 .build_int_truncate_or_bit_cast(
-                    llvm_elem_ty.ptr_type(AddressSpace::default()).size_of(),
+                    llvm_ret_ty.element_type().size_of().unwrap(),
                     llvm_usize,
                     "",
                 )
@@ -659,7 +662,7 @@ fn format_rpc_ret<'ctx>(
                 .unwrap();
             let buffer = ctx
                 .builder
-                .build_bit_cast(buffer, llvm_pi8, "")
+                .build_bitcast(buffer, llvm_pi8, "")
                 .map(BasicValueEnum::into_pointer_value)
                 .unwrap();
             let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
@@ -782,7 +785,7 @@ fn format_rpc_ret<'ctx>(
 
         _ => {
             let slot = ctx.builder.build_alloca(llvm_ret_ty, "rpc.ret.slot").unwrap();
-            let slotgen = ctx.builder.build_bit_cast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
+            let slotgen = ctx.builder.build_bitcast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
             ctx.builder.build_unconditional_branch(head_bb).unwrap();
             ctx.builder.position_at_end(head_bb);
 
@@ -803,7 +806,7 @@ fn format_rpc_ret<'ctx>(
             let alloc_ptr =
                 ctx.builder.build_array_alloca(llvm_pi8, alloc_size, "rpc.alloc").unwrap();
             let alloc_ptr =
-                ctx.builder.build_bit_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
+                ctx.builder.build_bitcast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
             phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
             ctx.builder.build_unconditional_branch(head_bb).unwrap();
 
@@ -821,7 +824,6 @@ fn rpc_codegen_callback_fn<'ctx>(
     fun: (&FunSignature, DefinitionId),
     args: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
     generator: &mut dyn CodeGenerator,
-    is_async: bool,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
     let int8 = ctx.ctx.i8_type();
     let int32 = ctx.ctx.i32_type();
@@ -930,64 +932,35 @@ fn rpc_codegen_callback_fn<'ctx>(
     }
 
     // call
-    if is_async {
+    let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
-        let rpc_send_async = ctx.module.get_function("rpc_send_async").unwrap_or_else(|| {
+        ctx.module.add_function(
-            ctx.module.add_function(
+            "rpc_send",
-                "rpc_send_async",
+            ctx.ctx.void_type().fn_type(
-                ctx.ctx.void_type().fn_type(
+                &[
-                    &[
+                    int32.into(),
-                        int32.into(),
+                    tag_ptr_type.ptr_type(AddressSpace::default()).into(),
-                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
+                    ptr_type.ptr_type(AddressSpace::default()).into(),
-                        ptr_type.ptr_type(AddressSpace::default()).into(),
+                ],
-                    ],
+                false,
-                    false,
+            ),
-                ),
+            None,
-                None,
+        )
-            )
+    });
-        });
+    ctx.builder
-        ctx.builder
+        .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
-            .build_call(
+        .unwrap();
-                rpc_send_async,
-                &[service_id.into(), tag_ptr.into(), args_ptr.into()],
-                "rpc.send",
-            )
-            .unwrap();
-    } else {
-        let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
-            ctx.module.add_function(
-                "rpc_send",
-                ctx.ctx.void_type().fn_type(
-                    &[
-                        int32.into(),
-                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
-                        ptr_type.ptr_type(AddressSpace::default()).into(),
-                    ],
-                    false,
-                ),
-                None,
-            )
-        });
-        ctx.builder
-            .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
-            .unwrap();
-    }
 
     // reclaim stack space used by arguments
     call_stackrestore(ctx, stackptr);
 
-    if is_async {
+    let result = format_rpc_ret(generator, ctx, fun.0.ret);
-        // async RPCs do not return any values
-        Ok(None)
-    } else {
-        let result = format_rpc_ret(generator, ctx, fun.0.ret);
 
-        if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
+    if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
-            // An RPC returning an NDArray would not touch here.
+        // An RPC returning an NDArray would not touch here.
-            call_stackrestore(ctx, stackptr);
+        call_stackrestore(ctx, stackptr);
-        }
-
-        Ok(result)
     }
+
+    Ok(result)
 }
 
 pub fn attributes_writeback(
@@ -1082,7 +1055,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 +1065,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)
     })))
 }
 

nac3artiq/src/lib.rs

@@ -16,53 +16,48 @@
     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};
+    context::Context,
-use pyo3::{
+    memory_buffer::MemoryBuffer,
-    create_exception, exceptions,
+    module::{Linkage, Module},
-    prelude::*,
+    passes::PassBuilderOptions,
-    types::{PyBytes, PyDict, PySet},
+    support::is_multithreaded,
+    targets::*,
+    OptimizationLevel,
 };
-use tempfile::{self, TempDir};
+use itertools::Itertools;
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
+use nac3core::toplevel::builtins::get_exn_constructor;
+use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
+use nac3parser::{
+    ast::{ExprKind, Stmt, StmtKind, StrRef},
+    parser::parse_program,
+};
+use pyo3::create_exception;
+use pyo3::prelude::*;
+use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};
+
+use parking_lot::{Mutex, RwLock};
 
 use nac3core::{
-    codegen::{
+    codegen::irrt::load_irrt,
-        concrete_type::ConcreteTypeStore, gen_func_impl, irrt::load_irrt, CodeGenLLVMOptions,
+    codegen::{concrete_type::ConcreteTypeStore, CodeGenTask, WithCall, WorkerRegistry},
-        CodeGenTargetMachineOptions, CodeGenTask, WithCall, WorkerRegistry,
-    },
-    inkwell::{
-        context::Context,
-        memory_buffer::MemoryBuffer,
-        module::{Linkage, Module},
-        passes::PassBuilderOptions,
-        support::is_multithreaded,
-        targets::*,
-        OptimizationLevel,
-    },
-    nac3parser::{
-        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
-        parser::parse_program,
-    },
     symbol_resolver::SymbolResolver,
     toplevel::{
-        builtins::get_exn_constructor,
         composer::{BuiltinFuncCreator, BuiltinFuncSpec, ComposerConfig, TopLevelComposer},
         DefinitionId, GenCall, TopLevelDef,
     },
-    typecheck::{
+    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 crate::{
@@ -70,13 +65,15 @@ use crate::{
         attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
     },
     symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver},
-    timeline::TimeFns,
 };
+use tempfile::{self, TempDir};
 
 mod codegen;
 mod symbol_resolver;
 mod timeline;
 
+use timeline::TimeFns;
+
 #[derive(PartialEq, Clone, Copy)]
 enum Isa {
     Host,
@@ -197,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
                                 }
@@ -211,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
                         }
@@ -478,25 +478,9 @@ impl Nac3 {
 
             match &stmt.node {
                 StmtKind::FunctionDef { decorator_list, .. } => {
-                    if decorator_list
+                    if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
-                        .iter()
+                        store_fun.call1(py, (def_id.0.into_py(py), module.getattr(py, name.to_string().as_str()).unwrap())).unwrap();
-                        .any(|decorator| decorator_id_string(decorator) == Some("rpc".to_string()))
+                        rpc_ids.push((None, def_id));
-                    {
-                        store_fun
-                            .call1(
-                                py,
-                                (
-                                    def_id.0.into_py(py),
-                                    module.getattr(py, name.to_string().as_str()).unwrap(),
-                                ),
-                            )
-                            .unwrap();
-                        let is_async = decorator_list.iter().any(|decorator| {
-                            decorator_get_flags(decorator)
-                                .iter()
-                                .any(|constant| *constant == Constant::Str("async".into()))
-                        });
-                        rpc_ids.push((None, def_id, is_async));
                     }
                 }
                 StmtKind::ClassDef { name, body, .. } => {
@@ -504,26 +488,19 @@ impl Nac3 {
                     let class_obj = module.getattr(py, class_name.as_str()).unwrap();
                     for stmt in body {
                         if let StmtKind::FunctionDef { name, decorator_list, .. } = &stmt.node {
-                            if decorator_list.iter().any(|decorator| {
+                            if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
-                                decorator_id_string(decorator) == Some("rpc".to_string())
-                            }) {
-                                let is_async = decorator_list.iter().any(|decorator| {
-                                    decorator_get_flags(decorator)
-                                        .iter()
-                                        .any(|constant| *constant == Constant::Str("async".into()))
-                                });
                                 if name == &"__init__".into() {
                                     return Err(CompileError::new_err(format!(
                                         "compilation failed\n----------\nThe constructor of class {} should not be decorated with rpc decorator (at {})",
                                         class_name, stmt.location
                                     )));
                                 }
-                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id, is_async));
+                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id));
                             }
                         }
                     }
                 }
-                _ => (),
+                _ => ()
             }
 
             let id = *name_to_pyid.get(&name).unwrap();
@@ -579,7 +556,7 @@ impl Nac3 {
             .unwrap();
 
         // Process IRRT
-        let context = Context::create();
+        let context = inkwell::context::Context::create();
         let irrt = load_irrt(&context, resolver.as_ref());
 
         let fun_signature =
@@ -619,12 +596,13 @@ impl Nac3 {
         let top_level = Arc::new(composer.make_top_level_context());
 
         {
+            let rpc_codegen = rpc_codegen_callback();
             let defs = top_level.definitions.read();
-            for (class_data, id, is_async) in &rpc_ids {
+            for (class_data, id) in &rpc_ids {
                 let mut def = defs[id.0].write();
                 match &mut *def {
                     TopLevelDef::Function { codegen_callback, .. } => {
-                        *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                        *codegen_callback = Some(rpc_codegen.clone());
                     }
                     TopLevelDef::Class { methods, .. } => {
                         let (class_def, method_name) = class_data.as_ref().unwrap();
@@ -635,7 +613,7 @@ impl Nac3 {
                             if let TopLevelDef::Function { codegen_callback, .. } =
                                 &mut *defs[id.0].write()
                             {
-                                *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                                *codegen_callback = Some(rpc_codegen.clone());
                                 store_fun
                                     .call1(
                                         py,
@@ -650,11 +628,6 @@ impl Nac3 {
                             }
                         }
                     }
-                    TopLevelDef::Variable { .. } => {
-                        return Err(CompileError::new_err(String::from(
-                            "Unsupported @rpc annotation on global variable",
-                        )))
-                    }
                 }
             }
         }
@@ -714,7 +687,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 };
@@ -733,7 +706,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());
@@ -871,41 +844,6 @@ impl Nac3 {
     }
 }
 
-/// Retrieves the Name.id from a decorator, supports decorators with arguments.
-fn decorator_id_string(decorator: &Located<ExprKind>) -> Option<String> {
-    if let ExprKind::Name { id, .. } = decorator.node {
-        // Bare decorator
-        return Some(id.to_string());
-    } else if let ExprKind::Call { func, .. } = &decorator.node {
-        // Decorators that are calls (e.g. "@rpc()") have Call for the node,
-        // need to extract the id from within.
-        if let ExprKind::Name { id, .. } = func.node {
-            return Some(id.to_string());
-        }
-    }
-    None
-}
-
-/// Retrieves flags from a decorator, if any.
-fn decorator_get_flags(decorator: &Located<ExprKind>) -> Vec<Constant> {
-    let mut flags = vec![];
-    if let ExprKind::Call { keywords, .. } = &decorator.node {
-        for keyword in keywords {
-            if keyword.node.arg != Some("flags".into()) {
-                continue;
-            }
-            if let ExprKind::Set { elts } = &keyword.node.value.node {
-                for elt in elts {
-                    if let ExprKind::Constant { value, .. } = &elt.node {
-                        flags.push(value.clone());
-                    }
-                }
-            }
-        }
-    }
-    flags
-}
-
 fn link_with_lld(elf_filename: String, obj_filename: String) -> PyResult<()> {
     let linker_args = vec![
         "-shared".to_string(),

nac3artiq/src/symbol_resolver.rs

@@ -1,30 +1,16 @@
-use std::{
+use crate::PrimitivePythonId;
-    collections::{HashMap, HashSet},
+use inkwell::{
-    sync::{
+    module::Linkage,
-        atomic::{AtomicBool, Ordering::Relaxed},
+    types::{BasicType, BasicTypeEnum},
-        Arc,
+    values::BasicValueEnum,
-    },
+    AddressSpace,
 };
-
 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 +22,19 @@ use nac3core::{
         typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
     },
 };
-
+use nac3parser::ast::{self, StrRef};
-use crate::PrimitivePythonId;
+use parking_lot::RwLock;
+use pyo3::{
+    types::{PyDict, PyTuple},
+    PyAny, PyObject, PyResult, Python,
+};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::{
+        atomic::{AtomicBool, Ordering::Relaxed},
+        Arc,
+    },
+};
 
 pub enum PrimitiveValue {
     I32(i32),
@@ -1470,7 +1467,6 @@ impl SymbolResolver for Resolver {
         &self,
         id: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
-        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         let sym_value = {
             let id_to_val = self.0.id_to_pyval.read();

nac3artiq/src/timeline.rs

@@ -1,12 +1,9 @@
-use itertools::Either;
+use inkwell::{
-
+    values::{BasicValueEnum, CallSiteValue},
-use nac3core::{
+    AddressSpace, AtomicOrdering,
-    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();
 

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_macros = "0.26"
 
 [dependencies.inkwell]
-version = "0.5"
+version = "0.4"
 default-features = false
-features = ["llvm14-0-prefer-dynamic", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
+features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 
 [dev-dependencies]
 test-case = "1.2.0"

nac3core/build.rs

@@ -1,3 +1,4 @@
+use regex::Regex;
 use std::{
     env,
     fs::File,
@@ -6,8 +7,6 @@ use std::{
     process::{Command, Stdio},
 };
 
-use regex::Regex;
-
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
     let out_dir = Path::new(&out_dir);

nac3core/irrt/irrt/int_types.hpp

@@ -1,20 +1,11 @@
 #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 NDIndexInt = uint32_t;

nac3core/src/codegen/builtin_fns.rs

@@ -1,32 +1,21 @@
-use inkwell::{
+use inkwell::types::BasicTypeEnum;
-    types::BasicTypeEnum,
+use inkwell::values::{BasicValue, BasicValueEnum, IntValue};
-    values::{BasicValue, BasicValueEnum, IntValue},
+use inkwell::{FloatPredicate, IntPredicate, OptimizationLevel};
-    FloatPredicate, IntPredicate, OptimizationLevel,
-};
 use itertools::Itertools;
 
-use super::{
+use super::model::*;
-    model::*,
+use super::object::any::AnyObject;
-    object::{
+use super::object::list::ListObject;
-        any::AnyObject,
+use super::object::ndarray::NDArrayObject;
-        list::ListObject,
+use super::object::tuple::TupleObject;
-        ndarray::{NDArrayObject, NDArrayOut, ScalarOrNDArray},
+use crate::codegen::classes::RangeValue;
-        tuple::TupleObject,
+use crate::codegen::expr::destructure_range;
-    },
+use crate::codegen::irrt::calculate_len_for_slice_range;
-};
+use crate::codegen::macros::codegen_unreachable;
-use crate::{
+use crate::codegen::object::ndarray::{NDArrayOut, ScalarOrNDArray};
-    codegen::{
+use crate::codegen::{extern_fns, irrt, llvm_intrinsics, CodeGenContext, CodeGenerator};
-        classes::RangeValue,
+use crate::toplevel::helper::PrimDef;
-        expr::destructure_range,
+use crate::typecheck::typedef::{Type, TypeEnum};
-        extern_fns, irrt,
-        irrt::calculate_len_for_slice_range,
-        llvm_intrinsics,
-        macros::codegen_unreachable,
-        CodeGenContext, CodeGenerator,
-    },
-    toplevel::helper::PrimDef,
-    typecheck::typedef::{Type, TypeEnum},
-};
 
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.
 ///

nac3core/src/codegen/classes.rs

@@ -1,16 +1,17 @@
-use inkwell::{
-    context::Context,
-    types::{AnyTypeEnum, ArrayType, BasicType, BasicTypeEnum, IntType, PointerType, StructType},
-    values::{ArrayValue, BasicValue, BasicValueEnum, IntValue, PointerValue, StructValue},
-    AddressSpace, IntPredicate,
-};
-
 use crate::codegen::{
     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()
     }
 }

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>,
 }

nac3core/src/codegen/expr.rs

@@ -1,30 +1,3 @@
-use std::{
-    cmp::min,
-    collections::HashMap,
-    convert::TryInto,
-    iter::{once, repeat, repeat_with, zip},
-};
-
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    types::{AnyType, BasicType, BasicTypeEnum},
-    values::{
-        BasicValue, 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::object::{
-    any::AnyObject,
-    ndarray::{indexing::util::gen_ndarray_subscript_ndindices, NDArrayObject},
-};
 use crate::{
     codegen::{
         classes::{
@@ -54,6 +27,28 @@ use crate::{
         typedef::{FunSignature, FuncArg, Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    types::{AnyType, BasicType, BasicTypeEnum},
+    values::{
+        BasicValue, BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue,
+        StructValue,
+    },
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+use itertools::{chain, izip, Either, Itertools};
+use nac3parser::ast::{
+    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
+    Unaryop,
+};
+use std::cmp::min;
+use std::iter::{repeat, repeat_with};
+use std::{collections::HashMap, convert::TryInto, iter::once, iter::zip};
+
+use super::object::{
+    any::AnyObject,
+    ndarray::{indexing::util::gen_ndarray_subscript_ndindices, NDArrayObject},
+};
 
 pub fn get_subst_key(
     unifier: &mut Unifier,
@@ -561,7 +556,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,
             })
@@ -981,7 +976,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| {
@@ -2491,31 +2485,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             Some((_, Some(static_value), _)) => ValueEnum::Static(static_value.clone()),
             None => {
                 let resolver = ctx.resolver.clone();
-                let value = resolver.get_symbol_value(*id, ctx, generator).unwrap();
+                resolver.get_symbol_value(*id, ctx).unwrap()
-
-                let globals = ctx
-                    .top_level
-                    .definitions
-                    .read()
-                    .iter()
-                    .filter_map(|def| {
-                        if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
-                            Some((*simple_name, *ty))
-                        } else {
-                            None
-                        }
-                    })
-                    .collect_vec();
-
-                if let Some((_, ty)) = globals.iter().find(|(name, _)| name == id) {
-                    let ptr = value
-                        .to_basic_value_enum(ctx, generator, *ty)
-                        .map(BasicValueEnum::into_pointer_value)?;
-
-                    ctx.builder.build_load(ptr, id.to_string().as_str()).map(Into::into).unwrap()
-                } else {
-                    value
-                }
             }
         },
         ExprKind::List { elts, .. } => {

nac3core/src/codegen/extern_fns.rs

@@ -1,7 +1,5 @@
-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 crate::codegen::CodeGenContext;

nac3core/src/codegen/generator.rs

@@ -1,17 +1,15 @@
-use inkwell::{
-    context::Context,
-    types::{BasicTypeEnum, IntType},
-    values::{BasicValueEnum, IntValue, PointerValue},
-};
-
-use nac3parser::ast::{Expr, Stmt, StrRef};
-
 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};
 
 pub trait CodeGenerator {
     /// Return the module name for the code generator.

nac3core/src/codegen/irrt/mod.rs

@@ -1,15 +1,4 @@
-use inkwell::{
+use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
-    attributes::{Attribute, AttributeLoc},
-    context::Context,
-    memory_buffer::MemoryBuffer,
-    module::Module,
-    types::{BasicTypeEnum, IntType},
-    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
-    AddressSpace, IntPredicate,
-};
-use itertools::Either;
-
-use nac3parser::ast::Expr;
 
 use super::{
     classes::{
@@ -26,8 +15,18 @@ use super::{
     stmt::gen_for_callback_incrementing,
     CodeGenContext, CodeGenerator,
 };
-use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
 use function::FnCall;
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    context::Context,
+    memory_buffer::MemoryBuffer,
+    module::Module,
+    types::{BasicTypeEnum, IntType},
+    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+    AddressSpace, IntPredicate,
+};
+use itertools::Either;
+use nac3parser::ast::Expr;
 
 #[must_use]
 pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver) -> Module<'ctx> {

nac3core/src/codegen/llvm_intrinsics.rs

@@ -1,13 +1,11 @@
-use inkwell::{
-    context::Context,
-    intrinsics::Intrinsic,
-    types::{AnyTypeEnum::IntType, FloatType},
-    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue},
-    AddressSpace,
-};
-use itertools::Either;
-
 use crate::codegen::CodeGenContext;
+use inkwell::context::Context;
+use inkwell::intrinsics::Intrinsic;
+use inkwell::types::AnyTypeEnum::IntType;
+use inkwell::types::FloatType;
+use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue};
+use inkwell::AddressSpace;
+use itertools::Either;
 
 /// Returns the string representation for the floating-point type `ft` when used in intrinsic
 /// functions.
@@ -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()
     };

nac3core/src/codegen/mod.rs

@@ -1,12 +1,12 @@
-use std::{
+use crate::{
-    collections::{HashMap, HashSet},
+    codegen::classes::{ListType, ProxyType, RangeType},
-    sync::{
+    symbol_resolver::{StaticValue, SymbolResolver},
-        atomic::{AtomicBool, Ordering},
+    toplevel::{helper::PrimDef, 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,16 @@ use inkwell::{
     AddressSpace, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
-use parking_lot::{Condvar, Mutex};
-
-use nac3parser::ast::{Location, Stmt, StrRef};
-
-use crate::{
-    codegen::classes::{ListType, ProxyType, RangeType},
-    symbol_resolver::{StaticValue, SymbolResolver},
-    toplevel::{helper::PrimDef, TopLevelContext, TopLevelDef},
-    typecheck::{
-        type_inferencer::{CodeLocation, PrimitiveStore},
-        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
-    },
-};
 use model::*;
+use nac3parser::ast::{Location, Stmt, StrRef};
 use object::ndarray::NDArray;
+use parking_lot::{Condvar, Mutex};
+use std::collections::{HashMap, HashSet};
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
+use std::thread;
 
 pub mod builtin_fns;
 pub mod classes;
@@ -852,9 +847,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(

nac3core/src/codegen/model/any.rs

@@ -4,9 +4,10 @@ use inkwell::{
     values::BasicValueEnum,
 };
 
-use super::*;
 use crate::codegen::CodeGenerator;
 
+use super::*;
+
 /// A [`Model`] of any [`BasicTypeEnum`].
 ///
 /// Use this when it is infeasible to use model abstractions.

nac3core/src/codegen/model/array.rs

@@ -6,9 +6,10 @@ use inkwell::{
     values::{ArrayValue, IntValue},
 };
 
-use super::*;
 use crate::codegen::{CodeGenContext, CodeGenerator};
 
+use super::*;
+
 /// Trait for Rust structs identifying length values for [`Array`].
 pub trait ArrayLen: fmt::Debug + Clone + Copy {
     fn length(&self) -> u32;

nac3core/src/codegen/model/float.rs

@@ -6,9 +6,10 @@ use inkwell::{
     values::FloatValue,
 };
 
-use super::*;
 use crate::codegen::CodeGenerator;
 
+use super::*;
+
 pub trait FloatKind<'ctx>: fmt::Debug + Clone + Copy {
     fn get_float_type<G: CodeGenerator + ?Sized>(
         &self,

nac3core/src/codegen/model/function.rs

@@ -5,9 +5,10 @@ use inkwell::{
 };
 use itertools::Itertools;
 
-use super::*;
 use crate::codegen::{CodeGenContext, CodeGenerator};
 
+use super::*;
+
 #[derive(Debug, Clone, Copy)]
 struct Arg<'ctx> {
     ty: BasicMetadataTypeEnum<'ctx>,

nac3core/src/codegen/model/int.rs

@@ -7,9 +7,10 @@ use inkwell::{
     IntPredicate,
 };
 
-use super::*;
 use crate::codegen::{CodeGenContext, CodeGenerator};
 
+use super::*;
+
 pub trait IntKind<'ctx>: fmt::Debug + Clone + Copy {
     fn get_int_type<G: CodeGenerator + ?Sized>(
         &self,

nac3core/src/codegen/model/ptr.rs

@@ -5,9 +5,10 @@ use inkwell::{
     AddressSpace,
 };
 
-use super::*;
 use crate::codegen::{llvm_intrinsics::call_memcpy_generic, CodeGenContext, CodeGenerator};
 
+use super::*;
+
 /// A model for [`PointerType`].
 ///
 /// `Item` is the element type this pointer is pointing to, and should be of a [`Model`].

nac3core/src/codegen/model/structure.rs

@@ -6,9 +6,10 @@ use inkwell::{
     values::{BasicValueEnum, StructValue},
 };
 
-use super::*;
 use crate::codegen::{CodeGenContext, CodeGenerator};
 
+use super::*;
+
 /// A traveral that traverses a Rust `struct` that is used to declare an LLVM's struct's field types.
 pub trait FieldTraversal<'ctx> {
     /// Output type of [`FieldTraversal::add`].

nac3core/src/codegen/model/util.rs

@@ -1,12 +1,13 @@
-use super::*;
 use crate::codegen::{
     stmt::{gen_for_callback_incrementing, BreakContinueHooks},
     CodeGenContext, CodeGenerator,
 };
 
+use super::*;
+
 /// Like [`gen_for_callback_incrementing`] with [`Model`] abstractions.
 ///
-/// The value for `stop` is exclusive.
+/// `stop` is not included.
 pub fn gen_for_model<'ctx, 'a, G, F, N>(
     generator: &mut G,
     ctx: &mut CodeGenContext<'ctx, 'a>,

nac3core/src/codegen/numpy.rs

@@ -1,11 +1,3 @@
-use inkwell::{
-    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
-    AddressSpace, IntPredicate,
-};
-
-use nac3parser::ast::StrRef;
-
 use crate::{
     codegen::{
         classes::{
@@ -39,6 +31,16 @@ use crate::{
     },
     typecheck::typedef::{FunSignature, Type},
 };
+use inkwell::{
+    types::BasicType,
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate,
+};
+use inkwell::{
+    types::{AnyTypeEnum, BasicTypeEnum, PointerType},
+    values::BasicValue,
+};
+use nac3parser::ast::StrRef;
 
 /// Creates an uninitialized `NDArray` instance.
 fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
@@ -944,7 +946,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();
@@ -966,7 +968,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);
@@ -985,9 +987,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();
 

nac3core/src/codegen/object/list.rs

@@ -1,9 +1,10 @@
-use super::any::AnyObject;
 use crate::{
     codegen::{model::*, CodeGenContext, CodeGenerator},
     typecheck::typedef::{iter_type_vars, Type, TypeEnum},
 };
 
+use super::any::AnyObject;
+
 /// Fields of [`List`]
 pub struct ListFields<'ctx, F: FieldTraversal<'ctx>, Item: Model<'ctx>> {
     /// Array pointer to content

nac3core/src/codegen/object/ndarray/factory.rs

@@ -1,6 +1,5 @@
 use inkwell::{values::BasicValueEnum, IntPredicate};
 
-use super::NDArrayObject;
 use crate::{
     codegen::{
         irrt::call_nac3_ndarray_util_assert_shape_no_negative, model::*, CodeGenContext,
@@ -9,6 +8,8 @@ use crate::{
     typecheck::typedef::Type,
 };
 
+use super::NDArrayObject;
+
 /// Get the zero value in `np.zeros()` of a `dtype`.
 fn ndarray_zero_value<'ctx, G: CodeGenerator + ?Sized>(
     generator: &mut G,

nac3core/src/codegen/object/ndarray/indexing.rs

@@ -1,4 +1,3 @@
-use super::NDArrayObject;
 use crate::codegen::{
     irrt::call_nac3_ndarray_index,
     model::*,
@@ -6,6 +5,8 @@ use crate::codegen::{
     CodeGenContext, CodeGenerator,
 };
 
+use super::NDArrayObject;
+
 pub type NDIndexType = Byte;
 
 /// Fields of [`NDIndex`]

nac3core/src/codegen/object/ndarray/mod.rs

@@ -1,3 +1,14 @@
+pub mod array;
+pub mod broadcast;
+pub mod contiguous;
+pub mod factory;
+pub mod indexing;
+pub mod map;
+pub mod matmul;
+pub mod nditer;
+pub mod shape_util;
+pub mod view;
+
 use inkwell::{
     context::Context,
     types::BasicType,
@@ -5,7 +16,6 @@ use inkwell::{
     AddressSpace,
 };
 
-use super::{any::AnyObject, tuple::TupleObject};
 use crate::{
     codegen::{
         irrt::{
@@ -25,16 +35,7 @@ use crate::{
     typecheck::typedef::{Type, TypeEnum},
 };
 
-pub mod array;
+use super::{any::AnyObject, tuple::TupleObject};
-pub mod broadcast;
-pub mod contiguous;
-pub mod factory;
-pub mod indexing;
-pub mod map;
-pub mod matmul;
-pub mod nditer;
-pub mod shape_util;
-pub mod view;
 
 /// Fields of [`NDArray`]
 pub struct NDArrayFields<'ctx, F: FieldTraversal<'ctx>> {

nac3core/src/codegen/object/ndarray/nditer.rs

@@ -1,6 +1,5 @@
 use inkwell::{types::BasicType, values::PointerValue, AddressSpace};
 
-use super::NDArrayObject;
 use crate::codegen::{
     irrt::{call_nac3_nditer_has_element, call_nac3_nditer_initialize, call_nac3_nditer_next},
     model::*,
@@ -9,6 +8,8 @@ use crate::codegen::{
     CodeGenContext, CodeGenerator,
 };
 
+use super::NDArrayObject;
+
 /// Fields of [`NDIter`]
 pub struct NDIterFields<'ctx, F: FieldTraversal<'ctx>> {
     pub ndims: F::Output<Int<SizeT>>,

nac3core/src/codegen/object/ndarray/shape_util.rs

@@ -1,3 +1,5 @@
+use util::gen_for_model;
+
 use crate::{
     codegen::{
         model::*,
@@ -6,7 +8,6 @@ use crate::{
     },
     typecheck::typedef::TypeEnum,
 };
-use util::gen_for_model;
 
 /// Parse a NumPy-like "int sequence" input and return the int sequence as an array and its length.
 ///

nac3core/src/codegen/object/ndarray/view.rs

@@ -1,10 +1,11 @@
-use super::{indexing::RustNDIndex, NDArrayObject};
 use crate::codegen::{
     irrt::{call_nac3_ndarray_reshape_resolve_and_check_new_shape, call_nac3_ndarray_transpose},
     model::*,
     CodeGenContext, CodeGenerator,
 };
 
+use super::{indexing::RustNDIndex, NDArrayObject};
+
 impl<'ctx> NDArrayObject<'ctx> {
     /// Make sure the ndarray is at least `ndmin`-dimensional.
     ///

nac3core/src/codegen/object/tuple.rs

@@ -1,12 +1,13 @@
 use inkwell::values::StructValue;
 use itertools::Itertools;
 
-use super::any::AnyObject;
 use crate::{
     codegen::{model::*, CodeGenContext, CodeGenerator},
     typecheck::typedef::{Type, TypeEnum},
 };
 
+use super::any::AnyObject;
+
 /// A NAC3 tuple object.
 ///
 /// NOTE: This struct has no copy trait.

nac3core/src/codegen/stmt.rs

@@ -1,16 +1,3 @@
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    basic_block::BasicBlock,
-    types::{BasicType, BasicTypeEnum},
-    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
-    IntPredicate,
-};
-use itertools::{izip, Itertools};
-
-use nac3parser::ast::{
-    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
-};
-
 use super::{
     classes::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
     expr::{destructure_range, gen_binop_expr},
@@ -33,6 +20,17 @@ use crate::{
         typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    basic_block::BasicBlock,
+    types::{BasicType, BasicTypeEnum},
+    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
+    IntPredicate,
+};
+use itertools::{izip, Itertools};
+use nac3parser::ast::{
+    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
+};
 
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
@@ -1874,37 +1872,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(())

nac3core/src/codegen/test.rs

@@ -1,20 +1,3 @@
-use std::{
-    collections::{HashMap, HashSet},
-    sync::Arc,
-};
-
-use indexmap::IndexMap;
-use indoc::indoc;
-use inkwell::{
-    targets::{InitializationConfig, Target},
-    OptimizationLevel,
-};
-use nac3parser::{
-    ast::{fold::Fold, FileName, StrRef},
-    parser::parse_program,
-};
-use parking_lot::RwLock;
-
 use crate::{
     codegen::{
         classes::{ListType, NDArrayType, ProxyType, RangeType},
@@ -28,10 +11,24 @@ use crate::{
         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,

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;

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>;

nac3core/src/toplevel/builtins.rs

@@ -1,5 +1,6 @@
 use std::iter::once;
 
+use helper::{debug_assert_prim_is_allowed, extract_ndims, make_exception_fields, PrimDefDetails};
 use indexmap::IndexMap;
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -11,10 +12,6 @@ use itertools::Either;
 use numpy::unpack_ndarray_var_tys;
 use strum::IntoEnumIterator;
 
-use super::{
-    helper::{debug_assert_prim_is_allowed, extract_ndims, make_exception_fields, PrimDefDetails},
-    *,
-};
 use crate::{
     codegen::{
         builtin_fns,
@@ -32,6 +29,8 @@ use crate::{
     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(

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,18 +962,18 @@ 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()
+                        .iter()
-                    .rev()
+                        .rev()
-                    .zip(
+                        .zip(
-                        args.defaults
+                            args.defaults
-                            .iter()
+                                .iter()
-                            .rev()
+                                .rev()
-                            .map(|x| -> Option<&Expr> { Some(x) })
+                                .map(|x| -> Option<&ast::Expr> { Some(x) })
-                            .chain(std::iter::repeat(None)),
+                                .chain(std::iter::repeat(None)),
-                    )
+                        )
-                    .collect_vec();
+                        .collect_vec();
 
                 arg_with_default
                     .iter()
@@ -1204,8 +1128,6 @@ impl TopLevelComposer {
             })?;
             Ok(())
         };
-
-        let mut errors = HashSet::new();
         for (function_def, function_ast) in def_list.iter().skip(self.builtin_num) {
             if function_ast.is_none() {
                 continue;
@@ -1307,7 +1229,7 @@ impl TopLevelComposer {
 
                         let arg_with_default: Vec<(
                             &ast::Located<ast::ArgData<()>>,
-                            Option<&Expr>,
+                            Option<&ast::Expr>,
                         )> = args
                             .args
                             .iter()
@@ -1316,7 +1238,7 @@ impl TopLevelComposer {
                                 args.defaults
                                     .iter()
                                     .rev()
-                                    .map(|x| -> Option<&Expr> { Some(x) })
+                                    .map(|x| -> Option<&ast::Expr> { Some(x) })
                                     .chain(std::iter::repeat(None)),
                             )
                             .collect_vec();
@@ -1473,7 +1395,7 @@ impl TopLevelComposer {
                         .map_err(|e| HashSet::from([e.to_display(unifier).to_string()]))?;
                 }
                 ast::StmtKind::AnnAssign { target, annotation, value, .. } => {
-                    if let ExprKind::Name { id: attr, .. } = &target.node {
+                    if let ast::ExprKind::Name { id: attr, .. } = &target.node {
                         if defined_fields.insert(attr.to_string()) {
                             let dummy_field_type = unifier.get_dummy_var().ty;
 
@@ -1481,7 +1403,7 @@ impl TopLevelComposer {
                                 None => {
                                     // handle Kernel[T], KernelInvariant[T]
                                     let (annotation, mutable) = match &annotation.node {
-                                        ExprKind::Subscript { value, slice, .. }
+                                        ast::ExprKind::Subscript { value, slice, .. }
                                             if matches!(
                                                 &value.node,
                                                 ast::ExprKind::Name { id, .. } if id == &core_config.kernel_invariant_ann.into()
@@ -1489,7 +1411,7 @@ impl TopLevelComposer {
                                         {
                                             (slice, false)
                                         }
-                                        ExprKind::Subscript { value, slice, .. }
+                                        ast::ExprKind::Subscript { value, slice, .. }
                                             if matches!(
                                                 &value.node,
                                                 ast::ExprKind::Name { id, .. } if core_config.kernel_ann.map_or(false, |c| id == &c.into())
@@ -1507,13 +1429,13 @@ impl TopLevelComposer {
                                 Some(boxed_expr) => {
                                     // Class attributes are set as immutable regardless
                                     let (annotation, _) = match &annotation.node {
-                                        ExprKind::Subscript { slice, .. } => (slice, false),
+                                        ast::ExprKind::Subscript { slice, .. } => (slice, false),
                                         _ if core_config.kernel_ann.is_none() => (annotation, false),
                                         _ => continue,
                                     };
 
                                     match &**boxed_expr {
-                                        ast::Located {location: _, custom: (), node: ExprKind::Constant { value: v, kind: _ }} => {
+                                        ast::Located {location: _, custom: (), node: ast::ExprKind::Constant { value: v, kind: _ }} => {
                                             // Restricting the types allowed to be defined as class attributes
                                             match v {
                                                 ast::Constant::Bool(_) | ast::Constant::Str(_) | ast::Constant::Int(_) | ast::Constant::Float(_) => {}
@@ -1780,6 +1702,7 @@ impl TopLevelComposer {
             }
         }
 
+        let mut errors = HashSet::new();
         let mut analyze = |i, def: &Arc<RwLock<TopLevelDef>>, ast: &Option<Stmt>| {
             let class_def = def.read();
             if let TopLevelDef::Class {
@@ -1922,8 +1845,6 @@ impl TopLevelComposer {
             }
             Ok(())
         };
-
-        let mut errors = HashSet::new();
         for (i, (def, ast)) in definition_ast_list.iter().enumerate().skip(self.builtin_num) {
             if ast.is_none() {
                 continue;
@@ -1961,296 +1882,272 @@ 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,
+                simple_name,
+                signature,
+                resolver,
+                ..
+            } = &mut *function_def
+            {
+                let signature_ty_enum = unifier.get_ty(*signature);
+                let TypeEnum::TFunc(FunSignature { args, ret, vars }) = signature_ty_enum.as_ref()
                 else {
-                    return Ok(());
+                    unreachable!("must be typeenum::tfunc")
                 };
 
-                (name.clone(), *simple_name, *signature, resolver.clone())
+                let mut vars = vars.clone();
-            };
+                // None if is not class method
+                let uninst_self_type = {
+                    if let Some(class_id) = method_class.get(&DefinitionId(id)) {
+                        let class_def = definition_ast_list.get(class_id.0).unwrap();
+                        let class_def = class_def.0.read();
+                        let TopLevelDef::Class { type_vars, .. } = &*class_def else {
+                            unreachable!("must be class def")
+                        };
 
-            let signature_ty_enum = unifier.get_ty(signature);
+                        let ty_ann = make_self_type_annotation(type_vars, *class_id);
-            let TypeEnum::TFunc(FunSignature { args, ret, vars, .. }) = signature_ty_enum.as_ref()
+                        let self_ty = get_type_from_type_annotation_kinds(
-            else {
+                            &def_list,
-                unreachable!("must be typeenum::tfunc")
+                            unifier,
-            };
+                            primitives_ty,
+                            &ty_ann,
+                            &mut None,
+                        )?;
+                        vars.extend(type_vars.iter().map(|ty| {
+                            let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*ty) else {
+                                unreachable!()
+                            };
 
-            let mut vars = vars.clone();
+                            (*id, *ty)
-            // None if is not class method
+                        }));
-            let uninst_self_type = {
+                        Some((self_ty, type_vars.clone()))
-                if let Some(class_id) = method_class.get(&DefinitionId(id)) {
+                    } else {
-                    let class_def = definition_ast_list.get(class_id.0).unwrap();
+                        None
-                    let class_def = class_def.0.read();
+                    }
-                    let TopLevelDef::Class { type_vars, .. } = &*class_def else {
+                };
-                        unreachable!("must be class def")
+                // carefully handle those with bounds, without bounds and no typevars
+                // if class methods, `vars` also contains all class typevars here
+                let (type_var_subst_comb, no_range_vars) = {
+                    let mut no_ranges: Vec<Type> = Vec::new();
+                    let var_combs = vars
+                        .values()
+                        .map(|ty| {
+                            unifier.get_instantiations(*ty).unwrap_or_else(|| {
+                                let TypeEnum::TVar { name, loc, is_const_generic: false, .. } =
+                                    &*unifier.get_ty(*ty)
+                                else {
+                                    unreachable!()
+                                };
+
+                                let rigid = unifier.get_fresh_rigid_var(*name, *loc).ty;
+                                no_ranges.push(rigid);
+                                vec![rigid]
+                            })
+                        })
+                        .multi_cartesian_product()
+                        .collect_vec();
+                    let mut result: Vec<VarMap> = Vec::default();
+                    for comb in var_combs {
+                        result.push(vars.keys().copied().zip(comb).collect());
+                    }
+                    // NOTE: if is empty, means no type var, append a empty subst, ok to do this?
+                    if result.is_empty() {
+                        result.push(VarMap::new());
+                    }
+                    (result, no_ranges)
+                };
+
+                for subst in type_var_subst_comb {
+                    // for each instance
+                    let inst_ret = unifier.subst(*ret, &subst).unwrap_or(*ret);
+                    let inst_args = {
+                        args.iter()
+                            .map(|a| FuncArg {
+                                name: a.name,
+                                ty: unifier.subst(a.ty, &subst).unwrap_or(a.ty),
+                                default_value: a.default_value.clone(),
+                                is_vararg: false,
+                            })
+                            .collect_vec()
+                    };
+                    let self_type = {
+                        uninst_self_type.clone().map(|(self_type, type_vars)| {
+                            let subst_for_self = {
+                                let class_ty_var_ids = type_vars
+                                    .iter()
+                                    .map(|x| {
+                                        if let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*x) {
+                                            *id
+                                        } else {
+                                            unreachable!("must be type var here");
+                                        }
+                                    })
+                                    .collect::<HashSet<_>>();
+                                subst
+                                    .iter()
+                                    .filter_map(|(ty_var_id, ty_var_target)| {
+                                        if class_ty_var_ids.contains(ty_var_id) {
+                                            Some((*ty_var_id, *ty_var_target))
+                                        } else {
+                                            None
+                                        }
+                                    })
+                                    .collect::<VarMap>()
+                            };
+                            unifier.subst(self_type, &subst_for_self).unwrap_or(self_type)
+                        })
+                    };
+                    let mut identifiers = {
+                        let mut result: HashSet<_> = HashSet::new();
+                        if self_type.is_some() {
+                            result.insert("self".into());
+                        }
+                        result.extend(inst_args.iter().map(|x| x.name));
+                        result
+                    };
+                    let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
+                    let mut inferencer = Inferencer {
+                        top_level: ctx.as_ref(),
+                        defined_identifiers: identifiers.clone(),
+                        function_data: &mut FunctionData {
+                            resolver: resolver.as_ref().unwrap().clone(),
+                            return_type: if unifier.unioned(inst_ret, primitives_ty.none) {
+                                None
+                            } else {
+                                Some(inst_ret)
+                            },
+                            // NOTE: allowed type vars
+                            bound_variables: no_range_vars.clone(),
+                        },
+                        unifier,
+                        variable_mapping: {
+                            let mut result: HashMap<StrRef, Type> = HashMap::new();
+                            if let Some(self_ty) = self_type {
+                                result.insert("self".into(), self_ty);
+                            }
+                            result.extend(inst_args.iter().map(|x| (x.name, x.ty)));
+                            result
+                        },
+                        primitives: primitives_ty,
+                        virtual_checks: &mut Vec::new(),
+                        calls: &mut calls,
+                        in_handler: false,
                     };
 
-                    let ty_ann = make_self_type_annotation(type_vars, *class_id);
+                    let ast::StmtKind::FunctionDef { body, decorator_list, .. } =
-                    let self_ty = get_type_from_type_annotation_kinds(
+                        ast.clone().unwrap().node
-                        &def_list,
+                    else {
-                        unifier,
+                        unreachable!("must be function def ast")
-                        primitives_ty,
+                    };
-                        &ty_ann,
+                    if !decorator_list.is_empty()
-                        &mut None,
+                        && matches!(&decorator_list[0].node,
-                    )?;
+                            ast::ExprKind::Name{ id, .. } if id == &"extern".into())
-                    vars.extend(type_vars.iter().map(|ty| {
+                    {
-                        let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*ty) else {
+                        instance_to_symbol.insert(String::new(), simple_name.to_string());
-                            unreachable!()
+                        continue;
-                        };
+                    }
-
+                    if !decorator_list.is_empty()
-                        (*id, *ty)
+                        && matches!(&decorator_list[0].node,
-                    }));
+                            ast::ExprKind::Name{ id, .. } if id == &"rpc".into())
-                    Some((self_ty, type_vars.clone()))
-                } else {
-                    None
-                }
-            };
-            // carefully handle those with bounds, without bounds and no typevars
-            // if class methods, `vars` also contains all class typevars here
-            let (type_var_subst_comb, no_range_vars) = {
-                let mut no_ranges: Vec<Type> = Vec::new();
-                let var_combs = vars
-                    .values()
-                    .map(|ty| {
-                        unifier.get_instantiations(*ty).unwrap_or_else(|| {
-                            let TypeEnum::TVar { name, loc, is_const_generic: false, .. } =
-                                &*unifier.get_ty(*ty)
-                            else {
-                                unreachable!()
-                            };
-
-                            let rigid = unifier.get_fresh_rigid_var(*name, *loc).ty;
-                            no_ranges.push(rigid);
-                            vec![rigid]
-                        })
-                    })
-                    .multi_cartesian_product()
-                    .collect_vec();
-                let mut result: Vec<VarMap> = Vec::default();
-                for comb in var_combs {
-                    result.push(vars.keys().copied().zip(comb).collect());
-                }
-                // NOTE: if is empty, means no type var, append a empty subst, ok to do this?
-                if result.is_empty() {
-                    result.push(VarMap::new());
-                }
-                (result, no_ranges)
-            };
-
-            for subst in type_var_subst_comb {
-                // for each instance
-                let inst_ret = unifier.subst(*ret, &subst).unwrap_or(*ret);
-                let inst_args = {
-                    args.iter()
-                        .map(|a| FuncArg {
-                            name: a.name,
-                            ty: unifier.subst(a.ty, &subst).unwrap_or(a.ty),
-                            default_value: a.default_value.clone(),
-                            is_vararg: false,
-                        })
-                        .collect_vec()
-                };
-                let self_type = {
-                    uninst_self_type.clone().map(|(self_type, type_vars)| {
-                        let subst_for_self = {
-                            let class_ty_var_ids = type_vars
-                                .iter()
-                                .map(|x| {
-                                    if let TypeEnum::TVar { id, .. } = &*unifier.get_ty(*x) {
-                                        *id
-                                    } else {
-                                        unreachable!("must be type var here");
-                                    }
-                                })
-                                .collect::<HashSet<_>>();
-                            subst
-                                .iter()
-                                .filter_map(|(ty_var_id, ty_var_target)| {
-                                    if class_ty_var_ids.contains(ty_var_id) {
-                                        Some((*ty_var_id, *ty_var_target))
-                                    } else {
-                                        None
-                                    }
-                                })
-                                .collect::<VarMap>()
-                        };
-                        unifier.subst(self_type, &subst_for_self).unwrap_or(self_type)
-                    })
-                };
-                let mut identifiers = {
-                    let mut result = HashMap::new();
-                    if self_type.is_some() {
-                        result.insert("self".into(), IdentifierInfo::default());
-                    }
-                    result.extend(inst_args.iter().map(|x| (x.name, IdentifierInfo::default())));
-                    result
-                };
-                let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
-                let mut inferencer = Inferencer {
-                    top_level: ctx.as_ref(),
-                    defined_identifiers: identifiers.clone(),
-                    function_data: &mut FunctionData {
-                        resolver: resolver.as_ref().unwrap().clone(),
-                        return_type: if unifier.unioned(inst_ret, primitives_ty.none) {
-                            None
-                        } else {
-                            Some(inst_ret)
-                        },
-                        // NOTE: allowed type vars
-                        bound_variables: no_range_vars.clone(),
-                    },
-                    unifier,
-                    variable_mapping: {
-                        let mut result: HashMap<StrRef, Type> = HashMap::new();
-                        if let Some(self_ty) = self_type {
-                            result.insert("self".into(), self_ty);
-                        }
-                        result.extend(inst_args.iter().map(|x| (x.name, x.ty)));
-                        result
-                    },
-                    primitives: primitives_ty,
-                    virtual_checks: &mut Vec::new(),
-                    calls: &mut calls,
-                    in_handler: false,
-                };
-
-                let ast::StmtKind::FunctionDef { body, decorator_list, .. } =
-                    ast.clone().unwrap().node
-                else {
-                    unreachable!("must be function def ast")
-                };
-
-                if !decorator_list.is_empty() {
-                    if matches!(&decorator_list[0].node, 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 matches!(&decorator_list[0].node, ExprKind::Name { id, .. } if id == &"rpc".into())
+                    let fun_body = body
-                    {
+                        .into_iter()
-                        let TopLevelDef::Function { instance_to_symbol, .. } = &mut *def.write()
-                        else {
-                            unreachable!()
-                        };
-                        instance_to_symbol.insert(String::new(), simple_name.to_string());
-                        continue;
-                    }
-
-                    if let ExprKind::Call { func, .. } = &decorator_list[0].node {
-                        if matches!(&func.node, ExprKind::Name { id, .. } if id == &"rpc".into()) {
-                            let TopLevelDef::Function { instance_to_symbol, .. } =
-                                &mut *def.write()
-                            else {
-                                unreachable!()
-                            };
-                            instance_to_symbol.insert(String::new(), simple_name.to_string());
-                            continue;
-                        }
-                    }
-                }
-
-                let fun_body =
-                    body.into_iter()
                         .map(|b| inferencer.fold_stmt(b))
                         .collect::<Result<Vec<_>, _>>()?;
 
-                let returned = inferencer.check_block(fun_body.as_slice(), &mut identifiers)?;
+                    let returned = inferencer.check_block(fun_body.as_slice(), &mut identifiers)?;
-                {
+                    {
-                    // check virtuals
+                        // check virtuals
-                    let defs = ctx.definitions.read();
+                        let defs = ctx.definitions.read();
-                    for (subtype, base, loc) in &*inferencer.virtual_checks {
+                        for (subtype, base, loc) in &*inferencer.virtual_checks {
-                        let base_id = {
+                            let base_id = {
-                            let base = inferencer.unifier.get_ty(*base);
+                                let base = inferencer.unifier.get_ty(*base);
-                            if let TypeEnum::TObj { obj_id, .. } = &*base {
+                                if let TypeEnum::TObj { obj_id, .. } = &*base {
-                                *obj_id
+                                    *obj_id
-                            } else {
+                                } else {
-                                return Err(HashSet::from([format!(
+                                    return Err(HashSet::from([format!(
-                                    "Base type should be a class (at {loc})"
+                                        "Base type should be a class (at {loc})"
-                                )]));
+                                    )]));
-                            }
+                                }
-                        };
+                            };
-                        let subtype_id = {
+                            let subtype_id = {
-                            let ty = inferencer.unifier.get_ty(*subtype);
+                                let ty = inferencer.unifier.get_ty(*subtype);
-                            if let TypeEnum::TObj { obj_id, .. } = &*ty {
+                                if let TypeEnum::TObj { obj_id, .. } = &*ty {
-                                *obj_id
+                                    *obj_id
-                            } else {
+                                } else {
+                                    let base_repr = inferencer.unifier.stringify(*base);
+                                    let subtype_repr = inferencer.unifier.stringify(*subtype);
+                                    return Err(HashSet::from([format!(
+                                        "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
+                                    ]));
+                                }
+                            };
+                            let subtype_entry = defs[subtype_id.0].read();
+                            let TopLevelDef::Class { ancestors, .. } = &*subtype_entry else {
+                                unreachable!()
+                            };
+
+                            let m = ancestors.iter()
+                                .find(|kind| matches!(kind, TypeAnnotation::CustomClass { id, .. } if *id == base_id));
+                            if m.is_none() {
                                 let base_repr = inferencer.unifier.stringify(*base);
                                 let subtype_repr = inferencer.unifier.stringify(*subtype);
                                 return Err(HashSet::from([format!(
                                     "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
                                 ]));
                             }
-                        };
-                        let subtype_entry = defs[subtype_id.0].read();
-                        let TopLevelDef::Class { ancestors, .. } = &*subtype_entry else {
-                            unreachable!()
-                        };
-
-                        let m = ancestors.iter()
-                            .find(|kind| matches!(kind, TypeAnnotation::CustomClass { id, .. } if *id == base_id));
-                        if m.is_none() {
-                            let base_repr = inferencer.unifier.stringify(*base);
-                            let subtype_repr = inferencer.unifier.stringify(*subtype);
-                            return Err(HashSet::from([format!(
-                                "Expected a subtype of {base_repr}, but got {subtype_repr} (at {loc})"),
-                            ]));
                         }
                     }
-                }
+                    if !unifier.unioned(inst_ret, primitives_ty.none) && !returned {
-                if !unifier.unioned(inst_ret, primitives_ty.none) && !returned {
+                        let def_ast_list = &definition_ast_list;
-                    let def_ast_list = &definition_ast_list;
+                        let ret_str = unifier.internal_stringify(
-                    let ret_str = unifier.internal_stringify(
+                            inst_ret,
-                        inst_ret,
+                            &mut |id| {
-                        &mut |id| {
+                                let TopLevelDef::Class { name, .. } = &*def_ast_list[id].0.read()
-                            let TopLevelDef::Class { name, .. } = &*def_ast_list[id].0.read()
+                                else {
-                            else {
+                                    unreachable!("must be class id here")
-                                unreachable!("must be class id here")
+                                };
-                            };
 
-                            name.to_string()
+                                name.to_string()
+                            },
+                            &mut |id| format!("typevar{id}"),
+                            &mut None,
+                        );
+                        return Err(HashSet::from([format!(
+                            "expected return type of `{}` in function `{}` (at {})",
+                            ret_str,
+                            name,
+                            ast.as_ref().unwrap().location
+                        )]));
+                    }
+
+                    instance_to_stmt.insert(
+                        get_subst_key(
+                            unifier,
+                            self_type,
+                            &subst,
+                            Some(&vars.keys().copied().collect()),
+                        ),
+                        FunInstance {
+                            body: Arc::new(fun_body),
+                            unifier_id: 0,
+                            calls: Arc::new(calls),
+                            subst,
                         },
-                        &mut |id| format!("typevar{id}"),
-                        &mut None,
                     );
-                    return Err(HashSet::from([format!(
-                        "expected return type of `{}` in function `{}` (at {})",
-                        ret_str,
-                        name,
-                        ast.as_ref().unwrap().location
-                    )]));
                 }
-
-                let TopLevelDef::Function { instance_to_stmt, .. } = &mut *def.write() else {
-                    unreachable!()
-                };
-                instance_to_stmt.insert(
-                    get_subst_key(
-                        unifier,
-                        self_type,
-                        &subst,
-                        Some(&vars.keys().copied().collect()),
-                    ),
-                    FunInstance {
-                        body: Arc::new(fun_body),
-                        unifier_id: 0,
-                        calls: Arc::new(calls),
-                        subst,
-                    },
-                );
             }
 
             Ok(())
         };
-
         for (id, (def, ast)) in self.definition_ast_list.iter().enumerate().skip(self.builtin_num) {
             if ast.is_none() {
                 continue;
@@ -2264,59 +2161,4 @@ impl TopLevelComposer {
         }
         Ok(())
     }
-
-    /// Step 6. Analyze and populate the types of global variables.
-    fn analyze_top_level_variables(&mut self) -> Result<(), HashSet<String>> {
-        let def_list = &self.definition_ast_list;
-        let temp_def_list = self.extract_def_list();
-        let unifier = &mut self.unifier;
-        let primitives_store = &self.primitives_ty;
-
-        let mut analyze = |variable_def: &Arc<RwLock<TopLevelDef>>| -> Result<_, HashSet<String>> {
-            let TopLevelDef::Variable { ty: dummy_ty, ty_decl, resolver, loc, .. } =
-                &*variable_def.read()
-            else {
-                // not top level variable def, skip
-                return Ok(());
-            };
-
-            let resolver = &**resolver.as_ref().unwrap();
-
-            if let Some(ty_decl) = ty_decl {
-                let ty_annotation = parse_ast_to_type_annotation_kinds(
-                    resolver,
-                    &temp_def_list,
-                    unifier,
-                    primitives_store,
-                    ty_decl,
-                    HashMap::new(),
-                )?;
-                let ty_from_ty_annotation = get_type_from_type_annotation_kinds(
-                    &temp_def_list,
-                    unifier,
-                    primitives_store,
-                    &ty_annotation,
-                    &mut None,
-                )?;
-
-                unifier.unify(*dummy_ty, ty_from_ty_annotation).map_err(|e| {
-                    HashSet::from([e.at(Some(loc.unwrap())).to_display(unifier).to_string()])
-                })?;
-            }
-
-            Ok(())
-        };
-
-        let mut errors = HashSet::new();
-        for (variable_def, _) in def_list.iter().skip(self.builtin_num) {
-            if let Err(e) = analyze(variable_def) {
-                errors.extend(e);
-            }
-        }
-        if !errors.is_empty() {
-            return Err(errors);
-        }
-
-        Ok(())
-    }
 }

nac3core/src/toplevel/helper.rs

@@ -1,17 +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 ast::ExprKind;
-use nac3parser::ast::{Constant, Location};
-
 use super::*;
-use crate::{
-    symbol_resolver::SymbolValue,
-    toplevel::numpy::unpack_ndarray_var_tys,
-    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)]
@@ -407,9 +404,6 @@ impl TopLevelDef {
                     r
                 }
             ),
-            TopLevelDef::Variable { name, ty, .. } => {
-                format!("Variable {{ name: {name:?}, ty: {:?} }}", unifier.stringify(*ty),)
-            }
         }
     }
 }
@@ -611,18 +605,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('.');

nac3core/src/toplevel/mod.rs

@@ -6,23 +6,23 @@ 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 inkwell::values::BasicValueEnum;
+use itertools::Itertools;
+use nac3parser::ast::{self, Location, Stmt, StrRef};
+use parking_lot::RwLock;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
 pub struct DefinitionId(pub usize);
@@ -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 {

nac3core/src/toplevel/numpy.rs

@@ -1,5 +1,3 @@
-use itertools::Itertools;
-
 use crate::{
     toplevel::helper::PrimDef,
     typecheck::{
@@ -7,6 +5,7 @@ use crate::{
         typedef::{Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
+use itertools::Itertools;
 
 /// Creates a `ndarray` [`Type`] with the given type arguments.
 ///

nac3core/src/toplevel/test.rs

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

nac3core/src/toplevel/type_annotation.rs

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

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 {

nac3core/src/typecheck/magic_methods.rs

@@ -1,22 +1,19 @@
-use std::{cmp::max, collections::HashMap, rc::Rc};
+use crate::symbol_resolver::SymbolValue;
-
+use crate::toplevel::helper::{extract_ndims, PrimDef};
+use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_var_tys};
+use crate::typecheck::{
+    type_inferencer::*,
+    typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
+};
 use itertools::{iproduct, Itertools};
+use nac3parser::ast::StrRef;
+use nac3parser::ast::{Cmpop, Operator, Unaryop};
+use std::cmp::max;
+use std::collections::HashMap;
+use std::rc::Rc;
 use strum::IntoEnumIterator;
 
-use nac3parser::ast::{Cmpop, Operator, StrRef, Unaryop};
-
 use super::typedef::into_var_map;
-use crate::{
-    symbol_resolver::SymbolValue,
-    toplevel::{
-        helper::{extract_ndims, PrimDef},
-        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
-    },
-    typecheck::{
-        type_inferencer::*,
-        typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
-    },
-};
 
 /// The variant of a binary operator.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

nac3core/src/typecheck/type_error.rs

@@ -1,14 +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,
     typedef::{RecordKey, Type, Unifier},
 };
-use crate::typecheck::{magic_methods::HasOpInfo, typedef::TypeEnum};
+use itertools::Itertools;
+use nac3parser::ast::{Cmpop, Location, StrRef};
 
 #[derive(Debug, Clone)]
 pub enum TypeErrorKind {

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::{self, once};
-    convert::{From, TryInto},
+use std::{cell::RefCell, sync::Arc};
-    iter::{self, 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
@@ -1641,29 +1589,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,
                     },
@@ -1681,7 +1636,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![],
                 },
             }));
@@ -2724,22 +2679,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)
-    }
 }

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();

nac3core/src/typecheck/typedef/mod.rs

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

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 {

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;

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"
 

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(

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)]

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>>,

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>,

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 {

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.

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)]

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"]

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

nac3standalone/demo/src/ndarray.py

@@ -127,22 +127,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)

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,6 +7,10 @@ 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>>,
@@ -50,51 +45,20 @@ impl SymbolResolver for Resolver {
 
     fn get_symbol_type(
         &self,
-        unifier: &mut Unifier,
+        _: &mut Unifier,
         _: &[Arc<RwLock<TopLevelDef>>],
-        primitives: &PrimitiveStore,
+        _: &PrimitiveStore,
         str: StrRef,
     ) -> Result<Type, String> {
-        self.0
+        self.0.id_to_type.lock().get(&str).copied().ok_or(format!("cannot get type of {str}"))
-            .id_to_type
-            .lock()
-            .get(&str)
-            .copied()
-            .or_else(|| {
-                self.0
-                    .module_globals
-                    .lock()
-                    .get(&str)
-                    .cloned()
-                    .map(|v| v.get_type(primitives, unifier))
-            })
-            .ok_or(format!("cannot get type of {str}"))
     }
 
     fn get_symbol_value<'ctx>(
         &self,
-        str: StrRef,
+        _: StrRef,
-        ctx: &mut CodeGenContext<'ctx, '_>,
+        _: &mut CodeGenContext<'ctx, '_>,
-        generator: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
-        self.0.module_globals.lock().get(&str).cloned().map(|v| {
+        unimplemented!()
-            ctx.module
-                .get_global(&str.to_string())
-                .unwrap_or_else(|| {
-                    let ty = v.get_type(&ctx.primitives, &mut ctx.unifier);
-
-                    let init_val = ctx.gen_symbol_val(generator, &v, ty);
-                    let llvm_ty = init_val.get_type();
-
-                    let global = ctx.module.add_global(llvm_ty, None, &str.to_string());
-                    global.set_linkage(Linkage::LinkOnceAny);
-                    global.set_initializer(&init_val);
-
-                    global
-                })
-                .as_basic_value_enum()
-                .into()
-        })
     }
 
     fn get_identifier_def(&self, id: StrRef) -> Result<DefinitionId, HashSet<String>> {

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,6 +31,14 @@ use nac3core::{
         typedef::{FunSignature, Type, Unifier, VarMap},
     },
 };
+use nac3parser::{
+    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::*;
@@ -174,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 {
@@ -226,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(())
@@ -246,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 } =
@@ -319,19 +280,22 @@ fn main() {
         reloc_mode: RelocMode::PIC,
         ..host_target_machine
     };
-    let target_machine = target_machine_options
-        .create_target_machine(opt_level)
-        .expect("couldn't create target machine");
 
-    let context = nac3core::inkwell::context::Context::create();
+    let size_t = Context::create()
-
+        .ptr_sized_int_type(
-    let size_t =
+            &target_machine_options
-        context.ptr_sized_int_type(&target_machine.get_target_data(), None).get_bit_width();
+                .create_target_machine(opt_level)
+                .map(|tm| tm.get_target_data())
+                .unwrap(),
+            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;
         }
     };
 
@@ -349,6 +313,8 @@ fn main() {
     let resolver =
         Arc::new(Resolver(internal_resolver.clone())) as Arc<dyn SymbolResolver + Send + Sync>;
 
+    let context = inkwell::context::Context::create();
+
     // Process IRRT
     let irrt = load_irrt(&context, resolver.as_ref());
     if emit_llvm {
@@ -361,29 +327,22 @@ fn main() {
     for stmt in parser_result {
         match &stmt.node {
             StmtKind::Assign { targets, value, .. } => {
+                let def_list = composer.extract_def_list();
+                let unifier = &mut composer.unifier;
+                let primitives = &composer.primitives_ty;
                 if let Err(err) = handle_assignment_pattern(
                     targets,
                     value,
-                    resolver.clone(),
+                    resolver.as_ref(),
                     internal_resolver.as_ref(),
-                    &mut composer,
+                    &def_list,
+                    unifier,
+                    primitives,
                 ) {
-                    panic!("{err}");
+                    eprintln!("{err}");
+                    return;
                 }
             }
-
-            StmtKind::AnnAssign { target, value, .. } => {
-                if let Err(err) = handle_global_var(
-                    target,
-                    value.as_ref().map(Box::as_ref),
-                    &resolver,
-                    internal_resolver.as_ref(),
-                    &mut composer,
-                ) {
-                    panic!("{err}");
-                }
-            }
-
             // allow (and ignore) "from __future__ import annotations"
             StmtKind::ImportFrom { module, names, .. }
                 if module == &Some("__future__".into())
@@ -494,12 +453,17 @@ fn main() {
     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);

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
 }

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

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

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";
 })
 ]