diff --git a/Cargo.lock b/Cargo.lock index f0ebdfc..b00ed0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,230 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" + +[[package]] +name = "clap" +version = "4.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +dependencies = [ + "bitflags", + "clap_lex", + "is-terminal", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" + +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "rustix" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + [[package]] name = "sapphire" version = "0.1.0" +dependencies = [ + "clap", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" diff --git a/Cargo.toml b/Cargo.toml index 1fb4378..e7d58bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +clap = "4.0.29" diff --git a/core/__internal/allocate/linux.sp b/core/__internal/allocate/linux.sp deleted file mode 100644 index 22cdcbb..0000000 --- a/core/__internal/allocate/linux.sp +++ /dev/null @@ -1,7 +0,0 @@ -let @memalloc (u64 size) : void* in { - -} - -let @memfree (void* ptr) in { - -} \ No newline at end of file diff --git a/core/__internal/io/linux.sp b/core/__internal/io/linux.sp deleted file mode 100644 index ec7f05b..0000000 --- a/core/__internal/io/linux.sp +++ /dev/null @@ -1,7 +0,0 @@ -import core/linux; -import core/string; - -namespace io { - - -} \ No newline at end of file diff --git a/core/__internal/linux/x64.sp b/core/__internal/linux/x64.sp deleted file mode 100644 index ae6db5b..0000000 --- a/core/__internal/linux/x64.sp +++ /dev/null @@ -1,19 +0,0 @@ -let @sys_read (u32 fd, i8* buf, u64 size) in { - syscall3(0,fd,buf,size); -} - -let @sys_write (u32 fd, i8* buf, u64 size) in { - syscall3(1,fd,buf,size); -} - -let @sys_open (i8* name, i32 flags, u16 mode) in { - syscall3(2,name,flags,mode); -} - -let @sys_close (u32 fd) in { - syscall1(3,fd); -} - -let @sys_exit (i32 code) in { - syscall1(60,code); -} diff --git a/core/allocate.sp b/core/allocate.sp deleted file mode 100644 index 76423c1..0000000 --- a/core/allocate.sp +++ /dev/null @@ -1 +0,0 @@ -import core/__internal/allocate/linux; \ No newline at end of file diff --git a/core/flow.sp b/core/flow.sp deleted file mode 100644 index 92aeb9b..0000000 --- a/core/flow.sp +++ /dev/null @@ -1,10 +0,0 @@ -let compmacro('ifsystem','linux') in { - let { posix } in @'core/linux'; -} -let compmacro('ifsystem','darwin') in { - let { posix } in @'core/darwin'; -} - -let @exit (i32 code) in { - posix.sys_exit(code); -} \ No newline at end of file diff --git a/core/fs.sp b/core/fs.sp deleted file mode 100644 index 0a07b33..0000000 --- a/core/fs.sp +++ /dev/null @@ -1 +0,0 @@ -let { os } in @'core/os'; \ No newline at end of file diff --git a/core/init.sp b/core/init.sp deleted file mode 100644 index 4e3114f..0000000 --- a/core/init.sp +++ /dev/null @@ -1,13 +0,0 @@ -let { flow } in @'core/flow'; - -let _libcore_Argc : i32; -let _libcore_Argv : i8**; - -let @__libcore_call_init (i32 _Argc, i8** _Argv) in { - _libcore_Argc = _Argc; - _libcore_Argv = _Argv; - - main(); - - flow.exit(0); -} \ No newline at end of file diff --git a/core/io.sp b/core/io.sp deleted file mode 100644 index 53c7459..0000000 --- a/core/io.sp +++ /dev/null @@ -1,17 +0,0 @@ -let { os } in @'core/os'; -let { string } in @'core/string'; -let { alloc } in @'core/allocate'; - -let @out (String str) in { - os.write(1,(i8*)str,string.len(str)); -} - -let @in : String in { - i8* buffer = cast(i8*,alloc.memalloc(256)); - os.read(0,buffer,256); - return (String)buffer; -} - -let @outln (String str) in { - out(string.concat(str,'\n')); -} \ No newline at end of file diff --git a/core/linux.sp b/core/linux.sp deleted file mode 100644 index 625de0b..0000000 --- a/core/linux.sp +++ /dev/null @@ -1,3 +0,0 @@ -let compmacro('ifarch','x86-64') in { - let {} in @'core/__internal/linux/x64'; -} \ No newline at end of file diff --git a/core/os.sp b/core/os.sp deleted file mode 100644 index e40f4ee..0000000 --- a/core/os.sp +++ /dev/null @@ -1,7 +0,0 @@ -let compmacro('ifposix') in { - let {} in @'core/__internal/os/posix'; -} - -let compmacro('ifnt') in { - let {} in @'core/__internal/os/nt'; -} \ No newline at end of file diff --git a/core/string.sp b/core/string.sp deleted file mode 100644 index 9760487..0000000 --- a/core/string.sp +++ /dev/null @@ -1,32 +0,0 @@ -let { alloc } in @'core/allocate'; - -let @len (String string) : u64 in { - let ptr = cast(i8*,string); - let length : u64 = 0; - while(ptr[length] != 0) - { - length += 1; - } - return length; -} - -let @concat (String a, String b) : String in { - let len_a = len(a); - let len_b = len(b); - let final_size = len_a + len_b; - let chars = cast(i8*,alloc.memalloc(final_size + 1)); - clone(a,chars,len_a); - clone(b,chars + len_a,len_b); - chars[final_size] = 0; - return (String)chars; -} - -let @clone (str string, i8* buffer, u64 max_copy_size) in { - let chars_cloned : u64 = 0; - let ptr = cast(i8*,string); - while(chars_cloned <= max_copy_size and ptr[chars_cloned] != 0) - { - buffer[chars_cloned] = ptr[chars_cloned]; - chars_cloned += 1; - } -} \ No newline at end of file diff --git a/src/lexer.rs b/src/lexer.rs new file mode 100644 index 0000000..5e968cd --- /dev/null +++ b/src/lexer.rs @@ -0,0 +1,46 @@ +#![allow(dead_code)] + +use std::{iter::Peekable, str::Chars}; + +#[derive(Debug, Clone, PartialEq)] +pub enum Token +{ + EOF, + Delimiter, + Ident(String), + Number(f64), + Op(String) +} + +pub struct Lexer<'a> +{ + input: &'a str, + stream: Box>>, + position: usize +} + +impl <'a> Lexer<'a> +{ + pub fn new(input: &'a str) -> Lexer<'a> + { + Lexer { input: input, stream: Box::new(input.chars().peekable()), position: 0 } + } + + pub fn lex(&self) -> Option> + { + todo!() + } +} + +#[cfg(test)] +mod tests +{ + use super::*; + #[test] + #[should_panic] + fn test_lexer() + { + let lexer = Lexer::new("Hi!"); + lexer.lex(); + } +} \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..3aaaaa1 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod lexer; \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index e7a11a9..a0a6bd7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,8 @@ +mod lexer; + +use lexer::Lexer; + fn main() { - println!("Hello, world!"); + let lexer = Lexer::new("Hi!"); + lexer.lex(); }