diff --git a/README.md b/README.md index 3ea001f..9c378b0 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,12 @@ Currently developing the fourth iteration, a Scheme-like based on a functional V Working up to a JIT for fexprs by starting with -- sl - a Simple Lisp JIT (WIP) -- ? -- ? -- ? -- kv - A fexpr interpeter with mutation and delimited continuations - need to add a JIT to this +- [ ] slj - a Simple Lisp JIT (WIP) +- [ ] clj - a continuation lisp JIT? +- [ ] mlj - a mutation lisp JIT? +- [ ] flj - a fexpr Lisp JIT? +- [x] ki - A fexpr interpeter with mutation and delimited continuations +- [ ] kj - A fexpr+mutation+delimited continuations JIT koka_bench: Licensed under Apache-2.0, as they are derived from the benchmarks of the Koka project, see the readme and license in koka_bench for more, or https://github.com/koka-lang/koka for the source project. diff --git a/kv/.gitignore b/ki/.gitignore similarity index 100% rename from kv/.gitignore rename to ki/.gitignore diff --git a/kv/Cargo.lock b/ki/Cargo.lock similarity index 64% rename from kv/Cargo.lock rename to ki/Cargo.lock index af9b59e..aced3ec 100644 --- a/kv/Cargo.lock +++ b/ki/Cargo.lock @@ -2,18 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.2" @@ -71,142 +59,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cranelift" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50babaf4da30fd349e1b913760300266143535f15a0b7be7ce1ce9efafa8ff5e" -dependencies = [ - "cranelift-codegen", - "cranelift-frontend", -] - -[[package]] -name = "cranelift-bforest" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" -dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "cranelift-isle", - "gimli", - "hashbrown 0.13.2", - "log", - "regalloc2", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" -dependencies = [ - "cranelift-codegen-shared", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" - -[[package]] -name = "cranelift-entity" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" - -[[package]] -name = "cranelift-frontend" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" -dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cranelift-isle" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" - -[[package]] -name = "cranelift-jit" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ca96b05988aa057eda09a817a6e31915fabd7f476b513123aff08053cd193dd" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-entity", - "cranelift-module", - "cranelift-native", - "libc", - "log", - "region", - "target-lexicon", - "wasmtime-jit-icache-coherence", - "windows-sys 0.45.0", -] - -[[package]] -name = "cranelift-module" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5112c0be9cc5da064e0620570d67852f11ce44f2e572a58ecf7f11df73978b8" -dependencies = [ - "anyhow", - "cranelift-codegen", -] - -[[package]] -name = "cranelift-native" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -263,35 +121,20 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -303,37 +146,11 @@ dependencies = [ "wasi", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -341,16 +158,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -358,7 +165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", ] [[package]] @@ -382,14 +189,10 @@ dependencies = [ ] [[package]] -name = "kv" +name = "ki" version = "0.1.0" dependencies = [ "anyhow", - "cranelift", - "cranelift-jit", - "cranelift-module", - "cranelift-native", "lalrpop", "lalrpop-util", "once_cell", @@ -429,9 +232,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libredox" @@ -446,9 +249,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -466,15 +269,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "memchr" version = "2.6.4" @@ -489,9 +283,9 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" @@ -523,7 +317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -543,9 +337,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -579,18 +373,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "regalloc2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" -dependencies = [ - "fxhash", - "log", - "slice-group-by", - "smallvec", -] - [[package]] name = "regex" version = "1.10.2" @@ -626,29 +408,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags 1.3.2", - "libc", - "mach", - "winapi", -] - [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -669,24 +439,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "slice-group-by" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" - [[package]] name = "smallvec" version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "string_cache" version = "0.8.7" @@ -711,12 +469,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "target-lexicon" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" - [[package]] name = "term" version = "0.7.0" @@ -769,29 +521,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" -dependencies = [ - "cfg-if", - "libc", - "windows-sys 0.45.0", -] - [[package]] name = "winapi" version = "0.3.9" @@ -814,15 +549,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -833,18 +559,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -863,10 +583,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "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]] name = "windows_aarch64_gnullvm" @@ -875,10 +604,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -887,10 +616,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -899,10 +628,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -911,10 +640,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -923,10 +652,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -935,10 +664,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -947,21 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "zerocopy" -version = "0.7.26" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" diff --git a/kv/Cargo.toml b/ki/Cargo.toml similarity index 75% rename from kv/Cargo.toml rename to ki/Cargo.toml index a13963b..6778f35 100644 --- a/kv/Cargo.toml +++ b/ki/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kv" +name = "ki" version = "0.1.0" edition = "2021" build = "build.rs" @@ -15,10 +15,6 @@ lalrpop-util = {version="0.19.7", features=["lexer"]} regex = "1" once_cell = "1.17.0" anyhow = "1" -cranelift = "0.95.1" -cranelift-module = "0.95.1" -cranelift-jit = "0.95.1" -cranelift-native = "0.95.1" [build-dependencies] lalrpop = "0.19.7" diff --git a/kv/build.rs b/ki/build.rs similarity index 100% rename from kv/build.rs rename to ki/build.rs diff --git a/kv/src/grammar.lalrpop b/ki/src/grammar.lalrpop similarity index 94% rename from kv/src/grammar.lalrpop rename to ki/src/grammar.lalrpop index 1e0c12d..7267a86 100644 --- a/kv/src/grammar.lalrpop +++ b/ki/src/grammar.lalrpop @@ -1,7 +1,6 @@ use std::str::FromStr; use std::rc::Rc; -use crate::basic::Form; -use crate::eval::FormT; +use ki::Form; grammar; diff --git a/kv/src/basic.rs b/ki/src/lib.rs similarity index 75% rename from kv/src/basic.rs rename to ki/src/lib.rs index 46a9778..5acbe58 100644 --- a/kv/src/basic.rs +++ b/ki/src/lib.rs @@ -4,8 +4,6 @@ use std::rc::Rc; use std::cell::RefCell; use std::convert::From; -use crate::eval::{FormT,Cont,Cursor,PrimCombI}; - #[derive(Debug, Eq, PartialEq)] pub enum Form { Nil, @@ -16,7 +14,7 @@ pub enum Form { Pair(Rc
,Rc), PrimComb { eval_limit: i32, ins: PrimCombI }, DeriComb { se: Rc, de: Option, params: String, body: Rc }, - ContComb(Cont), + ContComb(Cont), } // todo, strings not symbols? @@ -88,9 +86,6 @@ impl Form { _ => None, } } -} - -impl FormT for Form { fn sym(&self) -> Option<&str> { match self { Form::Symbol(s) => Some(s), @@ -121,7 +116,7 @@ impl FormT for Form { _ => false, } } - fn call(&self, p: Rc, e: Rc, nc: Box>, metac: Cont) -> Cursor { + fn call(&self, p: Rc, e: Rc, nc: Box, metac: Cont) -> Cursor { match self { Form::PrimComb{eval_limit, ins} => { Cursor { f: Rc::new(Form::Nil), c: Cont::PramEval { eval_limit: *eval_limit, to_eval: p, collected: None, e, ins: *ins, nc: nc }, metac } @@ -142,7 +137,7 @@ impl FormT for Form { } } } - fn impl_prim(ins: PrimCombI, e: Rc, ps: Vec>, c: Cont, metac: Cont) -> Cursor { + fn impl_prim(ins: PrimCombI, e: Rc, ps: Vec>, c: Cont, metac: Cont) -> Cursor { match ins { PrimCombI::Eval => Cursor { f: Rc::clone(&ps[0]), c: Cont::Eval { e: Rc::clone(&ps[1]), nc: Box::new(c) }, metac }, PrimCombI::Vau => { @@ -238,6 +233,7 @@ impl FormT for Form { } } + fn assoc(k: &str, v: Rc, l: Rc) -> Rc { Rc::new(Form::Pair( Rc::new(Form::Pair( @@ -306,3 +302,125 @@ pub fn root_env() -> Rc { ]) } + + +#[derive(Debug, Eq, PartialEq)] +pub enum Cont { + Exit, + MetaRet, + CatchRet { nc: Box, restore_meta: Box }, + Eval { e: Rc, nc: Box }, + Call { p: Rc, e: Rc, nc: Box }, + PramEval { eval_limit: i32, to_eval: Rc, collected: Option>>, e: Rc, ins: PrimCombI, nc: Box }, +} +impl Clone for Cont { + fn clone(&self) -> Self { + match self { + Cont::Exit => Cont::Exit, + Cont::MetaRet => Cont::MetaRet, + Cont::CatchRet { nc, restore_meta } => Cont::CatchRet { nc: nc.clone(), restore_meta: restore_meta.clone() }, + Cont::Eval { e, nc } => Cont::Eval { e: Rc::clone(e), nc: nc.clone() }, + Cont::Call { p, e, nc } => Cont::Call { p: Rc::clone(p), e: Rc::clone(e), nc: nc.clone() }, + Cont::PramEval { eval_limit, to_eval, collected, e, ins, nc} => Cont::PramEval { eval_limit: *eval_limit, to_eval: Rc::clone(to_eval), + collected: collected.as_ref().map(|x| x.iter().map(|x| Rc::clone(x)).collect()), + e: Rc::clone(e), ins: ins.clone(), nc: nc.clone() }, + } + } +} +pub struct Cursor { pub f: Rc, pub c: Cont, pub metac: Cont } + +pub fn eval(e: Rc, f: Rc) -> Rc { + let mut cursor = Cursor { f, c: Cont::Eval { e, nc: Box::new(Cont::MetaRet) }, metac: Cont::Exit }; + loop { + let Cursor { f, c, metac } = cursor; + match c { + Cont::Exit => { + return f; + }, + Cont::MetaRet => { + cursor = Cursor { f: f, c: metac.clone(), metac: metac }; + }, + Cont::CatchRet { nc, restore_meta } => { + cursor = Cursor { f: f, c: *nc, metac: *restore_meta }; + }, + Cont::Eval { e, nc } => { + if let Some((comb, p)) = f.pair() { + cursor = Cursor { f: comb, c: Cont::Eval { e: Rc::clone(&e), nc: Box::new(Cont::Call { p, e, nc }) }, metac } + } else if let Some(s) = f.sym() { + let mut t = Rc::clone(&e); + while s != t.car().unwrap().car().unwrap().sym().unwrap() { + t = t.cdr().unwrap(); + } + cursor = Cursor { f: t.car().unwrap().cdr().unwrap(), c: *nc, metac }; + } else { + cursor = Cursor { f: Rc::clone(&f), c: *nc, metac }; + } + }, + Cont::PramEval { eval_limit, to_eval, collected, e, ins, nc } => { + let mut next_collected = if let Some(mut collected) = collected { + collected.push(f); collected + } else { vec![] }; + if eval_limit == 0 || to_eval.is_nil() { + let mut traverse = to_eval; + while !traverse.is_nil() { + next_collected.push(traverse.car().unwrap()); + traverse = traverse.cdr().unwrap(); + } + cursor = Form::impl_prim(ins, e, next_collected, *nc, metac); + } else { + cursor = Cursor { f: to_eval.car().unwrap(), c: Cont::Eval { e: Rc::clone(&e), nc: Box::new(Cont::PramEval { eval_limit: eval_limit - 1, + to_eval: to_eval.cdr().unwrap(), + collected: Some(next_collected), + e, ins, nc }) }, metac }; + } + }, + Cont::Call { p, e, nc } => { + cursor = f.call(p, e, nc, metac); + }, + } + } +} + +#[derive(Debug, Eq, PartialEq, Clone, Copy)] +pub enum PrimCombI { + Eval, + Vau, + If, + + Reset, + Shift, + + Cell, + Set, + Get, + + Cons, + Car, + Cdr, + Quote, + Assert, + + Eq, + Lt, + LEq, + Gt, + GEq, + + Plus, + Minus, + Mult, + Div, + Mod, + And, + Or, + Xor, + + CombP, + CellP, + PairP, + SymbolP, + IntP, + BoolP, + NilP, +} + diff --git a/kv/src/main.rs b/ki/src/main.rs similarity index 59% rename from kv/src/main.rs rename to ki/src/main.rs index e97901e..a03afc0 100644 --- a/kv/src/main.rs +++ b/ki/src/main.rs @@ -3,12 +3,7 @@ lalrpop_mod!(pub grammar); use std::rc::Rc; -mod basic; -use crate::basic::{root_env,Form}; -mod eval; -use crate::eval::{eval}; -mod opt; -use crate::opt::{OptForm}; +use ki::{root_env,eval}; #[cfg(test)] mod test; @@ -21,11 +16,6 @@ fn main() { //println!("Parsed input is {} - {:?}", parsed_input, parsed_input); let root = root_env(); let result = eval(Rc::clone(&root), Rc::clone(&parsed_input)); - let opt_root: Rc = (&*root).into(); - let opt_input: Rc = (&*parsed_input).into(); - let opt_result = eval(opt_root, opt_input); println!("Result is {} - {:?}", result, result); - println!("Opt Result is {} - {:?}", opt_result, opt_result); - assert!(opt_result.congruent(&*result)); } diff --git a/kv/src/test.rs b/ki/src/test.rs similarity index 60% rename from kv/src/test.rs rename to ki/src/test.rs index 6a5bdc4..cb12dcb 100644 --- a/kv/src/test.rs +++ b/ki/src/test.rs @@ -1,9 +1,7 @@ use std::rc::Rc; use crate::grammar; -use crate::basic::{root_env,Form}; -use crate::opt::{OptForm}; -use crate::eval::{eval}; +use ki::{root_env,Form,eval}; #[test] fn parse_test() { @@ -20,83 +18,74 @@ fn parse_test() { assert!(g.parse("((22)").is_err()); } -fn eval_test>(also_pe: bool, gram: &grammar::TermParser, e: &Rc, code: &str, expected: T) { +fn eval_test>(gram: &grammar::TermParser, e: &Rc, code: &str, expected: T) { println!("Doing test {}", code); let parsed = gram.parse(code).unwrap(); let basic_result = eval(Rc::clone(e), Rc::clone(&parsed)); assert_eq!(*basic_result, expected.into()); - - let opt_root: Rc = (&**e).into(); - let opt_input: Rc = (&*parsed).into(); - let opt_result = eval(opt_root, opt_input); - assert!(opt_result.congruent(&*basic_result)); - - - //if also_pe { - //} } #[test] fn basic_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, "(+ 2 (car (cons 4 '(1 2))))", 6); - eval_test(true, &g, &e, "(= 17 ((vau d p (+ (eval (car p) d) 13)) (+ 1 3)))", true); - eval_test(true, &g, &e, "(if (= 2 2) (+ 1 2) (+ 3 4))", 3); - eval_test(true, &g, &e, "(quote a)", "a"); - eval_test(true, &g, &e, "'a", "a"); - eval_test(true, &g, &e, "'(1 . a)", (1, "a")); - eval_test(true, &g, &e, "'(1 a)", (1, ("a", Form::Nil))); - eval_test(true, &g, &e, "true", true); - eval_test(true, &g, &e, "false", false); - eval_test(true, &g, &e, "nil", Form::Nil); + eval_test(&g, &e, "(+ 2 (car (cons 4 '(1 2))))", 6); + eval_test(&g, &e, "(= 17 ((vau d p (+ (eval (car p) d) 13)) (+ 1 3)))", true); + eval_test(&g, &e, "(if (= 2 2) (+ 1 2) (+ 3 4))", 3); + eval_test(&g, &e, "(quote a)", "a"); + eval_test(&g, &e, "'a", "a"); + eval_test(&g, &e, "'(1 . a)", (1, "a")); + eval_test(&g, &e, "'(1 a)", (1, ("a", Form::Nil))); + eval_test(&g, &e, "true", true); + eval_test(&g, &e, "false", false); + eval_test(&g, &e, "nil", Form::Nil); - eval_test(true, &g, &e, "(+ 1 2)", 3); - eval_test(true, &g, &e, "(- 1 2)", -1); - eval_test(true, &g, &e, "(* 1 2)", 2); - eval_test(true, &g, &e, "(/ 4 2)", 2); - eval_test(true, &g, &e, "(% 3 2)", 1); - eval_test(true, &g, &e, "(& 3 2)", 2); - eval_test(true, &g, &e, "(| 2 1)", 3); - eval_test(true, &g, &e, "(^ 2 1)", 3); - eval_test(true, &g, &e, "(^ 3 1)", 2); + eval_test(&g, &e, "(+ 1 2)", 3); + eval_test(&g, &e, "(- 1 2)", -1); + eval_test(&g, &e, "(* 1 2)", 2); + eval_test(&g, &e, "(/ 4 2)", 2); + eval_test(&g, &e, "(% 3 2)", 1); + eval_test(&g, &e, "(& 3 2)", 2); + eval_test(&g, &e, "(| 2 1)", 3); + eval_test(&g, &e, "(^ 2 1)", 3); + eval_test(&g, &e, "(^ 3 1)", 2); - eval_test(true, &g, &e, "(< 3 1)", false); - eval_test(true, &g, &e, "(<= 3 1)", false); - eval_test(true, &g, &e, "(> 3 1)", true); - eval_test(true, &g, &e, "(>= 3 1)", true); + eval_test(&g, &e, "(< 3 1)", false); + eval_test(&g, &e, "(<= 3 1)", false); + eval_test(&g, &e, "(> 3 1)", true); + eval_test(&g, &e, "(>= 3 1)", true); - eval_test(true, &g, &e, "(comb? +)", true); - eval_test(true, &g, &e, "(comb? (vau d p 1))", true); - eval_test(true, &g, &e, "(comb? 1)", false); - eval_test(true, &g, &e, "(pair? '(a))", true); - //eval_test(true, &g, &e, "(pair? '())", true); - eval_test(true, &g, &e, "(nil? nil)", true); - eval_test(true, &g, &e, "(nil? 1)", false); - eval_test(true, &g, &e, "(pair? 1)", false); - eval_test(true, &g, &e, "(symbol? 'a)", true); - eval_test(true, &g, &e, "(symbol? 1)", false); - eval_test(true, &g, &e, "(int? 1)", true); - eval_test(true, &g, &e, "(int? true)", false); - eval_test(true, &g, &e, "(bool? true)", true); - eval_test(true, &g, &e, "(bool? 1)", false); + eval_test(&g, &e, "(comb? +)", true); + eval_test(&g, &e, "(comb? (vau d p 1))", true); + eval_test(&g, &e, "(comb? 1)", false); + eval_test(&g, &e, "(pair? '(a))", true); + //eval_test(&g, &e, "(pair? '())", true); + eval_test(&g, &e, "(nil? nil)", true); + eval_test(&g, &e, "(nil? 1)", false); + eval_test(&g, &e, "(pair? 1)", false); + eval_test(&g, &e, "(symbol? 'a)", true); + eval_test(&g, &e, "(symbol? 1)", false); + eval_test(&g, &e, "(int? 1)", true); + eval_test(&g, &e, "(int? true)", false); + eval_test(&g, &e, "(bool? true)", true); + eval_test(&g, &e, "(bool? 1)", false); - eval_test(true, &g, &e, "!(bool?) 1", false); - eval_test(true, &g, &e, "!(bool?) true", true); + eval_test(&g, &e, "!(bool?) 1", false); + eval_test(&g, &e, "!(bool?) true", true); - eval_test(true, &g, &e, "((vau root_env _ (eval 'a (cons (cons 'a 2) root_env))))", 2); - eval_test(true, &g, &e, "'name-dash", "name-dash"); + eval_test(&g, &e, "((vau root_env _ (eval 'a (cons (cons 'a 2) root_env))))", 2); + eval_test(&g, &e, "'name-dash", "name-dash"); - eval_test(true, &g, &e, "(get (cell 1))", 1); - eval_test(true, &g, &e, "(set (cell 1) 2)", 1); - eval_test(true, &g, &e, "(cell? (cell 1))", true); - eval_test(true, &g, &e, "((vau de p (eval (quote (cons (set a 2) (get a))) (cons (cons (quote a) (cell 1)) de))))", (1,2)); + eval_test(&g, &e, "(get (cell 1))", 1); + eval_test(&g, &e, "(set (cell 1) 2)", 1); + eval_test(&g, &e, "(cell? (cell 1))", true); + eval_test(&g, &e, "((vau de p (eval (quote (cons (set a 2) (get a))) (cons (cons (quote a) (cell 1)) de))))", (1,2)); - eval_test(true, &g, &e, "(reset 1)", 1); - eval_test(true, &g, &e, "(reset (+ 1 2))", 3); - eval_test(true, &g, &e, "(reset (+ 1 (shift (vau de p 2))))", 2); - eval_test(true, &g, &e, "(reset (+ 1 (shift (vau de p ((car p) 2)))))", 3); - eval_test(true, &g, &e, "(reset (+ 1 (shift (vau de p ((car p) ((car p) 2)) ))))", 4); - eval_test(true, &g, &e, "(reset (+ 1 (shift (vau de p (+ ((car p) 3) ((car p) ((car p) 2))) ))))", 8); - eval_test(true, &g, &e, "((reset (+ 1 (shift (vau de p (car p))))) 2)", 3); + eval_test(&g, &e, "(reset 1)", 1); + eval_test(&g, &e, "(reset (+ 1 2))", 3); + eval_test(&g, &e, "(reset (+ 1 (shift (vau de p 2))))", 2); + eval_test(&g, &e, "(reset (+ 1 (shift (vau de p ((car p) 2)))))", 3); + eval_test(&g, &e, "(reset (+ 1 (shift (vau de p ((car p) ((car p) 2)) ))))", 4); + eval_test(&g, &e, "(reset (+ 1 (shift (vau de p (+ ((car p) 3) ((car p) ((car p) 2))) ))))", 8); + eval_test(&g, &e, "((reset (+ 1 (shift (vau de p (car p))))) 2)", 3); } @@ -111,7 +100,7 @@ static LET: Lazy = Lazy::new(|| { #[test] fn fib_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (let1 x 10 (+ x 7))", *LET), 17); + eval_test(&g, &e, &format!("{} (let1 x 10 (+ x 7))", *LET), 17); let def_fib = " !(let1 fib (vau de p !(let1 self (eval (car p) de)) @@ -120,7 +109,7 @@ fn fib_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); !(if (= 1 n) 1) (+ (self self (- n 1)) (self self (- n 2))) ))"; - eval_test(false, &g, &e, &format!("{} {} (fib fib 6)", *LET, def_fib), 8); + eval_test(&g, &e, &format!("{} {} (fib fib 6)", *LET, def_fib), 8); } #[test] fn fact_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); @@ -131,7 +120,7 @@ fn fact_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); !(if (= 0 n) 1) (* n (self self (- n 1))) ))"; - eval_test(true, &g, &e, &format!("{} {} (fact fact 6)", *LET, def_fact), 720); + eval_test(&g, &e, &format!("{} {} (fact fact 6)", *LET, def_fact), 720); } static VAPPLY: Lazy = Lazy::new(|| { format!(" @@ -161,7 +150,7 @@ fn vapply_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); ))", *VAPPLY); // Won't work unless tail calls work // so no PE? - eval_test(false, &g, &e, &format!("{} (badid 1000)", def_badid), 1000); + eval_test(&g, &e, &format!("{} (badid 1000)", def_badid), 1000); } static VMAP: Lazy = Lazy::new(|| { @@ -181,8 +170,8 @@ static VMAP: Lazy = Lazy::new(|| { #[test] fn vmap_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); // Maybe define in terms of a right fold? - //eval_test(true, &g, &e, &format!("{} (vmap (vau de p (+ 1 (car p))) '(1 2 3))", *VMAP), (2, (3, (4, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} (vmap (vau de p (+ 1 (car p))) '(1))", *VMAP), (2, Form::Nil)); + //eval_test(&g, &e, &format!("{} (vmap (vau de p (+ 1 (car p))) '(1 2 3))", *VMAP), (2, (3, (4, Form::Nil)))); + eval_test(&g, &e, &format!("{} (vmap (vau de p (+ 1 (car p))) '(1))", *VMAP), (2, Form::Nil)); } static WRAP: Lazy = Lazy::new(|| { @@ -196,7 +185,7 @@ static WRAP: Lazy = Lazy::new(|| { #[test] fn wrap_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); // Make sure (wrap (vau ...)) and internal style are optimized the same - eval_test(true, &g, &e, &format!("{} ((wrap (vau _ p (+ (car p) 1))) (+ 1 2))", *WRAP), 4); + eval_test(&g, &e, &format!("{} ((wrap (vau _ p (+ (car p) 1))) (+ 1 2))", *WRAP), 4); } static UNWRAP: Lazy = Lazy::new(|| { @@ -211,10 +200,10 @@ static UNWRAP: Lazy = Lazy::new(|| { fn unwrap_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); // Can't represent prims in tests :( - they do work though, uncommenting and checking the // failed assert verifies - //eval_test(true, &g, &e, &format!("{} ((unwrap (vau de p (car p))) (+ 1 2))", def_unwrap), ("quote", (("+", (1, (2, Form::Nil))), Form::Nil))); - //eval_test(true, &g, &e, &format!("{} ((unwrap (vau de p (eval (car p) de))) (+ 1 2))", def_unwrap), (("+", (1, (2, Form::Nil))), Form::Nil)); - eval_test(true, &g, &e, &format!("{} ((unwrap (vau de p (eval (eval (car p) de) de))) (+ 1 2))", *UNWRAP), 3); - eval_test(true, &g, &e, &format!("{} ((unwrap (vau de p (+ (eval (eval (car p) de) de) 1))) (+ 1 2))", *UNWRAP), 4); + //eval_test(&g, &e, &format!("{} ((unwrap (vau de p (car p))) (+ 1 2))", def_unwrap), ("quote", (("+", (1, (2, Form::Nil))), Form::Nil))); + //eval_test(&g, &e, &format!("{} ((unwrap (vau de p (eval (car p) de))) (+ 1 2))", def_unwrap), (("+", (1, (2, Form::Nil))), Form::Nil)); + eval_test(&g, &e, &format!("{} ((unwrap (vau de p (eval (eval (car p) de) de))) (+ 1 2))", *UNWRAP), 3); + eval_test(&g, &e, &format!("{} ((unwrap (vau de p (+ (eval (eval (car p) de) de) 1))) (+ 1 2))", *UNWRAP), 4); } static LAPPLY: Lazy = Lazy::new(|| { @@ -245,7 +234,7 @@ fn lapply_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); ))", *LAPPLY); // Won't work unless tail calls work // takes a while though - eval_test(false, &g, &e, &format!("{} (lbadid 1000)", def_lbadid), 1000); + eval_test(&g, &e, &format!("{} (lbadid 1000)", def_lbadid), 1000); } static VFOLDL: Lazy = Lazy::new(|| { @@ -265,7 +254,7 @@ static VFOLDL: Lazy = Lazy::new(|| { }); #[test] fn vfoldl_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (vfoldl (vau de p (+ (car p) (car (cdr p)))) 0 '(1 2 3))", *VFOLDL), 6); + eval_test(&g, &e, &format!("{} (vfoldl (vau de p (+ (car p) (car (cdr p)))) 0 '(1 2 3))", *VFOLDL), 6); } static ZIPD: Lazy = Lazy::new(|| { format!(" @@ -284,7 +273,7 @@ static ZIPD: Lazy = Lazy::new(|| { }); #[test] fn zipd_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (zipd '(1 2 3) '(4 5 6))", *ZIPD), ((1,4), ((2,5), ((3,6), Form::Nil)))); + eval_test(&g, &e, &format!("{} (zipd '(1 2 3) '(4 5 6))", *ZIPD), ((1,4), ((2,5), ((3,6), Form::Nil)))); } static CONCAT: Lazy = Lazy::new(|| { format!(" @@ -303,7 +292,7 @@ static CONCAT: Lazy = Lazy::new(|| { #[test] fn concat_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (concat '(1 2 3) '(4 5 6))", *CONCAT), (1, (2, (3, (4, (5, (6, Form::Nil))))))); + eval_test(&g, &e, &format!("{} (concat '(1 2 3) '(4 5 6))", *CONCAT), (1, (2, (3, (4, (5, (6, Form::Nil))))))); } static BVAU: Lazy = Lazy::new(|| { @@ -339,20 +328,20 @@ static BVAU: Lazy = Lazy::new(|| { }); #[test] fn bvau_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} ((bvau _ (a b c) (+ a (- b c))) 10 2 3)", *BVAU), 9); - eval_test(true, &g, &e, &format!("{} ((bvau (a b c) (+ a (- b c))) 10 2 3)", *BVAU), 9); + eval_test(&g, &e, &format!("{} ((bvau _ (a b c) (+ a (- b c))) 10 2 3)", *BVAU), 9); + eval_test(&g, &e, &format!("{} ((bvau (a b c) (+ a (- b c))) 10 2 3)", *BVAU), 9); - eval_test(true, &g, &e, &format!("{} ((bvau (a b . c) c) 10 2 3)", *BVAU), (3, Form::Nil)); - eval_test(true, &g, &e, &format!("{} ((bvau (a b . c) c) 10 2)", *BVAU), Form::Nil); - eval_test(true, &g, &e, &format!("{} ((bvau (a b . c) c) 10 2 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((bvau c c) 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((bvau c c))", *BVAU), Form::Nil); - eval_test(true, &g, &e, &format!("{} ((bvau ((a b) . c) c) (10 2) 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((bvau ((a b) . c) a) (10 2) 3 4 5)", *BVAU), 10); - eval_test(true, &g, &e, &format!("{} ((bvau ((a b) . c) b) (10 2) 3 4 5)", *BVAU), 2); + eval_test(&g, &e, &format!("{} ((bvau (a b . c) c) 10 2 3)", *BVAU), (3, Form::Nil)); + eval_test(&g, &e, &format!("{} ((bvau (a b . c) c) 10 2)", *BVAU), Form::Nil); + eval_test(&g, &e, &format!("{} ((bvau (a b . c) c) 10 2 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((bvau c c) 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((bvau c c))", *BVAU), Form::Nil); + eval_test(&g, &e, &format!("{} ((bvau ((a b) . c) c) (10 2) 3 4 5)", *BVAU), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((bvau ((a b) . c) a) (10 2) 3 4 5)", *BVAU), 10); + eval_test(&g, &e, &format!("{} ((bvau ((a b) . c) b) (10 2) 3 4 5)", *BVAU), 2); - eval_test(true, &g, &e, &format!("{} ((wrap (bvau _ (a b c) (+ a (- b c)))) (+ 10 1) (+ 2 2) (+ 5 3))", *BVAU), 7); - eval_test(true, &g, &e, &format!("{} ((wrap (bvau (a b c) (+ a (- b c)))) (+ 10 1) (+ 2 2) (+ 5 3))", *BVAU), 7); + eval_test(&g, &e, &format!("{} ((wrap (bvau _ (a b c) (+ a (- b c)))) (+ 10 1) (+ 2 2) (+ 5 3))", *BVAU), 7); + eval_test(&g, &e, &format!("{} ((wrap (bvau (a b c) (+ a (- b c)))) (+ 10 1) (+ 2 2) (+ 5 3))", *BVAU), 7); } static LAMBDA: Lazy = Lazy::new(|| { @@ -364,19 +353,19 @@ static LAMBDA: Lazy = Lazy::new(|| { }); #[test] fn lambda_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} ((lambda (a b c) (+ a (- b c))) (+ 10 1) (+ 2 2) (+ 5 3))", *LAMBDA), 7); - eval_test(true, &g, &e, &format!("{} ((lambda (a b . c) c) 10 2 3)", *LAMBDA), (3, Form::Nil)); - eval_test(true, &g, &e, &format!("{} ((lambda (a b . c) c) 10 2)", *LAMBDA), Form::Nil); - eval_test(true, &g, &e, &format!("{} ((lambda (a b . c) c) 10 2 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((lambda c c) 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((lambda c c))", *LAMBDA), Form::Nil); - eval_test(true, &g, &e, &format!("{} ((lambda ((a b) . c) c) '(10 2) 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); - eval_test(true, &g, &e, &format!("{} ((lambda ((a b) . c) a) '(10 2) 3 4 5)", *LAMBDA), 10); - eval_test(true, &g, &e, &format!("{} ((lambda ((a b) . c) b) '(10 2) 3 4 5)", *LAMBDA), 2); - eval_test(true, &g, &e, &format!("{} ((lambda ((a b . c) d) b) '(10 2 3 4) 3)", *LAMBDA), 2); - eval_test(true, &g, &e, &format!("{} ((lambda ((a b . c) d) c) '(10 2 3 4) 3)", *LAMBDA), (3, (4, Form::Nil))); + eval_test(&g, &e, &format!("{} ((lambda (a b c) (+ a (- b c))) (+ 10 1) (+ 2 2) (+ 5 3))", *LAMBDA), 7); + eval_test(&g, &e, &format!("{} ((lambda (a b . c) c) 10 2 3)", *LAMBDA), (3, Form::Nil)); + eval_test(&g, &e, &format!("{} ((lambda (a b . c) c) 10 2)", *LAMBDA), Form::Nil); + eval_test(&g, &e, &format!("{} ((lambda (a b . c) c) 10 2 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((lambda c c) 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((lambda c c))", *LAMBDA), Form::Nil); + eval_test(&g, &e, &format!("{} ((lambda ((a b) . c) c) '(10 2) 3 4 5)", *LAMBDA), (3, (4, (5, Form::Nil)))); + eval_test(&g, &e, &format!("{} ((lambda ((a b) . c) a) '(10 2) 3 4 5)", *LAMBDA), 10); + eval_test(&g, &e, &format!("{} ((lambda ((a b) . c) b) '(10 2) 3 4 5)", *LAMBDA), 2); + eval_test(&g, &e, &format!("{} ((lambda ((a b . c) d) b) '(10 2 3 4) 3)", *LAMBDA), 2); + eval_test(&g, &e, &format!("{} ((lambda ((a b . c) d) c) '(10 2 3 4) 3)", *LAMBDA), (3, (4, Form::Nil))); // should fail - //eval_test(true, &g, &e, &format!("{} ((lambda (a b c) c) 10 2 3 4)", *LAMBDA), 3); + //eval_test(&g, &e, &format!("{} ((lambda (a b c) c) 10 2 3 4)", *LAMBDA), 3); } static LET2: Lazy = Lazy::new(|| { @@ -391,16 +380,16 @@ static LET2: Lazy = Lazy::new(|| { #[test] fn let2_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (let1 x (+ 10 1) (+ x 1))", *LET2), 12); - eval_test(true, &g, &e, &format!("{} (let1 x '(10 1) x)", *LET2), (10, (1, Form::Nil))); - eval_test(true, &g, &e, &format!("{} (let1 (a b) '(10 1) a)", *LET2), 10); - eval_test(true, &g, &e, &format!("{} (let1 (a b) '(10 1) b)", *LET2), 1); - eval_test(true, &g, &e, &format!("{} (let1 (a b . c) '(10 1) c)", *LET2), Form::Nil); - eval_test(true, &g, &e, &format!("{} (let1 (a b . c) '(10 1 2 3) c)", *LET2), (2, (3, Form::Nil))); - eval_test(true, &g, &e, &format!("{} (let1 ((a . b) . c) '((10 1) 2 3) a)", *LET2), 10); - eval_test(true, &g, &e, &format!("{} (let1 ((a . b) . c) '((10 1) 2 3) b)", *LET2), (1, Form::Nil)); + eval_test( &g, &e, &format!("{} (let1 x (+ 10 1) (+ x 1))", *LET2), 12); + eval_test( &g, &e, &format!("{} (let1 x '(10 1) x)", *LET2), (10, (1, Form::Nil))); + eval_test( &g, &e, &format!("{} (let1 (a b) '(10 1) a)", *LET2), 10); + eval_test( &g, &e, &format!("{} (let1 (a b) '(10 1) b)", *LET2), 1); + eval_test( &g, &e, &format!("{} (let1 (a b . c) '(10 1) c)", *LET2), Form::Nil); + eval_test( &g, &e, &format!("{} (let1 (a b . c) '(10 1 2 3) c)", *LET2), (2, (3, Form::Nil))); + eval_test( &g, &e, &format!("{} (let1 ((a . b) . c) '((10 1) 2 3) a)", *LET2), 10); + eval_test( &g, &e, &format!("{} (let1 ((a . b) . c) '((10 1) 2 3) b)", *LET2), (1, Form::Nil)); // should fail - //eval_test(true, &g, &e, &format!("{} (let1 (a b c) '(10 2 3 4) a)", *LET2), 10); + //eval_test(&g, &e, &format!("{} (let1 (a b c) '(10 2 3 4) a)", *LET2), 10); } static LIST: Lazy = Lazy::new(|| { @@ -412,7 +401,7 @@ static LIST: Lazy = Lazy::new(|| { #[test] fn list_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (list 1 2 (+ 3 4))", *LIST), (1, (2, (7, Form::Nil)))); + eval_test(&g, &e, &format!("{} (list 1 2 (+ 3 4))", *LIST), (1, (2, (7, Form::Nil)))); } static Y: Lazy = Lazy::new(|| { @@ -428,7 +417,7 @@ static Y: Lazy = Lazy::new(|| { #[test] fn y_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} ((Y (lambda (recurse) (lambda (n) (if (= 0 n) 1 (* n (recurse (- n 1))))))) 5)", *Y), 120); + eval_test(&g, &e, &format!("{} ((Y (lambda (recurse) (lambda (n) (if (= 0 n) 1 (* n (recurse (- n 1))))))) 5)", *Y), 120); } @@ -443,7 +432,7 @@ static RLAMBDA: Lazy = Lazy::new(|| { #[test] fn rlambda_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} ((rlambda recurse (n) (if (= 0 n) 1 (* n (recurse (- n 1))))) 5)", *RLAMBDA), 120); + eval_test(&g, &e, &format!("{} ((rlambda recurse (n) (if (= 0 n) 1 (* n (recurse (- n 1))))) 5)", *RLAMBDA), 120); } static AND_OR: Lazy = Lazy::new(|| { // need to extend for varidac @@ -462,15 +451,15 @@ static AND_OR: Lazy = Lazy::new(|| { #[test] fn and_or_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (and true true)", *AND_OR), true); - eval_test(true, &g, &e, &format!("{} (and false true)", *AND_OR), false); - eval_test(true, &g, &e, &format!("{} (and true false)", *AND_OR), false); - eval_test(true, &g, &e, &format!("{} (and false false)", *AND_OR), false); + eval_test(&g, &e, &format!("{} (and true true)", *AND_OR), true); + eval_test(&g, &e, &format!("{} (and false true)", *AND_OR), false); + eval_test(&g, &e, &format!("{} (and true false)", *AND_OR), false); + eval_test(&g, &e, &format!("{} (and false false)", *AND_OR), false); - eval_test(true, &g, &e, &format!("{} (or true true)", *AND_OR), true); - eval_test(true, &g, &e, &format!("{} (or false true)", *AND_OR), true); - eval_test(true, &g, &e, &format!("{} (or true false)", *AND_OR), true); - eval_test(true, &g, &e, &format!("{} (or false false)", *AND_OR), false); + eval_test(&g, &e, &format!("{} (or true true)", *AND_OR), true); + eval_test(&g, &e, &format!("{} (or false true)", *AND_OR), true); + eval_test(&g, &e, &format!("{} (or true false)", *AND_OR), true); + eval_test(&g, &e, &format!("{} (or false false)", *AND_OR), false); } static LEN: Lazy = Lazy::new(|| { format!(" @@ -487,10 +476,10 @@ static LEN: Lazy = Lazy::new(|| { #[test] fn len_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (len '())", *LEN), 0); - eval_test(true, &g, &e, &format!("{} (len '(1))", *LEN), 1); - eval_test(true, &g, &e, &format!("{} (len '(1 2))", *LEN), 2); - eval_test(true, &g, &e, &format!("{} (len '(1 2 3))", *LEN), 3); + eval_test(&g, &e, &format!("{} (len '())", *LEN), 0); + eval_test(&g, &e, &format!("{} (len '(1))", *LEN), 1); + eval_test(&g, &e, &format!("{} (len '(1 2))", *LEN), 2); + eval_test(&g, &e, &format!("{} (len '(1 2 3))", *LEN), 3); } static MATCH: Lazy = Lazy::new(|| { format!(" @@ -527,11 +516,11 @@ static MATCH: Lazy = Lazy::new(|| { }); #[test] fn match_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(true, &g, &e, &format!("{} (match (+ 1 2) 1 2 2 3 3 4 _ 0)", *MATCH), 4); - eval_test(true, &g, &e, &format!("{} (match '(1 2) 1 2 2 3 3 4 _ 0)", *MATCH), 0); - eval_test(true, &g, &e, &format!("{} (match '(1 2) 1 2 2 3 (a b) (+ a (+ 2 b)) _ 0)", *MATCH), 5); - eval_test(true, &g, &e, &format!("{} (match '(1 2) 1 2 2 3 '(1 2) 7 _ 0)", *MATCH), 7); - eval_test(true, &g, &e, &format!("{} (let1 a 70 (match (+ 60 10) (unquote a) 100 2 3 _ 0))", *MATCH), 100); + eval_test(&g, &e, &format!("{} (match (+ 1 2) 1 2 2 3 3 4 _ 0)", *MATCH), 4); + eval_test(&g, &e, &format!("{} (match '(1 2) 1 2 2 3 3 4 _ 0)", *MATCH), 0); + eval_test(&g, &e, &format!("{} (match '(1 2) 1 2 2 3 (a b) (+ a (+ 2 b)) _ 0)", *MATCH), 5); + eval_test(&g, &e, &format!("{} (match '(1 2) 1 2 2 3 '(1 2) 7 _ 0)", *MATCH), 7); + eval_test(&g, &e, &format!("{} (let1 a 70 (match (+ 60 10) (unquote a) 100 2 3 _ 0))", *MATCH), 100); } static RBTREE: Lazy = Lazy::new(|| { format!(" @@ -578,6 +567,6 @@ static RBTREE: Lazy = Lazy::new(|| { }); #[test] fn rbtree_eval_test() { let g = grammar::TermParser::new(); let e = root_env(); - eval_test(false, &g, &e, &format!("{} (reduce-test-tree (make-test-tree 10 map-empty))", *RBTREE), 1); - //eval_test(false, &g, &e, &format!("{} (reduce-test-tree (make-test-tree 20 map-empty))", *RBTREE), 2); + eval_test(&g, &e, &format!("{} (reduce-test-tree (make-test-tree 10 map-empty))", *RBTREE), 1); + //eval_test(&g, &e, &format!("{} (reduce-test-tree (make-test-tree 20 map-empty))", *RBTREE), 2); } diff --git a/kv/src/eval.rs b/kv/src/eval.rs deleted file mode 100644 index 863df23..0000000 --- a/kv/src/eval.rs +++ /dev/null @@ -1,136 +0,0 @@ -use std::fmt; -use std::boxed::Box; -use std::rc::Rc; -use std::cell::RefCell; -use std::convert::From; - -pub trait FormT: std::fmt::Debug { - fn sym(&self) -> Option<&str>; - fn pair(&self) -> Option<(Rc,Rc)>; - fn car(&self) -> Option>; - fn cdr(&self) -> Option>; - fn is_nil(&self) -> bool; - fn call(&self, p: Rc, e: Rc, nc: Box>, metac: Cont) -> Cursor; - fn impl_prim(ins: PrimCombI, e: Rc, ps: Vec>, c: Cont, metac: Cont) -> Cursor; -} - -#[derive(Debug, Eq, PartialEq)] -pub enum Cont { - Exit, - MetaRet, - CatchRet { nc: Box>, restore_meta: Box> }, - Eval { e: Rc, nc: Box> }, - Call { p: Rc, e: Rc, nc: Box> }, - PramEval { eval_limit: i32, to_eval: Rc, collected: Option>>, e: Rc, ins: PrimCombI, nc: Box> }, -} -impl Clone for Cont { - fn clone(&self) -> Self { - match self { - Cont::Exit => Cont::Exit, - Cont::MetaRet => Cont::MetaRet, - Cont::CatchRet { nc, restore_meta } => Cont::CatchRet { nc: nc.clone(), restore_meta: restore_meta.clone() }, - Cont::Eval { e, nc } => Cont::Eval { e: Rc::clone(e), nc: nc.clone() }, - Cont::Call { p, e, nc } => Cont::Call { p: Rc::clone(p), e: Rc::clone(e), nc: nc.clone() }, - Cont::PramEval { eval_limit, to_eval, collected, e, ins, nc} => Cont::PramEval { eval_limit: *eval_limit, to_eval: Rc::clone(to_eval), - collected: collected.as_ref().map(|x| x.iter().map(|x| Rc::clone(x)).collect()), - e: Rc::clone(e), ins: ins.clone(), nc: nc.clone() }, - } - } -} -pub struct Cursor { pub f: Rc, pub c: Cont, pub metac: Cont } - -pub fn eval(e: Rc, f: Rc) -> Rc { - let mut cursor = Cursor:: { f, c: Cont::Eval { e, nc: Box::new(Cont::MetaRet) }, metac: Cont::Exit }; - loop { - let Cursor { f, c, metac } = cursor; - match c { - Cont::Exit => { - return f; - }, - Cont::MetaRet => { - cursor = Cursor { f: f, c: metac.clone(), metac: metac }; - }, - Cont::CatchRet { nc, restore_meta } => { - cursor = Cursor { f: f, c: *nc, metac: *restore_meta }; - }, - Cont::Eval { e, nc } => { - if let Some((comb, p)) = f.pair() { - cursor = Cursor { f: comb, c: Cont::Eval { e: Rc::clone(&e), nc: Box::new(Cont::Call { p, e, nc }) }, metac } - } else if let Some(s) = f.sym() { - let mut t = Rc::clone(&e); - while s != t.car().unwrap().car().unwrap().sym().unwrap() { - t = t.cdr().unwrap(); - } - cursor = Cursor { f: t.car().unwrap().cdr().unwrap(), c: *nc, metac }; - } else { - cursor = Cursor { f: Rc::clone(&f), c: *nc, metac }; - } - }, - Cont::PramEval { eval_limit, to_eval, collected, e, ins, nc } => { - let mut next_collected = if let Some(mut collected) = collected { - collected.push(f); collected - } else { vec![] }; - if eval_limit == 0 || to_eval.is_nil() { - let mut traverse = to_eval; - while !traverse.is_nil() { - next_collected.push(traverse.car().unwrap()); - traverse = traverse.cdr().unwrap(); - } - cursor = F::impl_prim(ins, e, next_collected, *nc, metac); - } else { - cursor = Cursor { f: to_eval.car().unwrap(), c: Cont::Eval { e: Rc::clone(&e), nc: Box::new(Cont::PramEval { eval_limit: eval_limit - 1, - to_eval: to_eval.cdr().unwrap(), - collected: Some(next_collected), - e, ins, nc }) }, metac }; - } - }, - Cont::Call { p, e, nc } => { - cursor = f.call(p, e, nc, metac); - }, - } - } -} - -#[derive(Debug, Eq, PartialEq, Clone, Copy)] -pub enum PrimCombI { - Eval, - Vau, - If, - - Reset, - Shift, - - Cell, - Set, - Get, - - Cons, - Car, - Cdr, - Quote, - Assert, - - Eq, - Lt, - LEq, - Gt, - GEq, - - Plus, - Minus, - Mult, - Div, - Mod, - And, - Or, - Xor, - - CombP, - CellP, - PairP, - SymbolP, - IntP, - BoolP, - NilP, -} - diff --git a/kv/src/opt.rs b/kv/src/opt.rs deleted file mode 100644 index 35d4db1..0000000 --- a/kv/src/opt.rs +++ /dev/null @@ -1,294 +0,0 @@ -use std::fmt; -use std::boxed::Box; -use std::rc::Rc; -use std::cell::RefCell; -use std::convert::From; - -use crate::eval::{FormT,Cont,Cursor,PrimCombI}; -use crate::basic::Form; - -#[derive(Debug, Eq, PartialEq)] -struct Trace {} - -#[derive(Debug, Eq, PartialEq)] -pub struct OptForm { - inner: OptFormInner, - trace: Option> -} - -#[derive(Debug, Eq, PartialEq)] -pub enum OptFormInner { - Nil, - Int(i32), - Bool(bool), - Symbol(String), - Cell(RefCell>), - Pair(Rc,Rc), - PrimComb { eval_limit: i32, ins: PrimCombI }, - DeriComb { se: Rc, de: Option, params: String, body: Rc, code: Option>>> }, - ContComb(Cont), -} -#[derive(Debug, Eq, PartialEq)] -pub enum ByteCode { - Ins(PrimCombI) -} - -impl fmt::Display for OptForm { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match &self.inner { - OptFormInner::Nil => write!(f, "nil"), - OptFormInner::Int(i) => write!(f, "{i}"), - OptFormInner::Bool(b) => write!(f, "{b}"), - OptFormInner::Symbol(s) => write!(f, "{s}"), - OptFormInner::Cell(c) => write!(f, "@{}", c.borrow()), - OptFormInner::Pair(car, cdr) => { - write!(f, "({}", car)?; - let mut traverse: Rc = Rc::clone(cdr); - loop { - match &traverse.inner { - OptFormInner::Pair(ref carp, ref cdrp) => { - write!(f, " {}", carp)?; - traverse = Rc::clone(cdrp); - }, - OptFormInner::Nil => { - write!(f, ")")?; - return Ok(()); - }, - x => { - write!(f, ". {})", traverse)?; - return Ok(()); - }, - } - } - }, - OptFormInner::PrimComb { eval_limit, ins } => write!(f, "<{eval_limit}> - {ins:?}"), - OptFormInner::DeriComb { se: _, de, params, body, code: _ } => { - write!(f, "<{} {} {}>", de.as_ref().unwrap_or(&"".to_string()), params, body) - }, - OptFormInner::ContComb(_) => write!(f, ""), - } - } -} - -impl From<&Form> for Rc { - fn from(x: &Form) -> Self { - match x { - Form::Nil => OptForm::new(OptFormInner::Nil, None), - Form::Int(i) => OptForm::new(OptFormInner::Int(*i), None), - Form::Bool(b) => OptForm::new(OptFormInner::Bool(*b), None), - Form::Symbol(s) => OptForm::new(OptFormInner::Symbol(s.to_owned()), None), - Form::Cell(cell) => panic!("bad"), - Form::Pair(car,cdr) => OptForm::new(OptFormInner::Pair((&**car).into(), (&**cdr).into()), None), - Form::PrimComb { eval_limit, ins } => OptForm::new(OptFormInner::PrimComb { eval_limit: *eval_limit, ins: *ins }, None), - Form::DeriComb { .. } => panic!("bad"), - Form::ContComb(c) => panic!("bad"), - } - } -} - -impl OptForm { - fn tc(&self) -> Option> { - self.trace.as_ref().map(Rc::clone) - } - fn tor(&self, o: &Rc) -> Option> { - match &self.trace { - Some(t) => Some(Rc::clone(t)), - None => o.trace.as_ref().map(Rc::clone) - } - } - fn new(inner: OptFormInner, trace: Option>) -> Rc { Rc::new(OptForm { inner, trace }) } - fn truthy(&self) -> bool { - match &self.inner { - OptFormInner::Bool(b) => *b, - OptFormInner::Nil => false, - _ => true, - } - } - fn int(&self) -> Option { - match &self.inner { - OptFormInner::Int(i) => Some(*i), - _ => None, - } - } - fn append(&self, x: Rc) -> Option> { - let trace = self.tor(&x); - match &self.inner { - OptFormInner::Pair(car, cdr) => cdr.append(x).map(|x| OptForm::new(OptFormInner::Pair(Rc::clone(car), x), trace)), - OptFormInner::Nil => Some(OptForm::new(OptFormInner::Pair(x, OptForm::new(OptFormInner::Nil, trace.as_ref().map(Rc::clone))), trace)), - _ => None, - } - } - pub fn congruent(&self, other: &Form) -> bool { - match other { - Form::Nil => self.inner == OptFormInner::Nil, - Form::Int(i) => self.inner == OptFormInner::Int(*i), - Form::Bool(b) => self.inner == OptFormInner::Bool(*b), - Form::Symbol(s) => self.inner == OptFormInner::Symbol(s.to_owned()), - Form::Cell(cell) => panic!("bad"), - Form::Pair(car,cdr) => match &self.inner { OptFormInner::Pair(carp, cdrp) => carp.congruent(car) && cdrp.congruent(cdr), _ => false }, - Form::PrimComb { eval_limit, ins } => self.inner == OptFormInner::PrimComb { eval_limit: *eval_limit, ins: *ins }, - Form::DeriComb { .. } => panic!("bad"), - Form::ContComb(c) => panic!("bad"), - } - } -} - -impl FormT for OptForm { - fn sym(&self) -> Option<&str> { - match &self.inner { - OptFormInner::Symbol(s) => Some(s), - _ => None, - } - } - fn pair(&self) -> Option<(Rc,Rc)> { - match &self.inner { - OptFormInner::Pair(car, cdr) => Some((Rc::clone(car),Rc::clone(cdr))), - _ => None, - } - } - fn car(&self) -> Option> { - match &self.inner { - OptFormInner::Pair(car, _cdr) => Some(Rc::clone(car)), - _ => None, - } - } - fn cdr(&self) -> Option> { - match &self.inner { - OptFormInner::Pair(_car, cdr) => Some(Rc::clone(cdr)), - _ => None, - } - } - fn is_nil(&self) -> bool { - match &self.inner { - OptFormInner::Nil => true, - _ => false, - } - } - fn call(&self, p: Rc, e: Rc, nc: Box>, metac: Cont) -> Cursor { - match &self.inner { - OptFormInner::PrimComb{eval_limit, ins} => { - Cursor { f: OptForm::new(OptFormInner::Nil, None), c: Cont::PramEval { eval_limit: *eval_limit, to_eval: p, collected: None, e, ins: *ins, nc: nc }, metac } - } - OptFormInner::DeriComb {se, de, params, body, code} => { - // TODO: Add traces here? - let mut new_e = Rc::clone(se); - if let Some(de) = de { - new_e = assoc(&de, Rc::clone(&e), new_e); - } - new_e = assoc(¶ms, p, new_e); - Cursor { f: Rc::clone(body), c: Cont::Eval { e: new_e, nc: nc }, metac } - } - OptFormInner::ContComb(c) => { - // TODO: Add traces here? - Cursor { f: p.car().unwrap(), c: Cont::Eval { e, nc: Box::new(c.clone()) }, metac: Cont::CatchRet { nc: nc, restore_meta: Box::new(metac) } } - } - _ => { - panic!("Tried to call not a Prim/DeriComb/ContComb {:?}, nc was {:?}", self, nc); - } - } - } - fn impl_prim(ins: PrimCombI, e: Rc, ps: Vec>, c: Cont, metac: Cont) -> Cursor { - match ins { - PrimCombI::Eval => Cursor { f: Rc::clone(&ps[0]), c: Cont::Eval { e: Rc::clone(&ps[1]), nc: Box::new(c) }, metac }, - PrimCombI::Vau => { - // Add traces here? If no on-going? - let de = ps[0].sym().map(|s| s.to_owned()); - let params = ps[1].sym().unwrap().to_owned(); - let body = Rc::clone(&ps[2]); - Cursor { f: OptForm::new(OptFormInner::DeriComb { se: e, de, params, body, code: Some(Rc::new(RefCell::new(vec![]))) }, None), c, metac } - }, - PrimCombI::If => if ps[0].truthy() { - Cursor { f: Rc::clone(&ps[1]), c: Cont::Eval { e: e, nc: Box::new(c) }, metac } - } else { - Cursor { f: Rc::clone(&ps[2]), c: Cont::Eval { e: e, nc: Box::new(c) }, metac } - }, - - PrimCombI::Reset => Cursor { f: Rc::clone(&ps[0]), - c: Cont::Eval { e: e, nc: Box::new(Cont::MetaRet) }, - metac: Cont::CatchRet { nc: Box::new(c), restore_meta: Box::new(metac) } }, - PrimCombI::Shift => Cursor { f: Rc::clone(&ps[0]), - // Trace here - c: Cont::Call { p: OptForm::new(OptFormInner::Pair(OptForm::new(OptFormInner::ContComb(c), None), - OptForm::new(OptFormInner::Nil, None)), None), - e: e, - nc: Box::new(Cont::MetaRet) }, - metac: Cont::CatchRet { nc: Box::new(metac.clone()), restore_meta: Box::new(metac) } }, - PrimCombI::Assert => { - let thing = Rc::clone(&ps[0]); - if !thing.truthy() { - println!("Assert failed: {:?}", thing); - } - assert!(thing.truthy()); - Cursor { f: Rc::clone(&ps[1]), c: Cont::Eval { e: e, nc: Box::new(c) }, metac } - }, - - PrimCombI::Cell => Cursor { f: OptForm::new(OptFormInner::Cell(RefCell::new(Rc::clone(&ps[0]))), ps[0].tc()), c, metac }, - PrimCombI::Set => match &ps[0].inner { - OptFormInner::Cell(cell) => Cursor { f: cell.replace(Rc::clone(&ps[1])), c, metac }, - _ => panic!("set on not cell"), - }, - PrimCombI::Get => match &ps[0].inner { - OptFormInner::Cell(cell) => Cursor { f: Rc::clone(&cell.borrow()), c, metac }, - _ => panic!("get on not cell"), - }, - - PrimCombI::Cons => Cursor { f: OptForm::new(OptFormInner::Pair(Rc::clone(&ps[0]), Rc::clone(&ps[1])), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Car => Cursor { f: ps[0].car().unwrap(), c, metac }, - PrimCombI::Cdr => Cursor { f: ps[0].cdr().unwrap(), c, metac }, - PrimCombI::Quote => Cursor { f: Rc::clone(&ps[0]), c, metac }, - - PrimCombI::Eq => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0] == ps[1]), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Lt => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0].int().unwrap() < ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::LEq => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0].int().unwrap() <= ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Gt => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0].int().unwrap() > ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::GEq => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0].int().unwrap() >= ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - - PrimCombI::Plus => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() + ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Minus => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() - ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Mult => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() * ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Div => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() / ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Mod => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() % ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::And => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() & ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Or => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() | ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - PrimCombI::Xor => Cursor { f: OptForm::new(OptFormInner::Int(ps[0].int().unwrap() ^ ps[1].int().unwrap()), ps[0].tor(&ps[1])), c, metac }, - - PrimCombI::CombP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::PrimComb { .. } => true, - OptFormInner::DeriComb { .. } => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::CellP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::Cell(_c) => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::PairP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::Pair(_a,_b) => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::SymbolP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::Symbol(_) => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::IntP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::Int(_) => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::BoolP => Cursor { f: OptForm::new(OptFormInner::Bool(match &ps[0].inner { - OptFormInner::Bool(_) => true, - _ => false, - }), ps[0].tc()), c, metac }, - PrimCombI::NilP => Cursor { f: OptForm::new(OptFormInner::Bool(ps[0].is_nil()), ps[0].tc()), c, metac }, - } - } -} - -fn assoc(k: &str, v: Rc, l: Rc) -> Rc { - let at = v.tc(); - let bt = v.tc(); - let tort = v.tor(&l); - OptForm::new(OptFormInner::Pair( - OptForm::new(OptFormInner::Pair( - OptForm::new(OptFormInner::Symbol(k.to_owned()), at), - v), bt), - l), tort) -} diff --git a/sl/Cargo.lock b/slj/Cargo.lock similarity index 100% rename from sl/Cargo.lock rename to slj/Cargo.lock diff --git a/sl/Cargo.toml b/slj/Cargo.toml similarity index 100% rename from sl/Cargo.toml rename to slj/Cargo.toml diff --git a/sl/build.rs b/slj/build.rs similarity index 100% rename from sl/build.rs rename to slj/build.rs diff --git a/sl/src/grammar.lalrpop b/slj/src/grammar.lalrpop similarity index 100% rename from sl/src/grammar.lalrpop rename to slj/src/grammar.lalrpop diff --git a/sl/src/lib.rs b/slj/src/lib.rs similarity index 97% rename from sl/src/lib.rs rename to slj/src/lib.rs index 0e234ac..272975d 100644 --- a/sl/src/lib.rs +++ b/slj/src/lib.rs @@ -286,12 +286,20 @@ impl Ctx { // Though I guess that means call start should recieve the parameters // also, for like variables, it should guard on what function // if dynamic, interacts with the constant tracking - // 5 options + // 7 options // - not tracing, closure - do stats // - not tracing, prim - do nothing // - tracing, Constant Prim - inline prim // - tracing, Constant Closure - inline call - // - tracing, Dynamic - emit call + // - tracing, Static, tail-self - emit loop + // - tracing, Static,nontail-self- emit call + // - tracing, Dynamic, other - emit call + // + // inline call is slightly tricky, have to add our own Env accounting + // emit call is trickier, because we either have to stop or postpone tracing + // use return stack, and count the post-return as it's own trace? + // weirder, but would eventually jive with continuations better? + // eh for now use trace stack in ctx and cont stack out, have them match? fn trace_call_start(&mut self, arg_len: usize, id: Option) { // Needs to take and use parameters for mid-trace diff --git a/sl/src/main.rs b/slj/src/main.rs similarity index 100% rename from sl/src/main.rs rename to slj/src/main.rs