Rearrange the monorepo and add a very basic web compiler (#1024)

* Rearrange the monorepo and add a very basic web compiler * Fix benchmarks * Make clippy happy * Make clippy happier
alantech · Dec 22, 2024 · 4049dbd · 4049dbd
1 parent 31613bb
commit 4049dbd
Show file tree

Hide file tree

Showing 35 changed files with 255 additions and 199 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,4 @@
 [workspace]
 
-members = [ "alan", "alan_std" ]
+members = [ "alan", "alan_compiler", "alan_std", "web_compiler" ]
 resolver = "2"
diff --git a/alan/Cargo.toml b/alan/Cargo.toml
@@ -12,11 +12,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alan_compiler = { path = "../alan_compiler" }
 clap = { version = "4.5.23", features = ["derive"] }
 dirs = "5.0.1"
 fs2 = "0.4.3"
-nom = "7.1.3"
-ordered_hash_map = "0.4.0"
 
 [dev-dependencies]
 divan = "0.1.17"

diff --git a/alan/src/compile/integration_tests.rs b/alan/src/compile/integration_tests.rs
@@ -17,17 +17,17 @@ macro_rules! test {
         mod $rule {
             #[test]
             fn $rule() -> Result<(), Box<dyn std::error::Error>> {
-                crate::program::Program::set_target_lang_rs();
+                alan_compiler::program::Program::set_target_lang_rs();
                 let filename = format!("{}.ln", stringify!($rule));
                 match std::fs::write(&filename, $code) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
                         return Err(format!("Unable to write {} to disk. {:?}", filename, e).into());
                     }
                 };
-                let mut program = crate::program::Program::get_program();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::build(filename.to_string()) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
@@ -49,10 +49,10 @@ macro_rules! test {
                     Ok(a) => Ok(a),
                     Err(e) => Err(format!("Could not remove the test binary {:?}", e)),
                 }?;
-                crate::program::Program::set_target_lang_js();
-                let mut program = crate::program::Program::get_program();
+                alan_compiler::program::Program::set_target_lang_js();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::web(filename.to_string()) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
@@ -84,16 +84,16 @@ macro_rules! test {
         mod $rule {
             #[test]
             fn $rule() -> Result<(), Box<dyn std::error::Error>> {
-                crate::program::Program::set_target_lang_rs();
+                alan_compiler::program::Program::set_target_lang_rs();
                 $( match std::fs::write($filename, $code) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
                         return Err(format!("Unable to write {} to disk. {:?}", $filename, e).into());
                     }
                 })+
-                let mut program = crate::program::Program::get_program();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::build(format!("{}.ln", $entryfile)) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
@@ -115,10 +115,10 @@ macro_rules! test {
                     Ok(a) => Ok(a),
                     Err(e) => Err(format!("Could not remove the test binary {:?}", e)),
                 }?;
-                crate::program::Program::set_target_lang_js();
-                let mut program = crate::program::Program::get_program();
+                alan_compiler::program::Program::set_target_lang_js();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::web(format!("{}.ln", $entryfile)) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
@@ -152,17 +152,17 @@ macro_rules! test_gpgpu {
         mod $rule {
             #[test]
             fn $rule() -> Result<(), Box<dyn std::error::Error>> {
-                crate::program::Program::set_target_lang_rs();
+                alan_compiler::program::Program::set_target_lang_rs();
                 let filename = format!("{}.ln", stringify!($rule));
                 match std::fs::write(&filename, $code) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
                         return Err(format!("Unable to write {} to disk. {:?}", filename, e).into());
                     }
                 };
-                let mut program = crate::program::Program::get_program();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::build(filename.to_string()) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {
@@ -191,10 +191,10 @@ macro_rules! test_gpgpu {
                 // to just MacOS to test this on.
                 // if cfg!(windows) || cfg!(macos) {
                 if cfg!(target_os = "macos") {
-                    crate::program::Program::set_target_lang_js();
-                    let mut program = crate::program::Program::get_program();
+                    alan_compiler::program::Program::set_target_lang_js();
+                    let mut program = alan_compiler::program::Program::get_program();
                     program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                    crate::program::Program::return_program(program);
+                    alan_compiler::program::Program::return_program(program);
                     match crate::compile::web(filename.to_string()) {
                         Ok(_) => { /* Do nothing */ }
                         Err(e) => {
@@ -274,9 +274,9 @@ macro_rules! test_ignore {
                         return Err(format!("Unable to write {} to disk. {:?}", filename, e).into());
                     }
                 };
-                let mut program = crate::program::Program::get_program();
+                let mut program = alan_compiler::program::Program::get_program();
                 program.env.insert("ALAN_TARGET".to_string(), "test".to_string());
-                crate::program::Program::return_program(program);
+                alan_compiler::program::Program::return_program(program);
                 match crate::compile::build(filename.to_string()) {
                     Ok(_) => { /* Do nothing */ }
                     Err(e) => {

diff --git a/alan/src/compile/mod.rs b/alan/src/compile/mod.rs
@@ -8,9 +8,9 @@ use std::time::{Instant, SystemTime, UNIX_EPOCH};
 use dirs::config_dir;
 use fs2::FileExt;
 
-use crate::lntojs::lntojs;
-use crate::lntors::lntors;
-use crate::program::Program;
+use alan_compiler::lntojs::lntojs;
+use alan_compiler::lntors::lntors;
+use alan_compiler::program::Program;
 
 mod integration_tests;
 

diff --git a/alan/src/lib.rs b/alan/src/lib.rs
@@ -1,5 +1 @@
 pub mod compile;
-pub mod lntojs;
-pub mod lntors;
-pub mod parse;
-pub mod program;
diff --git a/alan/src/main.rs b/alan/src/main.rs
@@ -1,11 +1,7 @@
 use crate::compile::{bundle, compile, test, to_js, to_rs};
 use clap::{Parser, Subcommand};
 
-mod compile;
-mod lntojs;
-mod lntors;
-mod parse;
-mod program;
+pub mod compile;
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, propagate_version = true)]

diff --git a/alan_compiler/Cargo.toml b/alan_compiler/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "alan_compiler"
+description = "The Alan Compiler"
+license = "MIT"
+homepage = "https://alan-lang.org"
+documentation = "https://docs.alan-lang.org"
+repository = "https://github.com/alantech/alan"
+version = "0.2.0"
+authors = ["David Ellis <[email protected]>"]
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+nom = "7.1.3"
+ordered_hash_map = "0.4.0"
diff --git a/alan_compiler/src/lib.rs b/alan_compiler/src/lib.rs
@@ -0,0 +1,4 @@
+pub mod lntojs;
+pub mod lntors;
+pub mod parse;
+pub mod program;
diff --git a/alan/src/lntojs/function.rs → alan_compiler/src/lntojs/function.rs b/alan/src/lntojs/function.rs → alan_compiler/src/lntojs/function.rs
diff --git a/alan/src/lntojs/mod.rs → alan_compiler/src/lntojs/mod.rs b/alan/src/lntojs/mod.rs → alan_compiler/src/lntojs/mod.rs
diff --git a/alan/src/lntojs/typen.rs → alan_compiler/src/lntojs/typen.rs b/alan/src/lntojs/typen.rs → alan_compiler/src/lntojs/typen.rs
diff --git a/alan/src/lntors/function.rs → alan_compiler/src/lntors/function.rs b/alan/src/lntors/function.rs → alan_compiler/src/lntors/function.rs
diff --git a/alan/src/lntors/mod.rs → alan_compiler/src/lntors/mod.rs b/alan/src/lntors/mod.rs → alan_compiler/src/lntors/mod.rs
diff --git a/alan/src/lntors/typen.rs → alan_compiler/src/lntors/typen.rs b/alan/src/lntors/typen.rs → alan_compiler/src/lntors/typen.rs
diff --git a/alan/src/parse.rs → alan_compiler/src/parse.rs b/alan/src/parse.rs → alan_compiler/src/parse.rs
diff --git a/alan/src/program/argkind.rs → alan_compiler/src/program/argkind.rs b/alan/src/program/argkind.rs → alan_compiler/src/program/argkind.rs
diff --git a/alan/src/program/constn.rs → alan_compiler/src/program/constn.rs b/alan/src/program/constn.rs → alan_compiler/src/program/constn.rs
diff --git a/alan/src/program/ctype.rs → alan_compiler/src/program/ctype.rs b/alan/src/program/ctype.rs → alan_compiler/src/program/ctype.rs
diff --git a/alan/src/program/export.rs → alan_compiler/src/program/export.rs b/alan/src/program/export.rs → alan_compiler/src/program/export.rs
diff --git a/alan/src/program/fnkind.rs → alan_compiler/src/program/fnkind.rs b/alan/src/program/fnkind.rs → alan_compiler/src/program/fnkind.rs
diff --git a/alan/src/program/function.rs → alan_compiler/src/program/function.rs b/alan/src/program/function.rs → alan_compiler/src/program/function.rs
diff --git a/alan/src/program/microstatement.rs → alan_compiler/src/program/microstatement.rs b/alan/src/program/microstatement.rs → alan_compiler/src/program/microstatement.rs
diff --git a/alan/src/program/mod.rs → alan_compiler/src/program/mod.rs b/alan/src/program/mod.rs → alan_compiler/src/program/mod.rs
diff --git a/alan/src/program/operatormapping.rs → alan_compiler/src/program/operatormapping.rs b/alan/src/program/operatormapping.rs → alan_compiler/src/program/operatormapping.rs
diff --git a/alan/src/program/program.rs → alan_compiler/src/program/program.rs b/alan/src/program/program.rs → alan_compiler/src/program/program.rs
diff --git a/alan/src/program/scope.rs → alan_compiler/src/program/scope.rs b/alan/src/program/scope.rs → alan_compiler/src/program/scope.rs
diff --git a/alan/src/program/typeoperatormapping.rs → ...mpiler/src/program/typeoperatormapping.rs b/alan/src/program/typeoperatormapping.rs → ...mpiler/src/program/typeoperatormapping.rs
diff --git a/alan/src/std/README.md → alan_compiler/src/std/README.md b/alan/src/std/README.md → alan_compiler/src/std/README.md
diff --git a/alan/src/std/fs.ln → alan_compiler/src/std/fs.ln b/alan/src/std/fs.ln → alan_compiler/src/std/fs.ln
diff --git a/alan/src/std/root.ln → alan_compiler/src/std/root.ln b/alan/src/std/root.ln → alan_compiler/src/std/root.ln
diff --git a/alan/src/std/seq.ln → alan_compiler/src/std/seq.ln b/alan/src/std/seq.ln → alan_compiler/src/std/seq.ln