begin refactoring
This commit is contained in:
parent
42511334f7
commit
7c9919256c
|
|
@ -1,31 +1,30 @@
|
||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aho-corasick"
|
name = "ahash"
|
||||||
version = "0.7.15"
|
version = "0.7.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
|
checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.2.3",
|
||||||
|
"once_cell",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "aho-corasick"
|
||||||
|
version = "0.7.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "arrayref"
|
|
||||||
version = "0.3.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "arrayvec"
|
|
||||||
version = "0.5.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ascii-canvas"
|
name = "ascii-canvas"
|
||||||
version = "2.0.0"
|
version = "3.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29"
|
checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"term",
|
"term",
|
||||||
]
|
]
|
||||||
|
|
@ -47,12 +46,6 @@ version = "1.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "base64"
|
|
||||||
version = "0.13.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bit-set"
|
name = "bit-set"
|
||||||
version = "0.5.2"
|
version = "0.5.2"
|
||||||
|
|
@ -69,60 +62,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
|
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "blake2b_simd"
|
name = "bitflags"
|
||||||
version = "0.5.11"
|
version = "1.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
|
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
dependencies = [
|
|
||||||
"arrayref",
|
|
||||||
"arrayvec",
|
|
||||||
"constant_time_eq",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "block-buffer"
|
|
||||||
version = "0.7.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
|
|
||||||
dependencies = [
|
|
||||||
"block-padding",
|
|
||||||
"byte-tools",
|
|
||||||
"byteorder",
|
|
||||||
"generic-array",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "block-padding"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
|
|
||||||
dependencies = [
|
|
||||||
"byte-tools",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "byte-tools"
|
|
||||||
version = "0.3.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "byteorder"
|
|
||||||
version = "1.3.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.66"
|
version = "1.0.68"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
|
checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg-if"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
|
|
@ -131,27 +80,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "constant_time_eq"
|
name = "codespan-reporting"
|
||||||
version = "0.1.5"
|
version = "0.11.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crossbeam-utils"
|
|
||||||
version = "0.8.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"termcolor",
|
||||||
"cfg-if 1.0.0",
|
"unicode-width",
|
||||||
"lazy_static",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ctor"
|
name = "crunchy"
|
||||||
version = "0.1.16"
|
version = "0.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
|
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ctor"
|
||||||
|
version = "0.1.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"syn",
|
"syn",
|
||||||
|
|
@ -164,37 +112,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
|
checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "digest"
|
name = "dirs-next"
|
||||||
version = "0.8.1"
|
version = "2.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
|
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"generic-array",
|
"cfg-if",
|
||||||
|
"dirs-sys-next",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs"
|
name = "dirs-sys-next"
|
||||||
version = "1.0.5"
|
version = "0.1.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
|
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "docopt"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
|
|
||||||
dependencies = [
|
|
||||||
"lazy_static",
|
|
||||||
"regex",
|
|
||||||
"serde",
|
|
||||||
"strsim",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.6.1"
|
version = "1.6.1"
|
||||||
|
|
@ -210,12 +147,6 @@ dependencies = [
|
||||||
"log",
|
"log",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fake-simd"
|
|
||||||
version = "0.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fixedbitset"
|
name = "fixedbitset"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
|
|
@ -223,23 +154,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
|
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "generic-array"
|
name = "getrandom"
|
||||||
version = "0.12.3"
|
version = "0.1.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
|
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"typenum",
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "getrandom"
|
name = "getrandom"
|
||||||
version = "0.1.15"
|
version = "0.2.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
|
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 0.1.10",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"wasi",
|
"wasi 0.10.2+wasi-snapshot-preview1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -261,18 +194,18 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hermit-abi"
|
name = "hermit-abi"
|
||||||
version = "0.1.17"
|
version = "0.1.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
|
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "1.6.1"
|
version = "1.6.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
|
checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"hashbrown",
|
"hashbrown",
|
||||||
|
|
@ -304,7 +237,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inkwell"
|
name = "inkwell"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/TheDan64/inkwell#3eab4db479c2ca9d20b191f431a6d36835093108"
|
source = "git+https://github.com/TheDan64/inkwell#aa4de1d78471a3d2f0fda1f56801177ddf80f3bf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
"inkwell_internals",
|
"inkwell_internals",
|
||||||
|
|
@ -317,8 +250,8 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inkwell_internals"
|
name = "inkwell_internals"
|
||||||
version = "0.2.0"
|
version = "0.3.0"
|
||||||
source = "git+https://github.com/TheDan64/inkwell#3eab4db479c2ca9d20b191f431a6d36835093108"
|
source = "git+https://github.com/TheDan64/inkwell#aa4de1d78471a3d2f0fda1f56801177ddf80f3bf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
@ -331,7 +264,7 @@ version = "0.1.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
|
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 1.0.0",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -358,43 +291,44 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.9.0"
|
version = "0.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
|
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lalrpop"
|
name = "lalrpop"
|
||||||
version = "0.19.1"
|
version = "0.19.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60fb56191fb8ed5311597e5750debe6779c9fdb487dbaa5ff302592897d7a2c8"
|
checksum = "b15174f1c529af5bf1283c3bc0058266b483a67156f79589fab2a25e23cf8988"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ascii-canvas",
|
"ascii-canvas",
|
||||||
"atty",
|
"atty",
|
||||||
"bit-set",
|
"bit-set",
|
||||||
"diff",
|
"diff",
|
||||||
"docopt",
|
|
||||||
"ena",
|
"ena",
|
||||||
"itertools",
|
"itertools",
|
||||||
"lalrpop-util",
|
"lalrpop-util",
|
||||||
"petgraph",
|
"petgraph",
|
||||||
|
"pico-args",
|
||||||
"regex",
|
"regex",
|
||||||
"regex-syntax",
|
"regex-syntax",
|
||||||
"serde",
|
|
||||||
"serde_derive",
|
|
||||||
"sha2",
|
|
||||||
"string_cache",
|
"string_cache",
|
||||||
"term",
|
"term",
|
||||||
|
"tiny-keccak",
|
||||||
"unicode-xid",
|
"unicode-xid",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lalrpop-util"
|
name = "lalrpop-util"
|
||||||
version = "0.19.1"
|
version = "0.19.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6771161eff561647fad8bb7e745e002c304864fb8f436b52b30acda51fca4408"
|
checksum = "d3e58cce361efcc90ba8a0a5f982c741ff86b603495bb15a998412e957dcd278"
|
||||||
|
dependencies = [
|
||||||
|
"regex",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "lazy_static"
|
||||||
|
|
@ -404,15 +338,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.81"
|
version = "0.2.97"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
|
checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "llvm-sys"
|
name = "llvm-sys"
|
||||||
version = "100.2.0"
|
version = "100.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9109e19fbfac3458f2970189719fa19f1007c6fd4e08c44fdebf4be0ddbe261d"
|
checksum = "15d9c00ce56221b2150e2d4d51887ff139fce5a0e50346c744861d1e66d2f7c4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
|
@ -423,34 +357,35 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lock_api"
|
name = "lock_api"
|
||||||
version = "0.4.2"
|
version = "0.4.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
|
checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"scopeguard",
|
"scopeguard",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.11"
|
version = "0.4.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 0.1.10",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.3.4"
|
version = "2.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
|
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nac3core"
|
name = "nac3core"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"codespan-reporting",
|
||||||
"inkwell",
|
"inkwell",
|
||||||
"num-bigint",
|
"num-bigint 0.3.2",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"rustpython-parser",
|
"rustpython-parser",
|
||||||
]
|
]
|
||||||
|
|
@ -482,9 +417,20 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-bigint"
|
name = "num-bigint"
|
||||||
version = "0.3.1"
|
version = "0.3.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
|
checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"num-integer",
|
||||||
|
"num-traits",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-bigint"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"num-integer",
|
"num-integer",
|
||||||
|
|
@ -512,15 +458,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.5.2"
|
version = "1.8.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
|
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "opaque-debug"
|
|
||||||
version = "0.2.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot"
|
name = "parking_lot"
|
||||||
|
|
@ -535,11 +475,11 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot_core"
|
name = "parking_lot_core"
|
||||||
version = "0.8.1"
|
version = "0.8.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"
|
checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 1.0.0",
|
"cfg-if",
|
||||||
"instant",
|
"instant",
|
||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
|
|
@ -576,6 +516,41 @@ dependencies = [
|
||||||
"indexmap",
|
"indexmap",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
|
||||||
|
dependencies = [
|
||||||
|
"phf_macros",
|
||||||
|
"phf_shared",
|
||||||
|
"proc-macro-hack",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_generator"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
|
||||||
|
dependencies = [
|
||||||
|
"phf_shared",
|
||||||
|
"rand",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "phf_macros"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
|
||||||
|
dependencies = [
|
||||||
|
"phf_generator",
|
||||||
|
"phf_shared",
|
||||||
|
"proc-macro-hack",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "phf_shared"
|
name = "phf_shared"
|
||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
|
|
@ -585,6 +560,18 @@ dependencies = [
|
||||||
"siphasher",
|
"siphasher",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pico-args"
|
||||||
|
version = "0.4.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "precomputed-hash"
|
name = "precomputed-hash"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
|
|
@ -599,9 +586,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.24"
|
version = "1.0.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
|
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-xid",
|
"unicode-xid",
|
||||||
]
|
]
|
||||||
|
|
@ -646,84 +633,132 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.7"
|
version = "1.0.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "rand"
|
||||||
version = "0.1.57"
|
version = "0.7.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.1.16",
|
||||||
|
"libc",
|
||||||
|
"rand_chacha",
|
||||||
|
"rand_core",
|
||||||
|
"rand_hc",
|
||||||
|
"rand_pcg",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom 0.1.16",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_hc"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_pcg"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
|
||||||
|
dependencies = [
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.2.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_users"
|
name = "redox_users"
|
||||||
version = "0.3.5"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
|
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom",
|
"getrandom 0.2.3",
|
||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
"rust-argon2",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.4.2"
|
version = "1.5.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
|
checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"memchr",
|
"memchr",
|
||||||
"regex-syntax",
|
"regex-syntax",
|
||||||
"thread_local",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-syntax"
|
name = "regex-syntax"
|
||||||
version = "0.6.21"
|
version = "0.6.25"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
|
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rust-argon2"
|
|
||||||
version = "0.8.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
|
|
||||||
dependencies = [
|
|
||||||
"base64",
|
|
||||||
"blake2b_simd",
|
|
||||||
"constant_time_eq",
|
|
||||||
"crossbeam-utils",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustpython-ast"
|
name = "rustpython-ast"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/RustPython/RustPython#b01cca97f4f94af6c1e15f161283f1ac9e0617b1"
|
source = "git+https://github.com/RustPython/RustPython#bee5794b6e2b777ee343c7277954b73d06b5cb7d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"num-bigint",
|
"num-bigint 0.4.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustpython-parser"
|
name = "rustpython-parser"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
source = "git+https://github.com/RustPython/RustPython#b01cca97f4f94af6c1e15f161283f1ac9e0617b1"
|
source = "git+https://github.com/RustPython/RustPython#bee5794b6e2b777ee343c7277954b73d06b5cb7d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"ahash",
|
||||||
"lalrpop",
|
"lalrpop",
|
||||||
"lalrpop-util",
|
"lalrpop-util",
|
||||||
"log",
|
"log",
|
||||||
"num-bigint",
|
"num-bigint 0.4.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
"phf",
|
||||||
"rustpython-ast",
|
"rustpython-ast",
|
||||||
"unic-emoji-char",
|
"unic-emoji-char",
|
||||||
"unic-ucd-ident",
|
"unic-ucd-ident",
|
||||||
"unicode_names2",
|
"unicode_names2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustversion"
|
||||||
|
version = "1.0.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "scopeguard"
|
name = "scopeguard"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
|
|
@ -745,49 +780,17 @@ version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde"
|
|
||||||
version = "1.0.118"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
|
|
||||||
dependencies = [
|
|
||||||
"serde_derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_derive"
|
|
||||||
version = "1.0.118"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sha2"
|
|
||||||
version = "0.8.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
|
|
||||||
dependencies = [
|
|
||||||
"block-buffer",
|
|
||||||
"digest",
|
|
||||||
"fake-simd",
|
|
||||||
"opaque-debug",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "siphasher"
|
name = "siphasher"
|
||||||
version = "0.3.3"
|
version = "0.3.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
|
checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smallvec"
|
name = "smallvec"
|
||||||
version = "1.5.1"
|
version = "1.6.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
|
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "string_cache"
|
name = "string_cache"
|
||||||
|
|
@ -799,20 +802,13 @@ dependencies = [
|
||||||
"new_debug_unreachable",
|
"new_debug_unreachable",
|
||||||
"phf_shared",
|
"phf_shared",
|
||||||
"precomputed-hash",
|
"precomputed-hash",
|
||||||
"serde",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "strsim"
|
|
||||||
version = "0.9.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.54"
|
version = "1.0.73"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
|
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
@ -821,29 +817,32 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "term"
|
name = "term"
|
||||||
version = "0.5.2"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
|
checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"dirs-next",
|
||||||
"dirs",
|
"rustversion",
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thread_local"
|
name = "termcolor"
|
||||||
version = "1.0.1"
|
version = "1.1.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
|
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy_static",
|
"winapi-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typenum"
|
name = "tiny-keccak"
|
||||||
version = "1.12.0"
|
version = "2.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
|
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
|
||||||
|
dependencies = [
|
||||||
|
"crunchy",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unic-char-property"
|
name = "unic-char-property"
|
||||||
|
|
@ -898,10 +897,16 @@ dependencies = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-width"
|
||||||
version = "0.2.1"
|
version = "0.1.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-xid"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode_names2"
|
name = "unicode_names2"
|
||||||
|
|
@ -915,12 +920,24 @@ version = "0.1.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
|
checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "version_check"
|
||||||
|
version = "0.9.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasi"
|
name = "wasi"
|
||||||
version = "0.9.0+wasi-snapshot-preview1"
|
version = "0.9.0+wasi-snapshot-preview1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasi"
|
||||||
|
version = "0.10.2+wasi-snapshot-preview1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
|
|
@ -937,6 +954,15 @@ version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-util"
|
||||||
|
version = "0.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||||
|
dependencies = [
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|
|
||||||
|
|
@ -9,3 +9,5 @@ num-bigint = "0.3"
|
||||||
num-traits = "0.2"
|
num-traits = "0.2"
|
||||||
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm10-0"] }
|
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "master", features = ["llvm10-0"] }
|
||||||
rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" }
|
rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" }
|
||||||
|
codespan-reporting = "0.11.1"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,922 +0,0 @@
|
||||||
use crate::context::InferenceContext;
|
|
||||||
use crate::inference_core::resolve_call;
|
|
||||||
use crate::magic_methods::*;
|
|
||||||
use crate::primitives::*;
|
|
||||||
use crate::typedef::{Type, TypeEnum::*};
|
|
||||||
use rustpython_parser::ast::{
|
|
||||||
Comparison, Comprehension, ComprehensionKind, Expression, ExpressionType, Operator,
|
|
||||||
UnaryOperator,
|
|
||||||
};
|
|
||||||
use std::convert::TryInto;
|
|
||||||
|
|
||||||
type ParserResult = Result<Option<Type>, String>;
|
|
||||||
|
|
||||||
pub fn infer_expr<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
expr: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
match &expr.node {
|
|
||||||
ExpressionType::Number { value } => infer_constant(ctx, value),
|
|
||||||
ExpressionType::Identifier { name } => infer_identifier(ctx, name),
|
|
||||||
ExpressionType::List { elements } => infer_list(ctx, elements),
|
|
||||||
ExpressionType::Tuple { elements } => infer_tuple(ctx, elements),
|
|
||||||
ExpressionType::Attribute { value, name } => infer_attribute(ctx, value, name),
|
|
||||||
ExpressionType::BoolOp { values, .. } => infer_bool_ops(ctx, values),
|
|
||||||
ExpressionType::Binop { a, b, op } => infer_bin_ops(ctx, op, a, b),
|
|
||||||
ExpressionType::Unop { op, a } => infer_unary_ops(ctx, op, a),
|
|
||||||
ExpressionType::Compare { vals, ops } => infer_compare(ctx, vals, ops),
|
|
||||||
ExpressionType::Call {
|
|
||||||
args,
|
|
||||||
function,
|
|
||||||
keywords,
|
|
||||||
} => {
|
|
||||||
if !keywords.is_empty() {
|
|
||||||
Err("keyword is not supported".into())
|
|
||||||
} else {
|
|
||||||
infer_call(ctx, &args, &function)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ExpressionType::Subscript { a, b } => infer_subscript(ctx, a, b),
|
|
||||||
ExpressionType::IfExpression { test, body, orelse } => {
|
|
||||||
infer_if_expr(ctx, &test, &body, orelse)
|
|
||||||
}
|
|
||||||
ExpressionType::Comprehension { kind, generators } => match kind.as_ref() {
|
|
||||||
ComprehensionKind::List { element } => {
|
|
||||||
if generators.len() == 1 {
|
|
||||||
infer_list_comprehension(ctx, element, &generators[0])
|
|
||||||
} else {
|
|
||||||
Err("only 1 generator statement is supported".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => Err("only list comprehension is supported".into()),
|
|
||||||
},
|
|
||||||
ExpressionType::True | ExpressionType::False => Ok(Some(ctx.get_primitive(BOOL_TYPE))),
|
|
||||||
_ => Err("not supported".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_constant(
|
|
||||||
ctx: &mut InferenceContext,
|
|
||||||
value: &rustpython_parser::ast::Number,
|
|
||||||
) -> ParserResult {
|
|
||||||
use rustpython_parser::ast::Number;
|
|
||||||
match value {
|
|
||||||
Number::Integer { value } => {
|
|
||||||
let int32: Result<i32, _> = value.try_into();
|
|
||||||
if int32.is_ok() {
|
|
||||||
Ok(Some(ctx.get_primitive(INT32_TYPE)))
|
|
||||||
} else {
|
|
||||||
Err("integer out of range".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Number::Float { .. } => Ok(Some(ctx.get_primitive(FLOAT_TYPE))),
|
|
||||||
_ => Err("not supported".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_identifier(ctx: &mut InferenceContext, name: &str) -> ParserResult {
|
|
||||||
Ok(Some(ctx.resolve(name)?))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_list<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
elements: &'b [Expression],
|
|
||||||
) -> ParserResult {
|
|
||||||
if elements.is_empty() {
|
|
||||||
return Ok(Some(ParametricType(LIST_TYPE, vec![BotType.into()]).into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut types = elements.iter().map(|v| infer_expr(ctx, v));
|
|
||||||
|
|
||||||
let head = types.next().unwrap()?;
|
|
||||||
if head.is_none() {
|
|
||||||
return Err("list elements must have some type".into());
|
|
||||||
}
|
|
||||||
for v in types {
|
|
||||||
// TODO: try virtual type...
|
|
||||||
if v? != head {
|
|
||||||
return Err("inhomogeneous list is not allowed".into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Some(ParametricType(LIST_TYPE, vec![head.unwrap()]).into()))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_tuple<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
elements: &'b [Expression],
|
|
||||||
) -> ParserResult {
|
|
||||||
let types: Result<Option<Vec<_>>, String> =
|
|
||||||
elements.iter().map(|v| infer_expr(ctx, v)).collect();
|
|
||||||
if let Some(t) = types? {
|
|
||||||
Ok(Some(ParametricType(TUPLE_TYPE, t).into()))
|
|
||||||
} else {
|
|
||||||
Err("tuple elements must have some type".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_attribute<'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
value: &'a Expression,
|
|
||||||
name: &str,
|
|
||||||
) -> ParserResult {
|
|
||||||
let value = infer_expr(ctx, value)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
if let TypeVariable(_) = value.as_ref() {
|
|
||||||
return Err("no fields for type variable".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
value
|
|
||||||
.get_base(ctx)
|
|
||||||
.and_then(|b| b.fields.get(name).cloned())
|
|
||||||
.map_or_else(|| Err("no such field".to_string()), |v| Ok(Some(v)))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_bool_ops<'a>(ctx: &mut InferenceContext<'a>, values: &'a [Expression]) -> ParserResult {
|
|
||||||
assert_eq!(values.len(), 2);
|
|
||||||
let left = infer_expr(ctx, &values[0])?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
let right = infer_expr(ctx, &values[1])?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
|
|
||||||
let b = ctx.get_primitive(BOOL_TYPE);
|
|
||||||
if left == b && right == b {
|
|
||||||
Ok(Some(b))
|
|
||||||
} else {
|
|
||||||
Err("bool operands must be bool".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_bin_ops<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
op: &Operator,
|
|
||||||
left: &'b Expression,
|
|
||||||
right: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
let left = infer_expr(ctx, left)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
let right = infer_expr(ctx, right)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
let fun = binop_name(op);
|
|
||||||
resolve_call(ctx, Some(left), fun, &[right])
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_unary_ops<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
op: &UnaryOperator,
|
|
||||||
obj: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
let ty = infer_expr(ctx, obj)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
if let UnaryOperator::Not = op {
|
|
||||||
if ty == ctx.get_primitive(BOOL_TYPE) {
|
|
||||||
Ok(Some(ty))
|
|
||||||
} else {
|
|
||||||
Err("logical not must be applied to bool".into())
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
resolve_call(ctx, Some(ty), unaryop_name(op), &[])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_compare<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
vals: &'b [Expression],
|
|
||||||
ops: &'b [Comparison],
|
|
||||||
) -> ParserResult {
|
|
||||||
let types: Result<Option<Vec<_>>, _> = vals.iter().map(|v| infer_expr(ctx, v)).collect();
|
|
||||||
let types = types?;
|
|
||||||
if types.is_none() {
|
|
||||||
return Err("comparison operands must have type".into());
|
|
||||||
}
|
|
||||||
let types = types.unwrap();
|
|
||||||
let boolean = ctx.get_primitive(BOOL_TYPE);
|
|
||||||
let left = &types[..types.len() - 1];
|
|
||||||
let right = &types[1..];
|
|
||||||
|
|
||||||
for ((a, b), op) in left.iter().zip(right.iter()).zip(ops.iter()) {
|
|
||||||
let fun = comparison_name(op).ok_or_else(|| "unsupported comparison".to_string())?;
|
|
||||||
let ty = resolve_call(ctx, Some(a.clone()), fun, &[b.clone()])?;
|
|
||||||
if ty.is_none() || ty.unwrap() != boolean {
|
|
||||||
return Err("comparison result must be boolean".into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Some(boolean))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_call<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
args: &'b [Expression],
|
|
||||||
function: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
// TODO: special handling for int64 constant
|
|
||||||
let types: Result<Option<Vec<_>>, _> = args.iter().map(|v| infer_expr(ctx, v)).collect();
|
|
||||||
let types = types?;
|
|
||||||
if types.is_none() {
|
|
||||||
return Err("function params must have type".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let (obj, fun) = match &function.node {
|
|
||||||
ExpressionType::Identifier { name } => (None, name),
|
|
||||||
ExpressionType::Attribute { value, name } => (
|
|
||||||
Some(infer_expr(ctx, &value)?.ok_or_else(|| "no value".to_string())?),
|
|
||||||
name,
|
|
||||||
),
|
|
||||||
_ => return Err("not supported".into()),
|
|
||||||
};
|
|
||||||
resolve_call(ctx, obj, fun.as_str(), &types.unwrap())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_subscript<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
a: &'b Expression,
|
|
||||||
b: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
let a = infer_expr(ctx, a)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
let t = if let ParametricType(LIST_TYPE, ls) = a.as_ref() {
|
|
||||||
ls[0].clone()
|
|
||||||
} else {
|
|
||||||
return Err("subscript is not supported for types other than list".into());
|
|
||||||
};
|
|
||||||
|
|
||||||
match &b.node {
|
|
||||||
ExpressionType::Slice { elements } => {
|
|
||||||
let int32 = ctx.get_primitive(INT32_TYPE);
|
|
||||||
let types: Result<Option<Vec<_>>, _> = elements
|
|
||||||
.iter()
|
|
||||||
.map(|v| {
|
|
||||||
if let ExpressionType::None = v.node {
|
|
||||||
Ok(Some(int32.clone()))
|
|
||||||
} else {
|
|
||||||
infer_expr(ctx, v)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
let types = types?.ok_or_else(|| "slice must have type".to_string())?;
|
|
||||||
if types.iter().all(|v| v == &int32) {
|
|
||||||
Ok(Some(a))
|
|
||||||
} else {
|
|
||||||
Err("slice must be int32 type".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
let b = infer_expr(ctx, b)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
if b == ctx.get_primitive(INT32_TYPE) {
|
|
||||||
Ok(Some(t))
|
|
||||||
} else {
|
|
||||||
Err("index must be either slice or int32".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_if_expr<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
test: &'b Expression,
|
|
||||||
body: &'b Expression,
|
|
||||||
orelse: &'b Expression,
|
|
||||||
) -> ParserResult {
|
|
||||||
let test = infer_expr(ctx, test)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
if test != ctx.get_primitive(BOOL_TYPE) {
|
|
||||||
return Err("test should be bool".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let body = infer_expr(ctx, body)?;
|
|
||||||
let orelse = infer_expr(ctx, orelse)?;
|
|
||||||
if body.as_ref() == orelse.as_ref() {
|
|
||||||
Ok(body)
|
|
||||||
} else {
|
|
||||||
Err("divergent type".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_simple_binding<'a: 'b, 'b>(
|
|
||||||
ctx: &mut InferenceContext<'b>,
|
|
||||||
name: &'a Expression,
|
|
||||||
ty: Type,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
match &name.node {
|
|
||||||
ExpressionType::Identifier { name } => {
|
|
||||||
if name == "_" {
|
|
||||||
Ok(())
|
|
||||||
} else if ctx.defined(name.as_str()) {
|
|
||||||
Err("duplicated naming".into())
|
|
||||||
} else {
|
|
||||||
ctx.assign(name.as_str(), ty)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ExpressionType::Tuple { elements } => {
|
|
||||||
if let ParametricType(TUPLE_TYPE, ls) = ty.as_ref() {
|
|
||||||
if elements.len() == ls.len() {
|
|
||||||
for (a, b) in elements.iter().zip(ls.iter()) {
|
|
||||||
infer_simple_binding(ctx, a, b.clone())?;
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err("different length".into())
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Err("not supported".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => Err("not supported".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn infer_list_comprehension<'b: 'a, 'a>(
|
|
||||||
ctx: &mut InferenceContext<'a>,
|
|
||||||
element: &'b Expression,
|
|
||||||
comprehension: &'b Comprehension,
|
|
||||||
) -> ParserResult {
|
|
||||||
if comprehension.is_async {
|
|
||||||
return Err("async is not supported".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let iter = infer_expr(ctx, &comprehension.iter)?.ok_or_else(|| "no value".to_string())?;
|
|
||||||
if let ParametricType(LIST_TYPE, ls) = iter.as_ref() {
|
|
||||||
ctx.with_scope(|ctx| {
|
|
||||||
infer_simple_binding(ctx, &comprehension.target, ls[0].clone())?;
|
|
||||||
|
|
||||||
let boolean = ctx.get_primitive(BOOL_TYPE);
|
|
||||||
for test in comprehension.ifs.iter() {
|
|
||||||
let result =
|
|
||||||
infer_expr(ctx, test)?.ok_or_else(|| "no value in test".to_string())?;
|
|
||||||
if result != boolean {
|
|
||||||
return Err("test must be bool".into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let result = infer_expr(ctx, element)?.ok_or_else(|| "no value")?;
|
|
||||||
Ok(Some(ParametricType(LIST_TYPE, vec![result]).into()))
|
|
||||||
})
|
|
||||||
.1
|
|
||||||
} else {
|
|
||||||
Err("iteration is supported for list only".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
use crate::context::*;
|
|
||||||
use crate::typedef::*;
|
|
||||||
use rustpython_parser::parser::parse_expression;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::rc::Rc;
|
|
||||||
|
|
||||||
fn get_inference_context(ctx: TopLevelContext) -> InferenceContext {
|
|
||||||
InferenceContext::new(ctx, Box::new(|_| Err("unbounded identifier".into())))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_constants() {
|
|
||||||
let ctx = basic_ctx();
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
|
|
||||||
let ast = parse_expression("123").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("2147483647").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("2147483648").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("integer out of range".into()));
|
|
||||||
//
|
|
||||||
// let ast = parse_expression("2147483648").unwrap();
|
|
||||||
// let result = infer_expr(&mut ctx, &ast);
|
|
||||||
// assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT64_TYPE));
|
|
||||||
|
|
||||||
// let ast = parse_expression("9223372036854775807").unwrap();
|
|
||||||
// let result = infer_expr(&mut ctx, &ast);
|
|
||||||
// assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT64_TYPE));
|
|
||||||
|
|
||||||
// let ast = parse_expression("9223372036854775808").unwrap();
|
|
||||||
// let result = infer_expr(&mut ctx, &ast);
|
|
||||||
// assert_eq!(result, Err("integer out of range".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("123.456").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(FLOAT_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("True").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(BOOL_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("False").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(BOOL_TYPE));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_identifier() {
|
|
||||||
let ctx = basic_ctx();
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("abc", ctx.get_primitive(INT32_TYPE)).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("abc").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("ab").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("unbounded identifier".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_list() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"foo",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("abc", ctx.get_primitive(INT32_TYPE)).unwrap();
|
|
||||||
// def is reserved...
|
|
||||||
ctx.assign("efg", ctx.get_primitive(INT32_TYPE)).unwrap();
|
|
||||||
ctx.assign("xyz", ctx.get_primitive(FLOAT_TYPE)).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("[]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(LIST_TYPE, vec![BotType.into()]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[abc]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(LIST_TYPE, vec![ctx.get_primitive(INT32_TYPE)]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[abc, efg]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(LIST_TYPE, vec![ctx.get_primitive(INT32_TYPE)]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[abc, efg, xyz]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("inhomogeneous list is not allowed".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[foo()]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("list elements must have some type".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_tuple() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"foo",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("abc", ctx.get_primitive(INT32_TYPE)).unwrap();
|
|
||||||
ctx.assign("efg", ctx.get_primitive(FLOAT_TYPE)).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("(abc, efg)").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(
|
|
||||||
TUPLE_TYPE,
|
|
||||||
vec![ctx.get_primitive(INT32_TYPE), ctx.get_primitive(FLOAT_TYPE)]
|
|
||||||
)
|
|
||||||
.into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("(abc, efg, foo())").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("tuple elements must have some type".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_attribute() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let int32 = ctx.get_primitive(INT32_TYPE);
|
|
||||||
let float = ctx.get_primitive(FLOAT_TYPE);
|
|
||||||
|
|
||||||
let foo = ctx.add_class(ClassDef {
|
|
||||||
base: TypeDef {
|
|
||||||
name: "Foo",
|
|
||||||
fields: HashMap::new(),
|
|
||||||
methods: HashMap::new(),
|
|
||||||
},
|
|
||||||
parents: vec![],
|
|
||||||
});
|
|
||||||
let foo_def = ctx.get_class_def_mut(foo);
|
|
||||||
foo_def.base.fields.insert("a", int32.clone());
|
|
||||||
foo_def.base.fields.insert("b", ClassType(foo).into());
|
|
||||||
foo_def.base.fields.insert("c", int32.clone());
|
|
||||||
|
|
||||||
let bar = ctx.add_class(ClassDef {
|
|
||||||
base: TypeDef {
|
|
||||||
name: "Bar",
|
|
||||||
fields: HashMap::new(),
|
|
||||||
methods: HashMap::new(),
|
|
||||||
},
|
|
||||||
parents: vec![],
|
|
||||||
});
|
|
||||||
let bar_def = ctx.get_class_def_mut(bar);
|
|
||||||
bar_def.base.fields.insert("a", int32);
|
|
||||||
bar_def.base.fields.insert("b", ClassType(bar).into());
|
|
||||||
bar_def.base.fields.insert("c", float);
|
|
||||||
|
|
||||||
let v0 = ctx.add_variable(VarDef {
|
|
||||||
name: "v0",
|
|
||||||
bound: vec![],
|
|
||||||
});
|
|
||||||
|
|
||||||
let v1 = ctx.add_variable(VarDef {
|
|
||||||
name: "v1",
|
|
||||||
bound: vec![ClassType(foo).into(), ClassType(bar).into()],
|
|
||||||
});
|
|
||||||
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("foo", Rc::new(ClassType(foo))).unwrap();
|
|
||||||
ctx.assign("bar", Rc::new(ClassType(bar))).unwrap();
|
|
||||||
ctx.assign("foobar", Rc::new(VirtualClassType(foo)))
|
|
||||||
.unwrap();
|
|
||||||
ctx.assign("v0", ctx.get_variable(v0)).unwrap();
|
|
||||||
ctx.assign("v1", ctx.get_variable(v1)).unwrap();
|
|
||||||
ctx.assign("bot", Rc::new(BotType)).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("foo.a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("foo.d").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no such field".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("foobar.a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("v0.a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no fields for type variable".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("v1.a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no fields for type variable".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("none().a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("bot.a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no such field".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_bool_ops() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
|
|
||||||
let ast = parse_expression("True and False").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(BOOL_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("True and none()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("True and 123").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("bool operands must be bool".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_bin_ops() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
let v0 = ctx.add_variable(VarDef {
|
|
||||||
name: "v0",
|
|
||||||
bound: vec![ctx.get_primitive(INT32_TYPE), ctx.get_primitive(INT64_TYPE)],
|
|
||||||
});
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("a", TypeVariable(v0).into()).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("1 + 2 + 3").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("a + a + a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_unary_ops() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
let v0 = ctx.add_variable(VarDef {
|
|
||||||
name: "v0",
|
|
||||||
bound: vec![ctx.get_primitive(INT32_TYPE), ctx.get_primitive(INT64_TYPE)],
|
|
||||||
});
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("a", TypeVariable(v0).into()).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("-(123)").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("-a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("not True").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(BOOL_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("not (1)").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("logical not must be applied to bool".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_compare() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
let v0 = ctx.add_variable(VarDef {
|
|
||||||
name: "v0",
|
|
||||||
bound: vec![ctx.get_primitive(INT32_TYPE), ctx.get_primitive(INT64_TYPE)],
|
|
||||||
});
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("a", TypeVariable(v0).into()).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("a == a == a").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("a == a == 1").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("True > False").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no such function".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("True in False").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("unsupported comparison".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_call() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
let foo = ctx.add_class(ClassDef {
|
|
||||||
base: TypeDef {
|
|
||||||
name: "Foo",
|
|
||||||
fields: HashMap::new(),
|
|
||||||
methods: HashMap::new(),
|
|
||||||
},
|
|
||||||
parents: vec![],
|
|
||||||
});
|
|
||||||
let foo_def = ctx.get_class_def_mut(foo);
|
|
||||||
foo_def.base.methods.insert(
|
|
||||||
"a",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: Some(Rc::new(ClassType(foo))),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
let bar = ctx.add_class(ClassDef {
|
|
||||||
base: TypeDef {
|
|
||||||
name: "Bar",
|
|
||||||
fields: HashMap::new(),
|
|
||||||
methods: HashMap::new(),
|
|
||||||
},
|
|
||||||
parents: vec![],
|
|
||||||
});
|
|
||||||
let bar_def = ctx.get_class_def_mut(bar);
|
|
||||||
bar_def.base.methods.insert(
|
|
||||||
"a",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: Some(Rc::new(ClassType(bar))),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
let v0 = ctx.add_variable(VarDef {
|
|
||||||
name: "v0",
|
|
||||||
bound: vec![],
|
|
||||||
});
|
|
||||||
let v1 = ctx.add_variable(VarDef {
|
|
||||||
name: "v1",
|
|
||||||
bound: vec![ClassType(foo).into(), ClassType(bar).into()],
|
|
||||||
});
|
|
||||||
let v2 = ctx.add_variable(VarDef {
|
|
||||||
name: "v2",
|
|
||||||
bound: vec![
|
|
||||||
ClassType(foo).into(),
|
|
||||||
ClassType(bar).into(),
|
|
||||||
ctx.get_primitive(INT32_TYPE),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("foo", Rc::new(ClassType(foo))).unwrap();
|
|
||||||
ctx.assign("bar", Rc::new(ClassType(bar))).unwrap();
|
|
||||||
ctx.assign("foobar", Rc::new(VirtualClassType(foo)))
|
|
||||||
.unwrap();
|
|
||||||
ctx.assign("v0", ctx.get_variable(v0)).unwrap();
|
|
||||||
ctx.assign("v1", ctx.get_variable(v1)).unwrap();
|
|
||||||
ctx.assign("v2", ctx.get_variable(v2)).unwrap();
|
|
||||||
ctx.assign("bot", Rc::new(BotType)).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("foo.a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ClassType(foo).into());
|
|
||||||
|
|
||||||
let ast = parse_expression("v1.a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("foobar.a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ClassType(foo).into());
|
|
||||||
|
|
||||||
let ast = parse_expression("none().a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("bot.a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[][0].a()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("not supported".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn infer_subscript() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("[[1]][0][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][1:2]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(LIST_TYPE, vec![ctx.get_primitive(INT32_TYPE)]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][1:2:2]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(LIST_TYPE, vec![ctx.get_primitive(INT32_TYPE)]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][1:1.2]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("slice must be int32 type".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][1:none()]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("slice must have type".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][1.2]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("index must be either slice or int32".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[1, 2, 3][none()]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("none()[1.2]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("123[1]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result,
|
|
||||||
Err("subscript is not supported for types other than list".into())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_if_expr() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
|
|
||||||
let ast = parse_expression("1 if True else 0").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), ctx.get_primitive(INT32_TYPE));
|
|
||||||
|
|
||||||
let ast = parse_expression("none() if True else none()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap(), None);
|
|
||||||
|
|
||||||
let ast = parse_expression("none() if 1 else none()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("test should be bool".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("1 if True else none()").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("divergent type".into()));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_list_comp() {
|
|
||||||
let mut ctx = basic_ctx();
|
|
||||||
ctx.add_fn(
|
|
||||||
"none",
|
|
||||||
FnDef {
|
|
||||||
args: vec![],
|
|
||||||
result: None,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
let int32 = ctx.get_primitive(INT32_TYPE);
|
|
||||||
let mut ctx = get_inference_context(ctx);
|
|
||||||
ctx.assign("z", int32.clone()).unwrap();
|
|
||||||
|
|
||||||
let ast = parse_expression("[x for x in [(1, 2), (2, 3), (3, 4)]][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result.unwrap().unwrap(),
|
|
||||||
ParametricType(TUPLE_TYPE, vec![int32.clone(), int32.clone()]).into()
|
|
||||||
);
|
|
||||||
|
|
||||||
let ast = parse_expression("[x for (x, y) in [(1, 2), (2, 3), (3, 4)]][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), int32);
|
|
||||||
|
|
||||||
let ast =
|
|
||||||
parse_expression("[x for (x, y) in [(1, 2), (2, 3), (3, 4)] if x > 0][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result.unwrap().unwrap(), int32);
|
|
||||||
|
|
||||||
let ast = parse_expression("[x for (x, y) in [(1, 2), (2, 3), (3, 4)] if x][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("test must be bool".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[y for x in []][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("unbounded identifier".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[none() for x in []][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("no value".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[z for z in []][0]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(result, Err("duplicated naming".into()));
|
|
||||||
|
|
||||||
let ast = parse_expression("[x for x in [] for y in []]").unwrap();
|
|
||||||
let result = infer_expr(&mut ctx, &ast);
|
|
||||||
assert_eq!(
|
|
||||||
result,
|
|
||||||
Err("only 1 generator statement is supported".into())
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -5,589 +5,5 @@ extern crate num_bigint;
|
||||||
extern crate inkwell;
|
extern crate inkwell;
|
||||||
extern crate rustpython_parser;
|
extern crate rustpython_parser;
|
||||||
|
|
||||||
pub mod expression_inference;
|
mod typecheck;
|
||||||
pub mod inference_core;
|
|
||||||
mod magic_methods;
|
|
||||||
pub mod primitives;
|
|
||||||
pub mod typedef;
|
|
||||||
pub mod context;
|
|
||||||
|
|
||||||
use std::error::Error;
|
|
||||||
use std::fmt;
|
|
||||||
use std::path::Path;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use num_traits::cast::ToPrimitive;
|
|
||||||
|
|
||||||
use rustpython_parser::ast;
|
|
||||||
|
|
||||||
use inkwell::OptimizationLevel;
|
|
||||||
use inkwell::builder::Builder;
|
|
||||||
use inkwell::context::Context;
|
|
||||||
use inkwell::module::Module;
|
|
||||||
use inkwell::targets::*;
|
|
||||||
use inkwell::types;
|
|
||||||
use inkwell::types::BasicType;
|
|
||||||
use inkwell::values;
|
|
||||||
use inkwell::{IntPredicate, FloatPredicate};
|
|
||||||
use inkwell::basic_block;
|
|
||||||
use inkwell::passes;
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
enum CompileErrorKind {
|
|
||||||
Unsupported(&'static str),
|
|
||||||
MissingTypeAnnotation,
|
|
||||||
UnknownTypeAnnotation,
|
|
||||||
IncompatibleTypes,
|
|
||||||
UnboundIdentifier,
|
|
||||||
BreakOutsideLoop,
|
|
||||||
Internal(&'static str)
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for CompileErrorKind {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
CompileErrorKind::Unsupported(feature)
|
|
||||||
=> write!(f, "The following Python feature is not supported by NAC3: {}", feature),
|
|
||||||
CompileErrorKind::MissingTypeAnnotation
|
|
||||||
=> write!(f, "Missing type annotation"),
|
|
||||||
CompileErrorKind::UnknownTypeAnnotation
|
|
||||||
=> write!(f, "Unknown type annotation"),
|
|
||||||
CompileErrorKind::IncompatibleTypes
|
|
||||||
=> write!(f, "Incompatible types"),
|
|
||||||
CompileErrorKind::UnboundIdentifier
|
|
||||||
=> write!(f, "Unbound identifier"),
|
|
||||||
CompileErrorKind::BreakOutsideLoop
|
|
||||||
=> write!(f, "Break outside loop"),
|
|
||||||
CompileErrorKind::Internal(details)
|
|
||||||
=> write!(f, "Internal compiler error: {}", details),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct CompileError {
|
|
||||||
location: ast::Location,
|
|
||||||
kind: CompileErrorKind,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for CompileError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
write!(f, "{}, at {}", self.kind, self.location)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for CompileError {}
|
|
||||||
|
|
||||||
type CompileResult<T> = Result<T, CompileError>;
|
|
||||||
|
|
||||||
pub struct CodeGen<'ctx> {
|
|
||||||
context: &'ctx Context,
|
|
||||||
module: Module<'ctx>,
|
|
||||||
pass_manager: passes::PassManager<values::FunctionValue<'ctx>>,
|
|
||||||
builder: Builder<'ctx>,
|
|
||||||
current_source_location: ast::Location,
|
|
||||||
namespace: HashMap<String, values::PointerValue<'ctx>>,
|
|
||||||
break_bb: Option<basic_block::BasicBlock<'ctx>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'ctx> CodeGen<'ctx> {
|
|
||||||
pub fn new(context: &'ctx Context) -> CodeGen<'ctx> {
|
|
||||||
let module = context.create_module("kernel");
|
|
||||||
|
|
||||||
let pass_manager = passes::PassManager::create(&module);
|
|
||||||
pass_manager.add_instruction_combining_pass();
|
|
||||||
pass_manager.add_reassociate_pass();
|
|
||||||
pass_manager.add_gvn_pass();
|
|
||||||
pass_manager.add_cfg_simplification_pass();
|
|
||||||
pass_manager.add_basic_alias_analysis_pass();
|
|
||||||
pass_manager.add_promote_memory_to_register_pass();
|
|
||||||
pass_manager.add_instruction_combining_pass();
|
|
||||||
pass_manager.add_reassociate_pass();
|
|
||||||
pass_manager.initialize();
|
|
||||||
|
|
||||||
let i32_type = context.i32_type();
|
|
||||||
let fn_type = i32_type.fn_type(&[i32_type.into()], false);
|
|
||||||
module.add_function("output", fn_type, None);
|
|
||||||
|
|
||||||
CodeGen {
|
|
||||||
context, module, pass_manager,
|
|
||||||
builder: context.create_builder(),
|
|
||||||
current_source_location: ast::Location::default(),
|
|
||||||
namespace: HashMap::new(),
|
|
||||||
break_bb: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set_source_location(&mut self, location: ast::Location) {
|
|
||||||
self.current_source_location = location;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn compile_error(&self, kind: CompileErrorKind) -> CompileError {
|
|
||||||
CompileError {
|
|
||||||
location: self.current_source_location,
|
|
||||||
kind
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_basic_type(&self, name: &str) -> CompileResult<types::BasicTypeEnum<'ctx>> {
|
|
||||||
match name {
|
|
||||||
"bool" => Ok(self.context.bool_type().into()),
|
|
||||||
"int32" => Ok(self.context.i32_type().into()),
|
|
||||||
"int64" => Ok(self.context.i64_type().into()),
|
|
||||||
"float32" => Ok(self.context.f32_type().into()),
|
|
||||||
"float64" => Ok(self.context.f64_type().into()),
|
|
||||||
_ => Err(self.compile_error(CompileErrorKind::UnknownTypeAnnotation))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn compile_function_def(
|
|
||||||
&mut self,
|
|
||||||
name: &str,
|
|
||||||
args: &ast::Parameters,
|
|
||||||
body: &ast::Suite,
|
|
||||||
decorator_list: &[ast::Expression],
|
|
||||||
returns: &Option<ast::Expression>,
|
|
||||||
is_async: bool,
|
|
||||||
) -> CompileResult<values::FunctionValue<'ctx>> {
|
|
||||||
if is_async {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("async functions")))
|
|
||||||
}
|
|
||||||
for decorator in decorator_list.iter() {
|
|
||||||
self.set_source_location(decorator.location);
|
|
||||||
if let ast::ExpressionType::Identifier { name } = &decorator.node {
|
|
||||||
if name != "kernel" && name != "portable" {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("custom decorators")))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("decorator must be an identifier")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let args_type = args.args.iter().map(|val| {
|
|
||||||
self.set_source_location(val.location);
|
|
||||||
if let Some(annotation) = &val.annotation {
|
|
||||||
if let ast::ExpressionType::Identifier { name } = &annotation.node {
|
|
||||||
Ok(self.get_basic_type(&name)?)
|
|
||||||
} else {
|
|
||||||
Err(self.compile_error(CompileErrorKind::Unsupported("type annotation must be an identifier")))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Err(self.compile_error(CompileErrorKind::MissingTypeAnnotation))
|
|
||||||
}
|
|
||||||
}).collect::<CompileResult<Vec<types::BasicTypeEnum>>>()?;
|
|
||||||
let return_type = if let Some(returns) = returns {
|
|
||||||
self.set_source_location(returns.location);
|
|
||||||
if let ast::ExpressionType::Identifier { name } = &returns.node {
|
|
||||||
if name == "None" { None } else { Some(self.get_basic_type(name)?) }
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("type annotation must be an identifier")))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
let fn_type = match return_type {
|
|
||||||
Some(ty) => ty.fn_type(&args_type, false),
|
|
||||||
None => self.context.void_type().fn_type(&args_type, false)
|
|
||||||
};
|
|
||||||
|
|
||||||
let function = self.module.add_function(name, fn_type, None);
|
|
||||||
let basic_block = self.context.append_basic_block(function, "entry");
|
|
||||||
self.builder.position_at_end(basic_block);
|
|
||||||
|
|
||||||
for (n, arg) in args.args.iter().enumerate() {
|
|
||||||
let param = function.get_nth_param(n as u32).unwrap();
|
|
||||||
let alloca = self.builder.build_alloca(param.get_type(), &arg.arg);
|
|
||||||
self.builder.build_store(alloca, param);
|
|
||||||
self.namespace.insert(arg.arg.clone(), alloca);
|
|
||||||
}
|
|
||||||
|
|
||||||
self.compile_suite(body, return_type)?;
|
|
||||||
|
|
||||||
Ok(function)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn compile_expression(
|
|
||||||
&mut self,
|
|
||||||
expression: &ast::Expression
|
|
||||||
) -> CompileResult<values::BasicValueEnum<'ctx>> {
|
|
||||||
self.set_source_location(expression.location);
|
|
||||||
|
|
||||||
match &expression.node {
|
|
||||||
ast::ExpressionType::True => Ok(self.context.bool_type().const_int(1, false).into()),
|
|
||||||
ast::ExpressionType::False => Ok(self.context.bool_type().const_int(0, false).into()),
|
|
||||||
ast::ExpressionType::Number { value: ast::Number::Integer { value } } => {
|
|
||||||
let mut bits = value.bits();
|
|
||||||
if value.sign() == num_bigint::Sign::Minus {
|
|
||||||
bits += 1;
|
|
||||||
}
|
|
||||||
match bits {
|
|
||||||
0..=32 => Ok(self.context.i32_type().const_int(value.to_i32().unwrap() as _, true).into()),
|
|
||||||
33..=64 => Ok(self.context.i64_type().const_int(value.to_i64().unwrap() as _, true).into()),
|
|
||||||
_ => Err(self.compile_error(CompileErrorKind::Unsupported("integers larger than 64 bits")))
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Number { value: ast::Number::Float { value } } => {
|
|
||||||
Ok(self.context.f64_type().const_float(*value).into())
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Identifier { name } => {
|
|
||||||
match self.namespace.get(name) {
|
|
||||||
Some(value) => Ok(self.builder.build_load(*value, name).into()),
|
|
||||||
None => Err(self.compile_error(CompileErrorKind::UnboundIdentifier))
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Unop { op, a } => {
|
|
||||||
let a = self.compile_expression(&a)?;
|
|
||||||
match (op, a) {
|
|
||||||
(ast::UnaryOperator::Pos, values::BasicValueEnum::IntValue(a))
|
|
||||||
=> Ok(a.into()),
|
|
||||||
(ast::UnaryOperator::Pos, values::BasicValueEnum::FloatValue(a))
|
|
||||||
=> Ok(a.into()),
|
|
||||||
(ast::UnaryOperator::Neg, values::BasicValueEnum::IntValue(a))
|
|
||||||
=> Ok(self.builder.build_int_neg(a, "tmpneg").into()),
|
|
||||||
(ast::UnaryOperator::Neg, values::BasicValueEnum::FloatValue(a))
|
|
||||||
=> Ok(self.builder.build_float_neg(a, "tmpneg").into()),
|
|
||||||
(ast::UnaryOperator::Inv, values::BasicValueEnum::IntValue(a))
|
|
||||||
=> Ok(self.builder.build_not(a, "tmpnot").into()),
|
|
||||||
(ast::UnaryOperator::Not, values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
// boolean "not"
|
|
||||||
if a.get_type().get_bit_width() != 1 {
|
|
||||||
Err(self.compile_error(CompileErrorKind::Unsupported("unimplemented unary operation")))
|
|
||||||
} else {
|
|
||||||
Ok(self.builder.build_not(a, "tmpnot").into())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_ => Err(self.compile_error(CompileErrorKind::Unsupported("unimplemented unary operation"))),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Binop { a, op, b } => {
|
|
||||||
let a = self.compile_expression(&a)?;
|
|
||||||
let b = self.compile_expression(&b)?;
|
|
||||||
if a.get_type() != b.get_type() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
use ast::Operator::*;
|
|
||||||
match (op, a, b) {
|
|
||||||
(Add, values::BasicValueEnum::IntValue(a), values::BasicValueEnum::IntValue(b))
|
|
||||||
=> Ok(self.builder.build_int_add(a, b, "tmpadd").into()),
|
|
||||||
(Sub, values::BasicValueEnum::IntValue(a), values::BasicValueEnum::IntValue(b))
|
|
||||||
=> Ok(self.builder.build_int_sub(a, b, "tmpsub").into()),
|
|
||||||
(Mult, values::BasicValueEnum::IntValue(a), values::BasicValueEnum::IntValue(b))
|
|
||||||
=> Ok(self.builder.build_int_mul(a, b, "tmpmul").into()),
|
|
||||||
|
|
||||||
(Add, values::BasicValueEnum::FloatValue(a), values::BasicValueEnum::FloatValue(b))
|
|
||||||
=> Ok(self.builder.build_float_add(a, b, "tmpadd").into()),
|
|
||||||
(Sub, values::BasicValueEnum::FloatValue(a), values::BasicValueEnum::FloatValue(b))
|
|
||||||
=> Ok(self.builder.build_float_sub(a, b, "tmpsub").into()),
|
|
||||||
(Mult, values::BasicValueEnum::FloatValue(a), values::BasicValueEnum::FloatValue(b))
|
|
||||||
=> Ok(self.builder.build_float_mul(a, b, "tmpmul").into()),
|
|
||||||
|
|
||||||
(Div, values::BasicValueEnum::FloatValue(a), values::BasicValueEnum::FloatValue(b))
|
|
||||||
=> Ok(self.builder.build_float_div(a, b, "tmpdiv").into()),
|
|
||||||
(FloorDiv, values::BasicValueEnum::IntValue(a), values::BasicValueEnum::IntValue(b))
|
|
||||||
=> Ok(self.builder.build_int_signed_div(a, b, "tmpdiv").into()),
|
|
||||||
_ => Err(self.compile_error(CompileErrorKind::Unsupported("unimplemented binary operation"))),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Compare { vals, ops } => {
|
|
||||||
let mut vals = vals.iter();
|
|
||||||
let mut ops = ops.iter();
|
|
||||||
|
|
||||||
let mut result = None;
|
|
||||||
let mut a = self.compile_expression(vals.next().unwrap())?;
|
|
||||||
loop {
|
|
||||||
if let Some(op) = ops.next() {
|
|
||||||
let b = self.compile_expression(vals.next().unwrap())?;
|
|
||||||
if a.get_type() != b.get_type() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
let this_result = match (a, b) {
|
|
||||||
(values::BasicValueEnum::IntValue(a), values::BasicValueEnum::IntValue(b)) => {
|
|
||||||
match op {
|
|
||||||
ast::Comparison::Equal
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::EQ, a, b, "tmpeq"),
|
|
||||||
ast::Comparison::NotEqual
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::NE, a, b, "tmpne"),
|
|
||||||
ast::Comparison::Less
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::SLT, a, b, "tmpslt"),
|
|
||||||
ast::Comparison::LessOrEqual
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::SLE, a, b, "tmpsle"),
|
|
||||||
ast::Comparison::Greater
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::SGT, a, b, "tmpsgt"),
|
|
||||||
ast::Comparison::GreaterOrEqual
|
|
||||||
=> self.builder.build_int_compare(IntPredicate::SGE, a, b, "tmpsge"),
|
|
||||||
_ => return Err(self.compile_error(CompileErrorKind::Unsupported("special comparison"))),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
(values::BasicValueEnum::FloatValue(a), values::BasicValueEnum::FloatValue(b)) => {
|
|
||||||
match op {
|
|
||||||
ast::Comparison::Equal
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::OEQ, a, b, "tmpoeq"),
|
|
||||||
ast::Comparison::NotEqual
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::UNE, a, b, "tmpune"),
|
|
||||||
ast::Comparison::Less
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::OLT, a, b, "tmpolt"),
|
|
||||||
ast::Comparison::LessOrEqual
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::OLE, a, b, "tmpole"),
|
|
||||||
ast::Comparison::Greater
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::OGT, a, b, "tmpogt"),
|
|
||||||
ast::Comparison::GreaterOrEqual
|
|
||||||
=> self.builder.build_float_compare(FloatPredicate::OGE, a, b, "tmpoge"),
|
|
||||||
_ => return Err(self.compile_error(CompileErrorKind::Unsupported("special comparison"))),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_ => return Err(self.compile_error(CompileErrorKind::Unsupported("comparison of non-numerical types"))),
|
|
||||||
};
|
|
||||||
match result {
|
|
||||||
Some(last) => {
|
|
||||||
result = Some(self.builder.build_and(last, this_result, "tmpand"));
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
result = Some(this_result);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
a = b;
|
|
||||||
} else {
|
|
||||||
return Ok(result.unwrap().into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ast::ExpressionType::Call { function, args, keywords } => {
|
|
||||||
if !keywords.is_empty() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("keyword arguments")))
|
|
||||||
}
|
|
||||||
let args = args.iter().map(|val| self.compile_expression(val))
|
|
||||||
.collect::<CompileResult<Vec<values::BasicValueEnum>>>()?;
|
|
||||||
self.set_source_location(expression.location);
|
|
||||||
if let ast::ExpressionType::Identifier { name } = &function.node {
|
|
||||||
match (name.as_str(), args[0]) {
|
|
||||||
("int32", values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
let nbits = a.get_type().get_bit_width();
|
|
||||||
if nbits < 32 {
|
|
||||||
Ok(self.builder.build_int_s_extend(a, self.context.i32_type(), "tmpsext").into())
|
|
||||||
} else if nbits > 32 {
|
|
||||||
Ok(self.builder.build_int_truncate(a, self.context.i32_type(), "tmptrunc").into())
|
|
||||||
} else {
|
|
||||||
Ok(a.into())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
("int64", values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
let nbits = a.get_type().get_bit_width();
|
|
||||||
if nbits < 64 {
|
|
||||||
Ok(self.builder.build_int_s_extend(a, self.context.i64_type(), "tmpsext").into())
|
|
||||||
} else {
|
|
||||||
Ok(a.into())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
("int32", values::BasicValueEnum::FloatValue(a)) => {
|
|
||||||
Ok(self.builder.build_float_to_signed_int(a, self.context.i32_type(), "tmpfptosi").into())
|
|
||||||
},
|
|
||||||
("int64", values::BasicValueEnum::FloatValue(a)) => {
|
|
||||||
Ok(self.builder.build_float_to_signed_int(a, self.context.i64_type(), "tmpfptosi").into())
|
|
||||||
},
|
|
||||||
("float32", values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
Ok(self.builder.build_signed_int_to_float(a, self.context.f32_type(), "tmpsitofp").into())
|
|
||||||
},
|
|
||||||
("float64", values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
Ok(self.builder.build_signed_int_to_float(a, self.context.f64_type(), "tmpsitofp").into())
|
|
||||||
},
|
|
||||||
("float32", values::BasicValueEnum::FloatValue(a)) => {
|
|
||||||
if a.get_type() == self.context.f64_type() {
|
|
||||||
Ok(self.builder.build_float_trunc(a, self.context.f32_type(), "tmptrunc").into())
|
|
||||||
} else {
|
|
||||||
Ok(a.into())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
("float64", values::BasicValueEnum::FloatValue(a)) => {
|
|
||||||
if a.get_type() == self.context.f32_type() {
|
|
||||||
Ok(self.builder.build_float_ext(a, self.context.f64_type(), "tmpext").into())
|
|
||||||
} else {
|
|
||||||
Ok(a.into())
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
("output", values::BasicValueEnum::IntValue(a)) => {
|
|
||||||
let fn_value = self.module.get_function("output").unwrap();
|
|
||||||
Ok(self.builder.build_call(fn_value, &[a.into()], "call")
|
|
||||||
.try_as_basic_value().left().unwrap())
|
|
||||||
},
|
|
||||||
_ => Err(self.compile_error(CompileErrorKind::Unsupported("unrecognized call")))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("function must be an identifier")))
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_ => return Err(self.compile_error(CompileErrorKind::Unsupported("unimplemented expression"))),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn compile_statement(
|
|
||||||
&mut self,
|
|
||||||
statement: &ast::Statement,
|
|
||||||
return_type: Option<types::BasicTypeEnum>
|
|
||||||
) -> CompileResult<()> {
|
|
||||||
self.set_source_location(statement.location);
|
|
||||||
|
|
||||||
use ast::StatementType::*;
|
|
||||||
match &statement.node {
|
|
||||||
Assign { targets, value } => {
|
|
||||||
let value = self.compile_expression(value)?;
|
|
||||||
for target in targets.iter() {
|
|
||||||
self.set_source_location(target.location);
|
|
||||||
if let ast::ExpressionType::Identifier { name } = &target.node {
|
|
||||||
let builder = &self.builder;
|
|
||||||
let target = self.namespace.entry(name.clone()).or_insert_with(
|
|
||||||
|| builder.build_alloca(value.get_type(), name));
|
|
||||||
if target.get_type() != value.get_type().ptr_type(inkwell::AddressSpace::Generic) {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
builder.build_store(*target, value);
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::Unsupported("assignment target must be an identifier")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Expression { expression } => { self.compile_expression(expression)?; },
|
|
||||||
If { test, body, orelse } => {
|
|
||||||
let test = self.compile_expression(test)?;
|
|
||||||
if test.get_type() != self.context.bool_type().into() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
|
|
||||||
let parent = self.builder.get_insert_block().unwrap().get_parent().unwrap();
|
|
||||||
let then_bb = self.context.append_basic_block(parent, "then");
|
|
||||||
let else_bb = self.context.append_basic_block(parent, "else");
|
|
||||||
let cont_bb = self.context.append_basic_block(parent, "ifcont");
|
|
||||||
self.builder.build_conditional_branch(test.into_int_value(), then_bb, else_bb);
|
|
||||||
|
|
||||||
self.builder.position_at_end(then_bb);
|
|
||||||
self.compile_suite(body, return_type)?;
|
|
||||||
self.builder.build_unconditional_branch(cont_bb);
|
|
||||||
|
|
||||||
self.builder.position_at_end(else_bb);
|
|
||||||
if let Some(orelse) = orelse {
|
|
||||||
self.compile_suite(orelse, return_type)?;
|
|
||||||
}
|
|
||||||
self.builder.build_unconditional_branch(cont_bb);
|
|
||||||
self.builder.position_at_end(cont_bb);
|
|
||||||
},
|
|
||||||
While { test, body, orelse } => {
|
|
||||||
let parent = self.builder.get_insert_block().unwrap().get_parent().unwrap();
|
|
||||||
let test_bb = self.context.append_basic_block(parent, "test");
|
|
||||||
self.builder.build_unconditional_branch(test_bb);
|
|
||||||
self.builder.position_at_end(test_bb);
|
|
||||||
let test = self.compile_expression(test)?;
|
|
||||||
if test.get_type() != self.context.bool_type().into() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
|
|
||||||
let then_bb = self.context.append_basic_block(parent, "then");
|
|
||||||
let else_bb = self.context.append_basic_block(parent, "else");
|
|
||||||
let cont_bb = self.context.append_basic_block(parent, "ifcont");
|
|
||||||
self.builder.build_conditional_branch(test.into_int_value(), then_bb, else_bb);
|
|
||||||
|
|
||||||
self.break_bb = Some(cont_bb);
|
|
||||||
|
|
||||||
self.builder.position_at_end(then_bb);
|
|
||||||
self.compile_suite(body, return_type)?;
|
|
||||||
self.builder.build_unconditional_branch(test_bb);
|
|
||||||
|
|
||||||
self.builder.position_at_end(else_bb);
|
|
||||||
if let Some(orelse) = orelse {
|
|
||||||
self.compile_suite(orelse, return_type)?;
|
|
||||||
}
|
|
||||||
self.builder.build_unconditional_branch(cont_bb);
|
|
||||||
self.builder.position_at_end(cont_bb);
|
|
||||||
|
|
||||||
self.break_bb = None;
|
|
||||||
},
|
|
||||||
Break => {
|
|
||||||
if let Some(bb) = self.break_bb {
|
|
||||||
self.builder.build_unconditional_branch(bb);
|
|
||||||
let parent = self.builder.get_insert_block().unwrap().get_parent().unwrap();
|
|
||||||
let unreachable_bb = self.context.append_basic_block(parent, "unreachable");
|
|
||||||
self.builder.position_at_end(unreachable_bb);
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::BreakOutsideLoop));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Return { value: Some(value) } => {
|
|
||||||
if let Some(return_type) = return_type {
|
|
||||||
let value = self.compile_expression(value)?;
|
|
||||||
if value.get_type() != return_type {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
self.builder.build_return(Some(&value));
|
|
||||||
} else {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Return { value: None } => {
|
|
||||||
if !return_type.is_none() {
|
|
||||||
return Err(self.compile_error(CompileErrorKind::IncompatibleTypes));
|
|
||||||
}
|
|
||||||
self.builder.build_return(None);
|
|
||||||
},
|
|
||||||
Pass => (),
|
|
||||||
_ => return Err(self.compile_error(CompileErrorKind::Unsupported("special statement"))),
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn compile_suite(
|
|
||||||
&mut self,
|
|
||||||
suite: &ast::Suite,
|
|
||||||
return_type: Option<types::BasicTypeEnum>
|
|
||||||
) -> CompileResult<()> {
|
|
||||||
for statement in suite.iter() {
|
|
||||||
self.compile_statement(statement, return_type)?;
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn compile_toplevel(&mut self, statement: &ast::Statement) -> CompileResult<()> {
|
|
||||||
self.set_source_location(statement.location);
|
|
||||||
if let ast::StatementType::FunctionDef {
|
|
||||||
is_async,
|
|
||||||
name,
|
|
||||||
args,
|
|
||||||
body,
|
|
||||||
decorator_list,
|
|
||||||
returns,
|
|
||||||
} = &statement.node {
|
|
||||||
let function = self.compile_function_def(name, args, body, decorator_list, returns, *is_async)?;
|
|
||||||
self.pass_manager.run_on(&function);
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err(self.compile_error(CompileErrorKind::Internal("top-level is not a function definition")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn print_ir(&self) {
|
|
||||||
self.module.print_to_stderr();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn output(&self, filename: &str) {
|
|
||||||
//let triple = TargetTriple::create("riscv32-none-linux-gnu");
|
|
||||||
let triple = TargetMachine::get_default_triple();
|
|
||||||
let target = Target::from_triple(&triple)
|
|
||||||
.expect("couldn't create target from target triple");
|
|
||||||
|
|
||||||
let target_machine = target
|
|
||||||
.create_target_machine(
|
|
||||||
&triple,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
OptimizationLevel::Default,
|
|
||||||
RelocMode::Default,
|
|
||||||
CodeModel::Default,
|
|
||||||
)
|
|
||||||
.expect("couldn't create target machine");
|
|
||||||
|
|
||||||
target_machine
|
|
||||||
.write_to_file(&self.module, FileType::Object, Path::new(filename))
|
|
||||||
.expect("couldn't write module to file");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use super::TopLevelContext;
|
use super::TopLevelContext;
|
||||||
use crate::typedef::*;
|
use super::super::typedef::*;
|
||||||
use std::boxed::Box;
|
use std::boxed::Box;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
use crate::typedef::*;
|
use super::super::typedef::*;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use crate::context::InferenceContext;
|
use super::context::InferenceContext;
|
||||||
use crate::typedef::{TypeEnum::*, *};
|
use super::typedef::{TypeEnum::*, *};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
fn find_subst(
|
fn find_subst(
|
||||||
|
|
@ -168,8 +168,8 @@ pub fn resolve_call(
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::context::TopLevelContext;
|
use super::super::context::TopLevelContext;
|
||||||
use crate::primitives::*;
|
use super::super::primitives::*;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
fn get_inference_context(ctx: TopLevelContext) -> InferenceContext {
|
fn get_inference_context(ctx: TopLevelContext) -> InferenceContext {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
use rustpython_parser::ast::{Comparison, Operator, UnaryOperator};
|
use rustpython_parser::ast::{Cmpop, Operator, Unaryop};
|
||||||
|
|
||||||
pub fn binop_name(op: &Operator) -> &'static str {
|
pub fn binop_name(op: &Operator) -> &'static str {
|
||||||
match op {
|
match op {
|
||||||
|
|
@ -36,23 +36,23 @@ pub fn binop_assign_name(op: &Operator) -> &'static str {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn unaryop_name(op: &UnaryOperator) -> &'static str {
|
pub fn unaryop_name(op: &Unaryop) -> &'static str {
|
||||||
match op {
|
match op {
|
||||||
UnaryOperator::Pos => "__pos__",
|
Unaryop::UAdd => "__pos__",
|
||||||
UnaryOperator::Neg => "__neg__",
|
Unaryop::USub => "__neg__",
|
||||||
UnaryOperator::Not => "__not__",
|
Unaryop::Not => "__not__",
|
||||||
UnaryOperator::Inv => "__inv__",
|
Unaryop::Invert => "__inv__",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn comparison_name(op: &Comparison) -> Option<&'static str> {
|
pub fn comparison_name(op: &Cmpop) -> Option<&'static str> {
|
||||||
match op {
|
match op {
|
||||||
Comparison::Less => Some("__lt__"),
|
Cmpop::Lt => Some("__lt__"),
|
||||||
Comparison::LessOrEqual => Some("__le__"),
|
Cmpop::LtE => Some("__le__"),
|
||||||
Comparison::Greater => Some("__gt__"),
|
Cmpop::Gt => Some("__gt__"),
|
||||||
Comparison::GreaterOrEqual => Some("__ge__"),
|
Cmpop::GtE => Some("__ge__"),
|
||||||
Comparison::Equal => Some("__eq__"),
|
Cmpop::Eq => Some("__eq__"),
|
||||||
Comparison::NotEqual => Some("__ne__"),
|
Cmpop::NotEq => Some("__ne__"),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
pub mod inference_core;
|
||||||
|
pub mod magic_methods;
|
||||||
|
pub mod primitives;
|
||||||
|
pub mod typedef;
|
||||||
|
pub mod context;
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use super::typedef::{TypeEnum::*, *};
|
use super::typedef::{TypeEnum::*, *};
|
||||||
use crate::context::*;
|
use super::context::*;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
pub const TUPLE_TYPE: ParamId = ParamId(0);
|
pub const TUPLE_TYPE: ParamId = ParamId(0);
|
||||||
Loading…
Reference in New Issue