From 124fd3e267c56d5a87de11dd33546c3cb3fd7481 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Sun, 1 Nov 2020 19:40:07 +0000 Subject: [PATCH] Move current implementation to the 'bootstrap' directory Since we're decided to create a Serene interpreter to bootstrap the self hosted compiler, I moved the current implementation to bootstrap directory and setup a very basic REPL. --- .rusty-hook.toml | 4 +- Makefile | 12 + Cargo.lock => bootstrap/Cargo.lock | 131 +++++++ Cargo.toml => bootstrap/Cargo.toml | 1 + bootstrap/LICENSE | 339 ++++++++++++++++++ README.org => bootstrap/README.org | 0 {src => bootstrap/src}/ast.rs | 25 +- {src => bootstrap/src}/builtins.rs | 0 {src => bootstrap/src}/builtins/def.rs | 4 - bootstrap/src/cli.yml | 41 +++ {src => bootstrap/src}/compiler.rs | 10 - {src/types => bootstrap/src}/core.rs | 29 +- src/values.rs => bootstrap/src/errors.rs | 20 +- bootstrap/src/main.rs | 80 +++++ {src => bootstrap/src}/namespace.rs | 12 +- {src => bootstrap/src}/reader.rs | 0 bootstrap/src/repl.rs | 52 +++ bootstrap/src/runtime.rs | 94 +++++ {src => bootstrap/src}/scope.rs | 7 +- {src => bootstrap/src}/types.rs | 2 - {src => bootstrap/src}/types/collections.rs | 0 .../src}/types/collections/core.rs | 0 .../src}/types/collections/list.rs | 45 ++- {src => bootstrap/src}/types/number.rs | 12 +- {src => bootstrap/src}/types/symbol.rs | 11 +- src/cli.yml | 17 - src/main.rs | 58 --- 27 files changed, 868 insertions(+), 138 deletions(-) create mode 100644 Makefile rename Cargo.lock => bootstrap/Cargo.lock (72%) rename Cargo.toml => bootstrap/Cargo.toml (91%) create mode 100755 bootstrap/LICENSE rename README.org => bootstrap/README.org (100%) rename {src => bootstrap/src}/ast.rs (75%) rename {src => bootstrap/src}/builtins.rs (100%) rename {src => bootstrap/src}/builtins/def.rs (85%) create mode 100644 bootstrap/src/cli.yml rename {src => bootstrap/src}/compiler.rs (77%) rename {src/types => bootstrap/src}/core.rs (50%) rename src/values.rs => bootstrap/src/errors.rs (75%) create mode 100644 bootstrap/src/main.rs rename {src => bootstrap/src}/namespace.rs (77%) rename {src => bootstrap/src}/reader.rs (100%) create mode 100644 bootstrap/src/repl.rs create mode 100644 bootstrap/src/runtime.rs rename {src => bootstrap/src}/scope.rs (94%) rename {src => bootstrap/src}/types.rs (94%) rename {src => bootstrap/src}/types/collections.rs (100%) rename {src => bootstrap/src}/types/collections/core.rs (100%) rename {src => bootstrap/src}/types/collections/list.rs (55%) rename {src => bootstrap/src}/types/number.rs (88%) rename {src => bootstrap/src}/types/symbol.rs (83%) delete mode 100644 src/cli.yml delete mode 100644 src/main.rs diff --git a/.rusty-hook.toml b/.rusty-hook.toml index 5b10338..73aed70 100644 --- a/.rusty-hook.toml +++ b/.rusty-hook.toml @@ -1,6 +1,6 @@ [hooks] -pre-commit = "cargo fmt -- --check" -pre-push = "cargo test" +pre-commit = "make lint" +pre-push = "make test" [logging] verbose = true diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0e91481 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +THIS_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +.PHONY: lint +lint: + cd $(THIS_DIR)/bootstrap && cargo fmt -- --check + +.PHONY: test-bootstrap +test-bootstrap: + cd $(THIS_DIR)/bootstrap && cargo test + +.PHONY: test +test: test-bootstrap diff --git a/Cargo.lock b/bootstrap/Cargo.lock similarity index 72% rename from Cargo.lock rename to bootstrap/Cargo.lock index 195e923..98e4463 100644 --- a/Cargo.lock +++ b/bootstrap/Cargo.lock @@ -23,6 +23,24 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "cc" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "ci_info" version = "0.10.2" @@ -65,6 +83,27 @@ dependencies = [ "syn", ] +[[package]] +name = "dirs-next" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "envmnt" version = "0.8.4" @@ -90,6 +129,17 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "getrandom" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "wasi", +] + [[package]] name = "hashbrown" version = "0.9.1" @@ -142,12 +192,39 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +[[package]] +name = "log" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +dependencies = [ + "cfg-if 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + [[package]] name = "nias" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" +[[package]] +name = "nix" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", +] + [[package]] name = "os_str_bytes" version = "2.3.2" @@ -196,6 +273,22 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom", + "redox_syscall", +] + [[package]] name = "rusty-hook" version = "0.11.2" @@ -208,6 +301,31 @@ dependencies = [ "toml", ] +[[package]] +name = "rustyline" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0d5e7b0219a3eadd5439498525d4765c59b7c993ef0c12244865cd2d988413" +dependencies = [ + "cfg-if 0.1.10", + "dirs-next", + "libc", + "log", + "memchr", + "nix", + "scopeguard", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + [[package]] name = "serde" version = "1.0.117" @@ -220,6 +338,7 @@ version = "0.1.0" dependencies = [ "clap", "rusty-hook", + "rustyline", ] [[package]] @@ -284,6 +403,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +[[package]] +name = "utf8parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" + [[package]] name = "vec_map" version = "0.8.2" @@ -296,6 +421,12 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/bootstrap/Cargo.toml similarity index 91% rename from Cargo.toml rename to bootstrap/Cargo.toml index 912d278..f2148ac 100644 --- a/Cargo.toml +++ b/bootstrap/Cargo.toml @@ -13,6 +13,7 @@ license-file = "LICENSE" [dependencies] # CLI library clap = { version = "3.0.0-beta.1", features = ["yaml"] } +rustyline = "6.3.0" [dev-dependencies] rusty-hook = "^0.11.2" \ No newline at end of file diff --git a/bootstrap/LICENSE b/bootstrap/LICENSE new file mode 100755 index 0000000..d159169 --- /dev/null +++ b/bootstrap/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + 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 +this service 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. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey 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 General Public License as published by + the Free Software Foundation; either version 2 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README.org b/bootstrap/README.org similarity index 100% rename from README.org rename to bootstrap/README.org diff --git a/src/ast.rs b/bootstrap/src/ast.rs similarity index 75% rename from src/ast.rs rename to bootstrap/src/ast.rs index 289cfb8..e44c455 100644 --- a/src/ast.rs +++ b/bootstrap/src/ast.rs @@ -13,9 +13,18 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ + */ +use crate::errors::Error; +use crate::runtime::RT; +use crate::scope::Scope; use crate::types::collections; -use crate::types::{Expression, Number, Symbol}; +use crate::types::{Number, Symbol}; + +pub type PossibleExpr = Result; + +pub trait Expression { + fn eval(&self, rt: &RT, scope: &Scope) -> PossibleExpr; +} #[derive(Debug, Eq, PartialEq, Clone)] pub enum Expr { @@ -55,6 +64,12 @@ impl Expr { } } -impl Expression for Expr { - fn eval() {} -} +// impl Expression for Expr { +// fn eval(&self, rt: &RT, scope: &Scope) -> PossibleExpr { +// match self { +// Expr::Sym(s) => { +// s.eval +// } +// } +// } +// } diff --git a/src/builtins.rs b/bootstrap/src/builtins.rs similarity index 100% rename from src/builtins.rs rename to bootstrap/src/builtins.rs diff --git a/src/builtins/def.rs b/bootstrap/src/builtins/def.rs similarity index 85% rename from src/builtins/def.rs rename to bootstrap/src/builtins/def.rs index c5eec89..017b925 100644 --- a/src/builtins/def.rs +++ b/bootstrap/src/builtins/def.rs @@ -15,10 +15,6 @@ * along with this program. If not, see . */ use crate::ast::Expr; -use crate::compiler::Compiler; -use crate::types::collections::core::Seq; -use crate::types::{Expression, List}; -use crate::values::Value; // pub fn def<'ctx, 'val: 'ctx>(compiler: &'ctx mut Compiler<'val>, args: List) -> ExprResult<'val> { // } diff --git a/bootstrap/src/cli.yml b/bootstrap/src/cli.yml new file mode 100644 index 0000000..b67619f --- /dev/null +++ b/bootstrap/src/cli.yml @@ -0,0 +1,41 @@ +name: "Serene's bootstrap interpreter" +version: "0.1.0" + +about: | + Serene's bootstrap interpreter is used to + bootstrap the Serene's compiler.' + + It comes with ABSOLUTELY NO WARRANTY; + This is free software, and you are welcome + to redistribute it under certain conditions; + for details take a look at the LICENSE file. + +author: "Sameer Rahmani \n" + +settings: + - SubcommandRequiredElseHelp + - ColorAlways + - ColoredHelp + +subcommands: + - repl: + about: "Executes the local Serene's Repl" + args: + - debug-mode: + short: d + help: print debug information + - run: + about: Serene's bootstrap interpreter + args: + - debug-parser: + long: debug-parser + about: Prints out the AST only. + takes_value: false + - INPUT: + about: Sets the input file to use + required: true + index: 1 + - verbose: + short: v + multiple: true + about: Sets the level of verbosity diff --git a/src/compiler.rs b/bootstrap/src/compiler.rs similarity index 77% rename from src/compiler.rs rename to bootstrap/src/compiler.rs index 5b6c9e1..e7944b4 100644 --- a/src/compiler.rs +++ b/bootstrap/src/compiler.rs @@ -19,16 +19,6 @@ use crate::types::Expression; use std::collections::HashMap; pub struct Compiler { - /// This hashmap contains all the namespaces that has to be compiled and - /// maps two different keys to the same namespace. Since namespace names - /// can not contain `/` char, the keys of this map are the namespace - /// name and the path to the file containing the namespace. For example: - /// - /// A let's say we have a namespace `abc.xyz`, this namespace will have - /// two entries in this hashmap. One would be the ns name itself which - /// is `abc.xyz` in this case and the otherone would be - /// `/path/to/abc/xyz.srn` file that contains the ns. - pub namespaces: HashMap, //pub fpm: &'a PassManager>, current_ns_name: Option, } diff --git a/src/types/core.rs b/bootstrap/src/core.rs similarity index 50% rename from src/types/core.rs rename to bootstrap/src/core.rs index 70a0163..64a3d88 100644 --- a/src/types/core.rs +++ b/bootstrap/src/core.rs @@ -13,9 +13,30 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ -use crate::compiler::Compiler; + */ +use crate::ast::{Expr, PossibleExpr}; +use crate::errors::err; +use crate::reader::read_string; +use crate::runtime::RT; +use crate::scope::Scope; -pub trait Expression { - fn eval(); +fn eval_expr(rt: &RT, scope: &Scope, expr: Expr) -> PossibleExpr { + Ok(expr) +} + +pub fn eval(rt: &RT, scope: &Scope, exprs: Vec) -> PossibleExpr { + match exprs.last() { + Some(e) => Ok(e.clone()), + _ => Err(err("NotImplemented".to_string())), + } +} + +pub fn rep(rt: &RT, scope: &Scope, input: &str) { + match read_string(input) { + Ok(exprs) => { + let result_expr = eval(rt, scope, exprs); + println!("<<"); + } + Err(e) => println!("Error: {}", e), + } } diff --git a/src/values.rs b/bootstrap/src/errors.rs similarity index 75% rename from src/values.rs rename to bootstrap/src/errors.rs index 81f412b..5a00447 100644 --- a/src/values.rs +++ b/bootstrap/src/errors.rs @@ -14,9 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -use crate::ast::Expr; -#[derive(Debug, Eq, PartialEq, Clone)] -pub struct Value { - pub expr: Expr, +pub trait IError { + fn message(&self) -> &str; +} + +pub struct Error { + msg: String, +} + +impl IError for Error { + fn message(&self) -> &str { + &self.msg + } +} + +pub fn err(msg: String) -> Error { + Error { msg } } diff --git a/bootstrap/src/main.rs b/bootstrap/src/main.rs new file mode 100644 index 0000000..86763d8 --- /dev/null +++ b/bootstrap/src/main.rs @@ -0,0 +1,80 @@ +/** Serene --- Yet an other Lisp +* +* Copyright (c) 2020 Sameer Rahmani +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License. +* +* 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ +use clap::{load_yaml, App, ArgMatches}; +use std::fs::File; +use std::io; +use std::io::prelude::*; +use std::string::String; + +pub mod ast; +pub mod builtins; +pub mod core; +pub mod errors; +pub mod namespace; +pub mod reader; +pub mod repl; +pub mod runtime; +pub mod scope; +pub mod types; + +fn repl(args: ArgMatches) { + let mut debug = false; + + if args.is_present("debug-mode") { + debug = true; + } + + let mut rt = runtime::RT::new(); + + rt.create_ns("user".to_string(), None); + rt.set_current_ns("user".to_string()); + rt.set_debug_mode(debug); + repl::repl(rt); +} + +fn main() -> io::Result<()> { + let yaml = load_yaml!("cli.yml"); + let app = App::from(yaml); + + // let rt = runtime::RT::new(); + + // rt.create_ns("user".to_string(), None); + // rt.set_current_ns("user".to_string()); + + match app.get_matches().subcommand() { + Some(("repl", args)) => repl(args.clone()), + Some(("run", args)) => println!("repl, {:?}", args), + _ => {} + } + + // if let Some(input) = args.value_of("INPUT") { + // let mut f = File::open(input)?; + + // let mut buf = String::new(); + // f.read_to_string(&mut buf)?; + // match reader::read_string(&buf) { + // Ok(v) => { + // println!("AST: {:#?}", v); + // } + // Err(e) => println!(">> error {:?}", e), + // } + // } else { + // println!("Input file is missing.") + // } + + Ok(()) +} diff --git a/src/namespace.rs b/bootstrap/src/namespace.rs similarity index 77% rename from src/namespace.rs rename to bootstrap/src/namespace.rs index bb171d1..54964e9 100644 --- a/src/namespace.rs +++ b/bootstrap/src/namespace.rs @@ -14,19 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -use crate::compiler::Compiler; use crate::scope::Scope; -use crate::values::Value; pub struct Namespace { /// Root scope of the namespace - scope: Scope, + pub name: String, + pub source_file: Option, + root_scope: Scope, } impl<'ctx> Namespace { - pub fn new(name: String, source_file: Option<&str>) -> Namespace { + pub fn new(name: String, source_file: Option) -> Namespace { Namespace { - scope: Scope::new(None), + name, + source_file, + root_scope: Scope::new(None), } } } diff --git a/src/reader.rs b/bootstrap/src/reader.rs similarity index 100% rename from src/reader.rs rename to bootstrap/src/reader.rs diff --git a/bootstrap/src/repl.rs b/bootstrap/src/repl.rs new file mode 100644 index 0000000..3dc1fe5 --- /dev/null +++ b/bootstrap/src/repl.rs @@ -0,0 +1,52 @@ +/** Serene --- Yet an other Lisp +* +* Copyright (c) 2020 Sameer Rahmani +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License. +* +* 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ +use crate::runtime::RT; +use rustyline::error::ReadlineError; +use rustyline::Editor; + +pub fn repl(rt: RT) { + let mut rl = Editor::<()>::new(); + let history = rt.history_file_path(); + + if rl.load_history(&history).is_err() && rt.is_debug() { + println!("No previous history."); + } + + loop { + let prompt = format!("{}> ", rt.current_ns().name); + let readline = rl.readline(&prompt); + match readline { + Ok(line) => { + rl.add_history_entry(line.as_str()); + println!("Line: {}", line); + } + Err(ReadlineError::Interrupted) => { + println!("CTRL-C"); + break; + } + Err(ReadlineError::Eof) => { + println!("CTRL-D"); + break; + } + Err(err) => { + println!("Error: {:?}", err); + break; + } + } + } + rl.save_history(&history).unwrap(); +} diff --git a/bootstrap/src/runtime.rs b/bootstrap/src/runtime.rs new file mode 100644 index 0000000..b93f29a --- /dev/null +++ b/bootstrap/src/runtime.rs @@ -0,0 +1,94 @@ +/** Serene --- Yet an other Lisp +* +* Copyright (c) 2020 Sameer Rahmani +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License. +* +* 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ +use crate::namespace::Namespace; +use std::collections::HashMap; +use std::env; +use std::path::Path; + +const SERENE_HISTORY_FILE: &'static str = ".serene.hitory"; + +pub struct RT { + /// This hashmap contains all the namespaces that has to be compiled and + /// maps two different keys to the same namespace. Since namespace names + /// can not contain `/` char, the keys of this map are the namespace + /// name and the path to the file containing the namespace. For example: + /// + /// A let's say we have a namespace `abc.xyz`, this namespace will have + /// two entries in this hashmap. One would be the ns name itself which + /// is `abc.xyz` in this case and the otherone would be + /// `/path/to/abc/xyz.srn` file that contains the ns. + pub namespaces: HashMap, + current_ns_name: Option, + debug: bool, +} + +impl RT { + pub fn new() -> RT { + RT { + namespaces: HashMap::new(), + current_ns_name: None, + debug: false, + } + } + + /// Create a new namespace with the given `ns_name` and add it to the current + /// runtime. + pub fn create_ns(&mut self, ns_name: String, source_file: Option) { + self.namespaces + .insert(ns_name.clone(), Namespace::new(ns_name, source_file)); + } + + /// Set the current ns to the given `ns_name`. The `ns_name` has to be + /// part of the runtime already. + pub fn set_current_ns(&mut self, ns_name: String) { + match self.namespaces.get(&ns_name) { + Some(_) => self.current_ns_name = Some(ns_name), + None => panic!("The given namespace '{}' doesn't exit", ns_name), + } + } + + pub fn current_ns(&self) -> &Namespace { + if let None = self.current_ns_name { + // `current_ns_name` has to be not None all the time. + panic!("No namespace has been set to current."); + } + + self.namespaces + .get(&self.current_ns_name.clone().unwrap()) + .unwrap() + } + + #[inline] + pub fn set_debug_mode(&mut self, v: bool) { + self.debug = v; + } + + #[inline] + pub fn is_debug(&self) -> bool { + self.debug + } + + pub fn history_file_path(&self) -> String { + match env::var("HOME") { + Ok(v) => { + let history = Path::new(&v).join(SERENE_HISTORY_FILE).clone(); + history.to_str().unwrap().into() + } + Err(_) => SERENE_HISTORY_FILE.into(), + } + } +} diff --git a/src/scope.rs b/bootstrap/src/scope.rs similarity index 94% rename from src/scope.rs rename to bootstrap/src/scope.rs index 964718c..fe4bf44 100644 --- a/src/scope.rs +++ b/bootstrap/src/scope.rs @@ -14,13 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -use crate::values::Value; - +use crate::ast::Expr; use std::collections::HashMap; /// This struct describes the values in the scope. pub struct ScopeElement { - element_type: Value, + element_type: Expr, public: bool, } @@ -58,7 +57,7 @@ impl Scope { } } - pub fn insert(&mut self, key: &str, val: Value, public: bool) { + pub fn insert(&mut self, key: &str, val: Expr, public: bool) { let v = ScopeElement { public, element_type: val, diff --git a/src/types.rs b/bootstrap/src/types.rs similarity index 94% rename from src/types.rs rename to bootstrap/src/types.rs index 707e287..54114e3 100644 --- a/src/types.rs +++ b/bootstrap/src/types.rs @@ -15,11 +15,9 @@ * along with this program. If not, see . */ pub mod collections; -pub mod core; pub mod number; pub mod symbol; pub use self::collections::{List, Seq}; -pub use self::core::Expression; pub use self::number::Number; pub use self::symbol::Symbol; diff --git a/src/types/collections.rs b/bootstrap/src/types/collections.rs similarity index 100% rename from src/types/collections.rs rename to bootstrap/src/types/collections.rs diff --git a/src/types/collections/core.rs b/bootstrap/src/types/collections/core.rs similarity index 100% rename from src/types/collections/core.rs rename to bootstrap/src/types/collections/core.rs diff --git a/src/types/collections/list.rs b/bootstrap/src/types/collections/list.rs similarity index 55% rename from src/types/collections/list.rs rename to bootstrap/src/types/collections/list.rs index 55b40de..a33c0a8 100644 --- a/src/types/collections/list.rs +++ b/bootstrap/src/types/collections/list.rs @@ -2,23 +2,25 @@ * * Copyright (c) 2020 Sameer Rahmani * -* This program is free software; you can redistribute it and/or modify +* Exprhis program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License. * -* 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 +* Exprhis program is distributed in the hope that it will be useful, +* but WIExprHOUExpr ANY WARRANExprY; without even the implied warranty of +* MERCHANExprABILIExprY or FIExprNESS FOR A PARExprICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -use crate::ast::Expr; -use crate::builtins::def; -use crate::compiler::Compiler; +//use crate::builtins::def; +use crate::ast::{Expr, Expression, PossibleExpr}; +use crate::errors::err; +use crate::runtime::RT; +use crate::scope::Scope; use crate::types::collections::core::Seq; -use crate::types::core::Expression; +use crate::types::Symbol; #[derive(Debug, Eq, PartialEq, Clone)] pub struct List { @@ -40,17 +42,13 @@ impl List { self.elements.push(elem) } - pub fn length(&self) -> usize { + pub fn count(&self) -> usize { self.elements.len() } } -impl Expression for List { - fn eval() {} -} - impl Seq for List { - type Coll = List; + type Coll = Self; fn first(&self) -> Option { match self.elements.first() { @@ -60,10 +58,27 @@ impl Seq for List { } fn rest(&self) -> List { - if self.length() > 0 { + if self.count() > 0 { List::new(&self.elements[1..]) } else { List::new_empty() } } } + +impl Expression for List { + fn eval(&self, rt: &RT, scope: &Scope) -> PossibleExpr { + if self.count() == 0 { + return Ok(Expr::Nil); + } + + let first = self.first().unwrap(); + let rest = self.rest(); + Err(err("NotImplemented".to_string())) + //Ok(Expr::Cons(Box::new(*self))) + // match first { + // Expr::Sym(sum) => {} + // _ => Err(err("NotImplemented".to_string())), + // } + } +} diff --git a/src/types/number.rs b/bootstrap/src/types/number.rs similarity index 88% rename from src/types/number.rs rename to bootstrap/src/types/number.rs index ca6c581..3aab914 100644 --- a/src/types/number.rs +++ b/bootstrap/src/types/number.rs @@ -13,9 +13,11 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ -use crate::compiler::Compiler; -use crate::types::core::Expression; + */ +use crate::ast::{Expr, Expression, PossibleExpr}; +use crate::runtime::RT; +use crate::scope::Scope; + // Note: I kept the number implementation simple for now // but we need to decide on our approach to numbers, are // we going to only support the 64bit variants? or should @@ -45,5 +47,7 @@ impl PartialEq for Number { impl Eq for Number {} impl Expression for Number { - fn eval() {} + fn eval(&self, rt: &RT, scope: &Scope) -> PossibleExpr { + Ok(Expr::Num(self.clone())) + } } diff --git a/src/types/symbol.rs b/bootstrap/src/types/symbol.rs similarity index 83% rename from src/types/symbol.rs rename to bootstrap/src/types/symbol.rs index 5da08cd..be1b710 100644 --- a/src/types/symbol.rs +++ b/bootstrap/src/types/symbol.rs @@ -13,9 +13,10 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ -use crate::compiler::Compiler; -use crate::types::core::Expression; + */ +use crate::ast::{Expr, Expression, PossibleExpr}; +use crate::runtime::RT; +use crate::scope::Scope; #[derive(Debug, Clone)] pub struct Symbol { @@ -31,7 +32,9 @@ impl PartialEq for Symbol { impl Eq for Symbol {} impl Expression for Symbol { - fn eval() {} + fn eval(&self, rt: &RT, scope: &Scope) -> PossibleExpr { + Ok(Expr::Sym(self.clone())) + } } impl Symbol { diff --git a/src/cli.yml b/src/cli.yml deleted file mode 100644 index 35d6970..0000000 --- a/src/cli.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: myapp -version: "0.1.0" -author: Sameer Rahmani -about: Serene's compiler -args: - - debug-parser: - long: debug-parser - about: Prints out the AST only. - takes_value: false - - INPUT: - about: Sets the input file to use - required: true - index: 1 - - verbose: - short: v - multiple: true - about: Sets the level of verbosity diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 6faf67a..0000000 --- a/src/main.rs +++ /dev/null @@ -1,58 +0,0 @@ -/** Serene --- Yet an other Lisp -* -* Copyright (c) 2020 Sameer Rahmani -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 2 of the License. -* -* 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ -use clap::{load_yaml, App}; -use std::fs::File; -use std::io; -use std::io::prelude::*; -use std::string::String; - -pub mod ast; -pub mod builtins; -pub mod compiler; -pub mod namespace; -pub mod reader; -pub mod scope; -pub mod types; -pub mod values; - -fn main() -> io::Result<()> { - let yaml = load_yaml!("cli.yml"); - let args = App::from(yaml).get_matches(); - - // Create a compiler - let mut compiler = compiler::Compiler::new(); - - compiler.create_ns("user".to_string(), None); - compiler.set_current_ns("user".to_string()); - - if let Some(input) = args.value_of("INPUT") { - let mut f = File::open(input)?; - - let mut buf = String::new(); - f.read_to_string(&mut buf)?; - match reader::read_string(&buf) { - Ok(v) => { - println!("AST: {:#?}", v); - } - Err(e) => println!(">> error {:?}", e), - } - } else { - println!("Input file is missing.") - } - - Ok(()) -}