diff --git a/.gitignore b/.gitignore
index bca6aa2..b2f817b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,4 @@
/target
.pre-commit-config.yaml
*.pdf
-/docs/*.png
-/testfiles/gen/*
-!/testfiles/gen/.gitkeep
+*.png
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 748fd03..a89a2d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ Before we get started, thank you for thinking about doing so!
- How did you install iOwO?
- What version of iOwO are you running?
- What operating system are you running?
- In the case of a Linux distro, mention the specific distro and when you last updated as well.
+ In the case of a Linux distro, mention the specific distro and when you last update as well.
- If the bug causes a crash, try to get a backtrace or in worse cases, a coredump.
### Feature requests
@@ -67,7 +67,7 @@ Otherwise, we suggest these:
[The Rust Programming Language book]: https://doc.rust-lang.org/book/
[typst's excellent tutorial]: https://typst.app/docs/tutorial
-[Inkscape]: https://inkscape.org/
+[Inkscape]: https://inkscape.org/
[GIMP]: https://www.gimp.org/
[Blender]: https://www.blender.org/
[Penpot]: https://penpot.app/
diff --git a/Cargo.lock b/Cargo.lock
index a808278..091f8a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,67 +8,54 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-[[package]]
-name = "aligned-vec"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
-
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
- "is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.0"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
[[package]]
name = "app"
version = "0.1.0"
@@ -76,98 +63,34 @@ dependencies = [
"ariadne",
"clap",
"dirs",
- "eval",
- "ir",
"owo-colors",
- "prowocessing",
"ron",
"serde",
"serde_json",
"time",
]
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arbitrary"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
-
-[[package]]
-name = "arg_enum_proc_macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "ariadne"
-version = "0.4.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44055e597c674aef7cb903b2b9f6e4cba1277ed0d2d61dae7cd52d7ffa81f8e2"
+checksum = "dd002a6223f12c7a95cdd4b1cb3a0149d22d37f7a9ecdb2cb691a071fe236c29"
dependencies = [
"unicode-width",
"yansi",
]
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "av1-grain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
-dependencies = [
- "anyhow",
- "arrayvec",
- "log",
- "nom",
- "num-rational",
- "v_frame",
-]
-
-[[package]]
-name = "avif-serialize"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
-dependencies = [
- "arrayvec",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "base64"
-version = "0.21.7"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
[[package]]
name = "bit_field"
@@ -183,42 +106,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.6.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
dependencies = [
"serde",
]
-[[package]]
-name = "bitstream-io"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
-
-[[package]]
-name = "built"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "by_address"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
-
[[package]]
name = "bytemuck"
-version = "1.16.1"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
[[package]]
name = "byteorder"
@@ -226,32 +125,6 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "cc"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
-dependencies = [
- "jobserver",
- "libc",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -260,9 +133,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
-version = "4.5.8"
+version = "4.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
+checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -270,9 +143,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.8"
+version = "4.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
+checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
dependencies = [
"anstream",
"anstyle",
@@ -282,9 +155,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.8"
+version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
dependencies = [
"heck",
"proc-macro2",
@@ -294,9 +167,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "color_quant"
@@ -306,80 +179,49 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "colorchoice"
-version = "1.0.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
-
-[[package]]
-name = "countme"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "crc32fast"
-version = "1.4.2"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
"cfg-if",
]
[[package]]
-name = "crossbeam"
+name = "crossbeam-deque"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
dependencies = [
+ "cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
dependencies = [
+ "autocfg",
+ "cfg-if",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
+dependencies = [
+ "cfg-if",
+]
[[package]]
name = "crunchy"
@@ -387,62 +229,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-[[package]]
-name = "csscolorparser"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
-dependencies = [
- "phf",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
[[package]]
name = "deranged"
version = "0.3.11"
@@ -473,76 +259,26 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "drop_bomb"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
-
-[[package]]
-name = "ego-tree"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
-
[[package]]
name = "either"
-version = "1.13.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
-name = "enumset"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
-dependencies = [
- "enumset_derive",
-]
-
-[[package]]
-name = "enumset_derive"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "eval"
+name = "executor"
version = "0.1.0"
dependencies = [
"clap",
- "image 0.24.9",
- "ir",
- "serde",
-]
-
-[[package]]
-name = "executor-poc"
-version = "0.1.0"
-dependencies = [
- "image 0.25.1",
- "indexmap",
- "nalgebra",
- "petgraph",
+ "image",
+ "rpl",
]
[[package]]
name = "exr"
-version = "1.72.0"
+version = "1.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
dependencies = [
"bit_field",
"flume",
@@ -554,32 +290,20 @@ dependencies = [
"zune-inflate",
]
-[[package]]
-name = "fast-srgb8"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
-
[[package]]
name = "fdeflate"
-version = "0.3.4"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd"
dependencies = [
"simd-adler32",
]
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
[[package]]
name = "flate2"
-version = "1.0.30"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -594,17 +318,11 @@ dependencies = [
"spin",
]
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
[[package]]
name = "getrandom"
-version = "0.2.15"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
dependencies = [
"cfg-if",
"libc",
@@ -613,9 +331,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.13.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
dependencies = [
"color_quant",
"weezl",
@@ -623,43 +341,24 @@ dependencies = [
[[package]]
name = "half"
-version = "2.4.1"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
dependencies = [
- "cfg-if",
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
[[package]]
name = "heck"
-version = "0.5.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "image"
-version = "0.24.9"
+version = "0.24.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
dependencies = [
"bytemuck",
"byteorder",
@@ -667,179 +366,28 @@ dependencies = [
"exr",
"gif",
"jpeg-decoder",
+ "num-rational",
"num-traits",
"png",
"qoi",
"tiff",
]
-[[package]]
-name = "image"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif",
- "image-webp",
- "num-traits",
- "png",
- "qoi",
- "ravif",
- "rayon",
- "rgb",
- "tiff",
- "zune-core",
- "zune-jpeg",
-]
-
-[[package]]
-name = "image-webp"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
-dependencies = [
- "byteorder-lite",
- "quick-error",
-]
-
-[[package]]
-name = "imgref"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "interpolate_name"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ir"
-version = "0.1.0"
-dependencies = [
- "either",
- "ron",
- "serde",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_ci"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itoa"
-version = "1.0.11"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
-dependencies = [
- "libc",
-]
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
[[package]]
name = "jpeg-decoder"
-version = "0.3.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
dependencies = [
"rayon",
]
-[[package]]
-name = "json-pawarser"
-version = "0.1.0"
-dependencies = [
- "enumset",
- "logos",
- "pawarser",
- "rowan",
-]
-
-[[package]]
-name = "lang"
-version = "0.1.0"
-dependencies = [
- "ariadne",
- "clap",
- "crossbeam",
- "dashmap",
- "drop_bomb",
- "ego-tree",
- "enumset",
- "indexmap",
- "indoc",
- "logos",
- "owo-colors",
- "petgraph",
- "rowan",
- "strip-ansi-escapes",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
[[package]]
name = "lebe"
version = "0.5.2"
@@ -848,269 +396,80 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libfuzzer-sys"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
-dependencies = [
- "arbitrary",
- "cc",
- "once_cell",
-]
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
[[package]]
name = "libredox"
-version = "0.1.3"
+version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.4.1",
"libc",
+ "redox_syscall",
]
[[package]]
name = "lock_api"
-version = "0.4.12"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
]
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "logos"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b"
-dependencies = [
- "logos-derive",
-]
-
-[[package]]
-name = "logos-codegen"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32eb6b5f26efacd015b000bfc562186472cd9b34bdba3f6b264e2a052676d10"
-dependencies = [
- "beef",
- "fnv",
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex-syntax",
- "syn",
-]
-
-[[package]]
-name = "logos-derive"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5d0c5463c911ef55624739fc353238b4e310f0144be1f875dc42fec6bfd5ec"
-dependencies = [
- "logos-codegen",
-]
-
-[[package]]
-name = "loop9"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
-dependencies = [
- "imgref",
-]
-
-[[package]]
-name = "matrixmultiply"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
-[[package]]
-name = "maybe-rayon"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
-dependencies = [
- "cfg-if",
- "rayon",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
[[package]]
name = "miniz_oxide"
-version = "0.7.4"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
"simd-adler32",
]
-[[package]]
-name = "nalgebra"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4"
-dependencies = [
- "approx",
- "matrixmultiply",
- "nalgebra-macros",
- "num-complex",
- "num-rational",
- "num-traits",
- "simba",
- "typenum",
-]
-
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "noop_proc_macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "num-integer"
-version = "0.1.46"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
+ "autocfg",
"num-traits",
]
[[package]]
name = "num-rational"
-version = "0.4.2"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
- "num-bigint",
+ "autocfg",
"num-integer",
"num-traits",
]
[[package]]
name = "num-traits"
-version = "0.2.19"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
]
[[package]]
name = "num_threads"
-version = "0.1.7"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
dependencies = [
"libc",
]
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
[[package]]
name = "option-ext"
version = "0.2.0"
@@ -1122,125 +481,21 @@ name = "owo-colors"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
-dependencies = [
- "supports-color",
-]
[[package]]
-name = "palette"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
-dependencies = [
- "approx",
- "fast-srgb8",
- "palette_derive",
- "phf",
-]
-
-[[package]]
-name = "palette_derive"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
-dependencies = [
- "by_address",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pawarser"
+name = "pl-cli"
version = "0.1.0"
dependencies = [
- "drop_bomb",
- "enumset",
- "rowan",
+ "clap",
+ "executor",
+ "rpl",
]
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
[[package]]
name = "png"
-version = "0.17.13"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
@@ -1255,48 +510,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
dependencies = [
"unicode-ident",
]
-[[package]]
-name = "profiling"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
-dependencies = [
- "profiling-procmacros",
-]
-
-[[package]]
-name = "profiling-procmacros"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prowocessing"
-version = "0.1.0"
-dependencies = [
- "image 0.24.9",
- "palette",
-]
-
[[package]]
name = "qoi"
version = "0.4.1"
@@ -1306,122 +528,20 @@ dependencies = [
"bytemuck",
]
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
-[[package]]
-name = "quick-xml"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rav1e"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
-dependencies = [
- "arbitrary",
- "arg_enum_proc_macro",
- "arrayvec",
- "av1-grain",
- "bitstream-io",
- "built",
- "cfg-if",
- "interpolate_name",
- "itertools",
- "libc",
- "libfuzzer-sys",
- "log",
- "maybe-rayon",
- "new_debug_unreachable",
- "noop_proc_macro",
- "num-derive",
- "num-traits",
- "once_cell",
- "paste",
- "profiling",
- "rand",
- "rand_chacha",
- "simd_helpers",
- "system-deps",
- "thiserror",
- "v_frame",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "ravif"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
-dependencies = [
- "avif-serialize",
- "imgref",
- "loop9",
- "quick-error",
- "rav1e",
- "rayon",
- "rgb",
-]
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
[[package]]
name = "rayon"
-version = "1.10.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
dependencies = [
"either",
"rayon-core",
@@ -1429,9 +549,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.12.1"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
@@ -1439,39 +559,24 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.2"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_users"
-version = "0.4.5"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
dependencies = [
"getrandom",
"libredox",
"thiserror",
]
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "rgb"
-version = "0.8.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
-dependencies = [
- "bytemuck",
-]
-
[[package]]
name = "ron"
version = "0.8.1"
@@ -1479,44 +584,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
"base64",
- "bitflags 2.6.0",
+ "bitflags 2.4.1",
"serde",
"serde_derive",
]
[[package]]
-name = "rowan"
-version = "0.15.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+name = "rpl"
+version = "0.1.0"
dependencies = [
- "countme",
- "hashbrown",
- "memoffset",
- "rustc-hash",
- "text-size",
+ "ron",
+ "serde",
]
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
[[package]]
name = "ryu"
-version = "1.0.18"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "safe_arch"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
-dependencies = [
- "bytemuck",
-]
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
[[package]]
name = "scopeguard"
@@ -1526,18 +611,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
-version = "1.0.204"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.204"
+version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2",
"quote",
@@ -1546,63 +631,26 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.120"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
dependencies = [
"itoa",
"ryu",
"serde",
]
-[[package]]
-name = "serde_spanned"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "simba"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
-
[[package]]
name = "simd-adler32"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-[[package]]
-name = "simd_helpers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
-dependencies = [
- "quote",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
[[package]]
name = "smallvec"
-version = "1.13.2"
+version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
[[package]]
name = "spin"
@@ -1613,91 +661,37 @@ dependencies = [
"lock_api",
]
-[[package]]
-name = "strip-ansi-escapes"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
-dependencies = [
- "vte",
-]
-
[[package]]
name = "strsim"
-version = "0.11.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "supports-color"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89"
-dependencies = [
- "is-terminal",
- "is_ci",
-]
-
-[[package]]
-name = "svg-filters"
-version = "0.1.0"
-dependencies = [
- "csscolorparser",
- "indexmap",
- "petgraph",
- "quick-xml",
-]
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
-version = "2.0.70"
+version = "2.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
+checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
-[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
-
-[[package]]
-name = "text-size"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
-
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "6e3de26b0965292219b4287ff031fcba86837900fe9cd2b34ea8ad893c0953d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "268026685b2be38d7103e9e507c938a1fcb3d7e6eb15e87870b617bf37b6d581"
dependencies = [
"proc-macro2",
"quote",
@@ -1706,9 +700,9 @@ dependencies = [
[[package]]
name = "tiff"
-version = "0.9.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
dependencies = [
"flate2",
"jpeg-decoder",
@@ -1717,13 +711,12 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.36"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
dependencies = [
"deranged",
"libc",
- "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1736,46 +729,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-[[package]]
-name = "toml"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
[[package]]
name = "unicode-ident"
version = "1.0.12"
@@ -1784,52 +737,15 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "utf8parse"
-version = "0.2.2"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "v_frame"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
-dependencies = [
- "aligned-vec",
- "num-traits",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
-[[package]]
-name = "vte"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
-dependencies = [
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte_generate_state_changes"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
-dependencies = [
- "proc-macro2",
- "quote",
-]
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "wasi"
@@ -1837,75 +753,11 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
[[package]]
name = "weezl"
-version = "0.1.8"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[package]]
-name = "wide"
-version = "0.7.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2"
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
[[package]]
name = "windows-sys"
@@ -1922,7 +774,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.52.0",
]
[[package]]
@@ -1942,18 +794,17 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
]
[[package]]
@@ -1964,9 +815,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[package]]
name = "windows_aarch64_msvc"
@@ -1976,9 +827,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[package]]
name = "windows_i686_gnu"
@@ -1988,15 +839,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[package]]
name = "windows_i686_msvc"
@@ -2006,9 +851,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[package]]
name = "windows_x86_64_gnu"
@@ -2018,9 +863,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -2030,9 +875,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[package]]
name = "windows_x86_64_msvc"
@@ -2042,30 +887,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.6"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "yansi"
-version = "1.0.1"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
-[[package]]
-name = "zune-core"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]]
name = "zune-inflate"
@@ -2075,12 +905,3 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]
-
-[[package]]
-name = "zune-jpeg"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
-dependencies = [
- "zune-core",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 794dd5a..1fc1618 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,31 +1,20 @@
[workspace]
-members = [
- "crates/app",
- "crates/eval",
- "crates/ir",
- "crates/lang",
- "crates/svg-filters",
- "crates/prowocessing",
- "crates/executor-poc",
- "crates/pawarser",
- "crates/json-pawarser",
+members = [
+ "crates/app",
+ "crates/executor",
+ "crates/rpl"
]
resolver = "2"
[workspace.dependencies]
-clap = { version = "4", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-petgraph = "0.6.4"
+clap = { version = "4", features = [ "derive" ] }
+serde = { version = "1.0", features = [ "derive" ] }
-# to enable all the lints below, this must be present in a workspace member's Cargo.toml:
-# [lints]
-# workspace = true
-
-[workspace.lints.rust]
+[lints.rust]
unsafe_code = "deny"
variant_size_differences = "warn"
-[workspace.lints.clippy]
+[lints.clippy]
branches_sharing_code = "warn"
clone_on_ref_ptr = "warn"
cognitive_complexity = "warn"
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index fc3bcbd..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,676 +0,0 @@
-The main program and its libraries are licensed under the AGPL 3.0
-as listed below the separator line.
-
-Media samples in the testfiles folder are licensed under CC BY-SA 4.0.
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/
-The appropiate authors are given below, in the format of
-`- file/path: author (link to author)`
-
-- testfiles/rails.png: Schrottkatze (https://forge.katzen.cafe/schrottkatze)
-
-===============================================================================
-
-iOwO: media pipeline toolset
-Copyright (C) 2024 Schrottkatze, MultisampledNight and iOwO contributors
-
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
- A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
- The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
- An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU Affero General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Remote Network Interaction; Use with the GNU General Public License.
-
- Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-.
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
index d316efc..a0043ee 100644
--- a/crates/app/Cargo.toml
+++ b/crates/app/Cargo.toml
@@ -2,22 +2,15 @@
name = "app"
version = "0.1.0"
edition = "2021"
-default-run = "app"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-ariadne = "0.4"
clap = { workspace = true, features = [ "derive", "env" ] }
-dirs = "5"
-eval = { path = "../eval" }
-ir = { path = "../ir" }
-prowocessing = { path = "../prowocessing"}
-owo-colors = "4"
-ron = "0.8"
serde = { workspace = true, features = [ "derive" ] }
+ron = "0.8"
serde_json = "1.0"
+ariadne = "0.4"
time = { version = "0.3", features = [ "local-offset" ] }
-
-[lints]
-workspace = true
+dirs = "5"
+owo-colors = "4"
diff --git a/crates/app/src/config.rs b/crates/app/src/config.rs
index 17cd39c..9f2b15a 100644
--- a/crates/app/src/config.rs
+++ b/crates/app/src/config.rs
@@ -1,53 +1,53 @@
-use self::config_file::{find_config_file, Configs};
-pub(crate) use cli::CliConfigs;
+use clap::Parser;
+
+use self::{
+ cli::Args,
+ config_file::{find_config_file, Configs},
+};
mod cli;
mod config_file;
/// this struct may hold all configuration
pub struct Config {
- pub evaluator: eval::Available,
-
pub startup_msg: bool,
}
impl Config {
/// Get the configs from all possible places (args, file, env...)
- pub fn read(args: &CliConfigs) -> Self {
- // let config = if let Some(config) = &args.config_path {
- // Ok(config.clone())
- // } else {
- // find_config_file()
- // };
- let config = args
- .config_path
- .clone()
- .ok_or(())
- .or_else(|()| find_config_file());
+ pub fn read() -> Self {
+ let args = Args::parse();
+ let config_path = if let Some(config_path) = args.config_path {
+ Ok(config_path)
+ } else {
+ find_config_file()
+ };
// try to read a maybe existing config file
- let config = config.ok().and_then(|path| {
- Configs::read(path).map_or_else(
- |e| {
+ let file_config = if let Ok(config_path) = config_path {
+ let file_config = Configs::read(config_path);
+
+ match file_config {
+ Ok(c) => Some(c),
+ Err(e) => {
eprintln!("Config error: {e:?}");
eprintln!("Proceeding with defaults or cli args...");
None
- },
- Some,
- )
- });
+ }
+ }
+ } else {
+ None
+ };
- if let Some(file) = config {
+ if let Some(file_config) = file_config {
Self {
- evaluator: args.evaluator.and(file.evaluator).unwrap_or_default(),
// this is negated because to an outward api, the negative is more intuitive,
// while in the source the other way around is more intuitive
- startup_msg: !(args.no_startup_message || file.no_startup_message),
+ startup_msg: !(args.no_startup_message || file_config.no_startup_message),
}
} else {
Self {
startup_msg: !args.no_startup_message,
- evaluator: args.evaluator.unwrap_or_default(),
}
}
}
@@ -56,7 +56,7 @@ impl Config {
pub mod error {
/// Errors that can occur when reading configs
#[derive(Debug)]
- pub enum Config {
+ pub enum ConfigError {
/// The config dir doesn't exist
NoConfigDir,
/// We didn't find a config file in the config dir
@@ -73,19 +73,19 @@ pub mod error {
SerdeRonError(ron::error::SpannedError),
}
- impl From for Config {
+ impl From for ConfigError {
fn from(value: std::io::Error) -> Self {
Self::IoError(value)
}
}
- impl From for Config {
+ impl From for ConfigError {
fn from(value: serde_json::Error) -> Self {
Self::SerdeJsonError(value)
}
}
- impl From for Config {
+ impl From for ConfigError {
fn from(value: ron::error::SpannedError) -> Self {
Self::SerdeRonError(value)
}
diff --git a/crates/app/src/config/cli.rs b/crates/app/src/config/cli.rs
index c0e6c4d..bdf769e 100644
--- a/crates/app/src/config/cli.rs
+++ b/crates/app/src/config/cli.rs
@@ -1,14 +1,9 @@
use std::path::PathBuf;
-use clap::{builder::BoolishValueParser, ArgAction, Args};
-
-#[derive(Args)]
-pub(crate) struct CliConfigs {
- /// How to actually run the pipeline.
- /// Overrides the config file. Defaults to the debug evaluator.
- #[arg(short, long)]
- pub evaluator: Option,
+use clap::{builder::BoolishValueParser, ArgAction, Parser};
+#[derive(Parser)]
+pub(crate) struct Args {
/// Read this config file.
#[arg(short, long)]
pub config_path: Option,
diff --git a/crates/app/src/config/config_file.rs b/crates/app/src/config/config_file.rs
index 7078d32..a0c4db1 100644
--- a/crates/app/src/config/config_file.rs
+++ b/crates/app/src/config/config_file.rs
@@ -5,9 +5,7 @@ use std::{
use serde::{Deserialize, Serialize};
-use crate::error_reporting::{report_serde_json_err, report_serde_ron_err};
-
-use super::error::{self, Config};
+use super::error::ConfigError;
#[derive(Debug, Serialize, Deserialize)]
pub struct Configs {
@@ -15,7 +13,6 @@ pub struct Configs {
pub example_value: i32,
#[serde(default)]
pub no_startup_message: bool,
- pub evaluator: Option,
}
/// what the fuck serde why do i need this
@@ -24,9 +21,9 @@ fn default_example_value() -> i32 {
}
/// Find the location of a config file and check if there is, in fact, a file
-pub(super) fn find_config_file() -> Result {
+pub(super) fn find_config_file() -> Result {
let Some(config_path) = dirs::config_dir() else {
- return Err(Config::NoConfigDir);
+ return Err(ConfigError::NoConfigDir);
};
let ron_path = config_path.with_file_name("config.ron");
@@ -37,25 +34,16 @@ pub(super) fn find_config_file() -> Result {
} else if Path::new(&json_path).exists() {
Ok(json_path)
} else {
- Err(Config::NoConfigFileFound)
+ Err(ConfigError::NoConfigFileFound)
}
}
impl Configs {
- pub fn read(p: PathBuf) -> Result {
- match p
- .extension()
- .map(|v| v.to_str().expect("config path to be UTF-8"))
- {
- Some("ron") => {
- let f = fs::read_to_string(p)?;
- ron::from_str(&f).or_else(|e| report_serde_ron_err(&f, &e))
- }
- Some("json") => {
- let f = fs::read_to_string(p)?;
- serde_json::from_str(&f).or_else(|e| report_serde_json_err(&f, &e))
- }
- e => Err(error::Config::UnknownExtension(e.map(str::to_owned))),
+ pub fn read(p: PathBuf) -> Result {
+ match p.extension().map(|v| v.to_str().unwrap()) {
+ Some("ron") => Ok(serde_json::from_str(&fs::read_to_string(p)?)?),
+ Some("json") => Ok(ron::from_str(&fs::read_to_string(p)?)?),
+ e => Err(ConfigError::UnknownExtension(e.map(|v| v.to_owned()))),
}
}
}
diff --git a/crates/app/src/error_reporting.rs b/crates/app/src/error_reporting.rs
index 3981b17..33ffff6 100644
--- a/crates/app/src/error_reporting.rs
+++ b/crates/app/src/error_reporting.rs
@@ -3,12 +3,12 @@ use std::process;
use ron::error::Position;
/// Report an `Error` from the `serde_json` crate
-pub fn report_serde_json_err(src: &str, err: &serde_json::Error) -> ! {
+pub fn report_serde_json_err(src: &str, err: serde_json::Error) -> ! {
report_serde_err(src, err.line(), err.column(), err.to_string())
}
/// Report a `SpannedError` from the `ron` crate
-pub fn report_serde_ron_err(src: &str, err: &ron::error::SpannedError) -> ! {
+pub fn report_serde_ron_err(src: &str, err: ron::error::SpannedError) -> ! {
let Position { line, col } = err.position;
report_serde_err(src, line, col, err.to_string())
}
@@ -23,9 +23,9 @@ fn report_serde_err(src: &str, line: usize, col: usize, msg: String) -> ! {
.with_message(msg)
.with_note("We'd like to give better errors, but serde errors are horrible to work with...")
.finish()
- .eprint(("test", Source::from(src)))
- .expect("writing error to stderr failed");
- process::exit(1)
+ .print(("test", Source::from(src)))
+ .unwrap();
+ process::exit(1);
}
/// Reconstruct a byte offset from the line + column numbers typical from serde crates
diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs
index 9c7c0de..1347572 100644
--- a/crates/app/src/main.rs
+++ b/crates/app/src/main.rs
@@ -1,8 +1,4 @@
-use std::{fs, path::PathBuf};
-
-use clap::{Parser, Subcommand};
-use config::{CliConfigs, Config};
-use dev::DevCommands;
+use config::Config;
use welcome_msg::print_startup_msg;
mod config;
@@ -11,60 +7,11 @@ mod config;
mod error_reporting;
mod welcome_msg;
-#[derive(Parser)]
-struct Args {
- #[command(flatten)]
- configs: CliConfigs,
- #[command(subcommand)]
- command: Commands,
-}
-
-#[derive(Subcommand)]
-enum Commands {
- Run {
- /// What file contains the pipeline to evaluate.
- source: PathBuf,
- },
- Dev {
- #[command(subcommand)]
- command: DevCommands,
- },
-}
-
fn main() {
- // TODO: proper error handling across the whole function
- // don't forget to also look inside `Config`
- let args = Args::parse();
- let cfg = Config::read(&args.configs);
+ // TODO: proper error handling
+ let cfg = Config::read();
if cfg.startup_msg {
print_startup_msg();
}
-
- match args.command {
- Commands::Run { source } => {
- let source = fs::read_to_string(source).expect("can't find source file");
- let ir = ir::from_ron(&source).expect("failed to parse source to graph ir");
-
- let mut machine = cfg.evaluator.pick();
- machine.feed(ir);
- machine.eval_full();
- }
- Commands::Dev {
- command: dev_command,
- } => dev_command.run(),
- }
-}
-
-mod dev {
- use clap::Subcommand;
-
- #[derive(Subcommand)]
- pub(crate) enum DevCommands {}
-
- impl DevCommands {
- pub fn run(self) {
- println!("There are currently no dev commands.");
- }
- }
}
diff --git a/crates/app/src/welcome_msg.rs b/crates/app/src/welcome_msg.rs
index 63b7601..a3e15a3 100644
--- a/crates/app/src/welcome_msg.rs
+++ b/crates/app/src/welcome_msg.rs
@@ -13,10 +13,4 @@ pub fn print_startup_msg() {
} else {
println!("Hello, thanks for using iOwO! :3");
}
- if now.year() >= 2100 {
- println!("Is your system time set correctly? If yes, ... wow, humanity still exists! :0");
- println!(
- "Given current politics, I'm surprised we as a species made it another 75 years..."
- );
- }
}
diff --git a/crates/eval/src/kind/debug/instr/mod.rs b/crates/eval/src/kind/debug/instr/mod.rs
deleted file mode 100644
index 77e4101..0000000
--- a/crates/eval/src/kind/debug/instr/mod.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-pub mod read {
- use image::{io::Reader as ImageReader, DynamicImage};
- use ir::instruction::read::{Read, SourceType};
-
- pub fn read(Read { source }: Read) -> DynamicImage {
- // TODO: actual error handling
- let img = ImageReader::open(match source {
- SourceType::File(path) => path,
- })
- .expect("something went wrong :(((");
-
- img.decode().expect("couldn't decode image")
- }
-}
-
-pub mod write {
- use image::{DynamicImage, ImageFormat};
- use ir::instruction::write::{TargetFormat, TargetType, Write};
-
- pub fn write(Write { target, format }: Write, input_data: &DynamicImage) {
- // TODO: actual error handling
- input_data
- .save_with_format(
- match target {
- TargetType::File(path) => path,
- },
- match format {
- TargetFormat::Jpeg => ImageFormat::Jpeg,
- TargetFormat::Png => ImageFormat::Png,
- },
- )
- .expect("couldn't save file");
- }
-}
-
-pub mod filters {
- pub mod invert {
- use image::DynamicImage;
-
- pub fn invert(mut input_data: DynamicImage) -> DynamicImage {
- input_data.invert();
- input_data
- }
- }
-}
diff --git a/crates/eval/src/kind/debug/mod.rs b/crates/eval/src/kind/debug/mod.rs
deleted file mode 100644
index 9b53ebe..0000000
--- a/crates/eval/src/kind/debug/mod.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use ir::{
- id,
- instruction::{Filter, Kind},
- GraphIr, Instruction, Map,
-};
-
-use crate::value::Variant;
-mod instr;
-
-#[derive(Debug, Default)]
-pub struct Evaluator {
- ir: GraphIr,
-
- /// What the output of each individual streamer, and as result its output sockets, is.
- /// Grows larger as evaluation continues,
- /// as there's no mechanism for purging never-to-be-used-anymore instructions yet.
- evaluated: Map,
-}
-
-impl crate::Evaluator for Evaluator {
- fn feed(&mut self, ir: GraphIr) {
- self.ir = ir;
- self.evaluated.clear();
- }
-
- fn eval_full(&mut self) {
- // GraphIr::topological_sort returns InstructionRefs, which are mostly cool
- // but we'd like to have them owned, so we can call Self::step without lifetime hassle
- let queue: Vec = self
- .ir
- .topological_sort()
- .into_iter()
- .map(Into::into)
- .collect();
-
- for instr in queue {
- self.step(instr);
- }
- }
-}
-
-impl Evaluator {
- #[allow(clippy::needless_pass_by_value)]
- fn step(&mut self, instr: Instruction) {
- // what inputs does this instr need? fetch them
- let inputs: Vec<_> = instr
- .input_sources()
- .iter()
- .map(|source| {
- let source_socket = source
- .as_ref()
- .expect("all inputs to be connected when an instruction is ran");
- self.evaluated
- .get(source_socket)
- .expect("toposort to yield later instrs only after previous ones")
- })
- .collect();
-
- // then actually do whatever the instruction should do
- // NOTE: makes heavy use of index slicing,
- // on the basis that ir::instruction::Kind::socket_count is correct
- // TODO: make this a more flexible dispatch-ish arch
- let output = match instr.kind {
- Kind::Read(details) => Some(Variant::Image(instr::read::read(details))),
- Kind::Write(details) => {
- #[allow(irrefutable_let_patterns)] // will necessarily change
- let Variant::Image(input) = inputs[0] else {
- panic!("cannot only write images, but received: `{:?}`", inputs[0]);
- };
- instr::write::write(details, input);
- None
- }
- Kind::Math(_) => todo!(),
- Kind::Blend(_) => todo!(),
- Kind::Noise(_) => todo!(),
- Kind::Filter(filter_instruction) => match filter_instruction {
- Filter::Invert => {
- #[allow(irrefutable_let_patterns)]
- let Variant::Image(input) = inputs[0] else {
- panic!(
- "cannot only filter invert images, but received: `{:?}`",
- inputs[0]
- );
- };
-
- Some(Variant::Image(instr::filters::invert::invert(
- input.clone(),
- )))
- }
- },
- };
-
- if let Some(output) = output {
- // TODO: very inaccurate, actually respect individual instructions.
- // should be implied by a different arch
- // TODO: all of those should not be public, offer some methods to get this on
- // `Instruction` instead (can infer short-term based on Kind::socket_count)
- let socket = id::Output(id::Socket {
- belongs_to: instr.id,
- idx: id::SocketIdx(0),
- });
- self.evaluated.insert(socket, output);
- }
- }
-}
diff --git a/crates/eval/src/kind/mod.rs b/crates/eval/src/kind/mod.rs
deleted file mode 100644
index 2f36523..0000000
--- a/crates/eval/src/kind/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod debug;
diff --git a/crates/eval/src/lib.rs b/crates/eval/src/lib.rs
deleted file mode 100644
index 8687d91..0000000
--- a/crates/eval/src/lib.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use ir::GraphIr;
-
-mod kind;
-mod value;
-
-/// Can collapse a [`GraphIr`] in meaningful ways and do interesting work on it.
-///
-/// It's surprisingly difficult to find a fitting description for this.
-pub trait Evaluator {
- /// Take some [`GraphIr`] which will then be processed later.
- /// May be called multiple times, in which the [`GraphIr`]s should add up.
- // TODO: atm they definitely don't add up -- add some functionality to GraphIr to
- // make it combine two graphs into one
- fn feed(&mut self, ir: GraphIr);
-
- /// Walk through the _whole_ [`GraphIr`] and run through each instruction.
- fn eval_full(&mut self);
-
- // TODO: for an LSP or the like, eval_single which starts at a given instr
-}
-
-/// The available [`Evaluator`]s.
-///
-/// Checklist for adding new ones:
-///
-/// 1. Create a new module under the [`kind`] module.
-/// 2. Add a struct and implement [`Evaluator`] for it.
-#[derive(Clone, Copy, Debug, Default, clap::ValueEnum, serde::Deserialize, serde::Serialize)]
-pub enum Available {
- /// Runs fully on the CPU. Single-threaded, debug-friendly and quick to implement.
- #[default]
- Debug,
-}
-
-impl Available {
- /// Selects the [`Evaluator`] corresponding to this label.
- #[must_use]
- pub fn pick(&self) -> Box {
- match self {
- Self::Debug => Box::::default(),
- }
- }
-}
diff --git a/crates/eval/src/value/mod.rs b/crates/eval/src/value/mod.rs
deleted file mode 100644
index b1d85d5..0000000
--- a/crates/eval/src/value/mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use image::DynamicImage;
-
-/// Any runtime value that an instruction can input or output.
-///
-/// The name is taken from [Godot's `Variant` type],
-/// which is very similar to this one.
-///
-/// [Godot's `Variant` type]: https://docs.godotengine.org/en/stable/classes/class_variant.html
-#[derive(Clone, Debug)]
-pub enum Variant {
- Image(DynamicImage),
-}
diff --git a/crates/executor-poc/Cargo.toml b/crates/executor-poc/Cargo.toml
deleted file mode 100644
index 563b1aa..0000000
--- a/crates/executor-poc/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "executor-poc"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-image = "0.25.1"
-indexmap = "2.2.6"
-nalgebra = "0.33.0"
-petgraph.workspace = true
-
-[lints]
-workspace = true
diff --git a/crates/executor-poc/src/lib.rs b/crates/executor-poc/src/lib.rs
deleted file mode 100644
index e5c703e..0000000
--- a/crates/executor-poc/src/lib.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use indexmap::IndexMap;
-use instructions::Instruction;
-use petgraph::graph::DiGraph;
-use types::Type;
-
-trait Node {
- fn inputs() -> IndexMap;
- fn outputs() -> IndexMap;
-}
-
-struct NodeGraph {
- graph: DiGraph,
-}
-
-struct TypedEdge {
- from: String,
- to: String,
- typ: Type,
-}
-
-mod instructions {
- //! This is the lowest level of the IR, the one the executor will use.
-
- use std::path::Path;
-
- use indexmap::{indexmap, IndexMap};
- pub enum Instruction {
- // File handling
- LoadFile,
- SaveFile,
-
- ColorMatrix,
- PosMatrix,
-
- Blend,
- SplitChannels,
- }
-
- impl Instruction {
- fn inputs(&self) -> IndexMap {
- match self {
- Instruction::LoadFile => indexmap! {
- "path" => Type::Path
- },
- Instruction::SaveFile => indexmap! {
- "path" => Type::Path
- },
-
- Instruction::ColorMatrix => indexmap! {
- "image" => Type::ImageData,
- "matrix" => Type::Mat(4,5)
- },
- Instruction::PosMatrix => indexmap! {
- "image" => Type::ImageData,
- "matrix" => Type::Mat(2, 3),
- },
-
- Instruction::Blend => todo!(),
- Instruction::SplitChannels => todo!(),
- }
- }
- fn outputs(&self) -> IndexMap {
- match self {
- Instruction::LoadFile => indexmap! {
- "image" => Type::ImageData
- },
- Instruction::SaveFile => indexmap! {},
-
- Instruction::ColorMatrix => indexmap! {
- "resut" => Type::ImageData
- },
- Instruction::PosMatrix => todo!(),
-
- Instruction::Blend => todo!(),
- Instruction::SplitChannels => todo!(),
- }
- }
- }
-}
-
-mod types {
- pub enum Type {
- // TODO: later do lower level type system for this stuff?
- // Image(Size, PixelType),
- // // image data for processing.
- // // always PixelType::Rgba32F
- // ImageData(Size),
- // // stuff that's still to be generated, not sized and no pixeltype
- // ProceduralImage,
- ImageData,
- Text,
- Integer,
- Float,
- Double,
- Path,
- Bool,
- Vec(
- // length,
- u8,
- ),
- Mat(
- // Rows
- u8,
- // Columns
- u8,
- ),
- }
-
- // pub struct Size {
- // width: u16,
- // height: u16,
- // }
-
- // Pixel types. Taken from variants [here](https://docs.rs/image/latest/image/pub enum.DynamicImage.html).
- // pub enum PixelType {
- // Luma8,
- // LumaA8,
- // Rgb8,
- // Rgba8,
- // Luma16,
- // LumaA16,
- // Rgb16,
- // Rgba16,
- // Rgb32F,
- // #[default]
- // Rgba32F,
- // }
-}
diff --git a/crates/eval/Cargo.toml b/crates/executor/Cargo.toml
similarity index 70%
rename from crates/eval/Cargo.toml
rename to crates/executor/Cargo.toml
index b542d2f..fc01c27 100644
--- a/crates/eval/Cargo.toml
+++ b/crates/executor/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "eval"
+name = "executor"
version = "0.1.0"
edition = "2021"
@@ -8,8 +8,4 @@ edition = "2021"
[dependencies]
clap = { workspace = true, features = [ "derive" ] }
image = "0.24"
-ir = { path = "../ir" }
-serde = { workspace = true }
-
-[lints]
-workspace = true
+rpl = { path = "../rpl" }
diff --git a/crates/executor/src/cpu/mod.rs b/crates/executor/src/cpu/mod.rs
new file mode 100644
index 0000000..e82d20a
--- /dev/null
+++ b/crates/executor/src/cpu/mod.rs
@@ -0,0 +1 @@
+pub(crate) struct CpuExecutor;
diff --git a/crates/executor/src/debug/instructions/mod.rs b/crates/executor/src/debug/instructions/mod.rs
new file mode 100644
index 0000000..0c4b611
--- /dev/null
+++ b/crates/executor/src/debug/instructions/mod.rs
@@ -0,0 +1,41 @@
+pub mod read {
+ use image::{io::Reader as ImageReader, DynamicImage};
+ use rpl::instructions::read::{Read, SourceType};
+
+ pub fn read(Read { source, format }: Read) -> DynamicImage {
+ let mut img = ImageReader::open(match source {
+ SourceType::File(path) => path,
+ })
+ .expect("something went wrong :(((");
+
+ img.decode().expect("couldn't decode image")
+ }
+}
+
+pub mod write {
+ use image::{io::Reader as ImageReader, DynamicImage, ImageFormat};
+ use rpl::instructions::write::{TargetFormat, TargetType, Write};
+
+ pub fn write(Write { target, format }: Write, input_data: DynamicImage) {
+ input_data.save_with_format(
+ match target {
+ TargetType::File(path) => path,
+ },
+ match format {
+ TargetFormat::Jpeg => ImageFormat::Jpeg,
+ TargetFormat::Png => ImageFormat::Png,
+ },
+ );
+ }
+}
+
+pub mod filters {
+ pub mod invert {
+ use image::DynamicImage;
+
+ pub fn invert(mut input_data: DynamicImage) -> DynamicImage {
+ input_data.invert();
+ input_data
+ }
+ }
+}
diff --git a/crates/executor/src/debug/mod.rs b/crates/executor/src/debug/mod.rs
new file mode 100644
index 0000000..d56f546
--- /dev/null
+++ b/crates/executor/src/debug/mod.rs
@@ -0,0 +1,37 @@
+use rpl::instructions::{FilterInstruction, Instruction};
+
+use crate::{value::DynamicValue, Executor};
+mod instructions;
+
+pub struct DebugExecutor;
+
+impl Executor for DebugExecutor {
+ fn execute(instruction: Instruction, input: Option) -> Option {
+ match instruction {
+ Instruction::Read(read_instruction) => Some(DynamicValue::Image(
+ instructions::read::read(read_instruction),
+ )),
+ Instruction::Write(write_instruction) => {
+ instructions::write::write(
+ write_instruction,
+ match input {
+ Some(DynamicValue::Image(img)) => img,
+ _ => panic!("awawwawwa"),
+ },
+ );
+ None
+ }
+ Instruction::Math(_) => todo!(),
+ Instruction::Blend(_) => todo!(),
+ Instruction::Noise(_) => todo!(),
+ Instruction::Filter(filter_instruction) => match filter_instruction {
+ FilterInstruction::Invert => Some(DynamicValue::Image(
+ instructions::filters::invert::invert(match input {
+ Some(DynamicValue::Image(img)) => img,
+ _ => panic!("invalid value type for invert"),
+ }),
+ )),
+ },
+ }
+ }
+}
diff --git a/crates/executor/src/lib.rs b/crates/executor/src/lib.rs
new file mode 100644
index 0000000..fb55029
--- /dev/null
+++ b/crates/executor/src/lib.rs
@@ -0,0 +1,38 @@
+use rpl::instructions::Instruction;
+use value::DynamicValue;
+
+mod debug;
+mod value;
+
+/// The available executors
+/// unused in early dev.
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+pub enum Executors {
+ /// the debug executor is single threaded and really, *really* slow. And unstable. Don't use. Unless you're a dev working on this.
+ Debug,
+ /// the CPU executor primarily uses the CPU. Most likely most feature complete, and the fallback.
+ Cpu,
+ /// the Vulkan executor (obviously) uses vulkan. there's a good chance this isn't implemented yet as you're reading this.
+ Vulkan,
+}
+
+trait Executor {
+ fn execute(instruction: Instruction, input: Option) -> Option;
+}
+
+pub fn execute_all(instructions: Vec) {
+ let mut tmp = None;
+
+ for instruction in instructions {
+ tmp = debug::DebugExecutor::execute(instruction, tmp);
+ }
+}
+
+// scratchpad lol:
+// execution structure:
+// 1. take in rpl
+// 2. analyse/validate structure against allowed executors
+// 3. assign executors to instructions
+// 4. optimize
+// 5. prepare memory management patterns
+// 6. run
diff --git a/crates/executor/src/value/mod.rs b/crates/executor/src/value/mod.rs
new file mode 100644
index 0000000..daf0dd2
--- /dev/null
+++ b/crates/executor/src/value/mod.rs
@@ -0,0 +1,5 @@
+use image::DynamicImage;
+
+pub enum DynamicValue {
+ Image(DynamicImage),
+}
diff --git a/crates/ir/Cargo.toml b/crates/ir/Cargo.toml
deleted file mode 100644
index 77f8de4..0000000
--- a/crates/ir/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "ir"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-either = "1.9"
-ron = "0.8"
-serde = { version = "1.0.193", features = ["derive"] }
-
-[lints]
-workspace = true
diff --git a/crates/ir/src/id.rs b/crates/ir/src/id.rs
deleted file mode 100644
index 4834a4f..0000000
--- a/crates/ir/src/id.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-//! Instance identification for instructions and their glue.
-//!
-//! Instructions as defined in [`crate::instruction::Kind`] and descendants are very useful,
-//! but they cannot be directly used as vertices in the graph IR,
-//! as there may easily be multiple instructions of the same kind in the same program.
-//!
-//! Instead, this module offers an alternative way to refer to specific instances:
-//!
-//! - [`Instruction`]s are effectively just a number floating in space,
-//! incremented each time a new instruction is referred to.
-//! - [`Socket`]s contain
-//! - what [`Instruction`] they belong to
-//! - which index they occupy on it
-//!
-//! The distinction between [`Input`] and [`Output`] is implemented
-//! as them being different types.
-
-use std::fmt;
-
-use serde::{Deserialize, Serialize};
-
-/// One specific instruction.
-///
-/// It does **not** contain what kind of instruction this is.
-/// Refer to [`crate::instruction::Kind`] for this instead.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Instruction(pub(super) u64);
-
-impl fmt::Debug for Instruction {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f, "InstrId {}", self.0)
- }
-}
-
-/// On an **instruction**, accepts incoming data.
-///
-/// An **instruction** cannot run if any of these are not connected.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Input(pub(super) Socket);
-
-impl Input {
- #[must_use]
- pub fn socket(&self) -> &Socket {
- &self.0
- }
-}
-
-/// On an **instruction**, returns outgoing data to be fed to [`Input`]s.
-///
-/// In contrast to [`Input`]s, [`Output`]s may be used or unused.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Output(pub Socket); // TODO: Restrict publicness to super
-
-impl Output {
- #[must_use]
- pub fn socket(&self) -> &Socket {
- &self.0
- }
-}
-
-/// An unspecified socket on a specific **instruction**,
-/// and where it is on that **instruction**.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Socket {
- pub belongs_to: Instruction,
- pub idx: SocketIdx,
-}
-
-/// Where a [`Socket`] is on one **instruction**.
-///
-/// Note that this does **not** identify a [`Socket`] globally.
-/// There may be multiple [`Socket`]s sharing the same [`SocketIdx`],
-/// but on different [`Instruction`]s.
-///
-/// This really only serves for denoting where a socket is,
-/// when it's already clear which instruction is referred to.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct SocketIdx(pub u16); // TODO: Restrict publicness to super
-
-impl fmt::Debug for SocketIdx {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- self.0.fmt(f)
- }
-}
diff --git a/crates/ir/src/instruction/mod.rs b/crates/ir/src/instruction/mod.rs
deleted file mode 100644
index 069fa4f..0000000
--- a/crates/ir/src/instruction/mod.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub mod read;
-pub mod write;
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum Kind {
- // TODO: `read::Read` and `write::Write` hold real values atm -- they should actually
- // point to `Const` instructions instead (which are... yet to be done...)
- Read(read::Read),
- Write(write::Write),
- Math(Math),
- Blend(Blend),
- Noise(Noise),
- Filter(Filter),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum Math {
- Add,
- Subtract,
- Multiply,
- Divide,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum Blend {
- Normal,
- Multiply,
- Additive,
- Overlay,
- Screen,
- Subtractive,
- Difference,
- Darken,
- Lighten,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum Noise {
- Perlin,
- Simplex,
- Voronoi,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum Filter {
- Invert,
-}
-
-// TODO: given that this basically matches on all instructions, we may need to use
-// the visitor pattern in future here, or at least get them behind traits
-// which should allow far more nuanced description
-impl Kind {
- /// Returns how many sockets this kind of instruction has.
- #[must_use]
- pub fn socket_count(&self) -> SocketCount {
- match self {
- Self::Read(_) => (0, 1),
- Self::Write(_) => (1, 0),
- Self::Math(_) | Self::Blend(_) => (2, 1),
- Self::Noise(_) => {
- todo!("how many arguments does noise take? how many outputs does it have?")
- }
- Self::Filter(Filter::Invert) => (1, 1),
- }
- .into()
- }
-}
-
-/// How many sockets are on an instruction?
-pub struct SocketCount {
- pub inputs: u16,
- pub outputs: u16,
-}
-
-impl From<(u16, u16)> for SocketCount {
- fn from((inputs, outputs): (u16, u16)) -> Self {
- Self { inputs, outputs }
- }
-}
diff --git a/crates/ir/src/instruction/read.rs b/crates/ir/src/instruction/read.rs
deleted file mode 100644
index 2e4ab60..0000000
--- a/crates/ir/src/instruction/read.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Read {
- pub source: SourceType,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum SourceType {
- File(PathBuf),
-}
diff --git a/crates/ir/src/instruction/write.rs b/crates/ir/src/instruction/write.rs
deleted file mode 100644
index 8e9311b..0000000
--- a/crates/ir/src/instruction/write.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct Write {
- pub target: TargetType,
- pub format: TargetFormat,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum TargetType {
- File(PathBuf),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub enum TargetFormat {
- Jpeg,
- Png,
-}
diff --git a/crates/ir/src/lib.rs b/crates/ir/src/lib.rs
deleted file mode 100644
index 702244c..0000000
--- a/crates/ir/src/lib.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use std::num::NonZeroUsize;
-
-use instruction::SocketCount;
-use serde::{Deserialize, Serialize};
-
-pub mod id;
-pub mod instruction;
-pub mod semi_human;
-
-pub type Map = std::collections::BTreeMap;
-pub type Set = std::collections::BTreeSet;
-
-/// Gives you a super well typed graph IR for a given human-readable repr.
-///
-/// Look at [`semi_human::GraphIr`] and the test files in the repo at `testfiles/`
-/// to see what the RON should look like.
-/// No, we don't want you to write out [`GraphIr`] in full by hand.
-/// That's something for the machines to do.
-///
-/// # Errors
-///
-/// Returns an error if the parsed source is not a valid human-readable graph IR.
-pub fn from_ron(source: &str) -> ron::error::SpannedResult {
- let human_repr: semi_human::GraphIr = ron::from_str(source)?;
- Ok(human_repr.into())
-}
-
-/// The toplevel representation of a whole pipeline.
-///
-/// # DAGs
-///
-/// Pipelines may not be fully linear. They may branch out and recombine later on.
-/// As such, the representation for them which is currently used is a
-/// [**D**irected **A**cyclic **G**raph](https://en.wikipedia.org/wiki/Directed_acyclic_graph).
-///
-/// For those who are already familiar with graphs, a DAG is one, except that:
-///
-/// - It is **directed**: Edges have a direction they point to.
-/// In this case, edges point from the outputs of streamers to inputs of consumers.
-/// - It is **acyclic**: Those directed edges may not form loops.
-/// In other words, if one follows edges only in their direction, it must be impossible
-/// to come back to an already visited node.
-///
-/// Here, if an edge points from _A_ to _B_ (`A --> B`),
-/// then _A_ is called a **dependency** or an **input source** of _B_,
-/// and _B_ is called a **dependent** or an **output target** of _A_.
-///
-/// The DAG also enables another neat operation:
-/// [Topological sorting](https://en.wikipedia.org/wiki/Topological_sorting).
-/// This allows to put the entire graph into a linear list,
-/// where it's guaranteed that once a vertex is visited,
-/// all dependencies of it will have been visited already as well.
-///
-/// The representation used here in specific is a bit more complicated,
-/// since **instructions** directly aren't just connected to one another,
-/// but their **sockets** are instead.
-///
-/// So the vertices of the DAG are the **sockets**
-/// (which are either [`id::Input`] or [`id::Output`] depending on the direction),
-/// and each **socket** in turn belongs to an **instruction**.
-///
-/// # Usage
-///
-/// - If you want to build one from scratch,
-/// add a few helper methods like
-/// constructing an empty one,
-/// adding instructions and
-/// adding edges
-/// - If you want to construct one from an existing repr,
-/// maybe you want to use [`semi_human::GraphIr`].
-///
-/// # Storing additional data
-///
-/// Chances are the graph IR seems somewhat fit to put metadata in it.
-/// However, most likely you're interacting in context of some other system,
-/// and also want to manage and index that data on your own.
-///
-/// As such, consider using _secondary_ maps instead.
-/// That is, store in a data structure _you_ own a mapping
-/// from [`id`]s
-/// to whatever data you need.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
-pub struct GraphIr {
- /// "Backbone" storage of all **instruction** IDs to
- /// what **kind of instruction** they are.
- instructions: Map,
-
- /// How the data flows forward. **Dependencies** map to **dependents** here.
- edges: Map>,
- /// How the data flows backward. **Dependents** map to **dependencies** here.
- rev_edges: Map,
-}
-
-// TODO: this impl block, but actually the whole module, screams for tests
-impl GraphIr {
- /// Look "backwards" in the graph,
- /// and find out what instructions need to be done before this one.
- /// The input slots are visited in order.
- ///
- /// - The iterator returns individually [`Some`]`(`[`None`]`)` if the corresponding slot is
- /// not connected.
- ///
- /// The same caveats as for [`GraphIr::resolve`] apply.
- #[must_use]
- pub fn input_sources(
- &self,
- subject: &id::Instruction,
- ) -> Option> + '_> {
- let (subject, kind) = self.instructions.get_key_value(subject)?;
- let SocketCount { inputs, .. } = kind.socket_count();
-
- Some((0..inputs).map(|idx| {
- let input = id::Input(socket(subject, idx));
- self.rev_edges.get(&input)
- }))
- }
-
- /// Look "forwards" in the graph to see what other instructions this instruction feeds into.
- ///
- /// The output slots represent the top-level iterator,
- /// and each one's connections are emitted one level below.
- ///
- /// Just [`Iterator::flatten`] if you are not interested in the slots.
- ///
- /// The same caveats as for [`GraphIr::resolve`] apply.
- #[must_use]
- pub fn output_targets(
- &self,
- subject: &id::Instruction,
- ) -> Option>> + '_> {
- let (subject, kind) = self.instructions.get_key_value(subject)?;
- let SocketCount { outputs, .. } = kind.socket_count();
-
- Some((0..outputs).map(|idx| {
- let output = id::Output(socket(subject, idx));
- self.edges.get(&output)
- }))
- }
-
- /// Returns the instruction corresponding to the given ID.
- /// Returns [`None`] if there is no such instruction in this graph IR.
- ///
- /// Theoretically this could be fixed easily at the expense of some memory
- /// by just incrementing and storing some global counter,
- /// however, at the moment there's no compelling reason
- /// to actually have multiple [`GraphIr`]s at one point in time.
- /// Open an issue if that poses a problem for you.
- #[must_use]
- pub fn resolve<'ir>(&'ir self, subject: &id::Instruction) -> Option> {
- let (id, kind) = self.instructions.get_key_value(subject)?;
-
- let input_sources = self.input_sources(subject)?.collect();
- let output_targets = self.output_targets(subject)?.collect();
-
- Some(InstructionRef {
- id,
- kind,
- input_sources,
- output_targets,
- })
- }
-
- /// Returns the instruction this input belongs to.
- ///
- /// The same caveats as for [`GraphIr::resolve`] apply.
- #[must_use]
- pub fn owner_of_input<'ir>(&'ir self, input: &id::Input) -> Option> {
- self.resolve(&input.socket().belongs_to)
- }
-
- /// Returns the instruction this output belongs to.
- ///
- /// The same caveats as for [`GraphIr::resolve`] apply.
- #[must_use]
- pub fn owner_of_output<'ir>(&'ir self, output: &id::Output) -> Option> {
- self.resolve(&output.socket().belongs_to)
- }
-
- /// Returns the order in which the instructions could be visited
- /// in order to ensure that all dependencies are resolved
- /// before a vertex is visited.
- ///
- /// # Panics
- ///
- /// Panics if there are any cycles in the IR, as it needs to be a DAG.
- #[must_use]
- // yes, this function could probably return an iterator and be lazy
- // no, not today
- pub fn topological_sort(&self) -> Vec {
- // count how many incoming edges each vertex has
- let mut nonzero_input_counts: Map<_, NonZeroUsize> =
- self.rev_edges
- .iter()
- .fold(Map::new(), |mut count, (input, _)| {
- let _ = *count
- .entry(input.socket().belongs_to.clone())
- .and_modify(|count| *count = count.saturating_add(1))
- .or_insert(NonZeroUsize::MIN);
- count
- });
-
- // are there any unconnected ones we could start with?
- // TODO: experiment if a VecDeque with some ordering fun is digested better by the executor
- let no_inputs: Vec<_> = {
- let nonzero: Set<_> = nonzero_input_counts.keys().collect();
- let all: Set<_> = self.instructions.keys().collect();
- all.difference(&nonzero).copied().cloned().collect()
- };
-
- // then let's find the order!
- let mut order = Vec::new();
- let mut active_queue = no_inputs;
-
- while let Some(current) = active_queue.pop() {
- // now that this vertex is visited and resolved,
- // make sure all dependents notice that
-
- let dependents = self
- .output_targets(¤t)
- .expect("graph to be consistent")
- .flatten()
- .flatten();
-
- for dependent_input in dependents {
- let dependent = &dependent_input.socket().belongs_to;
-
- // how many inputs are connected to this dependent without us?
- let count = nonzero_input_counts
- .get_mut(dependent)
- .expect("connected output must refer to non-zero input");
-
- let new = NonZeroUsize::new(count.get() - 1);
- if let Some(new) = new {
- // aww, still some
- *count = new;
- continue;
- }
-
- // none, that means this one is free now! let's throw it onto the active queue then
- let (now_active, _) = nonzero_input_counts
- .remove_entry(dependent)
- .expect("connected output must refer to non-zero input");
- active_queue.push(now_active);
- }
-
- // TODO: check if this instruction is "well-fed", that is, has all the inputs it needs,
- // and if not, panic
- order.push(self.resolve(¤t).expect("graph to be consistent"));
- }
-
- assert!(
- nonzero_input_counts.is_empty(),
- concat!(
- "topological sort didn't cover all instructions\n",
- "either there are unconnected inputs, or there is a cycle\n",
- "unresolved instructions:\n",
- "{:#?}"
- ),
- nonzero_input_counts,
- );
-
- order
- }
-}
-
-/// Constructs an [`id::Socket`] a bit more tersely.
-fn socket(id: &id::Instruction, idx: u16) -> id::Socket {
- id::Socket {
- belongs_to: id.clone(),
- idx: id::SocketIdx(idx),
- }
-}
-
-/// A full instruction bundeled in context, with its inputs and outputs.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Instruction {
- pub id: id::Instruction,
- pub kind: instruction::Kind,
-
- // can't have these two public since then a user might corrupt their length
- input_sources: Vec>,
- output_targets: Vec>,
-}
-
-impl Instruction {
- /// Where this instruction gets its inputs from.
- ///
- /// [`None`] means that this input is unfilled,
- /// and must be filled before the instruction can be ran.
- #[must_use]
- pub fn input_sources(&self) -> &[Option] {
- &self.input_sources
- }
-
- /// To whom outputs are sent.
- #[must_use]
- pub fn output_targets(&self) -> &[Set] {
- &self.output_targets
- }
-}
-
-/// [`Instruction`], but every single field is borrowed instead.
-/// See its docs.
-///
-/// Use the [`From`] impl to handily convert into an [`Instruction`].
-/// The other way around is unlikely to be wanted — since you already have an [`Instruction`],
-/// chances are you just want to take a reference (`&`) of it.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub struct InstructionRef<'ir> {
- pub id: &'ir id::Instruction,
- pub kind: &'ir instruction::Kind,
-
- input_sources: Vec>,
- output_targets: Vec>>,
-}
-
-impl<'ir> InstructionRef<'ir> {
- /// Where this instruction gets its inputs from.
- ///
- /// [`None`] means that this input is unfilled,
- /// and must be filled before the instruction can be ran.
- #[must_use]
- pub fn input_sources(&self) -> &[Option<&'ir id::Output>] {
- &self.input_sources
- }
-
- /// To whom outputs are sent.
- #[must_use]
- pub fn output_targets(&self) -> &[Option<&'ir Set>] {
- &self.output_targets
- }
-}
-
-// would love to use ToOwned but Rust has no specialization yet
-// and it'd hurt a blanket impl of ToOwned otherwise
-impl From> for Instruction {
- fn from(source: InstructionRef<'_>) -> Self {
- Self {
- id: source.id.clone(),
- kind: source.kind.clone(),
- input_sources: source
- .input_sources
- .into_iter()
- .map(Option::<&_>::cloned)
- .collect(),
- output_targets: source
- .output_targets
- .into_iter()
- .map(|outputs| outputs.map(Clone::clone).unwrap_or_default())
- .collect(),
- }
- }
-}
diff --git a/crates/ir/src/semi_human.rs b/crates/ir/src/semi_human.rs
deleted file mode 100644
index e8d3bdd..0000000
--- a/crates/ir/src/semi_human.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-//! The midterm solution for source representation, until we've got a nice source frontend.
-//!
-//! Sacrifices type expressivity for the sake of typability in [RON] files.
-//!
-//! **If you want to construct a graph IR programmatically,
-//! use [`crate::GraphIr`] directly instead,
-//! as it gives you more control to specify where your instructions came from.**
-//!
-//! [RON]: https://docs.rs/ron/latest/ron/
-
-use serde::{Deserialize, Serialize};
-
-use crate::{id, instruction, Map, Set};
-
-/// Semi-human-{read,writ}able [`crate::GraphIr`] with far less useful types.
-///
-/// **Do not use this if you want to programatically construct IR.**
-/// Instead, directly use [`crate::GraphIr`].
-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub struct GraphIr {
- /// See [`crate::GraphIr::instructions`], just that a simple number is used for the ID instead
- pub(crate) instructions: Map,
- /// See [`crate::GraphIr::edges`], the forward edges.
- /// RON wants you to type the set as if it were a list.
- pub(crate) edges: Map>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
-pub struct Socket {
- /// ID of the instruction this socket is on.
- pub(crate) on: u64,
- pub(crate) idx: u16,
-}
-
-impl From for id::Socket {
- fn from(source: Socket) -> Self {
- Self {
- belongs_to: id::Instruction(source.on),
- idx: id::SocketIdx(source.idx),
- }
- }
-}
-
-impl From for crate::GraphIr {
- fn from(source: GraphIr) -> Self {
- let edges = source.edges.clone();
- Self {
- instructions: source
- .instructions
- .into_iter()
- .map(|(id, kind)| (id::Instruction(id), kind))
- .collect(),
- edges: type_edges(source.edges),
- rev_edges: reverse_and_type_edges(edges),
- }
- }
-}
-
-fn type_edges(edges: Map>) -> Map> {
- edges
- .into_iter()
- .map(|(output, inputs)| {
- let output = id::Output(output.into());
- let inputs = inputs.into_iter().map(Into::into).map(id::Input).collect();
- (output, inputs)
- })
- .collect()
-}
-
-fn reverse_and_type_edges(edges: Map>) -> Map {
- edges
- .into_iter()
- .fold(Map::new(), |mut rev_edges, (output, inputs)| {
- let output = id::Output(output.into());
-
- for input in inputs {
- let input = id::Input(input.into());
- let previous = rev_edges.insert(input, output.clone());
- if let Some(previous) = previous {
- // TODO: handle this with a TryFrom impl
- panic!("two or more outputs referred to the same input {previous:#?}");
- }
- }
-
- rev_edges
- })
-}
diff --git a/crates/json-pawarser/Cargo.toml b/crates/json-pawarser/Cargo.toml
deleted file mode 100644
index eb342e9..0000000
--- a/crates/json-pawarser/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "json-pawarser"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-logos = "0.14.2"
-enumset = "1.1.3"
-rowan = "0.15.15"
-pawarser = { path = "../pawarser" }
-
-[lints]
-workspace = true
diff --git a/crates/json-pawarser/src/grammar.rs b/crates/json-pawarser/src/grammar.rs
deleted file mode 100644
index bb94474..0000000
--- a/crates/json-pawarser/src/grammar.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use array::array;
-use enumset::{enum_set, EnumSet};
-use pawarser::parser::ParserBuilder;
-
-use crate::{
- syntax_error::SyntaxError,
- syntax_kind::{lex, SyntaxKind},
-};
-
-use self::object::object;
-
-mod array;
-mod object;
-
-pub(crate) type Parser<'src> = pawarser::Parser<'src, SyntaxKind, SyntaxError>;
-pub(crate) type CompletedMarker = pawarser::CompletedMarker;
-
-const BASIC_VALUE_TOKENS: EnumSet =
- enum_set!(SyntaxKind::BOOL | SyntaxKind::NULL | SyntaxKind::NUMBER | SyntaxKind::STRING);
-
-pub fn value(p: &mut Parser) -> bool {
- if BASIC_VALUE_TOKENS.contains(p.current()) {
- p.do_bump();
- return true;
- } else {
- object(p).or_else(|| array(p)).is_some()
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::{
- test_utils::{check_parser, gen_checks},
- value,
- };
-
- #[test]
- fn value_lit() {
- gen_checks! {value;
- r#""helo world""# => r#"ROOT { STRING "\"helo world\""; }"#,
- "42" => r#"ROOT { NUMBER "42"; }"#,
- "null" => r#"ROOT { NULL "null"; }"#,
- "true" => r#"ROOT { BOOL "true"; }"#,
- "false" => r#"ROOT { BOOL "false"; }"#
- };
- }
-}
-
-#[cfg(test)]
-mod test_utils {
- use pawarser::parser::ParserBuilder;
-
- use crate::syntax_kind::{lex, SyntaxKind};
-
- use super::Parser;
-
- macro_rules! gen_checks {
- ($fn_to_test:ident; $($in:literal => $out:literal),+) => {
- $(crate::grammar::test_utils::check_parser($in, |p| { $fn_to_test(p); }, $out);)+
- }
- }
-
- pub(super) use gen_checks;
-
- pub(super) fn check_parser(input: &str, parser_fn: fn(&mut Parser), expected_output: &str) {
- let toks = lex(input);
- let mut p: Parser = ParserBuilder::new(toks)
- .add_meaningless(SyntaxKind::WHITESPACE)
- .add_meaningless(SyntaxKind::NEWLINE)
- .build();
-
- parser_fn(&mut p);
-
- let out = p.finish();
-
- assert_eq!(format!("{out:?}").trim_end(), expected_output);
- }
-}
diff --git a/crates/json-pawarser/src/grammar/array.rs b/crates/json-pawarser/src/grammar/array.rs
deleted file mode 100644
index 3ae1726..0000000
--- a/crates/json-pawarser/src/grammar/array.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::{syntax_error::SyntaxError, syntax_kind::SyntaxKind};
-
-use super::{value, CompletedMarker, Parser};
-
-pub(super) fn array(p: &mut Parser) -> Option {
- let array_start = p.start("array");
-
- if !p.eat(SyntaxKind::BRACKET_OPEN) {
- array_start.abandon(p);
- return None;
- }
-
- let el = p.start("arr_el");
- value(p);
- el.complete(p, SyntaxKind::ELEMENT);
-
- while p.at(SyntaxKind::COMMA) {
- let potential_trailing_comma = p.start("potential_trailing_comma");
-
- p.eat(SyntaxKind::COMMA);
- let maybe_el = p.start("arr_el");
- if !value(p) {
- maybe_el.abandon(p);
- potential_trailing_comma.complete(p, SyntaxKind::TRAILING_COMMA);
- } else {
- maybe_el.complete(p, SyntaxKind::ELEMENT);
- potential_trailing_comma.abandon(p);
- }
- }
-
- Some(if !p.eat(SyntaxKind::BRACKET_CLOSE) {
- array_start.error(p, SyntaxError::UnclosedArray)
- } else {
- array_start.complete(p, SyntaxKind::ARRAY)
- })
-}
-
-#[cfg(test)]
-mod tests {
- use crate::grammar::{array::array, test_utils::gen_checks};
-
- #[test]
- fn array_basic() {
- gen_checks! {array;
- r#"[1,2,3]"# => r#"ROOT { ARRAY { BRACKET_OPEN "["; ELEMENT { NUMBER "1"; } COMMA ","; ELEMENT { NUMBER "2"; } COMMA ","; ELEMENT { NUMBER "3"; } BRACKET_CLOSE "]"; } }"#,
- r#"[1,2,]"# => r#"ROOT { ARRAY { BRACKET_OPEN "["; ELEMENT { NUMBER "1"; } COMMA ","; ELEMENT { NUMBER "2"; } TRAILING_COMMA { COMMA ","; } BRACKET_CLOSE "]"; } }"#,
- r#"[1,2"# => r#"ROOT { PARSE_ERR: UnclosedArray { BRACKET_OPEN "["; ELEMENT { NUMBER "1"; } COMMA ","; ELEMENT { NUMBER "2"; } } }"#,
- r#"[1,2,"# => r#"ROOT { PARSE_ERR: UnclosedArray { BRACKET_OPEN "["; ELEMENT { NUMBER "1"; } COMMA ","; ELEMENT { NUMBER "2"; } TRAILING_COMMA { COMMA ","; } } }"#,
- r#"[{"hello":"world""# => r#"ROOT { PARSE_ERR: UnclosedArray { BRACKET_OPEN "["; ELEMENT { PARSE_ERR: UnclosedObject { BRACE_OPEN "{"; MEMBER { MEMBER_NAME { STRING "\"hello\""; } COLON ":"; MEMBER_VALUE { STRING "\"world\""; } } } } } }"#
- }
- }
-}
diff --git a/crates/json-pawarser/src/grammar/object.rs b/crates/json-pawarser/src/grammar/object.rs
deleted file mode 100644
index 02d9e73..0000000
--- a/crates/json-pawarser/src/grammar/object.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::{grammar::value, syntax_error::SyntaxError, syntax_kind::SyntaxKind};
-
-use super::{CompletedMarker, Parser, BASIC_VALUE_TOKENS};
-
-pub(super) fn object(p: &mut Parser) -> Option {
- let obj_start = p.start("object");
-
- if !p.eat(SyntaxKind::BRACE_OPEN) {
- obj_start.abandon(p);
- return None;
- }
-
- member(p);
- while p.at(SyntaxKind::COMMA) {
- // not always an error, later configurable
- let potential_trailing_comma = p.start("potential_trailing_comma");
- p.eat(SyntaxKind::COMMA);
-
- if member(p).is_none() {
- potential_trailing_comma.complete(p, SyntaxKind::TRAILING_COMMA);
- } else {
- potential_trailing_comma.abandon(p);
- }
- }
-
- Some(if p.eat(SyntaxKind::BRACE_CLOSE) {
- obj_start.complete(p, SyntaxKind::OBJECT)
- } else {
- obj_start.error(p, SyntaxError::UnclosedObject)
- })
-}
-
-fn member(p: &mut Parser) -> Option {
- let member_start = p.start("member");
-
- if p.at(SyntaxKind::BRACE_CLOSE) {
- member_start.abandon(p);
- return None;
- } else if p.at(SyntaxKind::STRING) {
- let member_name_start = p.start("member_name");
- p.eat(SyntaxKind::STRING);
- member_name_start.complete(p, SyntaxKind::MEMBER_NAME);
- } else {
- return todo!("handle other tokens: {:?}", p.current());
- }
-
- if !p.eat(SyntaxKind::COLON) {
- todo!("handle wrong tokens")
- }
-
- let member_value_start = p.start("member_value_start");
- if value(p) {
- member_value_start.complete(p, SyntaxKind::MEMBER_VALUE);
- Some(member_start.complete(p, SyntaxKind::MEMBER))
- } else {
- member_value_start.abandon(p);
- let e = member_start.error(p, SyntaxError::MemberMissingValue);
- Some(
- e.precede(p, "member but failed already")
- .complete(p, SyntaxKind::MEMBER),
- )
- }
-}
-
-#[cfg(test)]
-mod tests {
- use crate::grammar::{
- object::{member, object},
- test_utils::gen_checks,
- };
-
- #[test]
- fn object_basic() {
- gen_checks! {object;
- r#"{"a": "b"}"# => r#"ROOT { OBJECT { BRACE_OPEN "{"; MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; WHITESPACE " "; MEMBER_VALUE { STRING "\"b\""; } } BRACE_CLOSE "}"; } }"#,
- r#"{"a": 42}"# => r#"ROOT { OBJECT { BRACE_OPEN "{"; MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; WHITESPACE " "; MEMBER_VALUE { NUMBER "42"; } } BRACE_CLOSE "}"; } }"#,
- r#"{"a": "b""# => r#"ROOT { PARSE_ERR: UnclosedObject { BRACE_OPEN "{"; MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; WHITESPACE " "; MEMBER_VALUE { STRING "\"b\""; } } } }"#,
- r#"{"a": }"# => r#"ROOT { OBJECT { BRACE_OPEN "{"; MEMBER { PARSE_ERR: MemberMissingValue { MEMBER_NAME { STRING "\"a\""; } COLON ":"; } } WHITESPACE " "; BRACE_CLOSE "}"; } }"#,
- r#"{"a":"# => r#"ROOT { PARSE_ERR: UnclosedObject { BRACE_OPEN "{"; MEMBER { PARSE_ERR: MemberMissingValue { MEMBER_NAME { STRING "\"a\""; } COLON ":"; } } } }"#,
- r#"{"a":true,}"# => r#"ROOT { OBJECT { BRACE_OPEN "{"; MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; MEMBER_VALUE { BOOL "true"; } } TRAILING_COMMA { COMMA ","; } BRACE_CLOSE "}"; } }"#
- }
- }
-
- #[test]
- fn member_basic() {
- gen_checks! {member;
- r#""a": "b""# => r#"ROOT { MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; WHITESPACE " "; MEMBER_VALUE { STRING "\"b\""; } } }"#,
- r#""a": 42"# => r#"ROOT { MEMBER { MEMBER_NAME { STRING "\"a\""; } COLON ":"; WHITESPACE " "; MEMBER_VALUE { NUMBER "42"; } } }"#,
- r#""a":"# => r#"ROOT { MEMBER { PARSE_ERR: MemberMissingValue { MEMBER_NAME { STRING "\"a\""; } COLON ":"; } } }"#
- }
- }
-}
diff --git a/crates/json-pawarser/src/lib.rs b/crates/json-pawarser/src/lib.rs
deleted file mode 100644
index 89160be..0000000
--- a/crates/json-pawarser/src/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod grammar;
-mod syntax_error;
-mod syntax_kind;
diff --git a/crates/json-pawarser/src/syntax_error.rs b/crates/json-pawarser/src/syntax_error.rs
deleted file mode 100644
index 8c76de2..0000000
--- a/crates/json-pawarser/src/syntax_error.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::syntax_kind::SyntaxKind;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum SyntaxError {
- UnclosedObject,
- UnclosedArray,
- DisallowedKeyType(SyntaxKind),
- MemberMissingValue,
- UnexpectedTrailingComma,
-}
-impl pawarser::parser::SyntaxError for SyntaxError {}
diff --git a/crates/json-pawarser/src/syntax_kind.rs b/crates/json-pawarser/src/syntax_kind.rs
deleted file mode 100644
index 6e6b966..0000000
--- a/crates/json-pawarser/src/syntax_kind.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use logos::Logos;
-
-pub fn lex(src: &str) -> Vec<(SyntaxKind, &str)> {
- let mut lex = SyntaxKind::lexer(src);
- let mut r = Vec::new();
-
- while let Some(tok_res) = lex.next() {
- r.push((tok_res.unwrap_or(SyntaxKind::LEX_ERR), lex.slice()))
- }
-
- r
-}
-
-#[derive(enumset::EnumSetType, Debug, Logos, PartialEq, Eq, Clone, Copy, Hash)]
-#[repr(u16)]
-#[enumset(no_super_impls)]
-#[allow(non_camel_case_types)]
-pub enum SyntaxKind {
- OBJECT,
- MEMBER,
- MEMBER_NAME,
- MEMBER_VALUE,
-
- ARRAY,
- ELEMENT,
-
- // SyntaxKinds for future json5/etc support
- TRAILING_COMMA,
-
- // Tokens
- // Regexes adapted from [the logos handbook](https://logos.maciej.codes/examples/json_borrowed.html)
- #[token("true")]
- #[token("false")]
- BOOL,
- #[token("{")]
- BRACE_OPEN,
- #[token("}")]
- BRACE_CLOSE,
- #[token("[")]
- BRACKET_OPEN,
- #[token("]")]
- BRACKET_CLOSE,
- #[token(":")]
- COLON,
- #[token(",")]
- COMMA,
- #[token("null")]
- NULL,
- #[regex(r"-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?")]
- NUMBER,
- #[regex(r#""([^"\\]|\\["\\bnfrt]|u[a-fA-F0-9]{4})*""#)]
- STRING,
-
- // Whitespace tokens
- #[regex("[ \\t\\f]+")]
- WHITESPACE,
- #[token("\n")]
- NEWLINE,
-
- // Error SyntaxKinds
- LEX_ERR,
- PARSE_ERR,
-
- // Meta SyntaxKinds
- ROOT,
- EOF,
-}
-
-impl pawarser::parser::SyntaxElement for SyntaxKind {
- const SYNTAX_EOF: Self = Self::EOF;
-
- const SYNTAX_ERROR: Self = Self::PARSE_ERR;
- const SYNTAX_ROOT: Self = Self::ROOT;
-}
-
-impl From for rowan::SyntaxKind {
- fn from(kind: SyntaxKind) -> Self {
- Self(kind as u16)
- }
-}
-
-impl From for SyntaxKind {
- fn from(raw: rowan::SyntaxKind) -> Self {
- assert!(raw.0 <= SyntaxKind::EOF as u16);
- #[allow(unsafe_code, reason = "The transmute is necessary here")]
- unsafe {
- std::mem::transmute::(raw.0)
- }
- }
-}
-
-#[cfg(test)]
-mod tests {
- use crate::syntax_kind::{lex, SyntaxKind};
-
- #[test]
- fn simple_object() {
- const TEST_DATA: &str = r#"{"hello_world": "meow", "some_num":7.42}"#;
-
- assert_eq!(
- dbg!(lex(TEST_DATA)),
- vec![
- (SyntaxKind::BRACE_OPEN, "{"),
- (SyntaxKind::STRING, "\"hello_world\""),
- (SyntaxKind::COLON, ":"),
- (SyntaxKind::WHITESPACE, " "),
- (SyntaxKind::STRING, "\"meow\""),
- (SyntaxKind::COMMA, ","),
- (SyntaxKind::WHITESPACE, " "),
- (SyntaxKind::STRING, "\"some_num\""),
- (SyntaxKind::COLON, ":"),
- (SyntaxKind::NUMBER, "7.42"),
- (SyntaxKind::BRACE_CLOSE, "}")
- ]
- );
- }
-}
diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml
deleted file mode 100644
index c7a2659..0000000
--- a/crates/lang/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "lang"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-logos = "0.14"
-petgraph = { workspace = true}
-indexmap = "2.2.6"
-clap = { version = "4", features = ["derive"] }
-ariadne = "0.4.0"
-ego-tree = "0.6.2"
-rowan = "0.15.15"
-drop_bomb = "0.1.5"
-enumset = "1.1.3"
-indoc = "2"
-dashmap = "5.5.3"
-crossbeam = "0.8.4"
-owo-colors = {version = "4", features = ["supports-colors"]}
-strip-ansi-escapes = "0.2.0"
-
-[lints]
-workspace = true
diff --git a/crates/lang/src/ast.rs b/crates/lang/src/ast.rs
deleted file mode 100644
index d5838a2..0000000
--- a/crates/lang/src/ast.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::lst_parser::syntax_kind::SyntaxKind::*;
-use crate::SyntaxNode;
-use rowan::Language;
-
-// Heavily modified version of https://github.com/rust-analyzer/rowan/blob/e2d2e93e16c5104b136d0bc738a0d48346922200/examples/s_expressions.rs#L250-L266
-macro_rules! ast_nodes {
- ($($ast:ident, $kind:ident);+) => {
- $(
- #[derive(Debug, Clone, PartialEq, Eq, Hash)]
- #[repr(transparent)]
- pub struct $ast(SyntaxNode);
- impl rowan::ast::AstNode for $ast {
- type Language = crate::Lang;
-
- fn can_cast(kind: ::Kind) -> bool {
- kind == $kind
- }
-
- fn cast(node: SyntaxNode) -> Option {
- if node.kind() == $kind {
- Some(Self(node))
- } else {
- None
- }
- }
-
- fn syntax(&self) -> &SyntaxNode {
- &self.0
- }
- }
- )+
- };
-}
-
-ast_nodes!(
- Def, DEF;
- DefName, DEF_NAME;
- DefBody, DEF_BODY;
-
- Mod, MODULE;
- ModName, MODULE_NAME;
- ModBody, MODULE_BODY;
-
- Use, USE;
- UsePat, USE_PAT;
- PatItem, PAT_ITEM;
- PatGlob, PAT_GLOB;
- PatGroup, PAT_GROUP;
-
- Literal, LITERAL;
- IntLit, INT_NUM;
- FloatLit, FLOAT_NUM;
- StringLit, STRING;
-
- Matrix, MATRIX;
- MatrixRow, MAT_ROW;
- Vector, VEC;
- List, LIST;
- CollectionItem, COLLECTION_ITEM;
-
- ParenthesizedExpr, PARENTHESIZED_EXPR;
- Expression, EXPR;
-
- Pipeline, PIPELINE;
-
- Instruction, INSTR;
- InstructionName, INSTR_NAME;
- InstructionParams, INSTR_PARAMS;
-
- AttributeSet, ATTR_SET;
- Attribute, ATTR;
- AttributeName, ATTR_NAME;
- AttributeValue, ATTR_VALUE;
-
- ParseError, PARSE_ERR;
- LexError, LEX_ERR;
-
- Root, ROOT;
- Eof, EOF
-);
diff --git a/crates/lang/src/lib.rs b/crates/lang/src/lib.rs
deleted file mode 100644
index f48385e..0000000
--- a/crates/lang/src/lib.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#![feature(type_alias_impl_trait, lint_reasons, box_into_inner)]
-
-use crate::lst_parser::syntax_kind::SyntaxKind;
-
-pub mod ast;
-pub mod lst_parser;
-pub mod world;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Lang {}
-impl rowan::Language for Lang {
- type Kind = SyntaxKind;
- #[allow(unsafe_code)]
- fn kind_from_raw(raw: rowan::SyntaxKind) -> Self::Kind {
- assert!(raw.0 <= SyntaxKind::ROOT as u16);
- unsafe { std::mem::transmute::(raw.0) }
- }
- fn kind_to_raw(kind: Self::Kind) -> rowan::SyntaxKind {
- kind.into()
- }
-}
-
-pub type SyntaxNode = rowan::SyntaxNode;
-pub type SyntaxToken = rowan::SyntaxNode;
-pub type SyntaxElement = rowan::NodeOrToken;
diff --git a/crates/lang/src/lst_parser.rs b/crates/lang/src/lst_parser.rs
deleted file mode 100644
index 5c90bb0..0000000
--- a/crates/lang/src/lst_parser.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use drop_bomb::DropBomb;
-
-use self::{
- error::SyntaxError,
- events::{Event, NodeKind},
- input::Input,
- syntax_kind::SyntaxKind,
-};
-use std::cell::Cell;
-
-pub mod syntax_kind;
-#[cfg(test)]
-mod tests;
-
-pub mod error;
-pub mod events;
-pub mod grammar;
-pub mod input;
-pub mod output;
-
-const PARSER_STEP_LIMIT: u32 = 4096;
-
-pub struct Parser<'src, 'toks> {
- input: Input<'src, 'toks>,
- pos: usize,
- events: Vec,
- steps: Cell,
-}
-
-impl<'src, 'toks> Parser<'src, 'toks> {
- pub fn new(input: Input<'src, 'toks>) -> Self {
- Self {
- input,
- pos: 0,
- events: Vec::new(),
- steps: Cell::new(0),
- }
- }
-
- pub fn finish(self) -> Vec {
- self.events
- }
-
- pub(crate) fn nth(&self, n: usize) -> SyntaxKind {
- self.step();
- self.input.kind(self.pos + n)
- }
-
- pub fn eat_succeeding_ws(&mut self) {
- self.push_ev(Event::Eat {
- count: self.input.meaningless_tail_len(),
- });
- }
-
- pub(crate) fn current(&self) -> SyntaxKind {
- self.step();
- self.input.kind(self.pos)
- }
-
- pub(crate) fn start(&mut self, name: &str) -> Marker {
- let pos = self.events.len();
- self.push_ev(Event::tombstone());
- Marker::new(pos, name)
- }
-
- pub(crate) fn at(&self, kind: SyntaxKind) -> bool {
- self.nth_at(0, kind)
- }
-
- pub(crate) fn eat(&mut self, kind: SyntaxKind) -> bool {
- if !self.at(kind) {
- return false;
- }
-
- self.do_bump();
- true
- }
-
- pub(crate) fn nth_at(&self, n: usize, kind: SyntaxKind) -> bool {
- self.nth(n) == kind
- }
-
- fn do_bump(&mut self) {
- self.push_ev(Event::Eat {
- count: self.input.preceding_meaningless(self.pos),
- });
- self.pos += 1;
- }
-
- fn push_ev(&mut self, event: Event) {
- self.events.push(event)
- }
-
- fn step(&self) {
- let steps = self.steps.get();
- assert!(steps <= PARSER_STEP_LIMIT, "the parser seems stuck...");
- self.steps.set(steps + 1);
- }
-}
-
-pub(crate) struct Marker {
- pos: usize,
- bomb: DropBomb,
-}
-
-impl Marker {
- pub(crate) fn new(pos: usize, name: &str) -> Self {
- Self {
- pos,
- bomb: DropBomb::new(format!("Marker {name} must be completed or abandoned")),
- }
- }
-
- fn close_node(mut self, p: &mut Parser, kind: NodeKind) -> CompletedMarker {
- self.bomb.defuse();
- match &mut p.events[self.pos] {
- Event::Start { kind: slot, .. } => *slot = kind.clone(),
- _ => unreachable!(),
- }
-
- p.push_ev(Event::Finish);
-
- CompletedMarker {
- pos: self.pos,
- kind,
- }
- }
-
- pub(crate) fn complete(self, p: &mut Parser<'_, '_>, kind: SyntaxKind) -> CompletedMarker {
- self.close_node(p, NodeKind::Syntax(kind))
- }
-
- pub(crate) fn error(self, p: &mut Parser, kind: SyntaxError) -> CompletedMarker {
- self.close_node(p, NodeKind::Error(kind))
- }
-
- pub(crate) fn abandon(mut self, p: &mut Parser<'_, '_>) {
- self.bomb.defuse();
- if self.pos == p.events.len() - 1 {
- match p.events.pop() {
- Some(Event::Start {
- kind: NodeKind::Syntax(SyntaxKind::TOMBSTONE),
- forward_parent: None,
- }) => (),
- _ => unreachable!(),
- }
- }
- }
-}
-
-pub(crate) struct CompletedMarker {
- pos: usize,
- kind: NodeKind,
-}
-
-impl CompletedMarker {
- pub(crate) fn precede(self, p: &mut Parser<'_, '_>, name: &str) -> Marker {
- let new_pos = p.start(name);
-
- match &mut p.events[self.pos] {
- Event::Start { forward_parent, .. } => {
- *forward_parent = Some(new_pos.pos - self.pos);
- }
- _ => unreachable!(),
- }
-
- new_pos
- }
-}
diff --git a/crates/lang/src/lst_parser/error.rs b/crates/lang/src/lst_parser/error.rs
deleted file mode 100644
index 73f290f..0000000
--- a/crates/lang/src/lst_parser/error.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::lst_parser::syntax_kind::SyntaxKind;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum SyntaxError {
- Expected(Vec),
- PipelineNeedsSink,
- // if there was two space seperated items in a list
- SpaceSepInList,
- SemicolonInList,
- CommaInMatOrVec,
- UnterminatedTopLevelItem,
- UnclosedModuleBody,
- UnfinishedPath,
- PathSepContainsSemicolon,
-}
diff --git a/crates/lang/src/lst_parser/events.rs b/crates/lang/src/lst_parser/events.rs
deleted file mode 100644
index 3ed630a..0000000
--- a/crates/lang/src/lst_parser/events.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use crate::lst_parser::syntax_kind::SyntaxKind;
-
-use super::error::SyntaxError;
-
-#[derive(Debug)]
-pub enum Event {
- Start {
- kind: NodeKind,
- forward_parent: Option,
- },
- Finish,
- Eat {
- count: usize,
- },
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum NodeKind {
- Syntax(SyntaxKind),
- Error(SyntaxError),
-}
-
-impl NodeKind {
- pub fn is_syntax(&self) -> bool {
- matches!(self, Self::Syntax(_))
- }
-
- pub fn is_error(&self) -> bool {
- matches!(self, Self::Error(_))
- }
-}
-
-impl From for NodeKind {
- fn from(value: SyntaxKind) -> Self {
- NodeKind::Syntax(value)
- }
-}
-
-impl From for NodeKind {
- fn from(value: SyntaxError) -> Self {
- NodeKind::Error(value)
- }
-}
-
-impl PartialEq for NodeKind {
- fn eq(&self, other: &SyntaxKind) -> bool {
- match self {
- NodeKind::Syntax(s) => s == other,
- NodeKind::Error(_) => false,
- }
- }
-}
-
-impl PartialEq for NodeKind {
- fn eq(&self, other: &SyntaxError) -> bool {
- match self {
- NodeKind::Syntax(_) => false,
- NodeKind::Error(e) => e == other,
- }
- }
-}
-
-impl Event {
- pub(crate) fn tombstone() -> Self {
- Self::Start {
- kind: SyntaxKind::TOMBSTONE.into(),
- forward_parent: None,
- }
- }
-}
diff --git a/crates/lang/src/lst_parser/grammar.rs b/crates/lang/src/lst_parser/grammar.rs
deleted file mode 100644
index 001050e..0000000
--- a/crates/lang/src/lst_parser/grammar.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::fmt::Debug;
-
-use crate::lst_parser::syntax_kind::SyntaxKind::*;
-
-use self::module::{mod_body, top_level_item};
-
-use super::{
- input::Input,
- output::Output,
- syntax_kind::{self, lex},
- Parser,
-};
-
-mod expression;
-mod module;
-
-pub fn source_file(p: &mut Parser) {
- let root = p.start("root");
-
- mod_body(p);
- // expression::expression(p, false);
- p.eat_succeeding_ws();
-
- root.complete(p, ROOT);
-}
-
-fn check_parser(input: &str, parser_fn: fn(&mut Parser), output: &str) {
- let toks = lex(input);
- let mut parser = Parser::new(Input::new(&toks));
-
- parser_fn(&mut parser);
-
- let p_out = dbg!(parser.finish());
- let o = Output::from_parser_output(toks, p_out);
-
- let s = strip_ansi_escapes::strip_str(format!("{o:?}"));
- assert_eq!(&s, output);
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression.rs b/crates/lang/src/lst_parser/grammar/expression.rs
deleted file mode 100644
index 03c0d10..0000000
--- a/crates/lang/src/lst_parser/grammar/expression.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use crate::lst_parser::{error::SyntaxError, syntax_kind::SyntaxKind::*, CompletedMarker, Parser};
-
-use self::{collection::collection, instruction::instr, lit::literal, pipeline::PIPES};
-
-mod collection;
-mod instruction;
-mod lit;
-mod pipeline;
-
-pub fn expression(p: &mut Parser, in_pipe: bool) -> Option {
- let expr = p.start("expr");
-
- if atom(p).or_else(|| instr(p)).is_none() {
- expr.abandon(p);
- return None;
- }
-
- let r = expr.complete(p, EXPR);
-
- if PIPES.contains(p.current()) && !in_pipe {
- pipeline::pipeline(p, r)
- } else {
- Some(r)
- }
-}
-
-pub fn atom(p: &mut Parser) -> Option {
- literal(p)
- .or_else(|| collection(p))
- .or_else(|| parenthesized_expr(p))
-}
-
-pub fn parenthesized_expr(p: &mut Parser) -> Option {
- if p.eat(L_PAREN) {
- let par_expr = p.start("parenthesized");
- expression(p, false);
- if !p.eat(R_PAREN) {
- return Some(par_expr.error(p, SyntaxError::Expected(vec![R_PAREN])));
- }
-
- return Some(par_expr.complete(p, PARENTHESIZED_EXPR));
- }
- None
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/collection.rs b/crates/lang/src/lst_parser/grammar/expression/collection.rs
deleted file mode 100644
index 8535291..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/collection.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use enumset::enum_set;
-
-use crate::lst_parser::{
- syntax_kind::{SyntaxKind::*, TokenSet},
- CompletedMarker, Parser,
-};
-
-use self::{attr_set::attr_set, vec::vec_matrix_list};
-
-mod attr_set;
-mod vec;
-
-const COLLECTION_START: TokenSet = enum_set!(L_BRACK | L_BRACE);
-
-pub fn collection(p: &mut Parser) -> Option {
- if !COLLECTION_START.contains(p.current()) {
- return None;
- }
-
- Some(match p.current() {
- L_BRACK => vec_matrix_list(p),
- L_BRACE => attr_set(p),
- _ => unreachable!(),
- })
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs b/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs
deleted file mode 100644
index b5a73fa..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/collection/attr_set.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::lst_parser::{
- error::SyntaxError,
- grammar::expression::{atom, expression},
- CompletedMarker, Marker, Parser,
- SyntaxKind::*,
-};
-
-pub fn attr_set(p: &mut Parser) -> CompletedMarker {
- let start = p.start("attr_set_start");
- assert!(p.eat(L_BRACE));
-
- loop {
- if attr(p).is_some() {
- // TODO: handle others
- if p.eat(COMMA) {
- continue;
- } else if p.eat(R_BRACE) {
- return start.complete(p, ATTR_SET);
- }
- // TODO: check for newline and stuff following that for recov of others
- } else if p.eat(R_BRACE) {
- return start.complete(p, ATTR_SET);
- }
- }
-}
-
-fn attr(p: &mut Parser) -> Option {
- if p.at(IDENT) {
- let attr_start = p.start("attr");
- let attr_name_start = p.start("attr_name");
- p.do_bump();
- attr_name_start.complete(p, ATTR_NAME);
-
- // TODO: handle comma, expr/atom, other
- p.eat(COLON);
-
- // TODO: handle failed expr parser too
- let attr_value = p.start("attr_value");
- let _ = expression(p, false);
- attr_value.complete(p, ATTR_VALUE);
- Some(attr_start.complete(p, ATTR))
- } else {
- None
- }
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs b/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs
deleted file mode 100644
index 4dfd299..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/collection/vec.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use crate::lst_parser::{
- error::SyntaxError, grammar::expression::atom, CompletedMarker, Marker, Parser, SyntaxKind::*,
-};
-
-pub fn vec_matrix_list(p: &mut Parser) -> CompletedMarker {
- let start = p.start("vec_matrix_list_start");
- assert!(p.eat(L_BRACK));
- let row_start = p.start("matrix_row_start");
- if let Some(item) = atom(p) {
- item.precede(p, "coll_item_start")
- .complete(p, COLLECTION_ITEM);
-
- if p.at(COMMA) {
- row_start.abandon(p);
- return finish_list(p, start);
- }
-
- finish_mat_or_vec(p, start, row_start)
- } else if p.eat(R_BRACK) {
- row_start.abandon(p);
- start.complete(p, LIST)
- } else {
- row_start.abandon(p);
- start.error(p, SyntaxError::Expected(vec![EXPR, R_BRACK]))
- }
-}
-
-fn finish_list(p: &mut Parser, list_start: Marker) -> CompletedMarker {
- loop {
- if p.eat(COMMA) {
- if let Some(item) = atom(p) {
- item.precede(p, "coll_item_start")
- .complete(p, COLLECTION_ITEM);
- } else if p.eat(R_BRACK) {
- return list_start.complete(p, LIST);
- }
- } else if p.eat(R_BRACK) {
- return list_start.complete(p, LIST);
- } else if let Some(item) = atom(p) {
- item.precede(p, "next_item")
- .complete(p, COLLECTION_ITEM)
- .precede(p, "err_space_sep")
- .error(p, SyntaxError::SpaceSepInList);
- } else if p.at(SEMICOLON) {
- let semi_err = p.start("semicolon_err");
- p.eat(SEMICOLON);
- semi_err.error(p, SyntaxError::SemicolonInList);
- if let Some(item) = atom(p) {
- item.precede(p, "coll_item_start")
- .complete(p, COLLECTION_ITEM);
- } else if p.eat(R_BRACK) {
- return list_start.complete(p, LIST);
- }
- }
- }
-}
-
-// TODO: handle commas, general other wrong toks
-fn finish_mat_or_vec(p: &mut Parser, coll_start: Marker, mut row_start: Marker) -> CompletedMarker {
- let mut is_matrix = false;
- let mut row_item_count = 1;
- loop {
- if let Some(item) = atom(p) {
- item.precede(p, "coll_item_start")
- .complete(p, COLLECTION_ITEM);
- row_item_count += 1;
- } else if p.at(SEMICOLON) {
- is_matrix = true;
- row_start.complete(p, MAT_ROW);
- p.eat(SEMICOLON);
- row_start = p.start("matrix_row_start");
- row_item_count = 0;
- } else if p.at(R_BRACK) {
- if is_matrix && row_item_count == 0 {
- row_start.abandon(p);
- p.eat(R_BRACK);
- return coll_start.complete(p, MATRIX);
- } else if is_matrix {
- row_start.complete(p, MAT_ROW);
- p.eat(R_BRACK);
- return coll_start.complete(p, MATRIX);
- } else {
- row_start.abandon(p);
- p.eat(R_BRACK);
- return coll_start.complete(p, VEC);
- }
- } else if p.at(COMMA) {
- let err_unexpected_comma = p.start("err_unexpected_comma");
- p.do_bump();
- err_unexpected_comma.error(p, SyntaxError::CommaInMatOrVec);
- } else {
- let err_unexpected = p.start("err_unexpected_tok");
- p.do_bump();
- err_unexpected.error(p, SyntaxError::Expected(vec![EXPR, SEMICOLON, R_BRACK]));
- }
- }
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/instruction.rs b/crates/lang/src/lst_parser/grammar/expression/instruction.rs
deleted file mode 100644
index bbe0ed3..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/instruction.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use crate::lst_parser::{syntax_kind::SyntaxKind::*, CompletedMarker, Parser};
-
-use super::{atom, lit::literal};
-
-pub fn instr(p: &mut Parser) -> Option {
- if !p.at(IDENT) {
- return None;
- }
-
- let instr = p.start("instr");
-
- instr_name(p);
- instr_params(p);
-
- Some(instr.complete(p, INSTR))
-}
-
-fn instr_name(p: &mut Parser) {
- let instr_name = p.start("instr_name");
-
- while p.at(IDENT) {
- p.do_bump();
- }
-
- instr_name.complete(p, INSTR_NAME);
-}
-
-fn instr_params(p: &mut Parser) {
- if let Some(start) = atom(p) {
- while atom(p).is_some() {}
-
- start.precede(p, "params_start").complete(p, INSTR_PARAMS);
- }
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/lit.rs b/crates/lang/src/lst_parser/grammar/expression/lit.rs
deleted file mode 100644
index 8a18a04..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/lit.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use enumset::enum_set;
-use indoc::indoc;
-
-use crate::lst_parser::{
- grammar::check_parser,
- syntax_kind::{SyntaxKind::*, TokenSet},
- CompletedMarker, Parser,
-};
-
-const LIT_TOKENS: TokenSet = enum_set!(INT_NUM | FLOAT_NUM | STRING);
-
-pub fn literal(p: &mut Parser) -> Option {
- if !LIT_TOKENS.contains(p.current()) {
- return None;
- }
-
- let lit = p.start("lit");
-
- p.do_bump();
-
- Some(lit.complete(p, LITERAL))
-}
-
-#[test]
-fn test_parse_lst_lit() {
- check_parser(
- "42",
- |p| {
- literal(p);
- },
- indoc! {r#"
- LITERAL {
- INT_NUM "42";
- }
- "#},
- );
- check_parser(
- "3.14",
- |p| {
- literal(p);
- },
- indoc! {r#"
- LITERAL {
- FLOAT_NUM "3.14";
- }
- "#},
- );
- check_parser(
- r#""Meow""#,
- |p| {
- literal(p);
- },
- indoc! {r#"
- LITERAL {
- STRING "\"Meow\"";
- }
- "#},
- );
-}
diff --git a/crates/lang/src/lst_parser/grammar/expression/pipeline.rs b/crates/lang/src/lst_parser/grammar/expression/pipeline.rs
deleted file mode 100644
index 2c1c678..0000000
--- a/crates/lang/src/lst_parser/grammar/expression/pipeline.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use enumset::enum_set;
-
-use crate::lst_parser::{
- error::SyntaxError,
- syntax_kind::{SyntaxKind::*, TokenSet},
- CompletedMarker, Parser,
-};
-
-use super::expression;
-
-pub fn pipeline(p: &mut Parser, start_expr: CompletedMarker) -> Option {
- if !pipe(p) {
- return Some(start_expr);
- }
- let pipeline_marker = start_expr.precede(p, "pipeline_start");
-
- loop {
- if expression(p, true).is_none() {
- return Some(pipeline_marker.error(p, SyntaxError::PipelineNeedsSink));
- }
- if !pipe(p) {
- return Some(pipeline_marker.complete(p, PIPELINE));
- }
- }
-}
-
-pub const PIPES: TokenSet = enum_set!(PIPE | MAPPING_PIPE | NULL_PIPE);
-
-fn pipe(p: &mut Parser) -> bool {
- if PIPES.contains(p.current()) {
- p.do_bump();
- true
- } else {
- false
- }
-}
diff --git a/crates/lang/src/lst_parser/grammar/module.rs b/crates/lang/src/lst_parser/grammar/module.rs
deleted file mode 100644
index 008627c..0000000
--- a/crates/lang/src/lst_parser/grammar/module.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-use enumset::enum_set;
-
-use crate::lst_parser::{
- error::SyntaxError,
- grammar::expression::expression,
- syntax_kind::{SyntaxKind::*, TokenSet},
- CompletedMarker, Parser,
-};
-
-const TOP_LEVEL_ITEM_START: TokenSet = enum_set!(DEF_KW | MOD_KW | USE_KW);
-
-pub fn mod_body(p: &mut Parser) {
- loop {
- if top_level_item(p).is_none() {
- break;
- }
- }
-}
-
-fn mod_decl(p: &mut Parser) -> Option {
- let mod_start = p.start("module");
- if !p.eat(MOD_KW) {
- mod_start.abandon(p);
- return None;
- }
-
- let mod_name = p.start("module_name");
- if p.eat(IDENT) {
- mod_name.complete(p, MODULE_NAME);
- } else {
- mod_name.error(p, SyntaxError::Expected(vec![IDENT]));
- }
-
- let mod_body_marker = p.start("mod_body");
- if p.eat(SEMICOLON) {
- mod_body_marker.abandon(p);
- Some(mod_start.complete(p, MODULE))
- } else if p.eat(L_BRACE) {
- mod_body(p);
- if !p.eat(R_BRACE) {
- mod_body_marker
- .complete(p, MODULE_BODY)
- .precede(p, "unclosed_mod_body_err")
- .error(p, SyntaxError::UnclosedModuleBody);
- } else {
- mod_body_marker.complete(p, MODULE_BODY);
- }
- Some(mod_start.complete(p, MODULE))
- } else {
- Some(mod_start.error(p, SyntaxError::Expected(vec![MODULE_BODY])))
- }
-}
-
-pub fn top_level_item(p: &mut Parser) -> Option {
- if !TOP_LEVEL_ITEM_START.contains(p.current()) {
- return None;
- }
- def(p).or_else(|| mod_decl(p)).or_else(|| r#use(p))
-}
-
-fn def(p: &mut Parser) -> Option {
- let def_start = p.start("top_level_def");
- if !p.eat(DEF_KW) {
- def_start.abandon(p);
- return None;
- }
-
- let def_name = p.start("def_name");
- if p.eat(IDENT) {
- def_name.complete(p, DEF_NAME);
- } else {
- def_name.error(p, SyntaxError::Expected(vec![IDENT]));
- }
-
- let maybe_expected_eq = p.start("maybe_expect_eq");
- if !p.eat(EQ) {
- maybe_expected_eq.error(p, SyntaxError::Expected(vec![EQ]));
- } else {
- maybe_expected_eq.abandon(p);
- }
-
- let body = p.start("def_body");
- if expression(p, false).is_some() {
- body.complete(p, DEF_BODY);
- } else {
- body.error(p, SyntaxError::Expected(vec![DEF_BODY]));
- }
-
- Some(if p.eat(SEMICOLON) {
- def_start.complete(p, DEF)
- } else if TOP_LEVEL_ITEM_START.contains(p.current()) || p.at(EOF) {
- def_start
- .complete(p, DEF)
- .precede(p, "unterminated_tl_item")
- .error(p, SyntaxError::UnterminatedTopLevelItem)
- } else {
- def_start
- .complete(p, DEF)
- .precede(p, "err_unexpected")
- .error(p, SyntaxError::Expected(vec![SEMICOLON]))
- })
-}
-
-fn r#use(p: &mut Parser) -> Option {
- let use_start = p.start("use_start");
- if !p.eat(USE_KW) {
- use_start.abandon(p);
- return None;
- }
-
- if use_pat(p).is_none() {
- p.start("expected_use_pat")
- .error(p, SyntaxError::Expected(vec![USE_PAT]));
- }
-
- let use_item = use_start.complete(p, USE);
- Some(if p.eat(SEMICOLON) {
- use_item
- } else if TOP_LEVEL_ITEM_START.contains(p.current()) || p.at(EOF) {
- use_item
- .precede(p, "unterminated_tl_item")
- .error(p, SyntaxError::UnterminatedTopLevelItem)
- } else {
- use_item
- .precede(p, "err_unexpected")
- .error(p, SyntaxError::Expected(vec![SEMICOLON]))
- })
-}
-
-fn use_pat(p: &mut Parser) -> Option {
- let use_pat_marker = p.start("use_pat");
- if !p.eat(IDENT) {
- return None;
- }
-
- loop {
- if p.eat(PATH_SEP) {
- if pat_item(p).is_none() {
- break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath));
- }
- } else if p.at(SEMICOLON) && p.nth_at(1, COLON) {
- let broken_sep = p.start("broken_path_sep");
- let wrong_semi = p.start("semi_typo");
- p.eat(SEMICOLON);
- wrong_semi.error(p, SyntaxError::PathSepContainsSemicolon);
- p.eat(COLON);
- broken_sep.complete(p, PATH_SEP);
- if pat_item(p).is_none() {
- break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath));
- }
- } else if p.at(COLON) && p.nth_at(1, SEMICOLON) {
- let broken_sep = p.start("broken_path_sep");
- p.eat(COLON);
- let wrong_semi = p.start("semi_typo");
- p.eat(SEMICOLON);
- wrong_semi.error(p, SyntaxError::PathSepContainsSemicolon);
- broken_sep.complete(p, PATH_SEP);
- if pat_item(p).is_none() {
- break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath));
- }
- } else if p.at(SEMICOLON) && p.nth_at(1, SEMICOLON) {
- let broken_sep = p.start("broken_path_sep");
- p.eat(SEMICOLON);
- p.eat(SEMICOLON);
- broken_sep
- .complete(p, PATH_SEP)
- .precede(p, "semi_typo_err")
- .error(p, SyntaxError::PathSepContainsSemicolon);
- if pat_item(p).is_none() {
- break Some(use_pat_marker.error(p, SyntaxError::UnfinishedPath));
- }
- } else if p.eat(SEMICOLON) {
- break Some(use_pat_marker.complete(p, USE_PAT));
- } else {
- break Some(use_pat_marker.error(p, SyntaxError::Expected(vec![PATH_SEP, SEMICOLON])));
- }
- }
-}
-
-fn pat_item(p: &mut Parser) -> Option {
- let item_start = p.start("pat_item_start");
- if p.eat(IDENT) {
- Some(item_start.complete(p, PAT_ITEM))
- } else if p.eat(STAR) {
- Some(item_start.complete(p, PAT_GLOB))
- } else if p.eat(L_BRACE) {
- todo!("write PAT_GROUPs")
- } else {
- None
- }
-}
diff --git a/crates/lang/src/lst_parser/input.rs b/crates/lang/src/lst_parser/input.rs
deleted file mode 100644
index a00d862..0000000
--- a/crates/lang/src/lst_parser/input.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use enumset::enum_set;
-
-use crate::lst_parser::syntax_kind::SyntaxKind;
-
-use super::syntax_kind::TokenSet;
-
-pub struct Input<'src, 'toks> {
- raw: &'toks Vec<(SyntaxKind, &'src str)>,
- /// indices of the "meaningful" tokens (not whitespace etc)
- /// includes newlines because those might indeed help with finding errors
- meaningful: Vec,
- /// indices of newlines for the purpose of easily querying them
- /// can be helpful with missing commas etc
- newlines: Vec,
-}
-
-pub const MEANINGLESS_TOKS: TokenSet = enum_set!(SyntaxKind::WHITESPACE | SyntaxKind::NEWLINE);
-
-impl<'src, 'toks> Input<'src, 'toks> {
- pub fn new(raw_toks: &'toks Vec<(SyntaxKind, &'src str)>) -> Self {
- let meaningful = raw_toks
- .iter()
- .enumerate()
- .filter_map(|(i, tok)| {
- if MEANINGLESS_TOKS.contains(tok.0) {
- None
- } else {
- Some(i)
- }
- })
- .collect();
- let newlines = raw_toks
- .iter()
- .enumerate()
- .filter_map(|(i, tok)| match tok.0 {
- SyntaxKind::NEWLINE => Some(i),
- _ => None,
- })
- .collect();
-
- Self {
- raw: raw_toks,
- meaningful,
- newlines,
- }
- }
-
- #[allow(clippy::unwrap_used, reason = "meaningful indices cannot be invalid")]
- pub(crate) fn kind(&self, idx: usize) -> SyntaxKind {
- let Some(meaningful_idx) = self.meaningful.get(idx) else {
- return SyntaxKind::EOF;
- };
-
- self.raw.get(*meaningful_idx).unwrap().0
- }
-
- pub(crate) fn preceding_meaningless(&self, idx: usize) -> usize {
- assert!(self.meaningful.len() > idx);
-
- if idx == 0 {
- 1
- } else {
- self.meaningful[idx] - self.meaningful[idx - 1]
- }
- }
-
- pub(crate) fn meaningless_tail_len(&self) -> usize {
- self.raw.len() - (self.meaningful.last().unwrap() + 1)
- }
-}
diff --git a/crates/lang/src/lst_parser/output.rs b/crates/lang/src/lst_parser/output.rs
deleted file mode 100644
index 78433b1..0000000
--- a/crates/lang/src/lst_parser/output.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use clap::builder;
-use owo_colors::{unset_override, OwoColorize};
-use rowan::{GreenNode, GreenNodeBuilder, GreenNodeData, GreenTokenData, Language, NodeOrToken};
-use std::mem;
-
-use crate::{
- lst_parser::{input::MEANINGLESS_TOKS, syntax_kind::SyntaxKind},
- Lang, SyntaxNode,
-};
-
-use super::{
- error::SyntaxError,
- events::{Event, NodeKind},
-};
-
-pub struct Output {
- pub green_node: GreenNode,
- pub errors: Vec,
-}
-
-impl std::fmt::Debug for Output {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- let mut errs: Vec<&SyntaxError> = self.errors.iter().collect();
- errs.reverse();
-
- debug_print_green_node(NodeOrToken::Node(&self.green_node), f, 0, &mut errs, false)
- }
-}
-
-const INDENT_STR: &str = " ";
-/// colored argument currently broken
-fn debug_print_green_node(
- node: NodeOrToken<&GreenNodeData, &GreenTokenData>,
- f: &mut dyn std::fmt::Write,
- lvl: i32,
- errs: &mut Vec<&SyntaxError>,
- colored: bool,
-) -> std::fmt::Result {
- for _ in 0..lvl {
- f.write_str(INDENT_STR)?;
- }
-
- let r = match node {
- NodeOrToken::Node(n) => {
- let kind = Lang::kind_from_raw(node.kind());
- if kind != SyntaxKind::PARSE_ERR {
- writeln!(
- f,
- "{:?} {}",
- Lang::kind_from_raw(node.kind()).bright_yellow().bold(),
- "{".yellow()
- )?;
- } else {
- let err = errs
- .pop()
- .expect("all error syntax nodes should correspond to an error")
- .bright_red();
-
- writeln!(
- f,
- "{:?}{} {err:?} {}",
- kind.bright_red().bold(),
- ":".red(),
- "{".bright_red().bold()
- )?;
- }
- for c in n.children() {
- debug_print_green_node(c, f, lvl + 1, errs, colored)?;
- }
- for _ in 0..lvl {
- f.write_str(INDENT_STR)?;
- }
- if kind != SyntaxKind::PARSE_ERR {
- write!(f, "{}", "}\n".yellow())
- } else {
- write!(f, "{}", "}\n".bright_red().bold())
- }
- }
- NodeOrToken::Token(t) => {
- let tok = Lang::kind_from_raw(t.kind());
- if MEANINGLESS_TOKS.contains(tok) {
- writeln!(
- f,
- "{:?} {:?}{}",
- Lang::kind_from_raw(t.kind()).white(),
- t.text().white(),
- ";".white()
- )
- } else {
- writeln!(
- f,
- "{:?} {:?}{}",
- Lang::kind_from_raw(t.kind()).bright_cyan().bold(),
- t.text().green(),
- ";".yellow()
- )
- }
- }
- };
-
- r
-}
-
-impl Output {
- pub fn debug_colored(&self) -> String {
- let mut out = String::new();
- let mut errs: Vec<&SyntaxError> = self.errors.iter().collect();
- errs.reverse();
-
- let _ = debug_print_green_node(
- NodeOrToken::Node(&self.green_node),
- &mut out,
- 0,
- &mut errs,
- true,
- );
-
- out
- }
- pub fn from_parser_output(
- mut raw_toks: Vec<(SyntaxKind, &str)>,
- mut events: Vec,
- ) -> Self {
- let mut builder = GreenNodeBuilder::new();
- let mut fw_parents = Vec::new();
- let mut errors = Vec::new();
- raw_toks.reverse();
-
- for i in 0..events.len() {
- match mem::replace(&mut events[i], Event::tombstone()) {
- Event::Start {
- kind,
- forward_parent,
- } => {
- if kind == SyntaxKind::TOMBSTONE && forward_parent.is_none() {
- continue;
- }
-
- fw_parents.push(kind);
- let mut idx = i;
- let mut fp = forward_parent;
- while let Some(fwd) = fp {
- idx += fwd as usize;
- fp = match mem::replace(&mut events[idx], Event::tombstone()) {
- Event::Start {
- kind,
- forward_parent,
- } => {
- fw_parents.push(kind);
- forward_parent
- }
- _ => unreachable!(),
- }
- }
-
- // remove whitespace bc it's ugly
- while let Some((SyntaxKind::WHITESPACE | SyntaxKind::NEWLINE, _)) =
- raw_toks.last()
- {
- match events.iter_mut().find(|ev| matches!(ev, Event::Eat { .. })) {
- Some(Event::Eat { count }) => *count -= 1,
- _ => unreachable!(),
- }
-
- let (tok, text): (SyntaxKind, &str) = raw_toks.pop().unwrap();
- builder.token(tok.into(), text);
- }
-
- for kind in fw_parents.drain(..).rev() {
- match kind {
- NodeKind::Syntax(kind) if kind != SyntaxKind::TOMBSTONE => {
- builder.start_node(kind.into())
- }
- NodeKind::Error(err) => {
- errors.push(err);
- builder.start_node(SyntaxKind::PARSE_ERR.into())
- }
- _ => {}
- }
- }
- }
- Event::Finish => builder.finish_node(),
- Event::Eat { count } => (0..count).for_each(|_| {
- let (tok, text): (SyntaxKind, &str) = raw_toks.pop().unwrap();
- builder.token(tok.into(), text);
- }),
- }
- }
-
- Self {
- green_node: builder.finish(),
- errors,
- }
- }
-
- pub fn syntax(&self) -> SyntaxNode {
- SyntaxNode::new_root(self.green_node.clone())
- }
-
- pub fn errors(&self) -> Vec {
- self.errors.clone()
- }
-
- pub fn dissolve(self) -> (GreenNode, Vec) {
- let Self { green_node, errors } = self;
- (green_node, errors)
- }
-}
diff --git a/crates/lang/src/lst_parser/syntax_kind.rs b/crates/lang/src/lst_parser/syntax_kind.rs
deleted file mode 100644
index 5cb7fb1..0000000
--- a/crates/lang/src/lst_parser/syntax_kind.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use enumset::EnumSet;
-use logos::Logos;
-
-pub fn lex(src: &str) -> Vec<(SyntaxKind, &str)> {
- let mut lex = SyntaxKind::lexer(src);
- let mut r = Vec::new();
-
- while let Some(tok_res) = lex.next() {
- r.push((tok_res.unwrap_or(SyntaxKind::LEX_ERR), lex.slice()))
- }
-
- r
-}
-
-#[derive(enumset::EnumSetType, Logos, Debug, PartialEq, Eq, Clone, Copy, Hash, PartialOrd, Ord)]
-#[repr(u16)]
-#[enumset(no_super_impls)]
-#[allow(non_camel_case_types)]
-pub enum SyntaxKind {
- #[token("def")]
- DEF_KW = 0,
- DEF,
- DEF_NAME,
- DEF_BODY,
- #[token("let")]
- LET_KW,
- #[token("in")]
- IN_KW,
- LET_IN,
- #[token("::")]
- PATH_SEP,
- #[token("mod")]
- MOD_KW,
- MODULE,
- MODULE_NAME,
- MODULE_BODY,
- USE,
- #[token("use")]
- USE_KW,
- USE_PAT,
- PAT_ITEM,
- PAT_GLOB,
- PAT_GROUP,
- #[regex("[\\d]+")]
- INT_NUM,
- #[regex("[+-]?([\\d]+\\.[\\d]*|[\\d]*\\.[\\d]+)")]
- FLOAT_NUM,
- #[regex(r#""([^"\\]|\\["\\bnfrt]|u[a-fA-F0-9]{4})*""#)]
- STRING,
- MATRIX,
- MAT_ROW,
- VEC,
- LIST,
- // either of a vec, a matrix or a list
- COLLECTION_ITEM,
- PARENTHESIZED_EXPR,
- EXPR,
- LITERAL,
- #[token("(")]
- L_PAREN,
- #[token(")")]
- R_PAREN,
- #[token("{")]
- L_BRACE,
- #[token("}")]
- R_BRACE,
- #[token("[")]
- L_BRACK,
- #[token("]")]
- R_BRACK,
- #[token("<")]
- L_ANGLE,
- #[token(">")]
- R_ANGLE,
- #[token("+")]
- PLUS,
- #[token("-")]
- MINUS,
- #[token("*")]
- STAR,
- #[token("/")]
- SLASH,
- #[token("%")]
- PERCENT,
- #[token("^")]
- CARET,
- INSTR,
- INSTR_NAME,
- INSTR_PARAMS,
- ATTR_SET,
- ATTR,
- ATTR_NAME,
- ATTR_VALUE,
- #[regex("[a-zA-Z_]+[a-zA-Z_\\-\\d]*")]
- IDENT,
- #[regex("\\$[a-zA-Z0-9_\\-]+")]
- VAR,
- #[regex("\\@[a-zA-Z0-9_\\-]+")]
- INPUT_VAR,
- #[token("$")]
- DOLLAR,
- #[token("@")]
- AT,
- #[token(",")]
- COMMA,
- #[token("|")]
- PIPE,
- #[token("@|")]
- MAPPING_PIPE,
- #[token("!|")]
- NULL_PIPE,
- PIPELINE,
- #[token("=")]
- EQ,
- #[token(":")]
- COLON,
- #[token(";")]
- SEMICOLON,
- #[token(".")]
- DOT,
- #[token("!")]
- BANG,
- #[regex("[ \\t\\f]+")]
- WHITESPACE,
- #[token("\n")]
- NEWLINE,
- PARSE_ERR,
- LEX_ERR,
- ROOT,
- EOF,
- TOMBSTONE,
-}
-
-pub type TokenSet = EnumSet;
-
-impl From for rowan::SyntaxKind {
- fn from(kind: SyntaxKind) -> Self {
- Self(kind as u16)
- }
-}
diff --git a/crates/lang/src/lst_parser/tests.rs b/crates/lang/src/lst_parser/tests.rs
deleted file mode 100644
index 8b13789..0000000
--- a/crates/lang/src/lst_parser/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/crates/lang/src/main.rs b/crates/lang/src/main.rs
deleted file mode 100644
index e9c0257..0000000
--- a/crates/lang/src/main.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use clap::Parser;
-use std::{fs, path::PathBuf};
-
-use lang::lst_parser::{self, grammar, input, output::Output, syntax_kind};
-
-#[derive(Parser)]
-struct Args {
- file: PathBuf,
-}
-
-#[allow(clippy::unwrap_used)]
-fn main() {
- let args = Args::parse();
- let n = args.file.clone();
- let f = fs::read_to_string(n.clone()).expect("failed to read file");
-
- let toks = dbg!(syntax_kind::lex(&f));
- let input = input::Input::new(&toks);
- let mut parser = lst_parser::Parser::new(input);
-
- grammar::source_file(&mut parser);
-
- let p_out = dbg!(parser.finish());
- let o = Output::from_parser_output(toks, p_out);
-
- println!("{}", o.debug_colored());
-
- // World::new(n);
-}
diff --git a/crates/lang/src/world.rs b/crates/lang/src/world.rs
deleted file mode 100644
index 7713422..0000000
--- a/crates/lang/src/world.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::path::Path;
-
-use self::files::{Files, OpenFileError};
-
-mod error;
-mod files;
-
-struct World;
-
-impl World {
- pub fn new(entry_point: &Path) -> Result {
- let mut files = Files::default();
- let (entry_point_id, errors) = files.add_file(entry_point)?;
-
- todo!()
- }
-}
-
-enum WorldCreationError {
- FailedToOpenEntryPoint(OpenFileError),
-}
-
-impl From for WorldCreationError {
- fn from(value: OpenFileError) -> Self {
- Self::FailedToOpenEntryPoint(value)
- }
-}
diff --git a/crates/lang/src/world/error.rs b/crates/lang/src/world/error.rs
deleted file mode 100644
index 1cebf8d..0000000
--- a/crates/lang/src/world/error.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::path::PathBuf;
-
-use crate::{ast::ParseError, lst_parser::error::SyntaxError};
-
-use super::files::{FileId, Loc, OpenFileError};
-
-pub enum Error {
- Syntax(Loc, SyntaxError),
- OpenFileError(OpenFileError),
-}
diff --git a/crates/lang/src/world/files.rs b/crates/lang/src/world/files.rs
deleted file mode 100644
index 24053d7..0000000
--- a/crates/lang/src/world/files.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::{
- collections::HashMap,
- io,
- path::{Path, PathBuf},
-};
-
-mod loc;
-
-pub use loc::Loc;
-use rowan::ast::AstNode;
-
-use crate::{
- ast::ParseError,
- lst_parser::{self, error::SyntaxError, input, output::Output},
- world::{error::Error, files::source_file::SourceFile},
-};
-
-#[derive(Default)]
-pub struct Files {
- inner: Vec,
- path_to_id_map: HashMap,
-}
-
-impl Files {
- pub fn add_file(&mut self, path: &Path) -> Result<(FileId, Vec), OpenFileError> {
- if !path.exists() {
- return Err(OpenFileError::NotFound(path.to_owned()));
- }
-
- let file_id = FileId(self.inner.len());
- let (source_file, errs) = match SourceFile::open(path) {
- Ok((source_file, errs)) => {
- let errs = errs
- .into_iter()
- .map(|(ptr, err)| Error::Syntax(Loc::from_ptr(ptr, file_id), err))
- .collect::>();
- (source_file, errs)
- }
- Err(e) => return Err(OpenFileError::IoError(path.to_path_buf(), e)),
- };
-
- self.inner.push(source_file);
- self.path_to_id_map.insert(path.to_path_buf(), file_id);
-
- Ok((file_id, errs))
- }
-}
-
-pub enum OpenFileError {
- NotFound(PathBuf),
- IoError(PathBuf, std::io::Error),
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct FileId(usize);
-
-mod source_file;
diff --git a/crates/lang/src/world/files/loc.rs b/crates/lang/src/world/files/loc.rs
deleted file mode 100644
index fa865d8..0000000
--- a/crates/lang/src/world/files/loc.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use rowan::ast::{AstNode, AstPtr};
-
-use crate::Lang;
-
-use super::FileId;
-
-#[derive(Clone)]
-pub struct Loc> {
- file: FileId,
- syntax: AstPtr,
-}
-
-impl> Loc {
- pub fn new(node: N, file: FileId) -> Self {
- Self::from_ptr(AstPtr::new(&node), file)
- }
-
- pub fn from_ptr(ptr: AstPtr, file: FileId) -> Self {
- Self { file, syntax: ptr }
- }
-
- pub fn file(&self) -> FileId {
- self.file
- }
-
- pub fn syntax(&self) -> AstPtr {
- self.syntax.clone()
- }
-}
diff --git a/crates/lang/src/world/files/source_file.rs b/crates/lang/src/world/files/source_file.rs
deleted file mode 100644
index 8ed8043..0000000
--- a/crates/lang/src/world/files/source_file.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use crate::lst_parser::{self, grammar, input, syntax_kind};
-use crate::SyntaxNode;
-
-use crate::lst_parser::output::Output;
-
-use crate::lst_parser::error::SyntaxError;
-
-use crate::ast::ParseError;
-
-use rowan::ast::{AstNode, AstPtr};
-
-use std::path::Path;
-use std::{fs, io};
-
-use rowan::GreenNode;
-
-use std::path::PathBuf;
-
-pub(crate) struct SourceFile {
- pub(crate) path: PathBuf,
- pub(crate) lst: rowan::GreenNode,
-}
-
-impl SourceFile {
- pub(crate) fn open(p: &Path) -> io::Result<(Self, Vec<(AstPtr, SyntaxError)>)> {
- assert!(p.exists());
-
- let f = fs::read_to_string(p)?;
- let (lst, errs) = Self::parse(f);
-
- Ok((
- Self {
- path: p.to_path_buf(),
- lst,
- },
- errs,
- ))
- }
-
- pub(crate) fn parse(f: String) -> (GreenNode, Vec<(AstPtr, SyntaxError)>) {
- let toks = syntax_kind::lex(&f);
- let input = input::Input::new(&toks);
- let mut parser = lst_parser::Parser::new(input);
-
- grammar::source_file(&mut parser);
-
- let p_out = parser.finish();
- let (lst, errs) = Output::from_parser_output(toks, p_out).dissolve();
-
- (lst.clone(), Self::find_errs(lst, errs))
- }
-
- pub(crate) fn find_errs(
- lst: GreenNode,
- mut errs: Vec,
- ) -> Vec<(AstPtr, SyntaxError)> {
- let mut out = Vec::new();
- errs.reverse();
-
- let lst = SyntaxNode::new_root(lst);
- Self::find_errs_recursive(&mut out, lst, &mut errs);
-
- out
- }
-
- pub(crate) fn find_errs_recursive(
- mut out: &mut Vec<(AstPtr, SyntaxError)>,
- lst: SyntaxNode,
- mut errs: &mut Vec,
- ) {
- lst.children()
- .filter_map(|c| ParseError::cast(c))
- .for_each(|e| out.push((AstPtr::new(&e), errs.pop().unwrap())));
-
- lst.children()
- .for_each(|c| Self::find_errs_recursive(out, c, errs));
- }
-}
-
-#[cfg(test)]
-mod tests {
- use crate::world::files::source_file::SourceFile;
-
- fn check_find_errs(input: &str, expected: &[&str]) {
- let (_, errs) = SourceFile::parse(input.to_string());
-
- let errs = errs
- .into_iter()
- .map(|(loc, err)| format!("{:?}@{:?}", err, loc.syntax_node_ptr().text_range()))
- .collect::>();
-
- assert_eq!(
- errs,
- expected
- .into_iter()
- .map(|s| s.to_string())
- .collect::>()
- )
- }
-
- #[test]
- fn test_find_errs() {
- check_find_errs(
- "def meow = ;\n mod ;",
- &["Expected([DEF_BODY])@11..11", "Expected([IDENT])@18..18"],
- );
-
- check_find_errs(
- "def awawa = a |",
- &["UnterminatedTopLevelItem@0..15", "PipelineNeedsSink@12..15"],
- )
- }
-}
diff --git a/crates/pawarser/Cargo.toml b/crates/pawarser/Cargo.toml
deleted file mode 100644
index 787cb2f..0000000
--- a/crates/pawarser/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "pawarser"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-rowan = "0.15.15"
-drop_bomb = "0.1.5"
-enumset = "1.1.3"
-
-[lints]
-workspace = true
diff --git a/crates/pawarser/src/lib.rs b/crates/pawarser/src/lib.rs
deleted file mode 100644
index 26d8679..0000000
--- a/crates/pawarser/src/lib.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(iter_collect_into)]
-pub mod parser;
-
-pub use parser::{
- error::SyntaxError,
- marker::{CompletedMarker, Marker},
- Parser, SyntaxElement,
-};
diff --git a/crates/pawarser/src/parser.rs b/crates/pawarser/src/parser.rs
deleted file mode 100644
index c592cdb..0000000
--- a/crates/pawarser/src/parser.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-use std::{cell::Cell, fmt, marker::PhantomData, mem};
-
-use enumset::{EnumSet, EnumSetType};
-use rowan::{GreenNode, GreenNodeBuilder};
-
-use crate::parser::event::NodeKind;
-
-use self::{event::Event, input::Input, marker::Marker};
-pub use {error::SyntaxError, output::ParserOutput};
-
-pub mod error;
-mod event;
-mod input;
-pub mod marker;
-pub mod output;
-
-/// this is used to define some required SyntaxKinds like an EOF token or an error token
-pub trait SyntaxElement
-where
- Self: EnumSetType
- + Into
- + From
- + fmt::Debug
- + Clone
- + PartialEq
- + Eq,
-{
- /// EOF value. This will be used by the rest of the parser library to represent an EOF.
- const SYNTAX_EOF: Self;
- /// Error value. This will be used as a placeholder for associated respective errors.
- const SYNTAX_ERROR: Self;
- const SYNTAX_ROOT: Self;
-}
-
-pub struct Parser<'src, SyntaxKind: SyntaxElement, SyntaxErr: SyntaxError> {
- input: Input<'src, SyntaxKind>,
- pos: usize,
- events: Vec>,
- step_limit: u32,
- steps: Cell,
-}
-
-impl<'src, 'toks, SyntaxKind: SyntaxElement, SyntaxErr: SyntaxError>
- Parser<'src, SyntaxKind, SyntaxErr>
-{
- /// eat all meaningless tokens at the end of the file.
- pub fn eat_succeeding_meaningless(&mut self) {
- self.push_ev(Event::Eat {
- count: self.input.meaningless_tail_len(),
- });
- }
-
- /// Get token from current position of the parser.
- pub fn current(&self) -> SyntaxKind {
- self.step();
- self.input.kind(self.pos)
- }
-
- pub fn start(&mut self, name: &str) -> Marker {
- let pos = self.events.len();
- self.push_ev(Event::tombstone());
- Marker::new(pos, name)
- }
-
- /// Eat next token if it's of kind `kind` and return `true`.
- /// Otherwise, `false`.
- pub fn eat(&mut self, kind: SyntaxKind) -> bool {
- if !self.at(kind) {
- return false;
- }
-
- self.do_bump();
- true
- }
-
- pub fn do_bump(&mut self) {
- self.push_ev(Event::Eat {
- count: self.input.preceding_meaningless(self.pos),
- });
- self.pos += 1;
- }
-
- /// Check if the token at the current parser position is of `kind`
- pub fn at(&self, kind: SyntaxKind) -> bool {
- self.nth_at(0, kind)
- }
-
- /// Check if the token that is `n` ahead is of `kind`
- pub fn nth_at(&self, n: usize, kind: SyntaxKind) -> bool {
- self.nth(n) == kind
- }
-
- pub fn nth(&self, n: usize) -> SyntaxKind {
- self.step();
- self.input.kind(self.pos + n)
- }
-
- fn push_ev(&mut self, event: Event) {
- self.events.push(event);
- }
-
- fn step(&self) {
- let steps = self.steps.get();
- assert!(steps <= self.step_limit, "the parser seems stuck.");
- self.steps.set(steps + 1);
- }
-
- pub fn finish(self) -> ParserOutput {
- let Self {
- input,
- pos,
- mut events,
- step_limit,
- steps,
- } = self;
- let (mut raw_toks, meaningless_tokens) = input.dissolve();
- let mut builder = GreenNodeBuilder::new();
- // TODO: document what the hell a forward parent is
- let mut fw_parents = Vec::new();
- let mut errors: Vec = Vec::new();
- raw_toks.reverse();
-
- // always have an implicit root node to avoid [`GreenNodeBuilder::finish()`] panicking due to multiple root elements.
- builder.start_node(SyntaxKind::SYNTAX_ROOT.into());
-
- for i in 0..events.len() {
- match mem::replace(&mut events[i], Event::tombstone()) {
- Event::Start {
- kind,
- forward_parent,
- } => {
- if kind == NodeKind::Tombstone && forward_parent.is_none() {
- continue;
- }
-
- // resolving forward parents
- // temporarily jump around with the parser index and replace them with tombstones
- fw_parents.push(kind);
- let mut idx = i;
- let mut fp = forward_parent;
- while let Some(fwd) = fp {
- idx += fwd as usize;
- fp = match mem::replace(&mut events[idx], Event::tombstone()) {
- Event::Start {
- kind,
- forward_parent,
- } => {
- fw_parents.push(kind);
- forward_parent
- }
- _ => unreachable!(),
- }
- }
-
- // clear semantically meaningless tokens before the new tree node for aesthetic reasons
- while raw_toks
- .last()
- .is_some_and(|v| meaningless_tokens.contains(v.0))
- {
- // update first next Eat event
- match events.iter_mut().find(|ev| matches!(ev, Event::Eat { .. })) {
- Some(Event::Eat { count }) => *count -= 1,
- _ => unreachable!(),
- }
-
- // put whitespace into lst
- let (tok, text) = raw_toks.pop().unwrap();
- builder.token(tok.into(), text);
- }
-
- // insert forward parents into the tree in correct order
- for kind in fw_parents.drain(..).rev() {
- match kind {
- NodeKind::Syntax(kind) => builder.start_node(kind.into()),
- NodeKind::Error(err) => {
- errors.push(err);
- builder.start_node(SyntaxKind::SYNTAX_ERROR.into())
- }
- _ => {}
- }
- }
- }
- Event::Finish => builder.finish_node(),
- Event::Eat { count } => (0..count).for_each(|_| {
- let (tok, text) = raw_toks.pop().unwrap();
- builder.token(tok.into(), text);
- }),
- }
- }
-
- // finish SYNTAX_ROOT
- builder.finish_node();
-
- ParserOutput {
- green_node: builder.finish(),
- errors,
- _syntax_kind: PhantomData::,
- }
- }
-}
-
-pub struct ParserBuilder<
- 'src,
- SyntaxKind: SyntaxElement,
- // SyntaxErr: SyntaxError,
-> {
- raw_toks: Vec<(SyntaxKind, &'src str)>,
- meaningless_token_kinds: EnumSet,
- step_limit: u32,
-}
-
-impl<'src, SyntaxKind: SyntaxElement> ParserBuilder<'src, SyntaxKind> {
- pub fn new(raw_toks: Vec<(SyntaxKind, &'src str)>) -> Self {
- Self {
- raw_toks,
- meaningless_token_kinds: EnumSet::new(),
- step_limit: 4096,
- }
- }
-
- /// Sets the parser step limit.
- /// Defaults to 4096
- pub fn step_limit(mut self, new: u32) -> Self {
- self.step_limit = new;
- self
- }
-
- pub fn add_meaningless(mut self, kind: SyntaxKind) -> Self {
- self.meaningless_token_kinds.insert(kind);
- self
- }
-
- pub fn add_meaningless_many(mut self, kind: Vec) -> Self {
- self.meaningless_token_kinds
- .insert_all(kind.into_iter().collect());
- self
- }
-
- pub fn build(self) -> Parser<'src, SyntaxKind, SyntaxErr> {
- let Self {
- raw_toks,
- meaningless_token_kinds,
- step_limit,
- } = self;
- Parser {
- input: Input::new(raw_toks, Some(meaningless_token_kinds)),
- pos: 0,
- events: Vec::new(),
- step_limit,
- steps: Cell::new(0),
- }
- }
-}
diff --git a/crates/pawarser/src/parser/error.rs b/crates/pawarser/src/parser/error.rs
deleted file mode 100644
index 9c9d893..0000000
--- a/crates/pawarser/src/parser/error.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use std::fmt;
-
-/// A marker trait... for now!
-// TODO: constrain that conversion to `NodeKind::Error` is enforced to be possible
-pub trait SyntaxError
-where
- Self: fmt::Debug + Clone + PartialEq + Eq,
-{
-}
diff --git a/crates/pawarser/src/parser/event.rs b/crates/pawarser/src/parser/event.rs
deleted file mode 100644
index 1b71d8e..0000000
--- a/crates/pawarser/src/parser/event.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use enumset::EnumSetType;
-
-use super::{error::SyntaxError, SyntaxElement};
-
-pub enum Event {
- Start {
- kind: NodeKind,
- forward_parent: Option,
- },
- Finish,
- Eat {
- count: usize,
- },
-}
-
-impl Event {
- pub fn tombstone() -> Self {
- Self::Start {
- kind: NodeKind::Tombstone,
- forward_parent: None,
- }
- }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-pub enum NodeKind {
- Tombstone,
- Syntax(SyntaxKind),
- Error(SyntaxErr),
-}
-
-impl NodeKind {
- pub fn is_tombstone(&self) -> bool {
- matches!(self, Self::Tombstone)
- }
- pub fn is_syntax(&self) -> bool {
- matches!(self, Self::Syntax(_))
- }
- pub fn is_error(&self) -> bool {
- matches!(self, Self::Error(_))
- }
-}
diff --git a/crates/pawarser/src/parser/input.rs b/crates/pawarser/src/parser/input.rs
deleted file mode 100644
index d7e14b3..0000000
--- a/crates/pawarser/src/parser/input.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use enumset::{EnumSet, EnumSetType};
-
-use super::SyntaxElement;
-
-pub struct Input<'src, SyntaxKind: SyntaxElement> {
- raw: Vec<(SyntaxKind, &'src str)>,
- // enumset of meaningless tokens
- semantically_meaningless: EnumSet,
- // indices of non-meaningless tokens
- meaningful_toks: Vec,
-}
-
-impl<'src, SyntaxKind: SyntaxElement> Input<'src, SyntaxKind> {
- pub fn new(
- raw_toks: Vec<(SyntaxKind, &'src str)>,
- meaningless: Option>,
- ) -> Self {
- let mut meaningful_toks = Vec::new();
-
- if let Some(meaningless) = meaningless {
- let meaningful_toks = raw_toks
- .iter()
- .enumerate()
- .filter_map(|(i, tok)| (!meaningless.contains(tok.0)).then_some(i))
- .collect_into(&mut meaningful_toks);
- }
-
- Self {
- raw: raw_toks,
- semantically_meaningless: meaningless.unwrap_or_default(),
- meaningful_toks,
- }
- }
-
- pub fn kind(&self, idx: usize) -> SyntaxKind {
- let Some(meaningful_idx) = self.meaningful_toks.get(idx) else {
- return SyntaxKind::SYNTAX_EOF;
- };
-
- self.raw.get(*meaningful_idx).unwrap().0
- }
-
- pub fn preceding_meaningless(&self, idx: usize) -> usize {
- assert!(self.meaningful_toks.len() > idx);
-
- if idx == 0 {
- // maybe should be `self.meaningful_toks[idx]` instead??
- 1
- } else {
- self.meaningful_toks[idx] - self.meaningful_toks[idx - 1]
- }
- }
-
- /// get the count of meaningless tokens at the end of the file.
- pub fn meaningless_tail_len(&self) -> usize {
- self.raw.len() - (self.meaningful_toks.last().unwrap() + 1)
- }
-
- pub fn dissolve(self) -> (Vec<(SyntaxKind, &'src str)>, EnumSet) {
- let Self {
- raw,
- semantically_meaningless,
- ..
- } = self;
- (raw, semantically_meaningless)
- }
-}
diff --git a/crates/pawarser/src/parser/marker.rs b/crates/pawarser/src/parser/marker.rs
deleted file mode 100644
index 2e1244d..0000000
--- a/crates/pawarser/src/parser/marker.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use drop_bomb::DropBomb;
-use rowan::SyntaxKind;
-
-use super::{
- error::SyntaxError,
- event::{Event, NodeKind},
- Parser, SyntaxElement,
-};
-
-pub struct Marker {
- pos: usize,
- bomb: DropBomb,
-}
-
-impl Marker {
- pub(super) fn new(pos: usize, name: &str) -> Self {
- Self {
- pos,
- bomb: DropBomb::new(format!("Marker {name} must be completed or abandoned.")),
- }
- }
-
- fn close_node(
- mut self,
- p: &mut Parser,
- kind: NodeKind,
- ) -> CompletedMarker {
- self.bomb.defuse();
-
- match &mut p.events[self.pos] {
- Event::Start { kind: slot, .. } => *slot = kind.clone(),
- _ => unreachable!(),
- }
-
- p.push_ev(Event::Finish);
- CompletedMarker {
- pos: self.pos,
- kind,
- }
- }
-
- pub fn complete(
- self,
- p: &mut Parser,
- kind: SyntaxKind,
- ) -> CompletedMarker {
- self.close_node(p, NodeKind::Syntax(kind))
- }
-
- pub fn error(
- self,
- p: &mut Parser,
- kind: SyntaxErr,
- ) -> CompletedMarker {
- self.close_node(p, NodeKind::Error(kind))
- }
-
- pub fn abandon(
- mut self,
- p: &mut Parser,
- ) {
- self.bomb.defuse();
-
- // clean up empty tombstone event from marker
- if self.pos == p.events.len() - 1 {
- match p.events.pop() {
- Some(Event::Start {
- kind: NodeKind::Tombstone,
- forward_parent: None,
- }) => (),
- _ => unreachable!(),
- }
- }
- }
-}
-
-pub struct CompletedMarker {
- pos: usize,
- kind: NodeKind,
-}
-
-impl CompletedMarker {
- pub fn precede(self, p: &mut Parser, name: &str) -> Marker {
- let new_pos = p.start(name);
-
- match &mut p.events[self.pos] {
- Event::Start { forward_parent, .. } => {
- // point forward parent of the node this marker completed to the new node
- // will later be used to make the new node a parent of the current node.
- *forward_parent = Some(new_pos.pos - self.pos)
- }
- _ => unreachable!(),
- }
-
- new_pos
- }
-}
diff --git a/crates/pawarser/src/parser/output.rs b/crates/pawarser/src/parser/output.rs
deleted file mode 100644
index 76c3cf7..0000000
--- a/crates/pawarser/src/parser/output.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::{fmt, marker::PhantomData};
-
-use rowan::{GreenNode, GreenNodeData, GreenTokenData, NodeOrToken};
-
-use crate::{SyntaxElement, SyntaxError};
-
-pub struct ParserOutput {
- pub green_node: GreenNode,
- pub errors: Vec,
- pub(super) _syntax_kind: PhantomData,
-}
-
-impl std::fmt::Debug
- for ParserOutput
-{
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- let mut errs: Vec<&SyntaxErr> = self.errors.iter().collect();
- errs.reverse();
- debug_print_output::(
- NodeOrToken::Node(&self.green_node),
- f,
- 0,
- &mut errs,
- )
- }
-}
-
-fn debug_print_output(
- node: NodeOrToken<&GreenNodeData, &GreenTokenData>,
- f: &mut std::fmt::Formatter<'_>,
- lvl: i32,
- errs: &mut Vec<&SyntaxErr>,
-) -> std::fmt::Result {
- if f.alternate() {
- for _ in 0..lvl {
- f.write_str(" ")?;
- }
- }
- let maybe_newline = if f.alternate() { "\n" } else { " " };
-
- match node {
- NodeOrToken::Node(n) => {
- let kind: SyntaxKind = node.kind().into();
- if kind != SyntaxKind::SYNTAX_ERROR {
- write!(f, "{:?} {{{maybe_newline}", kind)?;
- } else {
- let err = errs
- .pop()
- .expect("all error syntax nodes should correspond to an error");
-
- write!(f, "{:?}: {err:?} {{{maybe_newline}", kind)?;
- }
- for c in n.children() {
- debug_print_output::(c, f, lvl + 1, errs)?;
- }
-
- if f.alternate() {
- for _ in 0..lvl {
- f.write_str(" ")?;
- }
- }
- write!(f, "}}{maybe_newline}")
- }
- NodeOrToken::Token(t) => {
- write!(
- f,
- "{:?} {:?};{maybe_newline}",
- Into::::into(t.kind()),
- t.text()
- )
- }
- }
-}
diff --git a/crates/prowocessing/src/experimental.rs b/crates/prowocessing/src/experimental.rs
deleted file mode 100644
index 1a0f7e3..0000000
--- a/crates/prowocessing/src/experimental.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod enum_based;
-pub mod trait_based;
diff --git a/crates/prowocessing/src/experimental/enum_based.rs b/crates/prowocessing/src/experimental/enum_based.rs
deleted file mode 100644
index c60f4a9..0000000
--- a/crates/prowocessing/src/experimental/enum_based.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-pub enum Instruction {
- Uppercase,
- Lowercase,
-}
-
-pub struct Pipeline {
- pipeline: Vec String>,
-}
-
-impl Pipeline {
- pub fn run(&self, val: String) -> String {
- let mut current = val;
-
- for instr in &self.pipeline {
- current = instr(current);
- }
-
- current
- }
-}
-
-pub struct PipelineBuilder {
- pipeline: Vec,
-}
-
-impl PipelineBuilder {
- pub fn new() -> Self {
- Self {
- pipeline: Vec::new(),
- }
- }
-
- #[must_use]
- pub fn insert(mut self, instr: Instruction) -> Self {
- self.pipeline.push(instr);
- self
- }
-
- pub fn build(&self) -> Pipeline {
- fn uppercase(v: String) -> String {
- str::to_uppercase(&v)
- }
- fn lowercase(v: String) -> String {
- str::to_lowercase(&v)
- }
-
- let mut res = Vec::new();
-
- for item in &self.pipeline {
- res.push(match item {
- Instruction::Uppercase => uppercase,
- Instruction::Lowercase => lowercase,
- });
- }
-
- Pipeline { pipeline: res }
- }
-}
-
-impl Default for PipelineBuilder {
- fn default() -> Self {
- Self::new()
- }
-}
diff --git a/crates/prowocessing/src/experimental/trait_based.rs b/crates/prowocessing/src/experimental/trait_based.rs
deleted file mode 100644
index 251fb35..0000000
--- a/crates/prowocessing/src/experimental/trait_based.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! An experiment for a hyper-modular trait-based architecture.
-//!
-//! Patterns defining this (or well, which I reference a lot while writing this):
-//! - [Command pattern using trait objects](https://rust-unofficial.github.io/patterns/patterns/behavioural/command.html)
-//! - [Builder pattern](https://rust-unofficial.github.io/patterns/patterns/creational/builder.html)
-
-pub mod data;
-#[macro_use]
-pub mod element;
-pub mod ops;
-pub mod pipeline;
diff --git a/crates/prowocessing/src/experimental/trait_based/data.rs b/crates/prowocessing/src/experimental/trait_based/data.rs
deleted file mode 100644
index e3dd671..0000000
--- a/crates/prowocessing/src/experimental/trait_based/data.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Definitions of the data transfer and storage types.
-
-pub mod io;
-
-pub mod raw;
diff --git a/crates/prowocessing/src/experimental/trait_based/data/io.rs b/crates/prowocessing/src/experimental/trait_based/data/io.rs
deleted file mode 100644
index 4eb9bd3..0000000
--- a/crates/prowocessing/src/experimental/trait_based/data/io.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-//! Types for element and pipeline IO
-
-use std::{borrow::ToOwned, convert::Into};
-
-use super::raw::Data;
-
-/// Newtype struct with borrowed types for pipeline/element inputs, so that doesn't force a move or clone
-#[derive(PartialEq, Eq, Debug)]
-pub struct Inputs<'a>(pub Vec<&'a Data>);
-
-impl<'a> From> for Inputs<'a> {
- fn from(value: Vec<&'a Data>) -> Self {
- Self(value)
- }
-}
-
-impl<'a, T: Into<&'a Data>> From for Inputs<'a> {
- fn from(value: T) -> Self {
- Self(vec![value.into()])
- }
-}
-
-impl<'a> From<&'a Outputs> for Inputs<'a> {
- fn from(value: &'a Outputs) -> Self {
- Self(value.0.iter().map(Into::into).collect())
- }
-}
-
-/// Used for pipeline/element outputs
-#[derive(PartialEq, Eq, Debug)]
-pub struct Outputs(pub Vec);
-
-impl Outputs {
- /// consume self and return inner value(s)
- pub fn into_inner(self) -> Vec {
- self.0
- }
-}
-impl From> for Outputs {
- fn from(value: Vec) -> Self {
- Self(value)
- }
-}
-impl> From for Outputs {
- fn from(value: T) -> Self {
- Self(vec![value.into()])
- }
-}
-impl From> for Outputs {
- fn from(value: Inputs) -> Self {
- Self(value.0.into_iter().map(ToOwned::to_owned).collect())
- }
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/data/raw.rs b/crates/prowocessing/src/experimental/trait_based/data/raw.rs
deleted file mode 100644
index 6640e64..0000000
--- a/crates/prowocessing/src/experimental/trait_based/data/raw.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! Dynamic data storage and transfer types for use in [`io`]
-
-// Dynamic data type
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Data {
- String(String),
- Int(i32),
-}
-
-impl From for Data {
- fn from(value: String) -> Self {
- Self::String(value)
- }
-}
-
-impl From for Data {
- fn from(value: i32) -> Self {
- Self::Int(value)
- }
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/element.rs b/crates/prowocessing/src/experimental/trait_based/element.rs
deleted file mode 100644
index b07c739..0000000
--- a/crates/prowocessing/src/experimental/trait_based/element.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! The trait and type representations
-
-use std::any::TypeId;
-
-use crate::experimental::trait_based::data::io::Inputs;
-
-use super::data::io::Outputs;
-
-pub(crate) trait PipelineElement {
- /// return a static runner function pointer to avoid dynamic dispatch during pipeline execution - Types MUST match the signature
- fn runner(&self) -> fn(&Inputs) -> Outputs;
- /// return the signature of the element
- fn signature(&self) -> ElementSignature;
-}
-
-/// Type signature for an element used for static checking
-pub(crate) struct ElementSignature {
- pub inputs: Vec,
- pub outputs: Vec,
-}
-
-macro_rules! signature {
- ($($inputs:ty),+ => $($outputs:ty),+) => (
- ElementSignature {
- inputs: vec![$(std::any::TypeId::of::<$inputs>(), )+],
- outputs: vec![$(std::any::TypeId::of::<$outputs>(), )+]
- }
- )
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/ops.rs b/crates/prowocessing/src/experimental/trait_based/ops.rs
deleted file mode 100644
index e7c9d04..0000000
--- a/crates/prowocessing/src/experimental/trait_based/ops.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod num;
-mod str;
-
-pub mod prelude {
- pub(crate) use super::num::*;
- pub(crate) use super::str::*;
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/ops/num.rs b/crates/prowocessing/src/experimental/trait_based/ops/num.rs
deleted file mode 100644
index ea189bf..0000000
--- a/crates/prowocessing/src/experimental/trait_based/ops/num.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-//! Operations on numeric data
-use core::panic;
-use std::any::TypeId;
-
-use crate::experimental::trait_based::{
- data::{
- io::{Inputs, Outputs},
- raw::Data,
- },
- element::{ElementSignature, PipelineElement},
-};
-
-/// Addition
-pub struct Add(pub i32);
-impl PipelineElement for Add {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::Int(i0), Data::Int(i1), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- (i0 + i1).into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(i32, i32 => i32)
- }
-}
-
-/// Subtraction
-pub struct Subtract(pub i32);
-impl PipelineElement for Subtract {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::Int(i0), Data::Int(i1), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- (i0 + i1).into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(i32, i32 => i32)
- }
-}
-
-/// Turn input to string
-pub struct Stringify;
-impl PipelineElement for Stringify {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::Int(int), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- int.to_string().into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(i32 => String)
- }
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/ops/str.rs b/crates/prowocessing/src/experimental/trait_based/ops/str.rs
deleted file mode 100644
index fb59ada..0000000
--- a/crates/prowocessing/src/experimental/trait_based/ops/str.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-//! Operation on String/text data
-use crate::experimental::trait_based::{
- data::{
- io::{Inputs, Outputs},
- raw::Data,
- },
- element::{ElementSignature, PipelineElement},
-};
-
-/// Concatenate the inputs
-pub struct Concatenate(pub String);
-impl PipelineElement for Concatenate {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::String(s0), Data::String(s1), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- format!("{s0}{s1}").into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(String, String => String)
- }
-}
-
-/// Turn input text to uppercase
-pub struct Upper;
-impl PipelineElement for Upper {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::String(s), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- s.to_uppercase().into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(String => String)
- }
-}
-
-/// Turn input text to lowercase
-pub struct Lower;
-impl PipelineElement for Lower {
- fn runner(&self) -> fn(&Inputs) -> Outputs {
- |input| {
- let [Data::String(s), ..] = input.0[..] else {
- panic!("Invalid data passed")
- };
- s.to_lowercase().into()
- }
- }
-
- fn signature(&self) -> ElementSignature {
- signature!(String => String)
- }
-}
diff --git a/crates/prowocessing/src/experimental/trait_based/pipeline.rs b/crates/prowocessing/src/experimental/trait_based/pipeline.rs
deleted file mode 100644
index 715fda7..0000000
--- a/crates/prowocessing/src/experimental/trait_based/pipeline.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use super::data::io::{Inputs, Outputs};
-use super::element::PipelineElement;
-use super::ops::prelude::*;
-
-/// Builder for the pipelines that are actually run
-///
-/// TODO:
-/// - Bind additional inputs if instruction has more then one and is passd without any additional
-/// - allow binding to pointers to other pipelines?
-/// - allow referencing earlier data
-pub struct PipelineBuilder {
- elements: Vec>,
-}
-
-impl PipelineBuilder {
- /// Create new, empty builder
- pub fn new() -> Self {
- Self {
- elements: Vec::new(),
- }
- }
-
- /// Insert element into pipeline
- fn insert(mut self, el: T) -> Self {
- if let Some(previous_item) = self.elements.last() {
- assert_eq!(
- previous_item.signature().outputs[0],
- el.signature().inputs[0]
- );
- }
- self.elements.push(Box::new(el));
- self
- }
-
- /// insert string concatenattion element
- #[must_use]
- pub fn concatenate(self, sec: String) -> Self {
- self.insert(Concatenate(sec))
- }
-
- /// insert string uppercase element
- #[must_use]
- pub fn upper(self) -> Self {
- self.insert(Upper)
- }
-
- /// insert string lowercase element
- #[must_use]
- pub fn lower(self) -> Self {
- self.insert(Lower)
- }
-
- /// insert numeric addition element
- #[must_use]
- #[allow(
- clippy::should_implement_trait,
- reason = "is not equivalent to addition"
- )]
- pub fn add(self, sec: i32) -> Self {
- self.insert(Add(sec))
- }
-
- /// insert numeric subtraction element
- #[must_use]
- pub fn subtract(self, sec: i32) -> Self {
- self.insert(Subtract(sec))
- }
-
- /// insert stringify element
- #[must_use]
- pub fn stringify(self) -> Self {
- self.insert(Stringify)
- }
-
- /// Build the pipeline. Doesn't check again - `insert` should verify correctness.
- pub fn build(&self) -> Pipeline {
- let mut r = Vec::new();
-
- self.elements.iter().for_each(|el| r.push(el.runner()));
-
- Pipeline { runners: r }
- }
-}
-
-impl Default for PipelineBuilder {
- fn default() -> Self {
- Self::new()
- }
-}
-
-/// Runnable pipeline - at the core of this library
-pub struct Pipeline {
- runners: Vec Outputs>,
-}
-
-impl Pipeline {
- /// run the pipeline
- pub fn run(&self, inputs: Inputs) -> Outputs {
- let mut out: Outputs = inputs.into();
-
- for runner in &self.runners {
- out = runner(&(&out).into());
- }
-
- out
- }
-}
diff --git a/crates/prowocessing/src/lib.rs b/crates/prowocessing/src/lib.rs
deleted file mode 100644
index 083eb4f..0000000
--- a/crates/prowocessing/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-//! # This is the image processing library for iOwO
-//!
-//! One of the design goals for this library is, however, to be a simple, generic image processing library.
-//! For now, it's just indev... lets see what comes of it!
-#![feature(lint_reasons)]
-
-/// just some experiments, to test whether the architecture i want is even possible (or how to do it). probably temporary.
-/// Gonna first try string processing...
-pub mod experimental;
-
-#[cfg(test)]
-mod tests {
- use crate::experimental::{
- enum_based,
- trait_based::{self, data::io::Outputs},
- };
-
- #[test]
- fn test_enums() {
- let builder = enum_based::PipelineBuilder::new().insert(enum_based::Instruction::Uppercase);
- let upr = builder.build();
- let upr_lowr = builder.insert(enum_based::Instruction::Lowercase).build();
-
- assert_eq!(upr.run(String::from("Test")), String::from("TEST"));
- assert_eq!(upr_lowr.run(String::from("Test")), String::from("test"));
- }
-
- #[test]
- fn add() {
- let pipe = trait_based::pipeline::PipelineBuilder::new()
- .add(0)
- .stringify()
- .build();
-
- assert_eq!(
- pipe.run(vec![&2.into(), &3.into()].into()),
- Outputs(vec![String::from("5").into()])
- );
- }
-}
diff --git a/crates/prowocessing/Cargo.toml b/crates/rpl/Cargo.toml
similarity index 65%
rename from crates/prowocessing/Cargo.toml
rename to crates/rpl/Cargo.toml
index 42d1a80..b40a46e 100644
--- a/crates/prowocessing/Cargo.toml
+++ b/crates/rpl/Cargo.toml
@@ -1,13 +1,10 @@
[package]
-name = "prowocessing"
+name = "rpl"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-image = "0.24.8"
-palette = "0.7.4"
-
-[lints]
-workspace = true
+serde = { workspace = true, features = [ "derive" ] }
+ron = "0.8"
diff --git a/crates/rpl/src/instructions/mod.rs b/crates/rpl/src/instructions/mod.rs
new file mode 100644
index 0000000..9fb8a56
--- /dev/null
+++ b/crates/rpl/src/instructions/mod.rs
@@ -0,0 +1,47 @@
+use serde::{Deserialize, Serialize};
+
+pub mod read;
+pub mod write;
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum Instruction {
+ Read(read::Read),
+ Write(write::Write),
+ Math(MathInstruction),
+ Blend(BlendInstruction),
+ Noise(NoiseInstruction),
+ Filter(FilterInstruction),
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum MathInstruction {
+ Add,
+ Subtract,
+ Multiply,
+ Divide,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum BlendInstruction {
+ Normal,
+ Multiply,
+ Additive,
+ Overlay,
+ Screen,
+ Subtractive,
+ Difference,
+ Darken,
+ Lighten,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum NoiseInstruction {
+ Perlin,
+ Simplex,
+ Voronoi,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum FilterInstruction {
+ Invert,
+}
diff --git a/crates/rpl/src/instructions/read.rs b/crates/rpl/src/instructions/read.rs
new file mode 100644
index 0000000..6ccd4d3
--- /dev/null
+++ b/crates/rpl/src/instructions/read.rs
@@ -0,0 +1,19 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub struct Read {
+ pub source: SourceType,
+ pub format: SourceFormat,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum SourceType {
+ File(PathBuf),
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum SourceFormat {
+ Jpeg,
+ Png,
+}
diff --git a/crates/rpl/src/instructions/write.rs b/crates/rpl/src/instructions/write.rs
new file mode 100644
index 0000000..d5ea207
--- /dev/null
+++ b/crates/rpl/src/instructions/write.rs
@@ -0,0 +1,19 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub struct Write {
+ pub target: TargetType,
+ pub format: TargetFormat,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum TargetType {
+ File(PathBuf),
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub enum TargetFormat {
+ Jpeg,
+ Png,
+}
diff --git a/crates/rpl/src/lib.rs b/crates/rpl/src/lib.rs
new file mode 100644
index 0000000..dbecd0a
--- /dev/null
+++ b/crates/rpl/src/lib.rs
@@ -0,0 +1,38 @@
+use instructions::Instruction;
+use serde::{Deserialize, Serialize};
+
+use crate::instructions::{
+ read::{SourceFormat, SourceType},
+ write::{TargetFormat, TargetType},
+ MathInstruction,
+};
+
+pub mod instructions;
+
+pub fn from_ron(raw: &str) -> Rpl {
+ ron::from_str(raw).unwrap()
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+pub struct Rpl(pub Vec);
+
+#[test]
+fn test_simple_deserialize() {
+ const TEST_DATA: &str =
+ "([Read( (source: File(\"~/example/file.png\"), format: Png) ),Math(Add),Write(( target: File(\"~/example/out.jpg\"), format: Jpeg))])";
+
+ assert_eq!(
+ from_ron(TEST_DATA),
+ Rpl(vec![
+ Instruction::Read(instructions::read::Read {
+ source: SourceType::File("~/example/file.png".into()),
+ format: SourceFormat::Png
+ }),
+ Instruction::Math(MathInstruction::Add),
+ Instruction::Write(instructions::write::Write {
+ target: TargetType::File("~/example/out.jpg".into()),
+ format: TargetFormat::Jpeg
+ })
+ ])
+ );
+}
diff --git a/crates/rpl/src/value/mod.rs b/crates/rpl/src/value/mod.rs
new file mode 100644
index 0000000..238b9c2
--- /dev/null
+++ b/crates/rpl/src/value/mod.rs
@@ -0,0 +1,3 @@
+pub enum DynamicValue {
+ Image(DynamicImage),
+}
diff --git a/crates/svg-filters/Cargo.toml b/crates/svg-filters/Cargo.toml
deleted file mode 100644
index 7f41e66..0000000
--- a/crates/svg-filters/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "svg-filters"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-csscolorparser = "0.6.2"
-indexmap = "2.2.5"
-petgraph = { workspace = true }
-quick-xml = { version = "0.31.0", features = ["serialize"] }
-
-[lints]
-workspace = true
diff --git a/crates/svg-filters/src/codegen.rs b/crates/svg-filters/src/codegen.rs
deleted file mode 100644
index cd93d25..0000000
--- a/crates/svg-filters/src/codegen.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use std::{
- cmp,
- collections::{BTreeSet, HashMap},
- fmt::Display,
- io::Read,
- ops::Not,
-};
-
-use indexmap::IndexMap;
-use petgraph::{
- algo::toposort,
- graph::DiGraph,
- prelude::{EdgeIndex, NodeIndex},
-};
-use quick_xml::ElementWriter;
-
-use crate::{
- types::{
- graph::{edge::Edge, FilterGraph, NodeInput},
- nodes::{primitives::WriteElement, CommonAttrs},
- },
- Node,
-};
-
-use self::error::CodegenError;
-
-pub struct SvgDocument {
- filters: HashMap,
-}
-
-impl SvgDocument {
- pub fn new() -> Self {
- Self {
- filters: HashMap::new(),
- }
- }
-
- #[allow(clippy::unwrap_used, reason = "we literally just did the insertion")]
- pub fn create_filter(&mut self, id: impl ToString) -> &mut FilterGraph {
- let filter = FilterGraph::new();
-
- self.filters.insert(id.to_string(), filter);
- self.filters.get_mut(&id.to_string()).unwrap()
- }
-
- pub fn generate_svg_pretty(&self) -> String {
- let mut result = Vec::new();
- let doc_writer = quick_xml::Writer::new_with_indent(&mut result, b' ', 2);
-
- self.generate(doc_writer);
-
- String::from_utf8_lossy(&result).to_string()
- }
-
- pub fn generate_svg(&self) -> String {
- let mut result = Vec::new();
- let doc_writer = quick_xml::Writer::new(&mut result);
-
- self.generate(doc_writer);
-
- String::from_utf8_lossy(&result).to_string()
- }
-
- fn generate(&self, mut doc_writer: quick_xml::Writer<&mut Vec>) {
- doc_writer
- .create_element("svg")
- .write_inner_content(|writer| {
- self.filters
- .iter()
- .try_fold(writer, Self::gen_filter)
- .map(|_| {})
- });
- }
-
- fn gen_filter<'w, 'r>(
- writer: &'w mut quick_xml::Writer<&'r mut Vec>,
- (id, graph): (&String, &FilterGraph),
- ) -> Result<&'w mut quick_xml::Writer<&'r mut Vec>, CodegenError> {
- writer
- .create_element("filter")
- .with_attribute(("id", id.as_str()))
- .write_inner_content(|writer| Self::graph_to_svg(writer, graph))
- }
-
- fn graph_to_svg(
- writer: &mut quick_xml::Writer<&mut Vec>,
- graph: &FilterGraph,
- ) -> Result<(), CodegenError> {
- let sorted = toposort(&graph.dag, None).expect("no cycles allowed in a DAG");
- sorted
- .into_iter()
- .filter_map(|node_idx| {
- graph
- .dag
- .node_weight(node_idx)
- .and_then(|node| node.primitive())
- .map(|(primitive, common_attrs)| (node_idx, primitive, common_attrs))
- })
- .try_fold(writer, |writer, (node_idx, primitive, common_attrs)| {
- primitive.element_writer(
- writer,
- *common_attrs,
- graph
- .inputs(node_idx)
- .into_iter()
- .map(|v| v.to_string())
- .collect(),
- graph
- .outputs(node_idx)
- .is_empty()
- .not()
- .then_some(format!("r{}", node_idx.index())),
- )
- })?;
-
- Ok(())
- }
-}
-
-/// convenience method to avoid fuckups during future changes
-fn format_edge_idx(idx: EdgeIndex) -> String {
- format!("edge{}", idx.index())
-}
-
-fn format_node_idx(node_idx: NodeIndex) -> String {
- format!("r{}", node_idx.index())
-}
-
-mod error {
- use std::{error::Error, fmt::Display};
-
- #[derive(Debug)]
- pub enum CodegenError {
- QuickXmlError(quick_xml::Error),
- }
-
- impl From for CodegenError {
- fn from(value: quick_xml::Error) -> Self {
- Self::QuickXmlError(value)
- }
- }
-
- impl Display for CodegenError {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- CodegenError::QuickXmlError(e) => e.fmt(f),
- }
- }
- }
-
- impl Error for CodegenError {}
-}
-
-impl Default for SvgDocument {
- fn default() -> Self {
- Self::new()
- }
-}
diff --git a/crates/svg-filters/src/lib.rs b/crates/svg-filters/src/lib.rs
deleted file mode 100644
index 2afb148..0000000
--- a/crates/svg-filters/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-#![feature(lint_reasons)]
-
-#[macro_use]
-pub mod util {
- macro_rules! gen_attr {
- ($name:literal = $out:expr) => {
- quick_xml::events::attributes::Attribute {
- key: quick_xml::name::QName($name),
- value: std::borrow::Cow::from(($out).to_string().into_bytes()),
- }
- };
- }
-
- macro_rules! gen_attrs {
- ($($name:literal: $out:expr),+) => {
- vec![
- $(gen_attr!($name = $out)),+
- ]
- };
- ($($cond:expr => $name:literal: $out:expr),+) => {
- {
- let mut r = Vec::new();
- $(if $cond {
- r.push(gen_attr!($name = $out));
- })+
- r
- }
- };
- ($other:ident; $($cond:expr => $name:literal: $out:expr),+) => {
- $other.append(&mut gen_attrs![$($cond => $name: $out),+]);
- };
- }
-}
-
-pub mod codegen;
-pub mod types;
-pub use types::nodes::Node;
-
-#[cfg(test)]
-mod tests;
diff --git a/crates/svg-filters/src/main.rs b/crates/svg-filters/src/main.rs
deleted file mode 100644
index a063791..0000000
--- a/crates/svg-filters/src/main.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use svg_filters::{
- codegen::SvgDocument,
- types::nodes::{
- primitives::{
- blend::BlendMode,
- color_matrix::ColorMatrixType,
- component_transfer::TransferFn,
- displacement_map::Channel,
- turbulence::{NoiseType, StitchTiles},
- },
- standard_input::StandardInput,
- },
-};
-
-fn main() {
- let mut doc = SvgDocument::new();
-
- let f = doc.create_filter("cmyk-chromabb");
-
- let noise = f.turbulence(0., 0.1, 2, 0, StitchTiles::Stitch, NoiseType::FractalNoise);
- let noise = f.component_transfer_rgba(
- noise,
- TransferFn::Discrete {
- table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.],
- },
- TransferFn::Discrete {
- table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.],
- },
- TransferFn::Discrete {
- table_values: vec![0., 0.2, 0.4, 0.6, 0.8, 1.],
- },
- TransferFn::Linear {
- slope: 0.,
- intercept: 0.5,
- },
- );
-
- let cyan = f.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 0., 0., 0., 0., 0., //
- 0., 1., 0., 0., 0., //
- 0., 0., 1., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
- let cyan = f.offset(cyan, 25., 0.);
- let cyan = f.displacement_map(cyan, noise, 50., Channel::R, Channel::A);
-
- let magenta = f.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 1., 0., 0., 0., 0., //
- 0., 0., 0., 0., 0., //
- 0., 0., 1., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
- let magenta = f.displacement_map(magenta, noise, 50., Channel::R, Channel::A);
- let magenta = f.offset(magenta, -25., 0.);
-
- f.blend(cyan, magenta, BlendMode::Screen);
-
- println!("{}", doc.generate_svg_pretty());
-}
diff --git a/crates/svg-filters/src/tests.rs b/crates/svg-filters/src/tests.rs
deleted file mode 100644
index 742c457..0000000
--- a/crates/svg-filters/src/tests.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-mod blend;
-mod color_matrix;
-mod complex;
-mod component_transfer;
-mod displacement_map;
-mod flood;
-mod gaussian_blur;
-mod offset;
-mod turbulence;
-mod composite {}
-mod convolve_matrix {}
-mod diffuse_lighting {}
-mod image {}
-mod merge {}
-mod morphology {}
-mod specular_lighting {}
-mod tile {}
diff --git a/crates/svg-filters/src/tests/blend.rs b/crates/svg-filters/src/tests/blend.rs
deleted file mode 100644
index 71aea21..0000000
--- a/crates/svg-filters/src/tests/blend.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::{primitives::blend::BlendMode, standard_input::StandardInput},
-};
-
-#[test]
-fn test_offset_blend() {
- let mut doc = SvgDocument::new();
-
- let blend = doc.create_filter("blend");
-
- let offset0 = blend.offset(StandardInput::SourceGraphic, 100., 0.);
- let offset1 = blend.offset(StandardInput::SourceGraphic, -100., 0.);
- blend.blend(offset0, offset1, BlendMode::Multiply);
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/color_matrix.rs b/crates/svg-filters/src/tests/color_matrix.rs
deleted file mode 100644
index e32d507..0000000
--- a/crates/svg-filters/src/tests/color_matrix.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::{primitives::color_matrix::ColorMatrixType, standard_input::StandardInput},
-};
-
-#[test]
-fn test_greyscale_channel_extraction() {
- let mut doc = SvgDocument::new();
- let greyscale = doc.create_filter("greyscale");
-
- greyscale.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 1., 0., 0., 0., 0., //
- 1., 0., 0., 0., 0., //
- 1., 0., 0., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/complex.rs b/crates/svg-filters/src/tests/complex.rs
deleted file mode 100644
index 2936bb4..0000000
--- a/crates/svg-filters/src/tests/complex.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::{primitives::color_matrix::ColorMatrixType, standard_input::StandardInput},
-};
-
-#[test]
-fn test_chrom_abb() {
- let mut doc = SvgDocument::new();
- let chromabb = doc.create_filter("chromabb_gen");
-
- let chan_r = chromabb.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 1., 0., 0., 0., 0., //
- 0., 0., 0., 0., 0., //
- 0., 0., 0., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
- let offset_r = chromabb.offset(chan_r, 25., 0.);
- let blur_r = chromabb.gaussian_blur_xy(offset_r, 5, 0);
-
- let chan_b = chromabb.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 0., 0., 0., 0., 0., //
- 0., 0., 0., 0., 0., //
- 0., 0., 1., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
- let offset_b = chromabb.offset(chan_b, -25., 0.);
- let blur_b = chromabb.gaussian_blur_xy(offset_b, 5, 0);
-
- let composite_rb = chromabb.composite_arithmetic(blur_r, blur_b, 0., 1., 1., 0.);
-
- let chan_g = chromabb.color_matrix(
- StandardInput::SourceGraphic,
- ColorMatrixType::Matrix(Box::new([
- 0., 0., 0., 0., 0., //
- 0., 1., 0., 0., 0., //
- 0., 0., 0., 0., 0., //
- 0., 0., 0., 1., 0.,
- ])),
- );
- chromabb.composite_arithmetic(composite_rb, chan_g, 0., 1., 1., 0.);
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/component_transfer.rs b/crates/svg-filters/src/tests/component_transfer.rs
deleted file mode 100644
index 8f24c6f..0000000
--- a/crates/svg-filters/src/tests/component_transfer.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::primitives::{
- component_transfer::{ComponentTransfer, TransferFn},
- FePrimitive,
- },
- Node,
-};
-
-#[test]
-fn test_comp_trans_simple() {
- let mut doc = SvgDocument::new();
-
- let comptrans = doc.create_filter("comp_trans");
-
- comptrans.add_node(Node::simple(FePrimitive::ComponentTransfer(
- ComponentTransfer {
- func_r: TransferFn::Table {
- table_values: vec![0., 0.1, 0.4, 0.9],
- },
- func_g: TransferFn::Discrete {
- table_values: vec![0.1, 0.3, 0.5, 0.7, 0.9],
- },
- func_b: TransferFn::Linear {
- slope: 1.0,
- intercept: 0.75,
- },
- func_a: TransferFn::Identity,
- },
- )));
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/displacement_map.rs b/crates/svg-filters/src/tests/displacement_map.rs
deleted file mode 100644
index 3b41ff1..0000000
--- a/crates/svg-filters/src/tests/displacement_map.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::{
- primitives::{
- displacement_map::Channel,
- turbulence::{NoiseType, StitchTiles},
- },
- standard_input::StandardInput,
- },
-};
-
-#[test]
-fn test_displacement_map_simple() {
- let mut doc = SvgDocument::new();
-
- let displace = doc.create_filter("displace");
-
- let simple_noise =
- displace.turbulence(0.01, 0.01, 1, 0, StitchTiles::Stitch, NoiseType::Turbulence);
- displace.displacement_map(
- StandardInput::SourceGraphic,
- simple_noise,
- 128.,
- Channel::R,
- Channel::R,
- );
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/flood.rs b/crates/svg-filters/src/tests/flood.rs
deleted file mode 100644
index 27ed8bc..0000000
--- a/crates/svg-filters/src/tests/flood.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use csscolorparser::Color;
-
-use crate::codegen::SvgDocument;
-
-#[test]
-fn test_flood_simple() {
- let mut doc = SvgDocument::new();
-
- let turbdispl = doc.create_filter("noiseDisplace");
-
- turbdispl.flood(Color::new(0.9, 0.7, 0.85, 1.), 1.);
-
- assert_eq!(
- doc.generate_svg(),
- r##""##
- );
-}
diff --git a/crates/svg-filters/src/tests/gaussian_blur.rs b/crates/svg-filters/src/tests/gaussian_blur.rs
deleted file mode 100644
index f148684..0000000
--- a/crates/svg-filters/src/tests/gaussian_blur.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use crate::{codegen::SvgDocument, types::nodes::standard_input::StandardInput};
-
-#[test]
-fn test_simple_blur() {
- let mut doc = SvgDocument::new();
- let blur = doc.create_filter("blur");
-
- blur.gaussian_blur_xy(StandardInput::SourceGraphic, 30, 30);
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/offset.rs b/crates/svg-filters/src/tests/offset.rs
deleted file mode 100644
index 380170e..0000000
--- a/crates/svg-filters/src/tests/offset.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use crate::{codegen::SvgDocument, types::nodes::standard_input::StandardInput};
-
-#[test]
-fn test_offset_simple() {
- let mut doc = SvgDocument::new();
- let offset = doc.create_filter("offset");
-
- offset.offset(StandardInput::SourceGraphic, 25., -25.);
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/tests/turbulence.rs b/crates/svg-filters/src/tests/turbulence.rs
deleted file mode 100644
index dd53e7d..0000000
--- a/crates/svg-filters/src/tests/turbulence.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use crate::{
- codegen::SvgDocument,
- types::nodes::primitives::turbulence::{NoiseType, StitchTiles},
-};
-
-#[test]
-fn test_simple_turbulence() {
- let mut doc = SvgDocument::new();
-
- let noise = doc.create_filter("noise");
-
- noise.turbulence(
- 0.01,
- 0.01,
- 1,
- 0,
- StitchTiles::Stitch,
- NoiseType::FractalNoise,
- );
-
- assert_eq!(
- doc.generate_svg(),
- r#""#
- );
-}
diff --git a/crates/svg-filters/src/types.rs b/crates/svg-filters/src/types.rs
deleted file mode 100644
index 1290907..0000000
--- a/crates/svg-filters/src/types.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod length;
-pub mod nodes;
-
-// pub mod old;
-
-pub mod graph;
diff --git a/crates/svg-filters/src/types/graph.rs b/crates/svg-filters/src/types/graph.rs
deleted file mode 100644
index 4b63a87..0000000
--- a/crates/svg-filters/src/types/graph.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use std::fmt::{Debug, Display};
-
-use petgraph::{prelude::NodeIndex, prelude::*};
-
-use crate::Node;
-
-use super::nodes::standard_input::StandardInput;
-
-#[derive(Debug)]
-pub struct FilterGraph {
- pub dag: DiGraph,
- source_graphic_idx: NodeIndex,
- source_alpha_idx: NodeIndex,
- background_image_idx: NodeIndex,
- background_alpha_idx: NodeIndex,
- fill_paint_idx: NodeIndex,
- stroke_paint_idx: NodeIndex,
-}
-
-impl Default for FilterGraph {
- fn default() -> Self {
- Self::new()
- }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum NodeInput {
- Standard(StandardInput),
- Idx(NodeIndex),
-}
-
-impl Display for NodeInput {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- NodeInput::Standard(s) => Debug::fmt(s, f),
- NodeInput::Idx(idx) => write!(f, "r{}", idx.index()),
- }
- }
-}
-
-impl From for NodeInput {
- fn from(value: StandardInput) -> Self {
- Self::Standard(value)
- }
-}
-
-impl From for NodeInput {
- fn from(value: NodeIndex) -> Self {
- Self::Idx(value)
- }
-}
-
-impl FilterGraph {
- pub fn new() -> Self {
- let mut dag = DiGraph::new();
-
- let source_graphic_idx = dag.add_node(Node::StdInput(StandardInput::SourceGraphic));
- let source_alpha_idx = dag.add_node(Node::StdInput(StandardInput::SourceAlpha));
- let background_image_idx = dag.add_node(Node::StdInput(StandardInput::BackgroundImage));
- let background_alpha_idx = dag.add_node(Node::StdInput(StandardInput::BackgroundAlpha));
- let fill_paint_idx = dag.add_node(Node::StdInput(StandardInput::FillPaint));
- let stroke_paint_idx = dag.add_node(Node::StdInput(StandardInput::StrokePaint));
-
- Self {
- dag,
- source_graphic_idx,
- source_alpha_idx,
- background_image_idx,
- background_alpha_idx,
- fill_paint_idx,
- stroke_paint_idx,
- }
- }
-
- pub fn add_node(&mut self, node: Node) -> NodeIndex {
- self.dag.add_node(node)
- }
-
- fn resolve_input(&self, input: NodeInput) -> NodeIndex {
- match input {
- NodeInput::Standard(StandardInput::SourceGraphic) => self.source_graphic_idx,
- NodeInput::Standard(StandardInput::SourceAlpha) => self.source_alpha_idx,
- NodeInput::Standard(StandardInput::BackgroundImage) => self.background_image_idx,
- NodeInput::Standard(StandardInput::BackgroundAlpha) => self.background_alpha_idx,
- NodeInput::Standard(StandardInput::FillPaint) => self.fill_paint_idx,
- NodeInput::Standard(StandardInput::StrokePaint) => self.stroke_paint_idx,
- NodeInput::Idx(i) => i,
- }
- }
-
- #[allow(
- clippy::unwrap_used,
- reason = "we only operate on values we know exist, so unwrapping is safe"
- )]
- pub fn inputs(&self, node_idx: NodeIndex) -> Vec {
- let mut inputs = self
- .dag
- .neighbors_directed(node_idx, Direction::Incoming)
- .map(|input_idx| (self.dag.find_edge(input_idx, node_idx).unwrap(), input_idx))
- .collect::>();
-
- inputs.sort_by(|(a, _), (b, _)| a.cmp(b));
-
- inputs
- .into_iter()
- .map(
- |(_, input_idx)| match self.dag.node_weight(input_idx).unwrap() {
- Node::StdInput(s) => NodeInput::Standard(*s),
- Node::Primitive { .. } => NodeInput::Idx(input_idx),
- },
- )
- .collect()
- }
-
- pub fn outputs(&self, node_idx: NodeIndex) -> Vec {
- self.dag
- .neighbors_directed(node_idx, Direction::Outgoing)
- .collect()
- }
-
- pub fn source_graphic(&self) -> NodeIndex {
- self.source_graphic_idx
- }
- pub fn source_alpha(&self) -> NodeIndex {
- self.source_alpha_idx
- }
- pub fn background_image(&self) -> NodeIndex {
- self.background_image_idx
- }
- pub fn background_alpha(&self) -> NodeIndex {
- self.background_alpha_idx
- }
- pub fn fill_paint(&self) -> NodeIndex {
- self.fill_paint_idx
- }
- pub fn stroke_paint(&self) -> NodeIndex {
- self.stroke_paint_idx
- }
-}
-
-pub mod abstracted_inputs;
-
-pub mod edge;
diff --git a/crates/svg-filters/src/types/graph/abstracted_inputs.rs b/crates/svg-filters/src/types/graph/abstracted_inputs.rs
deleted file mode 100644
index 8d84707..0000000
--- a/crates/svg-filters/src/types/graph/abstracted_inputs.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use csscolorparser::Color;
-use petgraph::{data::Build, prelude::NodeIndex};
-
-use crate::{
- types::nodes::primitives::{
- blend::BlendMode,
- color_matrix::ColorMatrixType,
- component_transfer::TransferFn,
- displacement_map::Channel,
- turbulence::{NoiseType, StitchTiles},
- },
- Node,
-};
-
-use super::{FilterGraph, NodeInput};
-
-impl FilterGraph {
- pub fn color_matrix(
- &mut self,
- r#in: impl Into,
- cm_type: ColorMatrixType,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::color_matrix(cm_type));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
-
- pub fn offset(&mut self, r#in: impl Into, dx: f32, dy: f32) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::offset(dx, dy));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
-
- pub fn gaussian_blur_xy(&mut self, r#in: impl Into, x: u16, y: u16) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::gaussian_blur_xy(x, y));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
-
- pub fn blend(
- &mut self,
- r#in: impl Into,
- in2: impl Into,
- mode: BlendMode,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::blend(mode));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- self.dag
- .add_edge(self.resolve_input(in2.into()), node_idx, ());
- node_idx
- }
-
- pub fn composite_arithmetic(
- &mut self,
- r#in: impl Into,
- in2: impl Into,
- k1: f32,
- k2: f32,
- k3: f32,
- k4: f32,
- ) -> NodeIndex {
- let node_idx = self
- .dag
- .add_node(Node::composite_arithmetic(k1, k2, k3, k4));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- self.dag
- .add_edge(self.resolve_input(in2.into()), node_idx, ());
- node_idx
- }
-
- pub fn component_transfer_rgba(
- &mut self,
- r#in: impl Into,
- r: TransferFn,
- g: TransferFn,
- b: TransferFn,
- a: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_rgba(r, g, b, a));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_rgb(
- &mut self,
- r#in: impl Into,
- r: TransferFn,
- g: TransferFn,
- b: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_rgb(r, g, b));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_r(
- &mut self,
- r#in: impl Into,
- func: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_r(func));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_g(
- &mut self,
- r#in: impl Into,
- func: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_g(func));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_b(
- &mut self,
- r#in: impl Into,
- func: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_b(func));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_a(
- &mut self,
- r#in: impl Into,
- func: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_a(func));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
- pub fn component_transfer_single(
- &mut self,
- r#in: impl Into,
- func: TransferFn,
- ) -> NodeIndex {
- let node_idx = self.dag.add_node(Node::component_transfer_single(func));
- self.dag
- .add_edge(self.resolve_input(r#in.into()), node_idx, ());
- node_idx
- }
-
- pub fn flood(&mut self, flood_color: Color, flood_opacity: f32) -> NodeIndex {
- self.dag.add_node(Node::flood(flood_color, flood_opacity))
- }
-
- pub fn flood_opaque(&mut self, flood_color: Color) -> NodeIndex {
- self.dag.add_node(Node::flood_opaque(flood_color))
- }
-
- pub fn turbulence(
- &mut self,
- base_freq_x: f32,
- base_freq_y: f32,
- num_octaves: u16,
- seed: u32,
- stitch_tiles: StitchTiles,
- noise_type: NoiseType,
- ) -> NodeIndex {
- self.dag.add_node(Node::turbulence(
- base_freq_x,
- base_freq_y,
- num_octaves,
- seed,
- stitch_tiles,
- noise_type,
- ))
- }
-
- pub fn displacement_map(
- &mut self,
- source_image: impl Into,
- displacement_map: impl Into,
- scale: f32,
- x_channel: Channel,
- y_channel: Channel,
- ) -> NodeIndex {
- let node_idx = self
- .dag
- .add_node(Node::displacement_map(scale, x_channel, y_channel));
- self.dag
- .add_edge(self.resolve_input(source_image.into()), node_idx, ());
- self.dag
- .add_edge(self.resolve_input(displacement_map.into()), node_idx, ());
- node_idx
- }
-}
diff --git a/crates/svg-filters/src/types/graph/edge.rs b/crates/svg-filters/src/types/graph/edge.rs
deleted file mode 100644
index 0783a34..0000000
--- a/crates/svg-filters/src/types/graph/edge.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default)]
-pub struct Edge {
- input_idx: u8,
-}
-
-impl Edge {
- pub fn new(input_idx: u8) -> Self {
- Self { input_idx }
- }
-}
-
-impl ToString for Edge {
- fn to_string(&self) -> String {
- match self.input_idx {
- 0 => "in".to_owned(),
- n => format!("in{}", n + 1),
- }
- }
-}
diff --git a/crates/svg-filters/src/types/length.rs b/crates/svg-filters/src/types/length.rs
deleted file mode 100644
index ef9d2ef..0000000
--- a/crates/svg-filters/src/types/length.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use std::fmt::Display;
-
-#[derive(Default, Debug, Clone, Copy)]
-pub struct Length(f32, Unit);
-
-impl Length {
- pub fn is_zero(&self) -> bool {
- self.0 == 0.
- }
-}
-
-impl Display for Length {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}{}", self.0, self.1)
- }
-}
-
-pub type Coordinate = Length;
-
-#[derive(Default, Debug, Clone, Copy)]
-pub enum Unit {
- #[default]
- None,
- Em,
- Ex,
- Px,
- In,
- Cm,
- Mm,
- Pt,
- Pc,
-}
-
-impl Display for Unit {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- match self {
- Unit::None => f.write_str(""),
- Unit::Em => f.write_str("em"),
- Unit::Ex => f.write_str("ex"),
- Unit::Px => f.write_str("px"),
- Unit::In => f.write_str("in"),
- Unit::Cm => f.write_str("cm"),
- Unit::Mm => f.write_str("mm"),
- Unit::Pt => f.write_str("pt"),
- Unit::Pc => f.write_str("pc"),
- }
- }
-}
diff --git a/crates/svg-filters/src/types/nodes.rs b/crates/svg-filters/src/types/nodes.rs
deleted file mode 100644
index 797e7e4..0000000
--- a/crates/svg-filters/src/types/nodes.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use std::borrow::Cow;
-
-use csscolorparser::Color;
-use quick_xml::{events::attributes::Attribute, name::QName};
-
-use self::{
- primitives::{
- blend::{Blend, BlendMode},
- color_matrix::{ColorMatrix, ColorMatrixType},
- component_transfer::{ComponentTransfer, TransferFn},
- composite::{Composite, CompositeOperator},
- displacement_map::{Channel, DisplacementMap},
- flood::Flood,
- gaussian_blur::GaussianBlur,
- offset::Offset,
- turbulence::{NoiseType, StitchTiles, Turbulence},
- FePrimitive,
- },
- standard_input::StandardInput,
-};
-
-use super::length::{Coordinate, Length};
-
-pub mod primitives;
-pub mod standard_input;
-
-#[derive(Debug)]
-pub enum Node {
- StdInput(StandardInput),
- Primitive {
- primitive: FePrimitive,
- common_attrs: CommonAttrs,
- },
-}
-
-impl Default for Node {
- fn default() -> Self {
- Self::StdInput(StandardInput::SourceGraphic)
- }
-}
-
-#[derive(Default, Debug, Clone, Copy)]
-pub struct CommonAttrs {
- pub x: Coordinate,
- pub y: Coordinate,
- pub width: Length,
- pub height: Length,
-}
-
-impl From for Vec> {
- fn from(val: CommonAttrs) -> Self {
- gen_attrs![
- !val.x.is_zero() => b"x": val.x,
- !val.y.is_zero() => b"y": val.y,
- !val.width.is_zero() => b"width": val.width,
- !val.height.is_zero() => b"height": val.height
- ]
- }
-}
-
-impl Node {
- pub fn simple(el: FePrimitive) -> Node {
- Node::Primitive {
- primitive: el,
- common_attrs: CommonAttrs::default(),
- }
- }
-
- pub fn primitive(&self) -> Option<(&FePrimitive, &CommonAttrs)> {
- if let Node::Primitive {
- primitive,
- common_attrs,
- } = self
- {
- Some((primitive, common_attrs))
- } else {
- None
- }
- }
-
- pub fn input_count(&self) -> u8 {
- match self {
- Node::Primitive {
- primitive:
- FePrimitive::ColorMatrix(_)
- | FePrimitive::ComponentTransfer(_)
- | FePrimitive::ConvolveMatrix(_)
- | FePrimitive::DiffuseLighting(_)
- | FePrimitive::GaussianBlur(_)
- | FePrimitive::Morphology(_)
- | FePrimitive::Offset(_)
- | FePrimitive::SpecularLighting(_)
- | FePrimitive::Tile(_),
- ..
- } => 1,
-
- Node::Primitive {
- primitive:
- FePrimitive::Composite(_) | FePrimitive::Blend(_) | FePrimitive::DisplacementMap(_),
- ..
- } => 2,
-
- Node::StdInput(_)
- | Node::Primitive {
- primitive:
- FePrimitive::Flood(_) | FePrimitive::Image(_) | FePrimitive::Turbulence(_),
- ..
- } => 0,
- Node::Primitive {
- primitive: FePrimitive::Merge(_),
- ..
- } => todo!(),
- }
- }
-
- pub fn blend(mode: BlendMode) -> Self {
- Self::simple(FePrimitive::Blend(Blend::new(mode)))
- }
-
- pub fn color_matrix(cm_type: ColorMatrixType) -> Self {
- Self::simple(FePrimitive::ColorMatrix(ColorMatrix::new(cm_type)))
- }
-
- pub fn composite(op: CompositeOperator) -> Self {
- Self::simple(FePrimitive::Composite(Composite::new(op)))
- }
-
- pub fn composite_arithmetic(k1: f32, k2: f32, k3: f32, k4: f32) -> Self {
- Self::composite(CompositeOperator::Arithmetic { k1, k2, k3, k4 })
- }
-
- pub fn gaussian_blur(v: u16) -> Self {
- Self::simple(FePrimitive::GaussianBlur(GaussianBlur::single(v)))
- }
-
- pub fn gaussian_blur_xy(x: u16, y: u16) -> Self {
- Self::simple(FePrimitive::GaussianBlur(GaussianBlur::with_xy(x, y)))
- }
-
- pub fn offset(dx: f32, dy: f32) -> Self {
- Self::simple(FePrimitive::Offset(Offset::new(dx, dy)))
- }
-
- pub fn component_transfer_rgba(
- r: TransferFn,
- g: TransferFn,
- b: TransferFn,
- a: TransferFn,
- ) -> Self {
- Self::simple(FePrimitive::ComponentTransfer(ComponentTransfer {
- func_r: r,
- func_g: g,
- func_b: b,
- func_a: a,
- }))
- }
-
- pub fn component_transfer_rgb(r: TransferFn, g: TransferFn, b: TransferFn) -> Self {
- Self::component_transfer_rgba(r, g, b, TransferFn::Identity)
- }
-
- pub fn component_transfer_r(func: TransferFn) -> Self {
- Self::component_transfer_rgba(
- func,
- TransferFn::Identity,
- TransferFn::Identity,
- TransferFn::Identity,
- )
- }
-
- pub fn component_transfer_g(func: TransferFn) -> Self {
- Self::component_transfer_rgba(
- TransferFn::Identity,
- func,
- TransferFn::Identity,
- TransferFn::Identity,
- )
- }
-
- pub fn component_transfer_b(func: TransferFn) -> Self {
- Self::component_transfer_rgba(
- TransferFn::Identity,
- TransferFn::Identity,
- func,
- TransferFn::Identity,
- )
- }
-
- pub fn component_transfer_a(func: TransferFn) -> Self {
- Self::component_transfer_rgba(
- TransferFn::Identity,
- TransferFn::Identity,
- TransferFn::Identity,
- func,
- )
- }
-
- pub fn component_transfer_single(func: TransferFn) -> Self {
- Self::component_transfer_rgb(func.clone(), func.clone(), func)
- }
-
- pub fn flood(flood_color: Color, flood_opacity: f32) -> Self {
- Self::simple(FePrimitive::Flood(Flood {
- flood_color,
- flood_opacity,
- }))
- }
-
- pub fn flood_opaque(flood_color: Color) -> Self {
- Self::flood(flood_color, 1.)
- }
-
- pub fn turbulence(
- base_freq_x: f32,
- base_freq_y: f32,
- num_octaves: u16,
- seed: u32,
- stitch_tiles: StitchTiles,
- noise_type: NoiseType,
- ) -> Self {
- Self::simple(FePrimitive::Turbulence(Turbulence {
- base_frequency: (base_freq_x, base_freq_y),
- num_octaves,
- seed,
- stitch_tiles,
- noise_type,
- }))
- }
-
- pub fn displacement_map(scale: f32, x_channel: Channel, y_channel: Channel) -> Self {
- Self::simple(FePrimitive::DisplacementMap(DisplacementMap {
- scale,
- x_channel_selector: x_channel,
- y_channel_selector: y_channel,
- }))
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives.rs b/crates/svg-filters/src/types/nodes/primitives.rs
deleted file mode 100644
index 4675b8e..0000000
--- a/crates/svg-filters/src/types/nodes/primitives.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use quick_xml::{events::attributes::Attribute, ElementWriter, Writer};
-use std::convert::Into;
-
-use super::CommonAttrs;
-
-pub mod blend;
-pub mod color_matrix;
-pub mod component_transfer;
-pub mod composite;
-pub mod convolve_matrix;
-pub mod diffuse_lighting;
-pub mod displacement_map;
-pub mod flood;
-pub mod gaussian_blur;
-pub mod image;
-pub mod merge;
-pub mod morphology;
-pub mod offset;
-pub mod specular_lighting;
-pub mod tile;
-pub mod turbulence;
-
-pub trait WriteElement {
- fn attrs(&self) -> Vec;
- fn tag_name(&self) -> &'static str;
- fn element_writer<'writer, 'result>(
- &self,
- writer: &'writer mut Writer<&'result mut Vec>,
- common: CommonAttrs,
- inputs: Vec,
- output: Option,
- ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> {
- let attrs: Vec<_> = inputs
- .into_iter()
- .enumerate()
- .map(|(i, edge)| {
- (
- match i {
- 0 => "in".to_owned(),
- n => format!("in{}", n + 1),
- }
- .into_bytes(),
- edge.into_bytes(),
- )
- })
- .collect();
- let mut el_writer = writer
- .create_element(self.tag_name())
- .with_attributes(Into::>>::into(common))
- .with_attributes(self.attrs())
- .with_attributes(attrs.iter().map(|(k, v)| (&k[..], &v[..])));
- if let Some(output) = output {
- el_writer = el_writer.with_attribute(("result", output.as_str()));
- }
-
- el_writer.write_empty()
- }
-}
-
-/// svg filter effects primitives
-#[derive(Debug)]
-pub enum FePrimitive {
- Blend(blend::Blend),
- ColorMatrix(color_matrix::ColorMatrix),
- ComponentTransfer(component_transfer::ComponentTransfer),
- Composite(composite::Composite),
- ConvolveMatrix(convolve_matrix::ConvolveMatrix),
- DiffuseLighting(diffuse_lighting::DiffuseLighting),
- DisplacementMap(displacement_map::DisplacementMap),
- Flood(flood::Flood),
- GaussianBlur(gaussian_blur::GaussianBlur),
- Image(image::Image),
- Merge(merge::Merge),
- Morphology(morphology::Morphology),
- Offset(offset::Offset),
- SpecularLighting(specular_lighting::SpecularLighting),
- Tile(tile::Tile),
- Turbulence(turbulence::Turbulence),
-}
-
-impl WriteElement for FePrimitive {
- fn attrs(&self) -> std::vec::Vec> {
- match self {
- FePrimitive::Blend(el) => el.attrs(),
- FePrimitive::ColorMatrix(el) => el.attrs(),
- FePrimitive::ComponentTransfer(el) => el.attrs(),
- FePrimitive::Composite(el) => el.attrs(),
- FePrimitive::GaussianBlur(el) => el.attrs(),
- FePrimitive::Offset(el) => el.attrs(),
- FePrimitive::Turbulence(el) => el.attrs(),
- FePrimitive::DisplacementMap(el) => el.attrs(),
- FePrimitive::Flood(el) => el.attrs(),
- FePrimitive::Morphology(el) => el.attrs(),
- FePrimitive::ConvolveMatrix(_) => todo!(),
- FePrimitive::DiffuseLighting(_) => todo!(),
- FePrimitive::Image(_) => todo!(),
- FePrimitive::Merge(_) => todo!(),
- FePrimitive::SpecularLighting(_) => todo!(),
- FePrimitive::Tile(_) => todo!(),
- }
- }
-
- fn tag_name(&self) -> &'static str {
- match self {
- FePrimitive::Blend(el) => el.tag_name(),
- FePrimitive::ColorMatrix(el) => el.tag_name(),
- FePrimitive::ComponentTransfer(el) => el.tag_name(),
- FePrimitive::Composite(el) => el.tag_name(),
- FePrimitive::GaussianBlur(el) => el.tag_name(),
- FePrimitive::Offset(el) => el.tag_name(),
- FePrimitive::Turbulence(el) => el.tag_name(),
- FePrimitive::DisplacementMap(el) => el.tag_name(),
- FePrimitive::Flood(el) => el.tag_name(),
- FePrimitive::Morphology(el) => el.tag_name(),
- FePrimitive::ConvolveMatrix(_) => todo!(),
- FePrimitive::DiffuseLighting(_) => todo!(),
- FePrimitive::Image(_) => todo!(),
- FePrimitive::Merge(_) => todo!(),
- FePrimitive::SpecularLighting(_) => todo!(),
- FePrimitive::Tile(_) => todo!(),
- }
- }
-
- fn element_writer<'writer, 'result>(
- &self,
- writer: &'writer mut Writer<&'result mut Vec>,
- common: CommonAttrs,
- inputs: Vec,
- output: Option,
- ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> {
- match self {
- FePrimitive::Blend(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::ColorMatrix(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::ComponentTransfer(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::Composite(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::Turbulence(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::GaussianBlur(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::Offset(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::DisplacementMap(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::Flood(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::Morphology(el) => el.element_writer(writer, common, inputs, output),
- FePrimitive::ConvolveMatrix(_) => todo!(),
- FePrimitive::DiffuseLighting(_) => todo!(),
- FePrimitive::Image(_) => todo!(),
- FePrimitive::Merge(_) => todo!(),
- FePrimitive::SpecularLighting(_) => todo!(),
- FePrimitive::Tile(_) => todo!(),
- }
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/blend.rs b/crates/svg-filters/src/types/nodes/primitives/blend.rs
deleted file mode 100644
index 3e28401..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/blend.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use std::fmt::Display;
-
-use super::WriteElement;
-
-/// [feBlend](https://www.w3.org/TR/SVG11/filters.html#feBlendElement)
-#[derive(Debug)]
-pub struct Blend {
- mode: BlendMode,
-}
-
-impl Blend {
- pub fn new(mode: BlendMode) -> Self {
- Self { mode }
- }
-}
-
-impl Default for Blend {
- fn default() -> Self {
- Self {
- mode: BlendMode::Normal,
- }
- }
-}
-
-impl WriteElement for Blend {
- fn attrs(&self) -> Vec {
- if let BlendMode::Normal = self.mode {
- Vec::new()
- } else {
- gen_attrs![b"mode": self.mode]
- }
- }
-
- fn tag_name(&self) -> &'static str {
- "feBlend"
- }
-}
-
-/// as according to https://drafts.fxtf.org/compositing-1/#blending
-#[derive(Debug)]
-pub enum BlendMode {
- Normal,
- Multiply,
- Screen,
- Overlay,
- Darken,
- Lighten,
- ColorDodge,
- ColorBurn,
- HardLight,
- SoftLight,
- Difference,
- Exclusion,
-
- Hue,
- Saturation,
- Color,
- Luminosity,
-}
-
-impl Display for BlendMode {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- f.write_str(match self {
- BlendMode::Normal => "normal",
- BlendMode::Multiply => "multiply",
- BlendMode::Screen => "screen",
- BlendMode::Overlay => "overlay",
- BlendMode::Darken => "darken",
- BlendMode::Lighten => "lighten",
- BlendMode::ColorDodge => "color-dodge",
- BlendMode::ColorBurn => "color-burn",
- BlendMode::HardLight => "hard-light",
- BlendMode::SoftLight => "soft-light",
- BlendMode::Difference => "difference",
- BlendMode::Exclusion => "exclusion",
- BlendMode::Hue => "hue",
- BlendMode::Saturation => "saturation",
- BlendMode::Color => "color",
- BlendMode::Luminosity => "luminosity",
- })
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs b/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs
deleted file mode 100644
index 3a31b7d..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/color_matrix.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use super::WriteElement;
-
-/// [feColorMatrix](https://www.w3.org/TR/SVG11/filters.html#feColorMatrixElement)
-#[derive(Debug)]
-pub struct ColorMatrix {
- cm_type: ColorMatrixType,
-}
-
-impl ColorMatrix {
- pub fn new(cm_type: ColorMatrixType) -> Self {
- Self { cm_type }
- }
-}
-
-impl WriteElement for ColorMatrix {
- fn attrs(&self) -> Vec {
- match &self.cm_type {
- ColorMatrixType::Matrix(v) => gen_attrs![
- b"values": v
- .iter()
- .map(std::string::ToString::to_string)
- .reduce(|mut acc, e| {
- acc.push(' ');
- acc.push_str(&e);
- acc
- })
- .expect("fixed length arr should always work")
- ],
- ColorMatrixType::Saturate(v) | ColorMatrixType::HueRotate(v) => {
- gen_attrs![b"values": v]
- }
- ColorMatrixType::LuminanceToAlpha => Vec::new(),
- }
- }
-
- fn tag_name(&self) -> &'static str {
- "feColorMatrix"
- }
-}
-
-#[derive(Debug)]
-pub enum ColorMatrixType {
- Matrix(Box<[f32; 20]>),
- Saturate(f32),
- HueRotate(f32),
- LuminanceToAlpha,
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs b/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs
deleted file mode 100644
index 3f8a3a3..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/component_transfer.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use quick_xml::{events::attributes::Attribute, Writer};
-
-use super::WriteElement;
-
-/// [feComponentTransfer](https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement)
-#[derive(Debug)]
-pub struct ComponentTransfer {
- pub func_r: TransferFn,
- pub func_g: TransferFn,
- pub func_b: TransferFn,
- pub func_a: TransferFn,
-}
-
-impl WriteElement for ComponentTransfer {
- fn attrs(&self) -> Vec {
- Vec::new()
- }
-
- fn tag_name(&self) -> &'static str {
- "feComponentTransfer"
- }
-
- fn element_writer<'writer, 'result>(
- &self,
- writer: &'writer mut quick_xml::Writer<&'result mut Vec>,
- common: crate::types::nodes::CommonAttrs,
- inputs: Vec,
- output: Option,
- ) -> quick_xml::Result<&'writer mut quick_xml::Writer<&'result mut Vec>> {
- let inputs: Vec<_> = inputs
- .into_iter()
- .enumerate()
- .map(|(i, edge)| {
- (
- match i {
- 0 => "in".to_owned(),
- n => format!("in{}", n + 1),
- }
- .into_bytes(),
- edge.into_bytes(),
- )
- })
- .collect();
- let mut el_writer = writer
- .create_element(self.tag_name())
- .with_attributes(inputs.iter().map(|(k, v)| (&k[..], &v[..])))
- .with_attributes(Into::>>::into(common));
- if let Some(output) = output {
- el_writer = el_writer.with_attribute(("result", output.as_str()));
- }
-
- el_writer.write_inner_content(|writer| {
- self.func_r.write_self(writer, "feFuncR")?;
- self.func_g.write_self(writer, "feFuncG")?;
- self.func_b.write_self(writer, "feFuncB")?;
- self.func_a.write_self(writer, "feFuncA")?;
- Ok(())
- })
- }
-}
-
-/// [transfer functions](https://www.w3.org/TR/SVG11/filters.html#transferFuncElements)
-#[derive(Debug, Clone)]
-pub enum TransferFn {
- Identity,
- Table {
- table_values: Vec,
- },
- Discrete {
- table_values: Vec,
- },
- Linear {
- slope: f32,
- intercept: f32,
- },
- Gamma {
- amplitude: f32,
- exponent: f32,
- offset: f32,
- },
-}
-
-impl TransferFn {
- #[allow(clippy::str_to_string, reason = "inside macro call")]
- fn write_self<'writer, 'result>(
- &self,
- target: &'writer mut Writer<&'result mut Vec>,
- name: &'static str,
- ) -> quick_xml::Result<&'writer mut Writer<&'result mut Vec>> {
- target
- .create_element(name)
- .with_attributes(match self {
- TransferFn::Identity => gen_attrs![b"type": "identity"],
- TransferFn::Table { table_values } => gen_attrs![
- b"type": "table",
- b"tableValues": table_values
- .iter()
- .map(std::string::ToString::to_string)
- .reduce(|mut acc, e| {
- acc.push(' ');
- acc.push_str(&e);
- acc
- }).expect("empty tables disallowed")
- ],
- TransferFn::Discrete { table_values } => gen_attrs![
- b"type": "discrete",
- b"tableValues": table_values
- .iter()
- .map(std::string::ToString::to_string)
- .reduce(|mut acc, e| {
- acc.push(' ');
- acc.push_str(&e);
- acc
- }).expect("empty tables disallowed")
- ],
- TransferFn::Linear { slope, intercept } => gen_attrs![
- b"type": "linear",
- b"slope": slope,
- b"intercept": intercept
- ],
- TransferFn::Gamma {
- amplitude,
- exponent,
- offset,
- } => gen_attrs![
- b"type": "gamma",
- b"amplitude": amplitude,
- b"exponent": exponent,
- b"offset": offset
- ],
- })
- .write_empty()
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/composite.rs b/crates/svg-filters/src/types/nodes/primitives/composite.rs
deleted file mode 100644
index 45f639c..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/composite.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use std::borrow::Cow;
-
-use quick_xml::{events::attributes::Attribute, name::QName};
-
-use super::WriteElement;
-
-/// [feComposite](https://www.w3.org/TR/SVG11/filters.html#feCompositeElement)
-#[derive(Debug)]
-pub struct Composite {
- operator: CompositeOperator,
-}
-
-impl Composite {
- pub fn new(op: CompositeOperator) -> Self {
- Self { operator: op }
- }
-
- pub fn arithmetic(k1: f32, k2: f32, k3: f32, k4: f32) -> Self {
- Self {
- operator: CompositeOperator::Arithmetic { k1, k2, k3, k4 },
- }
- }
-}
-
-#[derive(Debug)]
-pub enum CompositeOperator {
- Over,
- In,
- Out,
- Atop,
- Xor,
- Arithmetic { k1: f32, k2: f32, k3: f32, k4: f32 },
-}
-
-impl WriteElement for Composite {
- fn attrs(&self) -> Vec {
- let (op_name, vals) = match self.operator {
- CompositeOperator::Over => ("over", None),
- CompositeOperator::In => ("in", None),
- CompositeOperator::Out => ("out", None),
- CompositeOperator::Atop => ("atop", None),
- CompositeOperator::Xor => ("xor", None),
- CompositeOperator::Arithmetic { k1, k2, k3, k4 } => {
- ("arithmetic", Some([k1, k2, k3, k4]))
- }
- };
-
- let mut r = vec![Attribute {
- key: QName(b"operator"),
- value: Cow::from(op_name.as_bytes()),
- }];
-
- if let Some([k1, k2, k3, k4]) = vals {
- // r.append(&mut vec![
- // Attribute {
- // key: QName(b"k1"),
- // value: Cow::from(k1.to_string().into_bytes()),
- // },
- // Attribute {
- // key: QName(b"k2"),
- // value: Cow::from(k2.to_string().into_bytes()),
- // },
- // Attribute {
- // key: QName(b"k3"),
- // value: Cow::from(k3.to_string().into_bytes()),
- // },
- // Attribute {
- // key: QName(b"k4"),
- // value: Cow::from(k4.to_string().into_bytes()),
- // },
- // ]);
- r.append(&mut gen_attrs![
- b"k1": k1,
- b"k2": k2,
- b"k3": k3,
- b"k4": k4
- ]);
- }
-
- r
- }
-
- fn tag_name(&self) -> &'static str {
- "feComposite"
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs b/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs
deleted file mode 100644
index 1fe2ef4..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/convolve_matrix.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-#[derive(Debug)]
-pub struct ConvolveMatrix {
- order: (u16, u16),
- // must be checked to be `order.0 * order.1`
- kernel_matrix: Vec,
- divisor: f32,
- bias: f32,
- target_x: i32,
- target_y: i32,
- edge_mode: EdgeMode,
- kernel_unit_length: (f32, f32),
- preserve_alpha: bool,
-}
-
-#[derive(Debug)]
-enum EdgeMode {
- None,
- Duplicate,
- Wrap,
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs b/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs
deleted file mode 100644
index 5d9cd6f..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/diffuse_lighting.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO
-#[derive(Debug)]
-pub struct DiffuseLighting;
diff --git a/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs b/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs
deleted file mode 100644
index 189291e..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/displacement_map.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use super::WriteElement;
-
-/// [feDisplacementMap](https://www.w3.org/TR/SVG11/filters.html#feDisplacementMapElement)
-#[derive(Debug)]
-pub struct DisplacementMap {
- pub scale: f32,
- pub x_channel_selector: Channel,
- pub y_channel_selector: Channel,
-}
-
-impl WriteElement for DisplacementMap {
- fn attrs(&self) -> Vec {
- let mut r = Vec::new();
- gen_attrs![
- r;
- self.scale != 0. => b"scale": self.scale,
- self.x_channel_selector != Channel::A => b"xChannelSelector": format!("{:?}", self.x_channel_selector),
- self.y_channel_selector != Channel::A => b"yChannelSelector": format!("{:?}", self.y_channel_selector)
- ];
- r
- }
-
- fn tag_name(&self) -> &'static str {
- "feDisplacementMap"
- }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum Channel {
- A,
- R,
- G,
- B,
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/flood.rs b/crates/svg-filters/src/types/nodes/primitives/flood.rs
deleted file mode 100644
index df912ef..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/flood.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use csscolorparser::Color;
-
-use super::WriteElement;
-
-/// [feFlood](https://www.w3.org/TR/SVG11/filters.html#feFloodElement)
-#[derive(Debug)]
-pub struct Flood {
- pub flood_color: Color,
- pub flood_opacity: f32,
-}
-
-impl WriteElement for Flood {
- fn attrs(&self) -> Vec {
- gen_attrs![
- b"flood-color": self.flood_color.to_hex_string(),
- b"flood-opacity": self.flood_opacity
- ]
- }
-
- fn tag_name(&self) -> &'static str {
- "feFlood"
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs b/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs
deleted file mode 100644
index cd18f72..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/gaussian_blur.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use std::borrow::Cow;
-
-use quick_xml::{events::attributes::Attribute, name::QName};
-
-use super::WriteElement;
-
-/// [feGaussianBlur](https://www.w3.org/TR/SVG11/filters.html#feGaussianBlurElement)
-#[derive(Debug)]
-pub struct GaussianBlur {
- std_deviation: (u16, u16),
-}
-
-impl GaussianBlur {
- pub fn single(v: u16) -> Self {
- Self {
- std_deviation: (v, v),
- }
- }
-
- pub fn with_xy(x: u16, y: u16) -> Self {
- Self {
- std_deviation: (x, y),
- }
- }
-}
-
-impl WriteElement for GaussianBlur {
- fn attrs(&self) -> Vec {
- gen_attrs![b"stdDeviation": format!("{} {}", self.std_deviation.0, self.std_deviation.1)]
- }
-
- fn tag_name(&self) -> &'static str {
- "feGaussianBlur"
- }
-}
diff --git a/crates/svg-filters/src/types/nodes/primitives/image.rs b/crates/svg-filters/src/types/nodes/primitives/image.rs
deleted file mode 100644
index c52c0b7..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/image.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO
-#[derive(Debug)]
-pub struct Image;
diff --git a/crates/svg-filters/src/types/nodes/primitives/merge.rs b/crates/svg-filters/src/types/nodes/primitives/merge.rs
deleted file mode 100644
index ab26374..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/merge.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO
-#[derive(Debug)]
-pub struct Merge;
diff --git a/crates/svg-filters/src/types/nodes/primitives/morphology.rs b/crates/svg-filters/src/types/nodes/primitives/morphology.rs
deleted file mode 100644
index f6b7bbf..0000000
--- a/crates/svg-filters/src/types/nodes/primitives/morphology.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use super::WriteElement;
-use std::fmt::Display;
-
-/// [feMorphology](https://www.w3.org/TR/SVG11/filters.html#feMorphologyElement)
-#[derive(Debug)]
-pub struct Morphology {
- operator: Operator,
- radius: (f32, f32),
-}
-
-impl WriteElement for Morphology {
- fn attrs(&self) -> Vec