diff --git a/.gitignore b/.gitignore index d03ef72..c7e89de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /target *.sh -sample.akai -.idea -/.idea \ No newline at end of file +sample.akai \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4a17967..4368f31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,31 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "akailang" -version = "0.1.0" -dependencies = [ - "akailang-backend", - "akailang-parser", -] - -[[package]] -name = "akailang-backend" -version = "0.1.0" -dependencies = [ - "akailang-parser", - "chumsky", - "inkwell", -] - -[[package]] -name = "akailang-parser" -version = "0.1.0" -dependencies = [ - "chumsky", - "logos", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -83,6 +58,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + [[package]] name = "equivalent" version = "1.0.2" @@ -114,10 +95,11 @@ dependencies = [ [[package]] name = "inkwell" -version = "0.7.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39457e8611219cf690f862a470575f5c06862910d03ea3c3b187ad7abc44b4e2" +checksum = "e67349bd7578d4afebbe15eaa642a80b884e8623db74b1716611b131feb1deef" dependencies = [ + "either", "inkwell_internals", "libc", "llvm-sys", @@ -127,15 +109,24 @@ dependencies = [ [[package]] name = "inkwell_internals" -version = "0.12.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9a7dd586b00f2b20e0b9ae3c6faa351fbfd56d15d63bbce35b13bece682eda" +checksum = "f365c8de536236cfdebd0ba2130de22acefed18b1fb99c32783b3840aec5fb46" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "lang" +version = "0.1.0" +dependencies = [ + "chumsky", + "inkwell", + "logos", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -150,9 +141,9 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "llvm-sys" -version = "211.0.0" +version = "181.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108b3ad2b2eaf2a561fc74196273b20e3436e4a688b8b44e250d83974dc1b2e2" +checksum = "d320f9d2723c97d4b78f9190a61ed25cc7cfbe456668c08e6e7dd8e50ceb8500" dependencies = [ "anyhow", "cc", @@ -164,34 +155,34 @@ dependencies = [ [[package]] name = "logos" -version = "0.15.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff472f899b4ec2d99161c51f60ff7075eeb3097069a36050d8037a6325eb8154" +checksum = "ab6f536c1af4c7cc81edf73da1f8029896e7e1e16a219ef09b184e76a296f3db" dependencies = [ "logos-derive", ] [[package]] name = "logos-codegen" -version = "0.15.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "192a3a2b90b0c05b27a0b2c43eecdb7c415e29243acc3f89cc8247a5b693045c" +checksum = "189bbfd0b61330abea797e5e9276408f2edbe4f822d7ad08685d67419aafb34e" dependencies = [ "beef", "fnv", "lazy_static", "proc-macro2", "quote", - "regex-syntax 0.8.8", + "regex-syntax 0.8.5", "rustc_version", "syn", ] [[package]] name = "logos-derive" -version = "0.15.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "605d9697bcd5ef3a42d38efc51541aa3d6a4a25f7ab6d1ed0da5ac632a26b470" +checksum = "ebfe8e1a19049ddbfccbd14ac834b215e11b85b90bab0c2dba7c7b92fb5d5cba" dependencies = [ "logos-codegen", ] @@ -260,9 +251,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustc_version" @@ -331,18 +322,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e76ba05..681fc8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,9 @@ -[workspace] -members = ["crates/akailang-backend", "crates/akailang", "crates/akailang-parser"] -resolver = "3" - -[workspace.package] +[package] +name = "lang" version = "0.1.0" edition = "2024" + +[dependencies] +logos = "0.15.0" +chumsky = "0.10.1" +inkwell = { version = "0.6.0", features = ["llvm18-1"] } diff --git a/crates/akailang-backend/Cargo.toml b/crates/akailang-backend/Cargo.toml deleted file mode 100644 index 4fc8844..0000000 --- a/crates/akailang-backend/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "akailang-backend" -version.workspace = true -edition.workspace = true - -[dependencies] -inkwell = { version = "0.7.0", features = ["llvm21-1"] } -chumsky = "0.10.1" -akailang-parser = { path = "../akailang-parser" } \ No newline at end of file diff --git a/crates/akailang-backend/src/lib.rs b/crates/akailang-backend/src/lib.rs deleted file mode 100644 index 9665cda..0000000 --- a/crates/akailang-backend/src/lib.rs +++ /dev/null @@ -1,18 +0,0 @@ -pub mod llvm; - -pub use akailang_parser::*; - -pub fn add(left: u64, right: u64) -> u64 { - left + right -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn it_works() { - let result = add(2, 2); - assert_eq!(result, 4); - } -} diff --git a/crates/akailang-parser/Cargo.toml b/crates/akailang-parser/Cargo.toml deleted file mode 100644 index 94dabd5..0000000 --- a/crates/akailang-parser/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "akailang-parser" -version.workspace = true -edition.workspace = true - -[dependencies] -logos = "0.15.0" -chumsky = "0.10.1" diff --git a/crates/akailang-parser/src/lib.rs b/crates/akailang-parser/src/lib.rs deleted file mode 100644 index 06c75b8..0000000 --- a/crates/akailang-parser/src/lib.rs +++ /dev/null @@ -1,17 +0,0 @@ -pub mod abstract_syntax_tree; -pub mod lexer; - -pub fn add(left: u64, right: u64) -> u64 { - left + right -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn it_works() { - let result = add(2, 2); - assert_eq!(result, 4); - } -} diff --git a/crates/akailang/Cargo.toml b/crates/akailang/Cargo.toml deleted file mode 100644 index 40ec6fe..0000000 --- a/crates/akailang/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "akailang" -version.workspace = true -edition.workspace = true - -[dependencies] -akailang-parser = {path = "../akailang-parser" } -akailang-backend = {path = "../akailang-backend" } \ No newline at end of file diff --git a/crates/akailang-parser/src/abstract_syntax_tree/ast.rs b/src/language_frontend/abstract_syntax_tree/ast.rs similarity index 91% rename from crates/akailang-parser/src/abstract_syntax_tree/ast.rs rename to src/language_frontend/abstract_syntax_tree/ast.rs index e3e4b60..3e8f666 100644 --- a/crates/akailang-parser/src/abstract_syntax_tree/ast.rs +++ b/src/language_frontend/abstract_syntax_tree/ast.rs @@ -1,4 +1,4 @@ -use crate::abstract_syntax_tree::definitions::*; +use crate::language_frontend::abstract_syntax_tree::definitions::*; // Option and Result -> define in Std #[derive(Clone, Debug, PartialEq)] diff --git a/crates/akailang-parser/src/abstract_syntax_tree/definitions.rs b/src/language_frontend/abstract_syntax_tree/definitions.rs similarity index 97% rename from crates/akailang-parser/src/abstract_syntax_tree/definitions.rs rename to src/language_frontend/abstract_syntax_tree/definitions.rs index 1ae4f96..b8be826 100644 --- a/crates/akailang-parser/src/abstract_syntax_tree/definitions.rs +++ b/src/language_frontend/abstract_syntax_tree/definitions.rs @@ -1,6 +1,6 @@ use std::{ops::Range, rc::Rc}; -use crate::abstract_syntax_tree::ast::Expr; +use crate::language_frontend::abstract_syntax_tree::ast::Expr; // Abstract Syntax Tree diff --git a/crates/akailang-parser/src/abstract_syntax_tree/mod.rs b/src/language_frontend/abstract_syntax_tree/mod.rs similarity index 100% rename from crates/akailang-parser/src/abstract_syntax_tree/mod.rs rename to src/language_frontend/abstract_syntax_tree/mod.rs diff --git a/crates/akailang-parser/src/abstract_syntax_tree/parser.rs b/src/language_frontend/abstract_syntax_tree/parser.rs similarity index 99% rename from crates/akailang-parser/src/abstract_syntax_tree/parser.rs rename to src/language_frontend/abstract_syntax_tree/parser.rs index d2d64f1..14c7690 100644 --- a/crates/akailang-parser/src/abstract_syntax_tree/parser.rs +++ b/src/language_frontend/abstract_syntax_tree/parser.rs @@ -15,14 +15,15 @@ use chumsky::{ newline, whitespace, }, }; +use inkwell::Either; use logos::{Logos, source}; use crate::{ - token, - { + language_frontend::{ abstract_syntax_tree::{ast::Expr, definitions::*}, lexer::tokens::Token, }, + token, }; // goal of parsing is to construct an abstract syntax tree diff --git a/crates/akailang-parser/src/lexer/mod.rs b/src/language_frontend/lexer/mod.rs similarity index 100% rename from crates/akailang-parser/src/lexer/mod.rs rename to src/language_frontend/lexer/mod.rs diff --git a/crates/akailang-parser/src/lexer/tokens.rs b/src/language_frontend/lexer/tokens.rs similarity index 100% rename from crates/akailang-parser/src/lexer/tokens.rs rename to src/language_frontend/lexer/tokens.rs diff --git a/src/language_frontend/mod.rs b/src/language_frontend/mod.rs new file mode 100644 index 0000000..0d2d3fd --- /dev/null +++ b/src/language_frontend/mod.rs @@ -0,0 +1,2 @@ +pub mod abstract_syntax_tree; +pub mod lexer; diff --git a/crates/akailang-backend/src/llvm/mod.rs b/src/llvm_backend/llvm.rs similarity index 82% rename from crates/akailang-backend/src/llvm/mod.rs rename to src/llvm_backend/llvm.rs index a7f8acc..3ddba9e 100644 --- a/crates/akailang-backend/src/llvm/mod.rs +++ b/src/llvm_backend/llvm.rs @@ -1,17 +1,17 @@ use chumsky::prelude::todo; use inkwell::{ - GlobalVisibility, OptimizationLevel, + OptimizationLevel, builder::{self, Builder}, context::Context, execution_engine::ExecutionEngine, module::Module, types::BasicTypeEnum, - values::{BasicValue, BasicValueEnum, FunctionValue}, + values::{BasicValueEnum, FunctionValue}, }; -use akailang_parser::abstract_syntax_tree::{ +use crate::language_frontend::abstract_syntax_tree::{ ast::Expr, - definitions::{Function, Identifier, Type}, + definitions::{Function, Type}, }; pub struct CodeGen<'ctx> { diff --git a/src/llvm_backend/mod.rs b/src/llvm_backend/mod.rs new file mode 100644 index 0000000..cd44a09 --- /dev/null +++ b/src/llvm_backend/mod.rs @@ -0,0 +1 @@ +pub mod llvm; diff --git a/crates/akailang/src/main.rs b/src/main.rs similarity index 62% rename from crates/akailang/src/main.rs rename to src/main.rs index 696524c..8881300 100644 --- a/crates/akailang/src/main.rs +++ b/src/main.rs @@ -1,4 +1,15 @@ -use akailang_parser::abstract_syntax_tree::parser::parse; +use chumsky::Parser; +use chumsky::input::{Input, Stream}; +use logos::Logos; + +mod language_frontend; +mod llvm_backend; + +use crate::{ + language_frontend::abstract_syntax_tree::parser::parse, language_frontend::lexer::tokens::Token, +}; + +use crate::language_frontend::abstract_syntax_tree::ast::Expr; /* Simple Compiler -> 4 Stages: