Merge pull request #77 from adam-mcdaniel/modules

Module system📦 New parser📝 Sage Lisp Preprocessor🛸

Author: adam-mcdaniel

.gitignore

@@ -10,4 +10,6 @@ massif.out.*
 /*.txt
 /*.sg
 /benches/temp
-/benches/temp.c
+/benches/temp.c
+.DS_Store
+ffi.h

CHANGELOG.md

@@ -76,4 +76,113 @@ New VM instructions:
 
 ### Fixed
 
-Generated code size is now up to 7x smaller than before. 
+Generated code size is now up to 7x smaller than before. 
+
+## [0.1.0-alpha] - 2024-9-4
+
+Sage has just gotten a major upgrade, with a new module system📦 parser📝 and the Sage Lisp Preprocessor🛸!!!
+
+### Added
+
+- [Sage lisp compile time preprocessor language](https://github.com/adam-mcdaniel/sage-lisp)
+```rs
+// Define some code that modifies the AST of the expression it's called on
+#![(defun square_sage_const(x) {
+    // Get a constant integer
+    (define n x@"ConstExpr"@"Int")
+    // Return the constant integer squared
+    ["ConstExpr" ["Float" n * n]]
+})]
+
+// Call the compile time macro on 5.
+// This will cause the compiler to perceive this code as `println(25)`
+println(#[square_sage_const] 5);
+```
+
+- Module system
+
+```rs
+// Import a module from a file named `from_file.sg`
+mod from_file;
+
+// Define a module `io` with `getchar`
+mod io {
+    fun getchar(): Char {
+        let mut ch = '\0';
+        input(&mut ch);
+        return ch;
+    }
+}
+
+// A module to test importing from other modules
+mod testing {
+    mod internals {
+        // Import getchar from two modules up
+        from io import getchar;
+        
+        // Use it in a function
+        fun get_two(): (Char, Char) { (getchar(), getchar()) }
+    }
+
+    // Get two chars and print them
+    fun get_two_then_print() {
+        // Import from a submodule, which imports from a supermodule
+        from internals import get_two;
+        let (a, b) = get_two();
+        print(a, b);
+    }
+}
+
+from testing import get_two_then_print;
+get_two_then_print();
+
+// Get two values and print them
+for let mut i=0; i<6; i+=1; {
+    // We can also use the full path name
+ 	testing.get_two_then_print();
+}
+```
+
+- Standard library
+
+```rs
+from std.fallible import Option, Result;
+
+enum Error {
+    DivideByZero { numerator: Int },
+    Custom(&Char)
+}
+
+fun divide(n: Int, d: Int): Option<Int> {
+    match d {
+        0 => Option<Int> of Nothing,
+        _ => Option<Int> of Some(n / d)
+    }
+}
+
+
+fun main(): Result<(), Error> {
+    println(divide(5, 2));
+    println(divide(5, 0));
+
+    return Result<(), Error> of Ok(());
+}
+
+println(main());
+```
+
+- Better constant evaluation
+- `from module.submodule import x, y as alias_for_y;` import statements
+- `from module.submodule import *` import statements
+
+### Changed
+
+- The `def` keyword has been changed in favor of `fun`.
+- `for` loops now have an extra semicolon on the last statement. `i += 1 {` becomes `i += 1; {`.
+
+### Fixed
+
+The compiler is significantly faster -- about 20 times faster at compiling the AES example.
+This is mainly due to the much faster parser implemented with Nom instead of Pest.
+There are also several optimizations with constant evaluation I added, along with optimizations
+for how declarations are typechecked.

Cargo.toml

@@ -1,45 +1,91 @@
+###############################################################################
+#                        THE SAGE PROGRAMMING LANGUAGE                        #
+#                                                                             #
+#           █████   ██████    ███████  ██████   `-.        _.-'               #
+#          ███░░   ░░░░░███  ███░░███ ███░░███   \ `,    .'/.'                #
+#         ░░█████   ███████ ░███ ░███░███████     \`.`. :.-'.-= .-'/          #
+#          ░░░░███ ███░░███ ░███ ░███░███░░░       `-.:/o  .'-'/ .'           #
+#          ██████ ░░████████░░███████░░██████         o\o / ._/.'             #
+#         ░░░░░░   ░░░░░░░░  ░░░░░███ ░░░░░░            \| /o|\`.             #
+#                            ███ ░███                    |'o `.`.'.           #
+#                           ░░██████                           `--'           #
+#                            ░░░░░░                                           #
+#                                                                             #
+###############################################################################
 [package]
 name = "sage"
 authors = ["Adam McDaniel <[email protected]> (https://adam-mcdaniel.net)"]
-version = "0.0.4-alpha"
+version = "0.1.0-alpha"
 edition = "2021"
 license = "MIT"
 description = "A portable programming language with a compact backend"
 readme = "README.md"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[lib]
-bench = false
-
+###############################################################################
+##                                BINARIES
+###############################################################################
 [[bin]]
 name = "sage"
 path = "src/cli.rs"
 bench = false
 
+###############################################################################
+##                                DEPENDENCIES
+###############################################################################
 [dependencies]
-regex = { version = "1.8.1", features = ["unicode"] }
-maplit = "1.0.2"
-lazy_static = "1.4.0"
-lalrpop-util = "0.19.8"
-lalrpop = { version = "=0.19.9", features = ["lexer"] }
-clap = { version ="4.2.4", features = ["derive", "cargo"] }
-no-comment = "0.0.3"
-pest = "2.6.0"
-pest_derive = "2.6.0"
-snailquote = "0.3.1"
-codespan-reporting = "0.11.1"
-log = {version = "0.4.20", features = ["release_max_level_info"] }
-env_logger = "0.10.0"
-rayon = "1.9.0"
+#######################################
+## QUALITY OF LIFE / MACROS
+#######################################
+maplit = "1.0"
+lazy_static = "1.5"
+nom = "7.1"
+
+#######################################
+## THREADING / PARALLELISM
+#######################################
+rayon = "1.10"
+
+#######################################
+## ERROR REPORTING
+#######################################
+codespan-reporting = "0.11"
+log = {version = "0.4", features = ["release_max_level_error"] }
+env_logger = "0.11"
+
+#######################################
+## SAGE LISP PREPROCESSING
+#######################################
+serde = { version = "1.0", features = ["rc"] }
+serde_derive = "1.0"
+sage-lisp = { git = "https://github.com/adam-mcdaniel/sage-lisp" }
 
-[dev-dependencies]
-criterion = "0.5"
 
-# Add a build-time dependency on the lalrpop library:
+#######################################
+## PARSING
+#######################################
+lalrpop-util = { version = "0.21", features = ["lexer"] }
+regex = { version = "1.10", features = ["unicode"] }
+clap = { version ="4.5", features = ["derive", "cargo"] }
+no-comment = "0.0.3"
+snailquote = "0.3"
+
 [build-dependencies]
-regex = { version = "1.8.1", features = ["unicode"] }
-lalrpop = { version = "=0.19.9", features = ["lexer"] }
+regex = { version = "1.10", features = ["unicode"] }
+lalrpop = "0.21"
+
+###############################################################################
+##                                PROFILING
+###############################################################################
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+bench = false
 
 [[bench]]
 name = "frontend"
 harness = false
+
+[dev-dependencies]
+criterion = "0.5"
+
+[profile.release]
+debug = true