artiq: Remove all uses to gil-refs APIs

With the extensive use of as_gil_ref. Will have to refactor those away
as well.

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.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
 
 [[package]]
 name = "bitflags"
@@ -126,9 +126,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "shlex",
 ]
@@ -141,9 +141,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.19"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -151,9 +151,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.19"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -163,14 +163,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",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -282,6 +282,27 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -385,33 +406,12 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 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 +424,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -460,7 +460,7 @@ checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -509,9 +509,9 @@ dependencies = [
 
 [[package]]
 name = "lalrpop"
-version = "0.22.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06093b57658c723a21da679530e061a8c25340fa5a6f98e313b542268c7e2a1f"
+checksum = "6e56f323e2d610628d1f5bdd39168a774674ac7989ed67011963bb3f71edd797"
 dependencies = [
  "ascii-canvas",
  "bit-set",
@@ -531,12 +531,11 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-util"
-version = "0.22.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feee752d43abd0f4807a921958ab4131f692a44d4d599733d4419c5d586176ce"
+checksum = "108dc8f5dabad92c65a03523055577d847f5dcc00f3e7d3a68bc4d48e01d8fe1"
 dependencies = [
  "regex-automata",
- "rustversion",
 ]
 
 [[package]]
@@ -547,9 +546,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 +560,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"
@@ -644,7 +653,7 @@ name = "nac3core"
 version = "0.1.0"
 dependencies = [
  "crossbeam",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
  "indoc",
  "inkwell",
  "insta",
@@ -698,12 +707,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 +741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
 ]
 
 [[package]]
@@ -778,7 +784,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -807,9 +813,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"
@@ -837,15 +843,15 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.21.2"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
  "memoffset",
- "parking_lot",
+ "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
@@ -855,9 +861,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.21.2"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -865,9 +871,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.21.2"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -875,27 +881,27 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.21.2"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.21.2"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -959,18 +965,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 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 +997,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 +1008,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"
@@ -1065,7 +1082,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1168,11 +1185,11 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1188,9 +1205,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1205,9 +1222,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 +1235,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,22 +1259,22 @@ 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.77",
 ]
 
 [[package]]
@@ -1325,15 +1343,15 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[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"
@@ -1391,6 +1409,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 +1434,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 +1549,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1725432240,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
         "type": "github"
       },
       "original": {

nac3artiq/Cargo.toml

@@ -10,9 +10,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 itertools = "0.13"
-pyo3 = { version = "0.21", features = ["extension-module", "gil-refs"] }
+pyo3 = { version = "0.22", features = ["extension-module", "py-clone"] }
 parking_lot = "0.12"
-tempfile = "3.13"
+tempfile = "3.10"
 nac3core = { path = "../nac3core" }
 nac3ld = { path = "../nac3ld" }
 

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 nac3core::nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
+
+use nac3core::inkwell::{
+    context::Context,
+    module::Linkage,
+    types::{BasicType, IntType},
+    values::{BasicValueEnum, PointerValue, StructValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+
+use pyo3::{
+    prelude::*,
+    types::{PyDict, PyList},
+};
+
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 
+use itertools::Itertools;
+use nac3core::inkwell::values::IntValue;
+use std::{
+    collections::{hash_map::DefaultHasher, HashMap},
+    hash::{Hash, Hasher},
+    iter::once,
+    mem,
+    sync::Arc,
+};
+
 /// The parallelism mode within a block.
 #[derive(Copy, Clone, Eq, PartialEq)]
 enum ParallelMode {
@@ -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,29 +932,6 @@ fn rpc_codegen_callback_fn<'ctx>(
     }
 
     // call
-    if is_async {
-        let rpc_send_async = ctx.module.get_function("rpc_send_async").unwrap_or_else(|| {
-            ctx.module.add_function(
-                "rpc_send_async",
-                ctx.ctx.void_type().fn_type(
-                    &[
-                        int32.into(),
-                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
-                        ptr_type.ptr_type(AddressSpace::default()).into(),
-                    ],
-                    false,
-                ),
-                None,
-            )
-        });
-        ctx.builder
-            .build_call(
-                rpc_send_async,
-                &[service_id.into(), tag_ptr.into(), args_ptr.into()],
-                "rpc.send",
-            )
-            .unwrap();
-    } else {
     let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
         ctx.module.add_function(
             "rpc_send",
@@ -970,15 +949,10 @@ fn rpc_codegen_callback_fn<'ctx>(
     ctx.builder
         .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
         .unwrap();
-    }
 
     // reclaim stack space used by arguments
     call_stackrestore(ctx, stackptr);
 
-    if is_async {
-        // async RPCs do not return any values
-        Ok(None)
-    } else {
     let result = format_rpc_ret(generator, ctx, fun.0.ret);
 
     if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
@@ -987,7 +961,6 @@ fn rpc_codegen_callback_fn<'ctx>(
     }
 
     Ok(result)
-    }
 }
 
 pub fn attributes_writeback(
@@ -997,7 +970,7 @@ pub fn attributes_writeback(
     host_attributes: &PyObject,
 ) -> Result<(), String> {
     Python::with_gil(|py| -> PyResult<Result<(), String>> {
-        let host_attributes: &PyList = host_attributes.downcast(py)?;
+        let host_attributes = host_attributes.downcast_bound::<PyList>(py)?;
         let top_levels = ctx.top_level.definitions.read();
         let globals = inner_resolver.global_value_ids.read();
         let int32 = ctx.ctx.i32_type();
@@ -1005,7 +978,7 @@ pub fn attributes_writeback(
         let mut values = Vec::new();
         let mut scratch_buffer = Vec::new();
         for val in (*globals).values() {
-            let val = val.as_ref(py);
+            let val = val.bind_borrowed(py);
             let ty = inner_resolver.get_obj_type(
                 py,
                 val,
@@ -1043,7 +1016,7 @@ pub fn attributes_writeback(
                         }
                     }
                     if !attributes.is_empty() {
-                        let pydict = PyDict::new(py);
+                        let pydict = PyDict::new_bound(py);
                         pydict.set_item("obj", val)?;
                         pydict.set_item("fields", attributes)?;
                         host_attributes.append(pydict)?;
@@ -1053,7 +1026,7 @@ pub fn attributes_writeback(
                     let elem_ty = iter_type_vars(params).next().unwrap().ty;
 
                     if gen_rpc_tag(ctx, elem_ty, &mut scratch_buffer).is_ok() {
-                        let pydict = PyDict::new(py);
+                        let pydict = PyDict::new_bound(py);
                         pydict.set_item("obj", val)?;
                         host_attributes.append(pydict)?;
                         values.push((
@@ -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,30 +16,16 @@
     clippy::wildcard_imports
 )]
 
-use std::{
+use std::collections::{HashMap, HashSet};
-    collections::{HashMap, HashSet},
+use std::fs;
-    fs,
+use std::io::Write;
-    io::Write,
+use std::process::Command;
-    process::Command,
+use std::rc::Rc;
-    rc::Rc,
+use std::sync::Arc;
-    sync::Arc,
-};
 
 use itertools::Itertools;
-use parking_lot::{Mutex, RwLock};
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
-use pyo3::{
+use nac3core::inkwell::{
-    create_exception, exceptions,
-    prelude::*,
-    types::{PyBytes, PyDict, PySet},
-};
-use tempfile::{self, TempDir};
-
-use nac3core::{
-    codegen::{
-        concrete_type::ConcreteTypeStore, gen_func_impl, irrt::load_irrt, CodeGenLLVMOptions,
-        CodeGenTargetMachineOptions, CodeGenTask, WithCall, WorkerRegistry,
-    },
-    inkwell::{
     context::Context,
     memory_buffer::MemoryBuffer,
     module::{Linkage, Module},
@@ -47,22 +33,33 @@ use nac3core::{
     support::is_multithreaded,
     targets::*,
     OptimizationLevel,
-    },
+};
-    nac3parser::{
+use nac3core::nac3parser::{
-        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
+    ast::{ExprKind, Stmt, StmtKind, StrRef},
     parser::parse_program,
-    },
+};
+use nac3core::toplevel::builtins::get_exn_constructor;
+use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
+use pyo3::{
+    create_exception, exceptions,
+    prelude::*,
+    types::{PyBytes, PyDict, PySet},
+};
+
+use parking_lot::{Mutex, RwLock};
+
+use nac3core::{
+    codegen::irrt::load_irrt,
+    codegen::{concrete_type::ConcreteTypeStore, CodeGenTask, WithCall, WorkerRegistry},
     symbol_resolver::SymbolResolver,
     toplevel::{
-        builtins::get_exn_constructor,
         composer::{BuiltinFuncCreator, BuiltinFuncSpec, ComposerConfig, TopLevelComposer},
         DefinitionId, GenCall, TopLevelDef,
     },
-    typecheck::{
+    typecheck::typedef::{FunSignature, FuncArg},
-        type_inferencer::PrimitiveStore,
+    typecheck::{type_inferencer::PrimitiveStore, typedef::Type},
-        typedef::{into_var_map, FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
-    },
 };
+
 use nac3ld::Linker;
 
 use crate::{
@@ -70,13 +67,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,
@@ -151,7 +150,7 @@ impl Nac3 {
         registered_class_ids: &HashSet<u64>,
     ) -> PyResult<()> {
         let (module_name, source_file) = Python::with_gil(|py| -> PyResult<(String, String)> {
-            let module: &PyAny = module.extract(py)?;
+            let module = module.bind_borrowed(py);
             Ok((module.getattr("__name__")?.extract()?, module.getattr("__file__")?.extract()?))
         })?;
 
@@ -177,14 +176,14 @@ impl Nac3 {
                     // Drop unregistered (i.e. host-only) base classes.
                     bases.retain(|base| {
                         Python::with_gil(|py| -> PyResult<bool> {
-                            let id_fn = PyModule::import(py, "builtins")?.getattr("id")?;
+                            let module = module.bind_borrowed(py);
+                            let id_fn = PyModule::import_bound(py, "builtins")?.getattr("id")?;
                             match &base.node {
                                 ExprKind::Name { id, .. } => {
                                     if *id == "Exception".into() {
                                         Ok(true)
                                     } else {
-                                        let base_obj =
+                                        let base_obj = module.getattr(id.to_string().as_str())?;
-                                            module.getattr(py, id.to_string().as_str())?;
                                         let base_id = id_fn.call1((base_obj,))?.extract()?;
                                         Ok(registered_class_ids.contains(&base_id))
                                     }
@@ -197,8 +196,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 +212,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
                         }
@@ -361,10 +363,10 @@ impl Nac3 {
 
     fn compile_method<T>(
         &self,
-        obj: &PyAny,
+        obj: &Bound<PyAny>,
         method_name: &str,
-        args: Vec<&PyAny>,
+        args: Vec<Bound<PyAny>>,
-        embedding_map: &PyAny,
+        embedding_map: &Bound<PyAny>,
         py: Python,
         link_fn: &dyn Fn(&Module) -> PyResult<T>,
     ) -> PyResult<T> {
@@ -376,8 +378,8 @@ impl Nac3 {
             size_t,
         );
 
-        let builtins = PyModule::import(py, "builtins")?;
+        let builtins = PyModule::import_bound(py, "builtins")?;
-        let typings = PyModule::import(py, "typing")?;
+        let typings = PyModule::import_bound(py, "typing")?;
         let id_fn = builtins.getattr("id")?;
         let issubclass = builtins.getattr("issubclass")?;
         let exn_class = builtins.getattr("Exception")?;
@@ -415,13 +417,17 @@ impl Nac3 {
 
         let mut rpc_ids = vec![];
         for (stmt, path, module) in &self.top_levels {
-            let py_module: &PyAny = module.extract(py)?;
+            let py_module = module.bind_borrowed(py);
             let module_id: u64 = id_fn.call1((py_module,))?.extract()?;
             let helper = helper.clone();
             let class_obj;
             if let StmtKind::ClassDef { name, .. } = &stmt.node {
                 let class = py_module.getattr(name.to_string().as_str()).unwrap();
-                if issubclass.call1((class, exn_class)).unwrap().extract().unwrap()
+                if issubclass
+                    .call1((class.as_borrowed(), exn_class.as_borrowed()))
+                    .unwrap()
+                    .extract()
+                    .unwrap()
                     && class.getattr("artiq_builtin").is_err()
                 {
                     class_obj = Some(class);
@@ -434,8 +440,8 @@ impl Nac3 {
             let (name_to_pyid, resolver) =
                 module_to_resolver_cache.get(&module_id).cloned().unwrap_or_else(|| {
                     let mut name_to_pyid: HashMap<StrRef, u64> = HashMap::new();
-                    let members: &PyDict =
+                    let members = py_module.getattr("__dict__").unwrap();
-                        py_module.getattr("__dict__").unwrap().downcast().unwrap();
+                    let members = members.downcast::<PyDict>().unwrap();
                     for (key, val) in members {
                         let key: &str = key.extract().unwrap();
                         let val = id_fn.call1((val,)).unwrap().extract().unwrap();
@@ -478,25 +484,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 +494,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();
@@ -536,15 +519,15 @@ impl Nac3 {
             }
         }
 
-        let id_fun = PyModule::import(py, "builtins")?.getattr("id")?;
+        let id_fun = PyModule::import_bound(py, "builtins")?.getattr("id")?;
         let mut name_to_pyid: HashMap<StrRef, u64> = HashMap::new();
-        let module = PyModule::new(py, "tmp")?;
+        let module = PyModule::new_bound(py, "tmp")?;
         module.add("base", obj)?;
         name_to_pyid.insert("base".into(), id_fun.call1((obj,))?.extract()?);
         let mut arg_names = vec![];
         for (i, arg) in args.into_iter().enumerate() {
             let name = format!("tmp{i}");
-            module.add(&name, arg)?;
+            module.add(&*name, arg.clone())?;
             name_to_pyid.insert(name.clone().into(), id_fun.call1((arg,))?.extract()?);
             arg_names.push(name);
         }
@@ -619,12 +602,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 +619,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 +634,6 @@ impl Nac3 {
                             }
                         }
                     }
-                    TopLevelDef::Variable { .. } => {
-                        return Err(CompileError::new_err(String::from(
-                            "Unsupported @rpc annotation on global variable",
-                        )))
-                    }
                 }
             }
         }
@@ -871,41 +850,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(),
@@ -962,7 +906,7 @@ fn add_exceptions(
 #[pymethods]
 impl Nac3 {
     #[new]
-    fn new(isa: &str, artiq_builtins: &PyDict, py: Python) -> PyResult<Self> {
+    fn new(isa: &str, artiq_builtins: &Bound<PyDict>, py: Python) -> PyResult<Self> {
         let isa = match isa {
             "host" => Isa::Host,
             "rv32g" => Isa::RiscV32G,
@@ -1026,43 +970,50 @@ impl Nac3 {
             ),
         ];
 
-        let builtins_mod = PyModule::import(py, "builtins").unwrap();
+        let builtins_mod = PyModule::import_bound(py, "builtins").unwrap();
         let id_fn = builtins_mod.getattr("id").unwrap();
-        let numpy_mod = PyModule::import(py, "numpy").unwrap();
+        let numpy_mod = PyModule::import_bound(py, "numpy").unwrap();
-        let typing_mod = PyModule::import(py, "typing").unwrap();
+        let typing_mod = PyModule::import_bound(py, "typing").unwrap();
-        let types_mod = PyModule::import(py, "types").unwrap();
+        let types_mod = PyModule::import_bound(py, "types").unwrap();
 
-        let get_id = |x: &PyAny| id_fn.call1((x,)).and_then(PyAny::extract).unwrap();
+        let get_id = |x: Borrowed<PyAny>| id_fn.call1((x,)).and_then(|id| id.extract()).unwrap();
-        let get_attr_id = |obj: &PyModule, attr| {
+        let get_attr_id = |obj: Borrowed<PyModule>, attr| {
             id_fn.call1((obj.getattr(attr).unwrap(),)).unwrap().extract().unwrap()
         };
         let primitive_ids = PrimitivePythonId {
-            virtual_id: get_id(artiq_builtins.get_item("virtual").ok().flatten().unwrap()),
+            virtual_id: get_id(
+                artiq_builtins.get_item("virtual").ok().flatten().unwrap().as_borrowed(),
+            ),
             generic_alias: (
-                get_attr_id(typing_mod, "_GenericAlias"),
+                get_attr_id(typing_mod.as_borrowed(), "_GenericAlias"),
-                get_attr_id(types_mod, "GenericAlias"),
+                get_attr_id(types_mod.as_borrowed(), "GenericAlias"),
             ),
-            none: get_id(artiq_builtins.get_item("none").ok().flatten().unwrap()),
+            none: get_id(artiq_builtins.get_item("none").ok().flatten().unwrap().as_borrowed()),
-            typevar: get_attr_id(typing_mod, "TypeVar"),
+            typevar: get_attr_id(typing_mod.as_borrowed(), "TypeVar"),
             const_generic_marker: get_id(
-                artiq_builtins.get_item("_ConstGenericMarker").ok().flatten().unwrap(),
+                artiq_builtins
+                    .get_item("_ConstGenericMarker")
+                    .ok()
+                    .flatten()
+                    .unwrap()
+                    .as_borrowed(),
             ),
-            int: get_attr_id(builtins_mod, "int"),
+            int: get_attr_id(builtins_mod.as_borrowed(), "int"),
-            int32: get_attr_id(numpy_mod, "int32"),
+            int32: get_attr_id(numpy_mod.as_borrowed(), "int32"),
-            int64: get_attr_id(numpy_mod, "int64"),
+            int64: get_attr_id(numpy_mod.as_borrowed(), "int64"),
-            uint32: get_attr_id(numpy_mod, "uint32"),
+            uint32: get_attr_id(numpy_mod.as_borrowed(), "uint32"),
-            uint64: get_attr_id(numpy_mod, "uint64"),
+            uint64: get_attr_id(numpy_mod.as_borrowed(), "uint64"),
-            bool: get_attr_id(builtins_mod, "bool"),
+            bool: get_attr_id(builtins_mod.as_borrowed(), "bool"),
-            np_bool_: get_attr_id(numpy_mod, "bool_"),
+            np_bool_: get_attr_id(numpy_mod.as_borrowed(), "bool_"),
-            string: get_attr_id(builtins_mod, "str"),
+            string: get_attr_id(builtins_mod.as_borrowed(), "str"),
-            np_str_: get_attr_id(numpy_mod, "str_"),
+            np_str_: get_attr_id(numpy_mod.as_borrowed(), "str_"),
-            float: get_attr_id(builtins_mod, "float"),
+            float: get_attr_id(builtins_mod.as_borrowed(), "float"),
-            float64: get_attr_id(numpy_mod, "float64"),
+            float64: get_attr_id(numpy_mod.as_borrowed(), "float64"),
-            list: get_attr_id(builtins_mod, "list"),
+            list: get_attr_id(builtins_mod.as_borrowed(), "list"),
-            ndarray: get_attr_id(numpy_mod, "ndarray"),
+            ndarray: get_attr_id(numpy_mod.as_borrowed(), "ndarray"),
-            tuple: get_attr_id(builtins_mod, "tuple"),
+            tuple: get_attr_id(builtins_mod.as_borrowed(), "tuple"),
-            exception: get_attr_id(builtins_mod, "Exception"),
+            exception: get_attr_id(builtins_mod.as_borrowed(), "Exception"),
-            option: get_id(artiq_builtins.get_item("Option").ok().flatten().unwrap()),
+            option: get_id(artiq_builtins.get_item("Option").ok().flatten().unwrap().as_borrowed()),
         };
 
         let working_directory = tempfile::Builder::new().prefix("nac3-").tempdir().unwrap();
@@ -1087,21 +1038,21 @@ impl Nac3 {
         })
     }
 
-    fn analyze(&mut self, functions: &PySet, classes: &PySet) -> PyResult<()> {
+    fn analyze(&mut self, functions: &Bound<PySet>, classes: &Bound<PySet>) -> PyResult<()> {
         let (modules, class_ids) =
             Python::with_gil(|py| -> PyResult<(HashMap<u64, PyObject>, HashSet<u64>)> {
                 let mut modules: HashMap<u64, PyObject> = HashMap::new();
                 let mut class_ids: HashSet<u64> = HashSet::new();
 
-                let id_fn = PyModule::import(py, "builtins")?.getattr("id")?;
+                let id_fn = PyModule::import_bound(py, "builtins")?.getattr("id")?;
-                let getmodule_fn = PyModule::import(py, "inspect")?.getattr("getmodule")?;
+                let getmodule_fn = PyModule::import_bound(py, "inspect")?.getattr("getmodule")?;
 
                 for function in functions {
                     let module = getmodule_fn.call1((function,))?.extract()?;
                     modules.insert(id_fn.call1((&module,))?.extract()?, module);
                 }
                 for class in classes {
-                    let module = getmodule_fn.call1((class,))?.extract()?;
+                    let module = getmodule_fn.call1((class.as_borrowed(),))?.extract()?;
                     modules.insert(id_fn.call1((&module,))?.extract()?, module);
                     class_ids.insert(id_fn.call1((class,))?.extract()?);
                 }
@@ -1116,11 +1067,11 @@ impl Nac3 {
 
     fn compile_method_to_file(
         &mut self,
-        obj: &PyAny,
+        obj: &Bound<PyAny>,
         method_name: &str,
-        args: Vec<&PyAny>,
+        args: Vec<Bound<PyAny>>,
         filename: &str,
-        embedding_map: &PyAny,
+        embedding_map: &Bound<PyAny>,
         py: Python,
     ) -> PyResult<()> {
         let target_machine = self.get_llvm_target_machine();
@@ -1162,10 +1113,10 @@ impl Nac3 {
 
     fn compile_method_to_mem(
         &mut self,
-        obj: &PyAny,
+        obj: &Bound<PyAny>,
         method_name: &str,
-        args: Vec<&PyAny>,
+        args: Vec<Bound<PyAny>>,
-        embedding_map: &PyAny,
+        embedding_map: &Bound<PyAny>,
         py: Python,
     ) -> PyResult<PyObject> {
         let target_machine = self.get_llvm_target_machine();
@@ -1184,7 +1135,7 @@ impl Nac3 {
                     working_directory.join("module.o").to_string_lossy().to_string(),
                 )?;
 
-                Ok(PyBytes::new(py, &fs::read(filename).unwrap()).into())
+                Ok(PyBytes::new_bound(py, &fs::read(filename).unwrap()).into())
             };
 
             self.compile_method(obj, method_name, args, embedding_map, py, &link_fn)
@@ -1194,7 +1145,7 @@ impl Nac3 {
                     .write_to_memory_buffer(module, FileType::Object)
                     .expect("couldn't write module to object file buffer");
                 if let Ok(dyn_lib) = Linker::ld(object_mem.as_slice()) {
-                    Ok(PyBytes::new(py, &dyn_lib).into())
+                    Ok(PyBytes::new_bound(py, &dyn_lib).into())
                 } else {
                     Err(CompileError::new_err("linker failed to process object file"))
                 }
@@ -1211,14 +1162,14 @@ extern "C" {
 }
 
 #[pymodule]
-fn nac3artiq(py: Python, m: &PyModule) -> PyResult<()> {
+fn nac3artiq(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     #[cfg(feature = "init-llvm-profile")]
     unsafe {
         __llvm_profile_initialize();
     }
 
     Target::initialize_all(&InitializationConfig::default());
-    m.add("CompileError", py.get_type::<CompileError>())?;
+    m.add("CompileError", py.get_type_bound::<CompileError>())?;
     m.add_class::<Nac3>()?;
     Ok(())
 }

nac3artiq/src/symbol_resolver.rs

@@ -1,30 +1,17 @@
-use std::{
+use crate::PrimitivePythonId;
-    collections::{HashMap, HashSet},
-    sync::{
-        atomic::{AtomicBool, Ordering::Relaxed},
-        Arc,
-    },
-};
-
 use itertools::Itertools;
-use parking_lot::RwLock;
+use nac3core::inkwell::{
-use pyo3::{
+    module::Linkage,
-    types::{PyDict, PyTuple},
+    types::{BasicType, BasicTypeEnum},
-    PyAny, PyObject, PyResult, Python,
+    values::BasicValueEnum,
+    AddressSpace,
 };
-
+use nac3core::nac3parser::ast::{self, StrRef};
 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 +23,18 @@ use nac3core::{
         typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
     },
 };
-
+use parking_lot::RwLock;
-use crate::PrimitivePythonId;
+use pyo3::{
+    prelude::*,
+    types::{PyDict, PyTuple},
+};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::{
+        atomic::{AtomicBool, Ordering::Relaxed},
+        Arc,
+    },
+};
 
 pub enum PrimitiveValue {
     I32(i32),
@@ -176,7 +173,7 @@ impl StaticValue for PythonValue {
 
         Python::with_gil(|py| -> PyResult<BasicValueEnum<'ctx>> {
             self.resolver
-                .get_obj_value(py, self.value.as_ref(py), ctx, generator, expected_ty)
+                .get_obj_value(py, self.value.bind_borrowed(py), ctx, generator, expected_ty)
                 .map(Option::unwrap)
         })
         .map_err(|e| e.to_string())
@@ -245,10 +242,10 @@ impl StaticValue for PythonValue {
             let ty = helper.type_fn.call1(py, (&self.value,))?;
             let ty_id: u64 = helper.id_fn.call1(py, (ty,))?.extract(py)?;
             assert_eq!(ty_id, self.resolver.primitive_ids.tuple);
-            let tup: &PyTuple = self.value.extract(py)?;
+            let tup = self.value.downcast_bound::<PyTuple>(py)?;
             let elem = tup.get_item(index as usize)?;
-            let id = self.resolver.helper.id_fn.call1(py, (elem,))?.extract(py)?;
+            let id = self.resolver.helper.id_fn.call1(py, (elem.as_borrowed(),))?.extract(py)?;
-            Ok(Some((id, elem.into())))
+            Ok(Some((id, elem.unbind())))
         })
         .unwrap()
         .map(|(id, obj)| {
@@ -266,21 +263,26 @@ impl InnerResolver {
     fn get_list_elem_type(
         &self,
         py: Python,
-        list: &PyAny,
+        list: Borrowed<PyAny>,
         len: usize,
         unifier: &mut Unifier,
         defs: &[Arc<RwLock<TopLevelDef>>],
         primitives: &PrimitiveStore,
     ) -> PyResult<Result<Type, String>> {
-        let mut ty = match self.get_obj_type(py, list.get_item(0)?, unifier, defs, primitives)? {
+        let mut ty = match self.get_obj_type(
+            py,
+            list.get_item(0)?.as_borrowed(),
+            unifier,
+            defs,
+            primitives,
+        )? {
             Ok(t) => t,
             Err(e) => return Ok(Err(format!("type error ({e}) at element #0 of the list"))),
         };
         for i in 1..len {
-            let b = match list
+            let b = match list.get_item(i).map(|elem| {
-                .get_item(i)
+                self.get_obj_type(py, elem.as_borrowed(), unifier, defs, primitives)
-                .map(|elem| self.get_obj_type(py, elem, unifier, defs, primitives))??
+            })?? {
-            {
                 Ok(t) => t,
                 Err(e) => return Ok(Err(format!("type error ({e}) at element #{i} of the list"))),
             };
@@ -306,7 +308,7 @@ impl InnerResolver {
     fn get_pyty_obj_type(
         &self,
         py: Python,
-        pyty: &PyAny,
+        pyty: Borrowed<PyAny>,
         unifier: &mut Unifier,
         defs: &[Arc<RwLock<TopLevelDef>>],
         primitives: &PrimitiveStore,
@@ -394,7 +396,8 @@ impl InnerResolver {
                 (unifier.add_ty(ty), false)
             }))
         } else if ty_ty_id == self.primitive_ids.typevar {
-            let name: &str = pyty.getattr("__name__").unwrap().extract().unwrap();
+            let name = pyty.getattr("__name__").unwrap();
+            let name: &str = name.extract().unwrap();
             let (constraint_types, is_const_generic) = {
                 let constraints = pyty.getattr("__constraints__").unwrap();
                 let mut result: Vec<Type> = vec![];
@@ -403,7 +406,8 @@ impl InnerResolver {
                 let mut is_const_generic = false;
                 for i in 0usize.. {
                     if let Ok(constr) = constraints.get_item(i) {
-                        let constr_id: u64 = self.helper.id_fn.call1(py, (constr,))?.extract(py)?;
+                        let constr_id: u64 =
+                            self.helper.id_fn.call1(py, (constr.as_borrowed(),))?.extract(py)?;
                         if constr_id == self.primitive_ids.const_generic_marker {
                             is_const_generic = true;
                             continue;
@@ -413,7 +417,7 @@ impl InnerResolver {
                             result.push(unifier.get_dummy_var().ty);
                         } else {
                             result.push({
-                                match self.get_pyty_obj_type(py, constr, unifier, defs, primitives)? {
+                                match self.get_pyty_obj_type(py, constr.as_borrowed(), unifier, defs, primitives)? {
                                     Ok((ty, _)) => {
                                         if unifier.is_concrete(ty, &[]) {
                                             ty
@@ -464,9 +468,14 @@ impl InnerResolver {
         {
             let origin = self.helper.origin_ty_fn.call1(py, (pyty,))?;
             let args = self.helper.args_ty_fn.call1(py, (pyty,))?;
-            let args: &PyTuple = args.downcast(py)?;
+            let args = args.downcast_bound::<PyTuple>(py)?;
-            let origin_ty =
+            let origin_ty = match self.get_pyty_obj_type(
-                match self.get_pyty_obj_type(py, origin.as_ref(py), unifier, defs, primitives)? {
+                py,
+                origin.bind_borrowed(py),
+                unifier,
+                defs,
+                primitives,
+            )? {
                 Ok((ty, false)) => ty,
                 Ok((_, true)) => {
                     return Ok(Err("instantiated type does not take type parameters".into()))
@@ -479,7 +488,7 @@ impl InnerResolver {
                     if args.len() == 1 {
                         let ty = match self.get_pyty_obj_type(
                             py,
-                            args.get_item(0)?,
+                            args.get_item(0)?.as_borrowed(),
                             unifier,
                             defs,
                             primitives,
@@ -525,9 +534,15 @@ impl InnerResolver {
                     // npt.NDArray[T] == np.ndarray[Any, np.dtype[T]]
                     let ndarray_dtype_pyty =
                         self.helper.args_ty_fn.call1(py, (args.get_item(1)?,))?;
-                    let dtype = ndarray_dtype_pyty.downcast::<PyTuple>(py)?.get_item(0)?;
+                    let dtype = ndarray_dtype_pyty.downcast_bound::<PyTuple>(py)?.get_item(0)?;
 
-                    let ty = match self.get_pyty_obj_type(py, dtype, unifier, defs, primitives)? {
+                    let ty = match self.get_pyty_obj_type(
+                        py,
+                        dtype.as_borrowed(),
+                        unifier,
+                        defs,
+                        primitives,
+                    )? {
                         Ok(ty) => ty,
                         Err(err) => return Ok(Err(err)),
                     };
@@ -543,7 +558,7 @@ impl InnerResolver {
                 TypeEnum::TTuple { .. } => {
                     let args = match args
                         .iter()
-                        .map(|x| self.get_pyty_obj_type(py, x, unifier, defs, primitives))
+                        .map(|x| self.get_pyty_obj_type(py, x.as_borrowed(), unifier, defs, primitives))
                         .collect::<Result<Vec<_>, _>>()?
                         .into_iter()
                         .collect::<Result<Vec<_>, _>>() {
@@ -576,7 +591,7 @@ impl InnerResolver {
                         }
                         let args = match args
                             .iter()
-                            .map(|x| self.get_pyty_obj_type(py, x, unifier, defs, primitives))
+                            .map(|x| self.get_pyty_obj_type(py, x.as_borrowed(), unifier, defs, primitives))
                             .collect::<Result<Vec<_>, _>>()?
                             .into_iter()
                             .collect::<Result<Vec<_>, _>>() {
@@ -603,7 +618,7 @@ impl InnerResolver {
                     if args.len() == 1 {
                         let ty = match self.get_pyty_obj_type(
                             py,
-                            args.get_item(0)?,
+                            args.get_item(0)?.as_borrowed(),
                             unifier,
                             defs,
                             primitives,
@@ -634,8 +649,7 @@ impl InnerResolver {
                 false,
             )))
         } else {
-            let str_fn =
+            let str_fn = PyModule::import_bound(py, "builtins").unwrap().getattr("repr").unwrap();
-                pyo3::types::PyModule::import(py, "builtins").unwrap().getattr("repr").unwrap();
             let str_repr: String = str_fn.call1((pyty,)).unwrap().extract().unwrap();
             Ok(Err(format!("{str_repr} is not registered with NAC3 (@nac3 decorator missing?)")))
         }
@@ -644,7 +658,7 @@ impl InnerResolver {
     pub fn get_obj_type(
         &self,
         py: Python,
-        obj: &PyAny,
+        obj: Borrowed<PyAny>,
         unifier: &mut Unifier,
         defs: &[Arc<RwLock<TopLevelDef>>],
         primitives: &PrimitiveStore,
@@ -691,7 +705,7 @@ impl InnerResolver {
                 {
                     obj
                 } else {
-                    ty.as_ref(py)
+                    ty.bind_borrowed(py)
                 }
             },
             unifier,
@@ -779,7 +793,8 @@ impl InnerResolver {
                     Ok(Ok(extracted_ty))
                 } else {
                     let dtype = obj.getattr("dtype")?.getattr("type")?;
-                    let dtype_ty = self.get_pyty_obj_type(py, dtype, unifier, defs, primitives)?;
+                    let dtype_ty =
+                        self.get_pyty_obj_type(py, dtype.as_borrowed(), unifier, defs, primitives)?;
                     match dtype_ty {
                         Ok((t, _)) => match unifier.unify(ty, t) {
                             Ok(()) => {
@@ -798,10 +813,12 @@ impl InnerResolver {
                 }
             }
             (TypeEnum::TTuple { .. }, false) => {
-                let elements: &PyTuple = obj.downcast()?;
+                let elements = obj.downcast::<PyTuple>()?;
                 let types: Result<Result<Vec<_>, _>, _> = elements
                     .iter()
-                    .map(|elem| self.get_obj_type(py, elem, unifier, defs, primitives))
+                    .map(|elem| {
+                        self.get_obj_type(py, elem.as_borrowed(), unifier, defs, primitives)
+                    })
                     .collect();
                 let types = types?;
                 Ok(types.map(|types| {
@@ -837,7 +854,13 @@ impl InnerResolver {
                     return Ok(Ok(unifier.subst(primitives.option, &var_map).unwrap()));
                 }
 
-                let ty = match self.get_obj_type(py, field_data, unifier, defs, primitives)? {
+                let ty = match self.get_obj_type(
+                    py,
+                    field_data.as_borrowed(),
+                    unifier,
+                    defs,
+                    primitives,
+                )? {
                     Ok(t) => t,
                     Err(e) => {
                         return Ok(Err(format!(
@@ -872,8 +895,13 @@ impl InnerResolver {
                             Ok(d) => d,
                             Err(e) => return Ok(Err(format!("{e}"))),
                         };
-                        let ty =
+                        let ty = match self.get_obj_type(
-                            match self.get_obj_type(py, field_data, unifier, defs, primitives)? {
+                            py,
+                            field_data.as_borrowed(),
+                            unifier,
+                            defs,
+                            primitives,
+                        )? {
                             Ok(t) => t,
                             Err(e) => {
                                 return Ok(Err(format!(
@@ -912,32 +940,32 @@ impl InnerResolver {
                 // check integer bounds
                 if unifier.unioned(extracted_ty, primitives.int32) {
                     obj.extract::<i32>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of int32"))),
+                        |_| Ok(Err(format!("{} is not in the range of int32", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else if unifier.unioned(extracted_ty, primitives.int64) {
                     obj.extract::<i64>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of int64"))),
+                        |_| Ok(Err(format!("{} is not in the range of int64", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else if unifier.unioned(extracted_ty, primitives.uint32) {
                     obj.extract::<u32>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of uint32"))),
+                        |_| Ok(Err(format!("{} is not in the range of uint32", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else if unifier.unioned(extracted_ty, primitives.uint64) {
                     obj.extract::<u64>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of uint64"))),
+                        |_| Ok(Err(format!("{} is not in the range of uint64", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else if unifier.unioned(extracted_ty, primitives.bool) {
                     obj.extract::<bool>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of bool"))),
+                        |_| Ok(Err(format!("{} is not in the range of bool", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else if unifier.unioned(extracted_ty, primitives.float) {
                     obj.extract::<f64>().map_or_else(
-                        |_| Ok(Err(format!("{obj} is not in the range of float64"))),
+                        |_| Ok(Err(format!("{} is not in the range of float64", obj.as_unbound()))),
                         |_| Ok(Ok(extracted_ty)),
                     )
                 } else {
@@ -950,7 +978,7 @@ impl InnerResolver {
     pub fn get_obj_value<'ctx>(
         &self,
         py: Python,
-        obj: &PyAny,
+        obj: Borrowed<PyAny>,
         ctx: &mut CodeGenContext<'ctx, '_>,
         generator: &mut dyn CodeGenerator,
         expected_ty: Type,
@@ -1020,15 +1048,19 @@ impl InnerResolver {
                     });
                     return Ok(Some(global.as_pointer_value().into()));
                 }
-                self.global_value_ids.write().insert(id, obj.into());
+                self.global_value_ids.write().insert(id, obj.as_unbound().clone());
             }
 
             let arr: Result<Option<Vec<_>>, _> = (0..len)
                 .map(|i| {
                     obj.get_item(i).and_then(|elem| {
-                        self.get_obj_value(py, elem, ctx, generator, elem_ty).map_err(|e| {
+                        self.get_obj_value(py, elem.as_borrowed(), ctx, generator, elem_ty).map_err(
-                            super::CompileError::new_err(format!("Error getting element {i}: {e}"))
+                            |e| {
-                        })
+                                super::CompileError::new_err(format!(
+                                    "Error getting element {i}: {e}"
+                                ))
+                            },
+                        )
                     })
                 })
                 .collect();
@@ -1103,7 +1135,7 @@ impl InnerResolver {
                     });
                     return Ok(Some(global.as_pointer_value().into()));
                 }
-                self.global_value_ids.write().insert(id, obj.into());
+                self.global_value_ids.write().insert(id, obj.as_unbound().clone());
             }
 
             let TypeEnum::TLiteral { values, .. } = &*ctx.unifier.get_ty_immutable(ndarray_ndims)
@@ -1121,15 +1153,23 @@ impl InnerResolver {
             };
 
             // Obtain the shape of the ndarray
-            let shape_tuple: &PyTuple = obj.getattr("shape")?.downcast()?;
+            let shape_tuple = obj.getattr("shape")?;
+            let shape_tuple = shape_tuple.downcast::<PyTuple>()?;
             assert_eq!(shape_tuple.len(), ndarray_ndims as usize);
             let shape_values: Result<Option<Vec<_>>, _> = shape_tuple
                 .iter()
                 .enumerate()
                 .map(|(i, elem)| {
-                    self.get_obj_value(py, elem, ctx, generator, ctx.primitives.usize()).map_err(
+                    self.get_obj_value(
-                        |e| super::CompileError::new_err(format!("Error getting element {i}: {e}")),
+                        py,
+                        elem.as_borrowed(),
+                        ctx,
+                        generator,
+                        ctx.primitives.usize(),
                     )
+                    .map_err(|e| {
+                        super::CompileError::new_err(format!("Error getting element {i}: {e}"))
+                    })
                 })
                 .collect();
             let shape_values = shape_values?.unwrap();
@@ -1150,8 +1190,11 @@ impl InnerResolver {
             let data: Result<Option<Vec<_>>, _> = (0..sz)
                 .map(|i| {
                     obj.getattr("flat")?.get_item(i).and_then(|elem| {
-                        self.get_obj_value(py, elem, ctx, generator, ndarray_dtype).map_err(|e| {
+                        self.get_obj_value(py, elem.as_borrowed(), ctx, generator, ndarray_dtype)
-                            super::CompileError::new_err(format!("Error getting element {i}: {e}"))
+                            .map_err(|e| {
+                                super::CompileError::new_err(format!(
+                                    "Error getting element {i}: {e}"
+                                ))
                             })
                     })
                 })
@@ -1217,14 +1260,14 @@ impl InnerResolver {
             };
 
             let tup_tys = ty.iter();
-            let elements: &PyTuple = obj.downcast()?;
+            let elements = obj.downcast::<PyTuple>()?;
             assert_eq!(elements.len(), tup_tys.len());
             let val: Result<Option<Vec<_>>, _> = elements
                 .iter()
                 .enumerate()
                 .zip(tup_tys)
                 .map(|((i, elem), ty)| {
-                    self.get_obj_value(py, elem, ctx, generator, *ty).map_err(|e| {
+                    self.get_obj_value(py, elem.as_borrowed(), ctx, generator, *ty).map_err(|e| {
                         super::CompileError::new_err(format!("Error getting element {i}: {e}"))
                     })
                 })
@@ -1253,7 +1296,7 @@ impl InnerResolver {
                 match self
                     .get_obj_value(
                         py,
-                        obj.getattr("_nac3_option").unwrap(),
+                        obj.getattr("_nac3_option").unwrap().as_borrowed(),
                         ctx,
                         generator,
                         option_val_ty,
@@ -1277,7 +1320,7 @@ impl InnerResolver {
                                     });
                                 return Ok(Some(global.as_pointer_value().into()));
                             }
-                            self.global_value_ids.write().insert(id, obj.into());
+                            self.global_value_ids.write().insert(id, obj.as_unbound().clone());
                         }
                         let global = ctx.module.add_global(
                             v.get_type(),
@@ -1313,7 +1356,7 @@ impl InnerResolver {
                     });
                     return Ok(Some(global.as_pointer_value().into()));
                 }
-                self.global_value_ids.write().insert(id, obj.into());
+                self.global_value_ids.write().insert(id, obj.as_unbound().clone());
             }
             // should be classes
             let definition =
@@ -1325,7 +1368,7 @@ impl InnerResolver {
                 .map(|(name, ty, _)| {
                     self.get_obj_value(
                         py,
-                        obj.getattr(name.to_string().as_str())?,
+                        obj.getattr(name.to_string().as_str())?.as_borrowed(),
                         ctx,
                         generator,
                         *ty,
@@ -1352,7 +1395,7 @@ impl InnerResolver {
     fn get_default_param_obj_value(
         &self,
         py: Python,
-        obj: &PyAny,
+        obj: Borrowed<PyAny>,
     ) -> PyResult<Result<SymbolValue, String>> {
         let id: u64 = self.helper.id_fn.call1(py, (obj,))?.extract(py)?;
         let ty_id: u64 =
@@ -1379,15 +1422,20 @@ impl InnerResolver {
             let val: f64 = obj.extract()?;
             Ok(SymbolValue::Double(val))
         } else if ty_id == self.primitive_ids.tuple {
-            let elements: &PyTuple = obj.downcast()?;
+            let elements = obj.downcast::<PyTuple>()?;
-            let elements: Result<Result<Vec<_>, String>, _> =
+            let elements: Result<Result<Vec<_>, String>, _> = elements
-                elements.iter().map(|elem| self.get_default_param_obj_value(py, elem)).collect();
+                .iter()
+                .map(|elem| self.get_default_param_obj_value(py, elem.as_borrowed()))
+                .collect();
             elements?.map(SymbolValue::Tuple)
         } else if ty_id == self.primitive_ids.option {
             if id == self.primitive_ids.none {
                 Ok(SymbolValue::OptionNone)
             } else {
-                self.get_default_param_obj_value(py, obj.getattr("_nac3_option").unwrap())?
+                self.get_default_param_obj_value(
+                    py,
+                    obj.getattr("_nac3_option").unwrap().as_borrowed(),
+                )?
                 .map(|v| SymbolValue::OptionSome(Box::new(v)))
             }
         } else {
@@ -1403,13 +1451,14 @@ impl SymbolResolver for Resolver {
         };
 
         Python::with_gil(|py| -> PyResult<Option<SymbolValue>> {
-            let obj: &PyAny = self.0.module.extract(py)?;
+            let obj = self.0.module.downcast_bound::<PyAny>(py)?;
-            let members: &PyDict = obj.getattr("__dict__").unwrap().downcast().unwrap();
+            let members = obj.getattr("__dict__").unwrap();
+            let members = members.downcast::<PyDict>().unwrap();
             let mut sym_value = None;
             for (key, val) in members {
                 let key: &str = key.extract()?;
                 if key == id.to_string() {
-                    if let Ok(Ok(v)) = self.0.get_default_param_obj_value(py, val) {
+                    if let Ok(Ok(v)) = self.0.get_default_param_obj_value(py, val.as_borrowed()) {
                         sym_value = Some(v);
                     }
                     break;
@@ -1443,13 +1492,20 @@ impl SymbolResolver for Resolver {
                 Ok(t)
             } else {
                 Python::with_gil(|py| -> PyResult<Result<Type, String>> {
-                    let obj: &PyAny = self.0.module.extract(py)?;
+                    let obj = self.0.module.downcast_bound::<PyAny>(py)?;
                     let mut sym_ty = Err(format!("cannot find symbol `{str}`"));
-                    let members: &PyDict = obj.getattr("__dict__").unwrap().downcast().unwrap();
+                    let members = obj.getattr("__dict__").unwrap();
+                    let members = members.downcast::<PyDict>().unwrap();
                     for (key, val) in members {
                         let key: &str = key.extract()?;
                         if key == str.to_string() {
-                            sym_ty = self.0.get_obj_type(py, val, unifier, defs, primitives)?;
+                            sym_ty = self.0.get_obj_type(
+                                py,
+                                val.as_borrowed(),
+                                unifier,
+                                defs,
+                                primitives,
+                            )?;
                             break;
                         }
                     }
@@ -1470,7 +1526,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();
@@ -1478,13 +1533,15 @@ impl SymbolResolver for Resolver {
         }
         .or_else(|| {
             Python::with_gil(|py| -> PyResult<Option<(u64, PyObject)>> {
-                let obj: &PyAny = self.0.module.extract(py)?;
+                let obj = self.0.module.downcast_bound::<PyAny>(py)?;
                 let mut sym_value: Option<(u64, PyObject)> = None;
-                let members: &PyDict = obj.getattr("__dict__").unwrap().downcast().unwrap();
+                let members = obj.getattr("__dict__").unwrap();
+                let members = members.downcast::<PyDict>().unwrap();
                 for (key, val) in members {
                     let key: &str = key.extract()?;
                     if key == id.to_string() {
-                        let id = self.0.helper.id_fn.call1(py, (val,))?.extract(py)?;
+                        let id =
+                            self.0.helper.id_fn.call1(py, (val.as_borrowed(),))?.extract(py)?;
                         sym_value = Some((id, val.extract()?));
                         break;
                     }
@@ -1553,10 +1610,16 @@ impl SymbolResolver for Resolver {
             let store = self.0.deferred_eval_store.store.read();
             Python::with_gil(|py| -> PyResult<Result<(), String>> {
                 for (variables, constraints, name) in store.iter() {
-                    let constraints: &PyAny = constraints.as_ref(py);
+                    let constraints = constraints.bind(py);
                     for (i, var) in variables.iter().enumerate() {
                         if let Ok(constr) = constraints.get_item(i) {
-                            match self.0.get_pyty_obj_type(py, constr, unifier, defs, primitives)? {
+                            match self.0.get_pyty_obj_type(
+                                py,
+                                constr.as_borrowed(),
+                                unifier,
+                                defs,
+                                primitives,
+                            )? {
                                 Ok((ty, _)) => {
                                     if !unifier.is_concrete(ty, &[]) {
                                         return Ok(Err(format!(

nac3artiq/src/timeline.rs

@@ -1,11 +1,8 @@
 use itertools::Either;
-
+use nac3core::codegen::CodeGenContext;
-use nac3core::{
+use nac3core::inkwell::{
-    codegen::CodeGenContext,
-    inkwell::{
     values::{BasicValueEnum, CallSiteValue},
     AddressSpace, AtomicOrdering,
-    },
 };
 
 /// Functions for manipulating the timeline.

nac3core/Cargo.toml

@@ -10,9 +10,9 @@ 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"

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/src/codegen/builtin_fns.rs

@@ -1,30 +1,21 @@
-use inkwell::{
+use inkwell::types::BasicTypeEnum;
-    types::BasicTypeEnum,
+use inkwell::values::{BasicValue, BasicValueEnum, IntValue, PointerValue};
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
+use inkwell::{FloatPredicate, IntPredicate, OptimizationLevel};
-    FloatPredicate, IntPredicate, OptimizationLevel,
-};
 use itertools::Itertools;
 
-use crate::{
+use crate::codegen::classes::{
-    codegen::{
-        classes::{
     ArrayLikeValue, NDArrayValue, ProxyValue, RangeValue, TypedArrayLikeAccessor,
     UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
-        },
-        expr::destructure_range,
-        extern_fns, irrt,
-        irrt::calculate_len_for_slice_range,
-        llvm_intrinsics,
-        macros::codegen_unreachable,
-        numpy,
-        numpy::ndarray_elementwise_unaryop_impl,
-        stmt::gen_for_callback_incrementing,
-        CodeGenContext, CodeGenerator,
-    },
-    toplevel::helper::PrimDef,
-    toplevel::numpy::unpack_ndarray_var_tys,
-    typecheck::typedef::{Type, TypeEnum},
 };
+use crate::codegen::expr::destructure_range;
+use crate::codegen::irrt::calculate_len_for_slice_range;
+use crate::codegen::macros::codegen_unreachable;
+use crate::codegen::numpy::ndarray_elementwise_unaryop_impl;
+use crate::codegen::stmt::gen_for_callback_incrementing;
+use crate::codegen::{extern_fns, irrt, llvm_intrinsics, numpy, CodeGenContext, CodeGenerator};
+use crate::toplevel::helper::PrimDef;
+use crate::toplevel::numpy::unpack_ndarray_var_tys;
+use crate::typecheck::typedef::{Type, TypeEnum};
 
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.
 ///

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

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,23 +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::{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 crate::{
     codegen::{
         classes::{
@@ -50,6 +30,20 @@ use crate::{
         typedef::{FunSignature, FuncArg, Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    types::{AnyType, BasicType, BasicTypeEnum},
+    values::{BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue, StructValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+use itertools::{chain, izip, Either, Itertools};
+use nac3parser::ast::{
+    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
+    Unaryop,
+};
+use std::cmp::min;
+use std::iter::{repeat, repeat_with};
+use std::{collections::HashMap, convert::TryInto, iter::once, iter::zip};
 
 pub fn get_subst_key(
     unifier: &mut Unifier,
@@ -977,7 +971,6 @@ pub fn gen_call<'ctx, G: CodeGenerator>(
             TopLevelDef::Class { .. } => {
                 return Ok(Some(generator.gen_constructor(ctx, fun.0, &def, params)?))
             }
-            TopLevelDef::Variable { .. } => unreachable!(),
         }
     }
     .or_else(|_: String| {
@@ -2886,7 +2879,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             Some((_, Some(static_value), _)) => ValueEnum::Static(static_value.clone()),
             None => {
                 let resolver = ctx.resolver.clone();
-                resolver.get_symbol_value(*id, ctx, generator).unwrap()
+                resolver.get_symbol_value(*id, ctx).unwrap()
             }
         },
         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::{
@@ -21,7 +10,17 @@ use super::{
     stmt::gen_for_callback_incrementing,
     CodeGenContext, CodeGenerator,
 };
-use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
+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.

nac3core/src/codegen/mod.rs

@@ -1,12 +1,12 @@
-use std::{
+use crate::{
-    collections::{HashMap, HashSet},
+    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
-    sync::{
+    symbol_resolver::{StaticValue, SymbolResolver},
-        atomic::{AtomicBool, Ordering},
+    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
-        Arc,
+    typecheck::{
+        type_inferencer::{CodeLocation, PrimitiveStore},
+        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
     },
-    thread,
 };
-
 use crossbeam::channel::{unbounded, Receiver, Sender};
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -24,19 +24,14 @@ use inkwell::{
     AddressSpace, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
-use parking_lot::{Condvar, Mutex};
-
 use nac3parser::ast::{Location, Stmt, StrRef};
-
+use parking_lot::{Condvar, Mutex};
-use crate::{
+use std::collections::{HashMap, HashSet};
-    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
+use std::sync::{
-    symbol_resolver::{StaticValue, SymbolResolver},
+    atomic::{AtomicBool, Ordering},
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
+    Arc,
-    typecheck::{
-        type_inferencer::{CodeLocation, PrimitiveStore},
-        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
-    },
 };
+use std::thread;
 
 pub mod builtin_fns;
 pub mod classes;
@@ -853,9 +848,10 @@ pub fn gen_func_impl<
     builder.position_at_end(init_bb);
     let body_bb = context.append_basic_block(fn_val, "body");
 
-    // Store non-vararg argument values into local variables
     let mut var_assignment = HashMap::new();
     let offset = u32::from(has_sret);
+
+    // Store non-vararg argument values into local variables
     for (n, arg) in args.iter().enumerate().filter(|(_, arg)| !arg.is_vararg) {
         let param = fn_val.get_nth_param((n as u32) + offset).unwrap();
         let local_type = get_llvm_type(

nac3core/src/codegen/numpy.rs

@@ -1,11 +1,3 @@
-use inkwell::{
-    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
-    AddressSpace, IntPredicate, OptimizationLevel,
-};
-
-use nac3parser::ast::{Operator, StrRef};
-
 use crate::{
     codegen::{
         classes::{
@@ -35,6 +27,16 @@ use crate::{
         typedef::{FunSignature, Type, TypeEnum},
     },
 };
+use inkwell::{
+    types::BasicType,
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+use inkwell::{
+    types::{AnyTypeEnum, BasicTypeEnum, PointerType},
+    values::BasicValue,
+};
+use nac3parser::ast::{Operator, StrRef};
 
 /// Creates an uninitialized `NDArray` instance.
 fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(

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},
@@ -27,6 +14,17 @@ use crate::{
         typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    basic_block::BasicBlock,
+    types::{BasicType, BasicTypeEnum},
+    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
+    IntPredicate,
+};
+use itertools::{izip, Itertools};
+use nac3parser::ast::{
+    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
+};
 
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
@@ -1828,37 +1826,6 @@ pub fn gen_stmt<G: CodeGenerator>(
                 stmt.location,
             );
         }
-        StmtKind::Global { names, .. } => {
-            let registered_globals = ctx
-                .top_level
-                .definitions
-                .read()
-                .iter()
-                .filter_map(|def| {
-                    if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
-                        Some((*simple_name, *ty))
-                    } else {
-                        None
-                    }
-                })
-                .collect_vec();
-
-            for id in names {
-                let Some((_, ty)) = registered_globals.iter().find(|(name, _)| name == id) else {
-                    return Err(format!("{id} is not a global at {}", stmt.location));
-                };
-
-                let resolver = ctx.resolver.clone();
-                let ptr = resolver
-                    .get_symbol_value(*id, ctx, generator)
-                    .map(|val| val.to_basic_value_enum(ctx, generator, *ty))
-                    .transpose()?
-                    .map(BasicValueEnum::into_pointer_value)
-                    .unwrap();
-
-                ctx.var_assignment.insert(*id, (ptr, None, 0));
-            }
-        }
         _ => unimplemented!(),
     };
     Ok(())

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/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, make_exception_fields, PrimDefDetails};
 use indexmap::IndexMap;
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -10,10 +11,6 @@ use inkwell::{
 use itertools::Either;
 use strum::IntoEnumIterator;
 
-use super::{
-    helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails},
-    *,
-};
 use crate::{
     codegen::{
         builtin_fns,
@@ -26,6 +23,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};
-
-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,58 +381,8 @@ impl TopLevelComposer {
                 ))
             }
 
-            ast::StmtKind::AnnAssign { target, annotation, .. } => {
-                let ExprKind::Name { id: name, .. } = target.node else {
-                    return Err(format!(
-                        "global variable declaration must be an identifier (at {})",
-                        ast.location
-                    ));
-                };
-
-                if self.keyword_list.contains(&name) {
-                    return Err(format!(
-                        "cannot use keyword `{}` as a class name (at {})",
-                        name,
-                        ast.location
-                    ));
-                }
-
-                let global_var_name = if mod_path.is_empty() {
-                    name.to_string()
-                } else {
-                    format!("{mod_path}.{name}")
-                };
-                if !defined_names.insert(global_var_name.clone()) {
-                    return Err(format!(
-                        "global variable `{}` defined twice (at {})",
-                        global_var_name,
-                        ast.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.clone()),
-                        resolver,
-                        Some(ast.location),
-                    )).into(),
-                    None,
-                ));
-
-                Ok((
-                    name,
-                    DefinitionId(self.definition_ast_list.len() - 1),
-                    Some(ty_to_be_unified),
-                ))
-            }
-
             _ => 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
             )),
         }
@@ -447,7 +396,6 @@ impl TopLevelComposer {
         if inference {
             self.analyze_function_instance()?;
         }
-        self.analyze_top_level_variables()?;
         Ok(())
     }
 
@@ -552,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() {
@@ -906,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;
@@ -1180,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;
@@ -1756,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 {
@@ -1898,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;
@@ -1949,8 +1894,7 @@ impl TopLevelComposer {
             } = &mut *function_def
             {
                 let signature_ty_enum = unifier.get_ty(*signature);
-                let TypeEnum::TFunc(FunSignature { args, ret, vars, .. }) =
+                let TypeEnum::TFunc(FunSignature { args, ret, vars }) = signature_ty_enum.as_ref()
-                    signature_ty_enum.as_ref()
                 else {
                     unreachable!("must be typeenum::tfunc")
                 };
@@ -2058,12 +2002,11 @@ impl TopLevelComposer {
                         })
                     };
                     let mut identifiers = {
-                        let mut result = HashMap::new();
+                        let mut result: HashSet<_> = HashSet::new();
                         if self_type.is_some() {
-                            result.insert("self".into(), IdentifierInfo::default());
+                            result.insert("self".into());
                         }
-                        result
+                        result.extend(inst_args.iter().map(|x| x.name));
-                            .extend(inst_args.iter().map(|x| (x.name, IdentifierInfo::default())));
                         result
                     };
                     let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
@@ -2114,16 +2057,6 @@ impl TopLevelComposer {
                         instance_to_symbol.insert(String::new(), simple_name.to_string());
                         continue;
                     }
-                    if !decorator_list.is_empty() {
-                        if let ast::ExprKind::Call { func, .. } = &decorator_list[0].node {
-                            if matches!(&func.node,
-                                ast::ExprKind::Name{ id, .. } if id == &"rpc".into())
-                            {
-                                instance_to_symbol.insert(String::new(), simple_name.to_string());
-                                continue;
-                            }
-                        }
-                    }
 
                     let fun_body = body
                         .into_iter()
@@ -2228,57 +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 variable_def = &mut *variable_def.write();
-
-            let TopLevelDef::Variable { ty: dummy_ty, ty_decl, resolver, loc, .. } = variable_def
-            else {
-                // not top level variable def, skip
-                return Ok(());
-            };
-
-            let resolver = &**resolver.as_ref().unwrap();
-
-            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)]
@@ -391,9 +388,6 @@ impl TopLevelDef {
                     r
                 }
             ),
-            TopLevelDef::Variable { name, ty, .. } => {
-                format!("Variable {{ name: {name:?}, ty: {:?} }}", unifier.stringify(*ty),)
-            }
         }
     }
 }
@@ -595,18 +589,6 @@ impl TopLevelComposer {
         }
     }
 
-    #[must_use]
-    pub fn make_top_level_variable_def(
-        name: String,
-        simple_name: StrRef,
-        ty: Type,
-        ty_decl: 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.
-        ty_decl: 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::{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,15 +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 !defined_identifiers.contains_key(id) {
+                if !defined_identifiers.contains(id) {
-                    defined_identifiers.insert(*id, IdentifierInfo::default());
+                    defined_identifiers.insert(*id);
                 }
                 self.should_have_value(pattern)?;
                 Ok(())
@@ -75,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 {
@@ -96,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(),
@@ -104,7 +98,7 @@ impl<'a> Inferencer<'a> {
                         *id,
                     ) {
                         Ok(_) => {
-                            self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                            self.defined_identifiers.insert(*id);
                         }
                         Err(e) => {
                             return Err(HashSet::from([format!(
@@ -177,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)?;
             }
@@ -240,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, .. } => {
@@ -266,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)
@@ -301,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)?;
                 }
@@ -365,40 +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.is_global {
-                            return Err(HashSet::from([format!(
-                                "name '{id}' is assigned to before 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(_) => {
-                            self.defined_identifiers
-                                .insert(*id, IdentifierInfo { is_global: true });
-                        }
-                        Err(e) => {
-                            return Err(HashSet::from([format!(
-                                "type error at identifier `{}` ({}) at {}",
-                                id, e, stmt.location
-                            )]))
-                        }
-                    }
-                }
-
-                Ok(false)
-            }
             // break, raise, etc.
             _ => Ok(false),
         }
@@ -407,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,21 +1,17 @@
-use std::{cmp::max, collections::HashMap, rc::Rc};
+use crate::symbol_resolver::SymbolValue;
-
+use crate::toplevel::helper::PrimDef;
-use itertools::{iproduct, Itertools};
+use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_var_tys};
-use strum::IntoEnumIterator;
+use crate::typecheck::{
-
-use nac3parser::ast::{Cmpop, Operator, StrRef, Unaryop};
-
-use crate::{
-    symbol_resolver::SymbolValue,
-    toplevel::{
-        helper::PrimDef,
-        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
-    },
-    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;
 
 /// 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::once;
-    convert::{From, TryInto},
+use std::{cell::RefCell, sync::Arc};
-    iter::once,
-    sync::Arc,
-};
-
-use itertools::{izip, Itertools};
-
-use nac3parser::ast::{
-    self,
-    fold::{self, Fold},
-    Arguments, Comprehension, ExprContext, ExprKind, 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,20 +84,6 @@ impl PrimitiveStore {
     }
 }
 
-/// Information regarding a defined identifier.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct IdentifierInfo {
-    /// Whether this identifier refers to a global variable.
-    pub is_global: bool,
-}
-
-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>,
@@ -110,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,
@@ -242,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| {
@@ -394,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, .. } => {
@@ -566,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(),
@@ -574,7 +557,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                             *id,
                         ) {
                             Ok(_) => {
-                                self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                                self.defined_identifiers.insert(*id);
                             }
                             Err(e) => {
                                 return report_error(
@@ -639,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(())
             }
@@ -749,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

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;

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.21"
 
 [dependencies]
 nac3ast = { path = "../nac3ast" }
-lalrpop-util = "0.22"
+lalrpop-util = "0.21"
 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/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 = 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/src/basic_symbol_resolver.rs

@@ -1,14 +1,6 @@
-use std::{
+use nac3core::nac3parser::ast::{self, StrRef};
-    collections::{HashMap, HashSet},
-    sync::Arc,
-};
-
-use parking_lot::{Mutex, RwLock};
-
 use nac3core::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenContext,
-    inkwell::{module::Linkage, values::BasicValue},
-    nac3parser::ast::{self, StrRef},
     symbol_resolver::{SymbolResolver, SymbolValue, ValueEnum},
     toplevel::{DefinitionId, TopLevelDef},
     typecheck::{
@@ -16,6 +8,9 @@ use nac3core::{
         typedef::{Type, Unifier},
     },
 };
+use parking_lot::{Mutex, RwLock};
+use std::collections::HashSet;
+use std::{collections::HashMap, sync::Arc};
 
 pub struct ResolverInternal {
     pub id_to_type: Mutex<HashMap<StrRef, Type>>,
@@ -50,51 +45,20 @@ impl SymbolResolver for Resolver {
 
     fn get_symbol_type(
         &self,
-        unifier: &mut Unifier,
+        _: &mut Unifier,
         _: &[Arc<RwLock<TopLevelDef>>],
-        primitives: &PrimitiveStore,
+        _: &PrimitiveStore,
         str: StrRef,
     ) -> Result<Type, String> {
-        self.0
+        self.0.id_to_type.lock().get(&str).copied().ok_or(format!("cannot get type of {str}"))
-            .id_to_type
-            .lock()
-            .get(&str)
-            .copied()
-            .or_else(|| {
-                self.0
-                    .module_globals
-                    .lock()
-                    .get(&str)
-                    .cloned()
-                    .map(|v| v.get_type(primitives, unifier))
-            })
-            .ok_or(format!("cannot get type of {str}"))
     }
 
     fn get_symbol_value<'ctx>(
         &self,
-        str: StrRef,
+        _: StrRef,
-        ctx: &mut CodeGenContext<'ctx, '_>,
+        _: &mut CodeGenContext<'ctx, '_>,
-        generator: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
-        self.0.module_globals.lock().get(&str).cloned().map(|v| {
+        unimplemented!()
-            ctx.module
-                .get_global(&str.to_string())
-                .unwrap_or_else(|| {
-                    let ty = v.get_type(&ctx.primitives, &mut ctx.unifier);
-
-                    let init_val = ctx.gen_symbol_val(generator, &v, ty);
-                    let llvm_ty = init_val.get_type();
-
-                    let global = ctx.module.add_global(llvm_ty, None, &str.to_string());
-                    global.set_linkage(Linkage::LinkOnceAny);
-                    global.set_initializer(&init_val);
-
-                    global
-                })
-                .as_basic_value_enum()
-                .into()
-        })
     }
 
     fn get_identifier_def(&self, id: StrRef) -> Result<DefinitionId, HashSet<String>> {

nac3standalone/src/main.rs

@@ -8,30 +8,20 @@
 #![warn(clippy::pedantic)]
 #![allow(clippy::too_many_lines, clippy::wildcard_imports)]
 
-use std::{
-    collections::{HashMap, HashSet},
-    fs,
-    num::NonZeroUsize,
-    path::Path,
-    sync::Arc,
-};
-
 use clap::Parser;
-use parking_lot::{Mutex, RwLock};
+use nac3core::inkwell::{
-
+    memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
+    support::is_multithreaded, targets::*, OptimizationLevel,
+};
+use nac3core::nac3parser::{
+    ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
+    parser,
+};
 use nac3core::{
     codegen::{
         concrete_type::ConcreteTypeStore, irrt::load_irrt, CodeGenLLVMOptions,
         CodeGenTargetMachineOptions, CodeGenTask, DefaultCodeGenerator, WithCall, WorkerRegistry,
     },
-    inkwell::{
-        memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
-        support::is_multithreaded, targets::*, OptimizationLevel,
-    },
-    nac3parser::{
-        ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
-        parser,
-    },
     symbol_resolver::SymbolResolver,
     toplevel::{
         composer::{ComposerConfig, TopLevelComposer},
@@ -44,6 +34,10 @@ use nac3core::{
         typedef::{FunSignature, Type, Unifier, VarMap},
     },
 };
+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::*;
@@ -245,34 +239,6 @@ fn handle_assignment_pattern(
     }
 }
 
-fn handle_global_var(
-    target: &Expr,
-    value: Option<&Expr>,
-    resolver: &(dyn SymbolResolver + Send + Sync),
-    internal_resolver: &ResolverInternal,
-) -> 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);
-        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 } =
@@ -325,7 +291,8 @@ fn main() {
     let program = match fs::read_to_string(file_name.clone()) {
         Ok(program) => program,
         Err(err) => {
-            panic!("Cannot open input file: {err}");
+            println!("Cannot open input file: {err}");
+            return;
         }
     };
 
@@ -367,26 +334,10 @@ fn main() {
                     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.as_ref(),
-                    internal_resolver.as_ref(),
-                ) {
-                    panic!("{err}");
-                }
-
-                let (name, def_id, _) = composer
-                    .register_top_level(stmt, Some(resolver.clone()), "__main__", true)
-                    .unwrap();
-                internal_resolver.add_id_def(name, def_id);
-            }
-
             // allow (and ignore) "from __future__ import annotations"
             StmtKind::ImportFrom { module, names, .. }
                 if module == &Some("__future__".into())

nix/windows/make_msys2_packages.sh

@@ -10,7 +10,7 @@ curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar
 curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | sed "s|SigLevel    = Required|SigLevel    = Never|g" | sed "s|/etc/pacman.d|$MSYS2DIR/etc/pacman.d|g" > $MSYS2DIR/etc/pacman.conf
 
 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
-pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python3.12 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
 
 echo "{ pkgs } : [" > msys2_packages.nix
 while read package; do