diff --git a/Cargo.lock b/Cargo.lock
index b75962c..77c8bf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,6 +110,12 @@ version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+[[package]]
+name = "beef"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+
[[package]]
name = "bit"
version = "0.1.1"
@@ -248,6 +254,9 @@ dependencies = [
[[package]]
name = "dev"
version = "0.1.0"
+dependencies = [
+ "logos",
+]
[[package]]
name = "embedded-graphics"
@@ -638,6 +647,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0fc32485e41ae5e9dedd1442f36dec998431adc9f321224c2c5d645f38fdcb"
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
[[package]]
name = "libc"
version = "0.2.149"
@@ -665,6 +680,39 @@ version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+[[package]]
+name = "logos"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff1ceb190eb9bdeecdd8f1ad6a71d6d632a50905948771718741b5461fb01e13"
+dependencies = [
+ "logos-derive",
+]
+
+[[package]]
+name = "logos-codegen"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90be66cb7bd40cb5cc2e9cfaf2d1133b04a3d93b72344267715010a466e0915a"
+dependencies = [
+ "beef",
+ "fnv",
+ "lazy_static",
+ "proc-macro2",
+ "quote",
+ "regex-syntax",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "logos-derive"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45154231e8e96586b39494029e58f12f8ffcb5ecf80333a603a13aa205ea8cbd"
+dependencies = [
+ "logos-codegen",
+]
+
[[package]]
name = "memchr"
version = "2.6.4"
@@ -803,6 +851,12 @@ dependencies = [
"rand_core",
]
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
[[package]]
name = "repbuild"
version = "0.2.0"
diff --git a/dev/Cargo.toml b/dev/Cargo.toml
index 0cf2f73..9895777 100644
--- a/dev/Cargo.toml
+++ b/dev/Cargo.toml
@@ -4,3 +4,4 @@ version = "0.1.0"
edition = "2021"
[dependencies]
+logos = "0.14.1"
diff --git a/dev/src/idl/mod.rs b/dev/src/idl/mod.rs
new file mode 100644
index 0000000..69b6523
--- /dev/null
+++ b/dev/src/idl/mod.rs
@@ -0,0 +1,20 @@
+use logos::Logos;
+
+#[derive(Logos, Debug, PartialEq)]
+#[logos(skip r"[ \t\n\f]+")] // Ignore this regex pattern between tokens
+enum Token {
+ // Tokens can be literal strings, of any length.
+ #[token("protocol")]
+ Protocol,
+
+ #[token(".")]
+ Period,
+
+ // Or regular expressions.
+ #[regex("[a-zA-Z]+")]
+ Text,
+}
+
+pub fn main() {
+ let mut lex = Token::lexer("Create ridiculously fast Lexers.");
+}
diff --git a/dev/src/main.rs b/dev/src/main.rs
index 107e2c6..8e27d72 100644
--- a/dev/src/main.rs
+++ b/dev/src/main.rs
@@ -1,4 +1,5 @@
-use std::{fmt::format, io::Write};
+use std::io::Write;
+pub mod idl;
pub enum Options {
Build,
@@ -6,6 +7,12 @@ pub enum Options {
New,
Run,
}
+#[derive(PartialEq)]
+pub enum DevelopmentType {
+ Program,
+ Library,
+ IDL,
+}
fn main() {
let mut args: Vec<String> = std::env::args().collect();
@@ -24,29 +31,31 @@ fn main() {
let binding = args.pop().unwrap();
let dev_type = binding.as_str();
let name = args.pop().unwrap();
+ use DevelopmentType::*;
match dev_type {
- "lib" | "library" => new(true, name),
- "prog" | "program" => new(false, name),
+ "lib" | "library" => new(Library, name),
+ "prog" | "program" => new(Program, name),
+ "idl" => {
+ new(IDL, name);
+ // idl::main();
+ panic!("IDL is not finalized yet.")
+ }
_ => {}
};
}
"run" => run(),
-
- "help" => {
- // println!("This is the help message.");
- // println!("A prototype build tool meant to help with ableOS software development.");
- help()
- }
+ "help" => help(),
_ => {
println!("Error");
}
}
}
-pub fn new(library: bool, name: String) {
- let (folder_hierarchy, entry_name) = match library {
- true => ("libraries", "lib.hb"),
- false => ("programs", "main.hb"),
+pub fn new(development_type: DevelopmentType, name: String) {
+ let (folder_hierarchy, entry_name) = match development_type {
+ DevelopmentType::Program => ("programs", "main.hb"),
+ DevelopmentType::Library => ("libraries", "lib.hb"),
+ DevelopmentType::IDL => ("idl", "protocol.aidl"),
};
let project_folder_path_string = format!("sysdata/{folder_hierarchy}/{name}");
@@ -66,18 +75,24 @@ pub fn new(library: bool, name: String) {
let full_path_string = format!("{src_folder_path_string}/{entry_name}");
let mut file = std::fs::File::create(full_path_string.clone()).unwrap();
- let file_contents = if library {
- ""
- } else {
- "main := fn(): int {
+ let file_contents = match development_type {
+ DevelopmentType::Program => "main := fn(): int {
return 0
}"
+ .to_string(),
+ DevelopmentType::Library => "".to_string(),
+ DevelopmentType::IDL => format!(
+ "protocol {} {{
+}}",
+ name
+ )
+ .to_owned(),
}
.to_string();
file.write_all(file_contents.as_bytes()).unwrap();
println!("New project created.");
- if !library {
+ if development_type == DevelopmentType::Program {
println!("You should add your project into the ableOS system configuration in sysdata/system_config.toml")
}
}
diff --git a/sysdata/idl/abc/README.md b/sysdata/idl/abc/README.md
new file mode 100644
index 0000000..bb36f37
--- /dev/null
+++ b/sysdata/idl/abc/README.md
@@ -0,0 +1 @@
+# abc
\ No newline at end of file
diff --git a/sysdata/idl/abc/src/protocol.aidl b/sysdata/idl/abc/src/protocol.aidl
new file mode 100644
index 0000000..b08bdcf
--- /dev/null
+++ b/sysdata/idl/abc/src/protocol.aidl
@@ -0,0 +1,2 @@
+protocol abc {
+ }
\ No newline at end of file