mclang/mclangc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refractor code, seperate instructions from keywords

Browse Source
This commit is contained in:
MCorange 2023-03-22 14:58:11 +02:00
parent 42492ce521
commit 93e308c0b0
12 changed files with 282 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/hello_world.mcl
View File

@ -1,18 +1,4 @@
include "std.mcl"
mem dup 72 @8 "Henlo World! :3\n" puts
1 + dup 101 @8
1 + dup 110 @8
1 + dup 108 @8
1 + dup 111 @8
1 + dup 32 @8
1 + dup 119 @8
1 + dup 111 @8
1 + dup 114 @8
1 + dup 108 @8
1 + dup 100 @8
1 + dup 33 @8
1 + dup 10 @8
1 +
mem - mem 1 1 syscall3

2
examples/rule110.mcl
View File

@ -1,4 +1,4 @@
include "io.mcl" include "std.mcl"
macro BOARD_SIZE 100 end macro BOARD_SIZE 100 end

19
include/fs.mcl Normal file
View File

@ -0,0 +1,19 @@
macro FS_O_APPEND 1024 end // append to existing file
macro FS_O_ASYNC 8192 end // use signal-driven IO
macro FS_O_CLOEXEC 524288 end // use close-on-exec (avoid race conditions and lock contentions)
macro FS_O_CREAT 64 end // create file if it doesn’t exist
macro FS_O_DIRECT 16384 end // bypass cache (slower)
macro FS_O_DIRECTORY 65536 end // fail if pathname isn’t a directory
macro FS_O_DSYNC 4096 end // ensure output is sent to hardware and metadata written before return
macro FS_O_EXCL 128 end // ensure creation of file
macro FS_O_LARGEFILE 0 end // allows use of file sizes represented by off64_t
macro FS_O_NOATIME 262144 end // do not increment access time upon open
macro FS_O_NOCTTY 256 end // if pathname is a terminal device, don’t become controlling terminal
macro FS_O_NOFOLLOW 131072 end // fail if pathname is symbolic link
macro FS_O_NONBLOCK 2048 end // if possible, open file with non-blocking IO
macro FS_O_NDELAY 2048 end // same as O_NONBLOCK
macro FS_O_PATH 2097152 end // open descriptor for obtaining permissions and status of a file but does not allow read/write operations
macro FS_O_SYNC 1052672 end // wait for IO to complete before returning
macro FS_O_TMPFILE 4259840 end // create an unnamed, unreachable (via any other open call) temporary file
macro FS_O_TRUNC 512 end // if file exists, ovewrite it (careful!)

11
include/int.mcl
View File

@ -1,5 +1,16 @@
macro NULL 0 end macro NULL 0 end
macro false 0 end macro false 0 end
macro true 1 end macro true 1 end
macro div divmod drop end macro div divmod drop end
macro mod divmod swap drop end macro mod divmod swap drop end
macro / div end
macro % mod end
macro 2dup over over end
macro 2drop drop drop end
macro sizeof(u64) 8 end
macro sizeof(u32) 4 end
macro sizeof(u16) 2 end
macro sizeof(u8) 1 end

28
include/io.mcl
View File

@ -1,21 +1,29 @@
include "linux.mcl"
// Write to a file descriptor using the SYS_write syscall // Write to a file descriptor using the SYS_write syscall
// args: [str_size, str_ptr, fd] // args: [buff_size, buff_ptr, fd]
// @arg str_size: Int // @arg buff_size: Int - number of bytes to write
// @arg str_ptr: Ptr // @arg buff_ptr: Ptr - pointer to the buffer to write
// @arg fd: Int // @arg fd: Int - file descriptor
// @ret Int // @ret Int
macro write macro write
SYS_write syscall3 SYS_write syscall3
end end
// Write to a file descriptor using the SYS_write syscall
// args: [buff_size, buff_ptr, fd]
// @arg buff_size: Int - number of bytes to write
// @arg buff_ptr: Ptr - pointer to the buffer to write
// @arg fd: Int - file descriptor
// @ret Int
macro read
SYS_read syscall3
end
// Print a string to STDOUT // Print a string to STDOUT
// args: [str_size, str_ptr] // args: [str_size, str_ptr]
// @arg str_size: Int // @arg buff_size: Int - number of bytes to write
// @arg str_ptr: Ptr // @arg buff_ptr: Ptr - pointer to the buffer to write
// @ret NULL // @ret NULL
macro puts macro puts
STDOUT write drop STDOUT write drop
@ -23,8 +31,8 @@ end
// Print a string to STDERR // Print a string to STDERR
// args: [str_size, str_ptr] // args: [str_size, str_ptr]
// @arg str_size: Int // @arg buff_size: Int - number of bytes to write
// @arg str_ptr: Ptr // @arg buff_ptr: Ptr - pointer to the buffer to write
// @ret NULL // @ret NULL
macro eputs macro eputs
STDOUT write drop STDOUT write drop

27
include/mem.mcl Normal file
View File

@ -0,0 +1,27 @@
macro load8 @8 end
macro store8 !8 end
macro load64
7 + 0
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap 1 - swap
8 shl over !8 + swap drop
end
macro store64
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 1 + swap
2dup 255 band @8 shr swap 2drop
end

5
include/std.mcl Normal file
View File

@ -0,0 +1,5 @@
include "linux.mcl"
include "io.mcl"
include "util.mcl"
include "int.mcl"
include "fs.mcl"

91
src/compile/linux_x86_64.rs
View File

@ -1,8 +1,8 @@
use std::{fs, path::PathBuf, io::{Write, BufWriter}}; use std::{fs, path::PathBuf, io::{Write, BufWriter}};
use crate::{constants::{Operator, OpType}, Args}; use crate::{constants::{Operator, OpType, KeywordType}, Args};
use color_eyre::Result; use color_eyre::Result;
use crate::compile::commands::linux_x86_64_compile_and_link; use crate::compile::commands::linux_x86_64_compile_and_link;
use crate::constants::InstructionType;
use super::commands::linux_x86_64_run; use super::commands::linux_x86_64_run;
@ -77,13 +77,13 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, "addr_{ti}:")?; writeln!(writer, "addr_{ti}:")?;
match token.typ { match token.typ {
// stack // stack
OpType::PushInt => { OpType::Instruction(InstructionType::PushInt) => {
writeln!(writer, " ;; -- push int {}", token.value)?; writeln!(writer, " ;; -- push int {}", token.value)?;
writeln!(writer, " mov rax, {}", token.value)?; writeln!(writer, " mov rax, {}", token.value)?;
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::PushStr => { OpType::Instruction(InstructionType::PushStr) => {
writeln!(writer, " ;; -- push str \"{}\"", token.text.escape_default())?; writeln!(writer, " ;; -- push str \"{}\"", token.text.escape_default())?;
writeln!(writer, " mov rax, {}", token.text.len())?; writeln!(writer, " mov rax, {}", token.text.len())?;
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
@ -91,19 +91,19 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
strings.push(token.text.clone()); strings.push(token.text.clone());
ti += 1; ti += 1;
} }
OpType::Drop => { OpType::Instruction(InstructionType::Drop) => {
writeln!(writer, " ;; -- drop")?; writeln!(writer, " ;; -- drop")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
ti += 1; ti += 1;
}, },
OpType::Print => { OpType::Instruction(InstructionType::Print) => {
writeln!(writer, " ;; -- print")?; writeln!(writer, " ;; -- print")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
writeln!(writer, " call print")?; writeln!(writer, " call print")?;
ti += 1; ti += 1;
}, },
OpType::Dup => { OpType::Instruction(InstructionType::Dup) => {
writeln!(writer, " ;; -- dup")?; writeln!(writer, " ;; -- dup")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
@ -111,19 +111,8 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
ti += 1; ti += 1;
}, },
OpType::Dup2 => {
writeln!(writer, " ;; -- 2dup")?;
writeln!(writer, " pop rbx")?;
writeln!(writer, " pop rax")?;
writeln!(writer, " push rax")?;
writeln!(writer, " push rbx")?;
writeln!(writer, " push rax")?;
writeln!(writer, " push rbx")?;
ti += 1; OpType::Instruction(InstructionType::Rot) => {
},
OpType::Rot => {
writeln!(writer, " ;; -- rot")?; writeln!(writer, " ;; -- rot")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -134,7 +123,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
ti += 1; ti += 1;
}, },
OpType::Swap => { OpType::Instruction(InstructionType::Swap) => {
writeln!(writer, " ;; -- swap")?; writeln!(writer, " ;; -- swap")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -143,7 +132,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
ti += 1; ti += 1;
}, },
OpType::Over => { OpType::Instruction(InstructionType::Over) => {
writeln!(writer, " ;; -- over")?; writeln!(writer, " ;; -- over")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -155,12 +144,12 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
}, },
//mem //mem
OpType::Mem => { OpType::Instruction(InstructionType::Mem) => {
writeln!(writer, " ;; -- mem")?; writeln!(writer, " ;; -- mem")?;
writeln!(writer, " push mem")?; writeln!(writer, " push mem")?;
ti += 1; ti += 1;
} }
OpType::Load8 => { OpType::Instruction(InstructionType::Load8) => {
writeln!(writer, " ;; -- load")?; writeln!(writer, " ;; -- load")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " xor rbx, rbx")?; writeln!(writer, " xor rbx, rbx")?;
@ -169,7 +158,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
ti += 1; ti += 1;
} }
OpType::Store8 => { OpType::Instruction(InstructionType::Store8) => {
writeln!(writer, " ;; -- store")?; writeln!(writer, " ;; -- store")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
@ -178,7 +167,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
} }
// math // math
OpType::Plus => { OpType::Instruction(InstructionType::Plus) => {
writeln!(writer, " ;; -- plus")?; writeln!(writer, " ;; -- plus")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -186,7 +175,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Minus => { OpType::Instruction(InstructionType::Minus) => {
writeln!(writer, " ;; -- minus")?; writeln!(writer, " ;; -- minus")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -194,7 +183,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rbx")?; writeln!(writer, " push rbx")?;
ti += 1; ti += 1;
}, },
OpType::Equals => { OpType::Instruction(InstructionType::Equals) => {
writeln!(writer, " ;; -- equals")?; writeln!(writer, " ;; -- equals")?;
writeln!(writer, " mov rcx, 0")?; writeln!(writer, " mov rcx, 0")?;
writeln!(writer, " mov rdx, 1")?; writeln!(writer, " mov rdx, 1")?;
@ -205,7 +194,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::Lt => { OpType::Instruction(InstructionType::Lt) => {
writeln!(writer, " ;; -- lt")?; writeln!(writer, " ;; -- lt")?;
writeln!(writer, " mov rcx, 0")?; writeln!(writer, " mov rcx, 0")?;
writeln!(writer, " mov rdx, 1")?; writeln!(writer, " mov rdx, 1")?;
@ -216,7 +205,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::Gt => { OpType::Instruction(InstructionType::Gt) => {
writeln!(writer, " ;; -- gt")?; writeln!(writer, " ;; -- gt")?;
writeln!(writer, " mov rcx, 0")?; writeln!(writer, " mov rcx, 0")?;
writeln!(writer, " mov rdx, 1")?; writeln!(writer, " mov rdx, 1")?;
@ -227,7 +216,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::NotEquals => { OpType::Instruction(InstructionType::NotEquals) => {
writeln!(writer, " ;; -- not equals")?; writeln!(writer, " ;; -- not equals")?;
writeln!(writer, " mov rcx, 1")?; writeln!(writer, " mov rcx, 1")?;
writeln!(writer, " mov rdx, 0")?; writeln!(writer, " mov rdx, 0")?;
@ -238,7 +227,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::Le => { OpType::Instruction(InstructionType::Le) => {
writeln!(writer, " ;; -- lt")?; writeln!(writer, " ;; -- lt")?;
writeln!(writer, " mov rcx, 0")?; writeln!(writer, " mov rcx, 0")?;
writeln!(writer, " mov rdx, 1")?; writeln!(writer, " mov rdx, 1")?;
@ -249,7 +238,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::Ge => { OpType::Instruction(InstructionType::Ge) => {
writeln!(writer, " ;; -- gt")?; writeln!(writer, " ;; -- gt")?;
writeln!(writer, " mov rcx, 0")?; writeln!(writer, " mov rcx, 0")?;
writeln!(writer, " mov rdx, 1")?; writeln!(writer, " mov rdx, 1")?;
@ -260,7 +249,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rcx")?; writeln!(writer, " push rcx")?;
ti += 1; ti += 1;
}, },
OpType::Band => { OpType::Instruction(InstructionType::Band) => {
writeln!(writer, " ;; -- band")?; writeln!(writer, " ;; -- band")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -268,7 +257,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rbx")?; writeln!(writer, " push rbx")?;
ti += 1; ti += 1;
}, },
OpType::Bor => { OpType::Instruction(InstructionType::Bor) => {
writeln!(writer, " ;; -- bor")?; writeln!(writer, " ;; -- bor")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -276,7 +265,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rbx")?; writeln!(writer, " push rbx")?;
ti += 1; ti += 1;
}, },
OpType::Shr => { OpType::Instruction(InstructionType::Shr) => {
writeln!(writer, " ;; -- shr")?; writeln!(writer, " ;; -- shr")?;
writeln!(writer, " pop rcx")?; writeln!(writer, " pop rcx")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -284,7 +273,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rbx")?; writeln!(writer, " push rbx")?;
ti += 1; ti += 1;
}, },
OpType::Shl => { OpType::Instruction(InstructionType::Shl) => {
writeln!(writer, " ;; -- shl")?; writeln!(writer, " ;; -- shl")?;
writeln!(writer, " pop rcx")?; writeln!(writer, " pop rcx")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -292,7 +281,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rbx")?; writeln!(writer, " push rbx")?;
ti += 1; ti += 1;
}, },
OpType::DivMod => { OpType::Instruction(InstructionType::DivMod) => {
writeln!(writer, " ;; -- div")?; writeln!(writer, " ;; -- div")?;
writeln!(writer, " xor rdx, rdx")?; writeln!(writer, " xor rdx, rdx")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -302,7 +291,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rdx")?; writeln!(writer, " push rdx")?;
ti += 1; ti += 1;
}, },
OpType::Mul => { OpType::Instruction(InstructionType::Mul) => {
writeln!(writer, " ;; -- mul")?; writeln!(writer, " ;; -- mul")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rbx")?; writeln!(writer, " pop rbx")?;
@ -313,44 +302,44 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
// block // block
OpType::If => { OpType::Keyword(KeywordType::If) => {
writeln!(writer, " ;; -- if")?; writeln!(writer, " ;; -- if")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " test rax, rax")?; writeln!(writer, " test rax, rax")?;
writeln!(writer, " jz addr_{}", token.jmp)?; writeln!(writer, " jz addr_{}", token.jmp)?;
ti += 1; ti += 1;
}, },
OpType::Else => { OpType::Keyword(KeywordType::Else) => {
writeln!(writer, " ;; -- else")?; writeln!(writer, " ;; -- else")?;
writeln!(writer, " jmp addr_{}", token.jmp)?; writeln!(writer, " jmp addr_{}", token.jmp)?;
ti += 1; ti += 1;
}, },
OpType::While => { OpType::Keyword(KeywordType::While) => {
writeln!(writer, " ;; -- while")?; writeln!(writer, " ;; -- while")?;
ti += 1; ti += 1;
} }
OpType::Do => { OpType::Keyword(KeywordType::Do) => {
writeln!(writer, " ;; -- do")?; writeln!(writer, " ;; -- do")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " test rax, rax")?; writeln!(writer, " test rax, rax")?;
writeln!(writer, " jz addr_{}", token.jmp)?; writeln!(writer, " jz addr_{}", token.jmp)?;
ti += 1; ti += 1;
} }
OpType::End => { OpType::Keyword(KeywordType::End) => {
writeln!(writer, " ;; -- end")?; writeln!(writer, " ;; -- end")?;
if ti + 1 != token.jmp { if ti + 1 != token.jmp {
writeln!(writer, " jmp addr_{}", token.jmp)?; writeln!(writer, " jmp addr_{}", token.jmp)?;
} }
ti += 1; ti += 1;
}, },
OpType::Syscall0 => { OpType::Instruction(InstructionType::Syscall0) => {
writeln!(writer, " ;; -- syscall0")?; writeln!(writer, " ;; -- syscall0")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " syscall")?; writeln!(writer, " syscall")?;
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Syscall1 => { OpType::Instruction(InstructionType::Syscall1) => {
writeln!(writer, " ;; -- syscall1")?; writeln!(writer, " ;; -- syscall1")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -358,7 +347,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Syscall2 => { OpType::Instruction(InstructionType::Syscall2) => {
writeln!(writer, " ;; -- syscall2")?; writeln!(writer, " ;; -- syscall2")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -367,7 +356,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Syscall3 => { OpType::Instruction(InstructionType::Syscall3) => {
writeln!(writer, " ;; -- syscall3")?; writeln!(writer, " ;; -- syscall3")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -378,7 +367,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
ti += 1; ti += 1;
}, },
OpType::Syscall4 => { OpType::Instruction(InstructionType::Syscall4) => {
writeln!(writer, " ;; -- syscall4")?; writeln!(writer, " ;; -- syscall4")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -389,7 +378,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Syscall5 => { OpType::Instruction(InstructionType::Syscall5) => {
writeln!(writer, " ;; -- syscall5")?; writeln!(writer, " ;; -- syscall5")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -401,7 +390,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::Syscall6 => { OpType::Instruction(InstructionType::Syscall6) => {
writeln!(writer, " ;; -- syscall6")?; writeln!(writer, " ;; -- syscall6")?;
writeln!(writer, " pop rax")?; writeln!(writer, " pop rax")?;
writeln!(writer, " pop rdi")?; writeln!(writer, " pop rdi")?;
@ -414,7 +403,7 @@ pub fn compile(tokens: &[Operator], args: &Args) -> Result<i32>{
writeln!(writer, " push rax")?; writeln!(writer, " push rax")?;
ti += 1; ti += 1;
}, },
OpType::None | OpType::Macro | OpType::Include => unreachable!() OpType::Instruction(InstructionType::None) | OpType::Keyword(KeywordType::Macro) | OpType::Keyword(KeywordType::Include) => unreachable!()
} }
} }
writeln!(writer, "addr_{ti}:")?; writeln!(writer, "addr_{ti}:")?;

109
src/constants.rs
View File

@ -3,7 +3,7 @@ pub const ALLOW_MACRO_REDEFINITION: bool = true;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub enum OpType { pub enum InstructionType {
// stack // stack
PushInt, PushInt,
@ -11,7 +11,6 @@ pub enum OpType {
Drop, Drop,
Print, Print,
Dup, Dup,
Dup2, // a b => a b a b
Rot, // a b c => b c a Rot, // a b c => b c a
Over, // a b => a b a Over, // a b => a b a
Swap, // a b => b a Swap, // a b => b a
@ -38,15 +37,6 @@ pub enum OpType {
Load8, Load8,
Store8, Store8,
// block
If,
Else,
End,
While,
Do,
Macro,
Include,
// syscalls // syscalls
Syscall0, Syscall0,
Syscall1, Syscall1,
@ -59,6 +49,22 @@ pub enum OpType {
None // Used for macros and any other non built in word definitions None // Used for macros and any other non built in word definitions
} }
#[derive(Debug, Clone, PartialEq)]
pub enum KeywordType {
If,
Else,
End,
While,
Do,
Macro,
Include,
}
#[derive(Debug, Clone, PartialEq)]
pub enum OpType {
Keyword(KeywordType),
Instruction(InstructionType)
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Operator{ pub struct Operator{
@ -87,47 +93,46 @@ impl Operator {
impl OpType { impl OpType {
pub fn human(&self) -> String { pub fn human(&self) -> String {
match *self { match *self {
OpType::PushInt => "Number", OpType::Instruction(InstructionType::PushInt) => "Number",
OpType::PushStr => "String", OpType::Instruction(InstructionType::PushStr) => "String",
OpType::Print => "print", OpType::Instruction(InstructionType::Print) => "print",
OpType::Dup => "dup", OpType::Instruction(InstructionType::Dup) => "dup",
OpType::Drop => "drop", OpType::Instruction(InstructionType::Drop) => "drop",
OpType::Dup2 => "2dup", OpType::Instruction(InstructionType::Rot) => "rot",
OpType::Rot => "rot", OpType::Instruction(InstructionType::Over) => "over",
OpType::Over => "over", OpType::Instruction(InstructionType::Swap) => "swap",
OpType::Swap => "swap", OpType::Instruction(InstructionType::Plus) => "+",
OpType::Plus => "+", OpType::Instruction(InstructionType::Minus) => "-",
OpType::Minus => "-", OpType::Instruction(InstructionType::Equals) => "=",
OpType::Equals => "=", OpType::Instruction(InstructionType::Gt) => ">",
OpType::Gt => ">", OpType::Instruction(InstructionType::Lt) => "<",
OpType::Lt => "<", OpType::Instruction(InstructionType::NotEquals) => "!=",
OpType::NotEquals => "!=", OpType::Instruction(InstructionType::Le) => "<=",
OpType::Le => "<=", OpType::Instruction(InstructionType::Ge) => ">=",
OpType::Ge => ">=", OpType::Instruction(InstructionType::Band) => "band",
OpType::Band => "band", OpType::Instruction(InstructionType::Bor) => "bor",
OpType::Bor => "bor", OpType::Instruction(InstructionType::Shr) => "shr",
OpType::Shr => "shr", OpType::Instruction(InstructionType::Shl) => "shl",
OpType::Shl => "shl", OpType::Instruction(InstructionType::DivMod) => "divmod",
OpType::DivMod => "divmod", OpType::Instruction(InstructionType::Mul) => "*",
OpType::Mul => "*", OpType::Keyword(KeywordType::If) => "if",
OpType::If => "if", OpType::Keyword(KeywordType::Else) => "else",
OpType::Else => "else", OpType::Keyword(KeywordType::End) => "end",
OpType::End => "end", OpType::Keyword(KeywordType::While) => "while",
OpType::While => "while", OpType::Keyword(KeywordType::Do) => "do",
OpType::Do => "do", OpType::Keyword(KeywordType::Macro) => "macro",
OpType::Macro => "macro", OpType::Keyword(KeywordType::Include) => "include",
OpType::Include => "include", OpType::Instruction(InstructionType::Mem) => "mem",
OpType::Mem => "mem", OpType::Instruction(InstructionType::Load8) => "!8",
OpType::Load8 => "!8", OpType::Instruction(InstructionType::Store8) => "@8",
OpType::Store8 => "@8", OpType::Instruction(InstructionType::Syscall0) => "syscall0",
OpType::Syscall0 => "syscall0", OpType::Instruction(InstructionType::Syscall1) => "syscall1",
OpType::Syscall1 => "syscall1", OpType::Instruction(InstructionType::Syscall2) => "syscall2",
OpType::Syscall2 => "syscall2", OpType::Instruction(InstructionType::Syscall3) => "syscall3",
OpType::Syscall3 => "syscall3", OpType::Instruction(InstructionType::Syscall4) => "syscall4",
OpType::Syscall4 => "syscall4", OpType::Instruction(InstructionType::Syscall5) => "syscall5",
OpType::Syscall5 => "syscall5", OpType::Instruction(InstructionType::Syscall6) => "syscall6",
OpType::Syscall6 => "syscall6", OpType::Instruction(InstructionType::None) => "None"
OpType::None => "None"
}.to_string() }.to_string()
} }
} }

86
src/interpret/linux_x86_64/mod.rs
View File

@ -1,4 +1,4 @@
use crate::{constants::{OpType, Loc}, lerror, error}; use crate::{constants::{OpType, Loc, InstructionType, KeywordType}, lerror, error};
// use crate::util::logger; // use crate::util::logger;
use color_eyre::Result; use color_eyre::Result;
use eyre::eyre; use eyre::eyre;
@ -27,11 +27,11 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
match token.typ { match token.typ {
// stack // stack
OpType::PushInt => { OpType::Instruction(InstructionType::PushInt) => {
stack.push(token.value); stack.push(token.value);
ti += 1; ti += 1;
}, },
OpType::PushStr => { OpType::Instruction(InstructionType::PushStr) => {
if token.addr.is_none() { if token.addr.is_none() {
stack.push(token.text.len()); // string len stack.push(token.text.len()); // string len
stack.push(string_idx + crate::compile::MEM_SZ); stack.push(string_idx + crate::compile::MEM_SZ);
@ -50,26 +50,18 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
ti += 1; ti += 1;
}, },
OpType::Drop => { OpType::Instruction(InstructionType::Drop) => {
stack.pop(); stack.pop();
ti += 1; ti += 1;
}, },
OpType::Dup => { OpType::Instruction(InstructionType::Dup) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
stack.push(a); stack.push(a);
stack.push(a); stack.push(a);
ti += 1; ti += 1;
}, },
OpType::Dup2 => {
let a = stack_pop(&mut stack, &pos)?; OpType::Instruction(InstructionType::Rot) => {
let b = stack_pop(&mut stack, &pos)?;
stack.push(b);
stack.push(a);
stack.push(b);
stack.push(a);
ti += 1;
}
OpType::Rot => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
let c = stack_pop(&mut stack, &pos)?; let c = stack_pop(&mut stack, &pos)?;
@ -78,14 +70,14 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
stack.push(c); stack.push(c);
ti += 1; ti += 1;
} }
OpType::Swap => { OpType::Instruction(InstructionType::Swap) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(a); stack.push(a);
stack.push(b); stack.push(b);
ti += 1; ti += 1;
} }
OpType::Over => { OpType::Instruction(InstructionType::Over) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b); stack.push(b);
@ -94,7 +86,7 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
ti += 1; ti += 1;
} }
OpType::Print => { OpType::Instruction(InstructionType::Print) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
println!("{a}"); println!("{a}");
// let _ = io::stdout().flush(); // let _ = io::stdout().flush();
@ -102,18 +94,18 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
}, },
// mem // mem
OpType::Mem => { OpType::Instruction(InstructionType::Mem) => {
stack.push(0); stack.push(0);
ti += 1; ti += 1;
} }
OpType::Load8 => { OpType::Instruction(InstructionType::Load8) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let byte = mem[a]; let byte = mem[a];
stack.push(byte as usize); stack.push(byte as usize);
ti += 1; ti += 1;
} }
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
OpType::Store8 => { OpType::Instruction(InstructionType::Store8) => {
let val = stack_pop(&mut stack, &pos)?; let val = stack_pop(&mut stack, &pos)?;
let addr = stack_pop(&mut stack, &pos)?; let addr = stack_pop(&mut stack, &pos)?;
@ -122,91 +114,91 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
} }
// math // math
OpType::Plus => { OpType::Instruction(InstructionType::Plus) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b + a); stack.push(b + a);
ti += 1; ti += 1;
}, },
OpType::Minus => { OpType::Instruction(InstructionType::Minus) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b - a); stack.push(b - a);
ti += 1; ti += 1;
}, },
OpType::Equals => { OpType::Instruction(InstructionType::Equals) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b == a)); stack.push(usize::from(b == a));
ti += 1; ti += 1;
}, },
OpType::Gt => { OpType::Instruction(InstructionType::Gt) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b > a)); stack.push(usize::from(b > a));
ti += 1; ti += 1;
}, },
OpType::Lt => { OpType::Instruction(InstructionType::Lt) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b < a)); stack.push(usize::from(b < a));
ti += 1; ti += 1;
}, },
OpType::NotEquals => { OpType::Instruction(InstructionType::NotEquals) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b != a)); stack.push(usize::from(b != a));
ti += 1; ti += 1;
}, },
OpType::Ge => { OpType::Instruction(InstructionType::Ge) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b >= a)); stack.push(usize::from(b >= a));
ti += 1; ti += 1;
}, },
OpType::Le => { OpType::Instruction(InstructionType::Le) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(usize::from(b <= a)); stack.push(usize::from(b <= a));
ti += 1; ti += 1;
}, },
OpType::Band => { OpType::Instruction(InstructionType::Band) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(a & b); stack.push(a & b);
ti += 1; ti += 1;
} }
OpType::Bor => { OpType::Instruction(InstructionType::Bor) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(a | b); stack.push(a | b);
ti += 1; ti += 1;
} }
OpType::Shr => { OpType::Instruction(InstructionType::Shr) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b >> a); stack.push(b >> a);
ti += 1; ti += 1;
} }
OpType::Shl => { OpType::Instruction(InstructionType::Shl) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b << a); stack.push(b << a);
ti += 1; ti += 1;
} }
OpType::DivMod => { OpType::Instruction(InstructionType::DivMod) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b / a); stack.push(b / a);
stack.push(b % a); stack.push(b % a);
ti += 1; ti += 1;
} }
OpType::Mul => { OpType::Instruction(InstructionType::Mul) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
let b = stack_pop(&mut stack, &pos)?; let b = stack_pop(&mut stack, &pos)?;
stack.push(b * a); stack.push(b * a);
@ -215,7 +207,7 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
// blocks // blocks
OpType::If => { OpType::Keyword(KeywordType::If) => {
let a = stack_pop(&mut stack, &pos)?; let a = stack_pop(&mut stack, &pos)?;
if a == 0 { if a == 0 {
// println!("If({ti}) => t: {:?} j: {}", tokens[token.jmp as usize].typ, token.jmp); // println!("If({ti}) => t: {:?} j: {}", tokens[token.jmp as usize].typ, token.jmp);
@ -224,13 +216,13 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
ti += 1; ti += 1;
} }
}, },
OpType::Else | OpType::End => { OpType::Keyword(KeywordType::Else) | OpType::Keyword(KeywordType::End) => {
ti = token.jmp; ti = token.jmp;
} }
OpType::While => { OpType::Keyword(KeywordType::While) => {
ti += 1; ti += 1;
} }
OpType::Do => { OpType::Keyword(KeywordType::Do) => {
let a = stack.pop().unwrap(); let a = stack.pop().unwrap();
if a == 0 { if a == 0 {
ti = token.jmp; ti = token.jmp;
@ -238,19 +230,19 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
ti += 1; ti += 1;
} }
} }
OpType::Syscall0 => { OpType::Instruction(InstructionType::Syscall0) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::Syscall1 => { OpType::Instruction(InstructionType::Syscall1) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::Syscall2 => { OpType::Instruction(InstructionType::Syscall2) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::Syscall3 => { OpType::Instruction(InstructionType::Syscall3) => {
let rax = stack_pop(&mut stack, &pos)?; let rax = stack_pop(&mut stack, &pos)?;
let rdi = stack_pop(&mut stack, &pos)?; let rdi = stack_pop(&mut stack, &pos)?;
let rsi = stack_pop(&mut stack, &pos)?; let rsi = stack_pop(&mut stack, &pos)?;
@ -268,19 +260,19 @@ pub fn run(tokens: &[crate::constants::Operator]) -> Result<i32>{
// println!("{}", stack.len()); // println!("{}", stack.len());
ti += 1; ti += 1;
}, },
OpType::Syscall4 => { OpType::Instruction(InstructionType::Syscall4) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::Syscall5 => { OpType::Instruction(InstructionType::Syscall5) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::Syscall6 => { OpType::Instruction(InstructionType::Syscall6) => {
todo!(); todo!();
// ti += 1; // ti += 1;
}, },
OpType::None | OpType::Macro | OpType::Include => unreachable!() OpType::Instruction(InstructionType::None) | OpType::Keyword(KeywordType::Macro) | OpType::Keyword(KeywordType::Include) => unreachable!()
} }
} }

102
src/parser.rs
View File

@ -1,6 +1,6 @@
use std::ops::Deref; use std::ops::Deref;
use crate::{constants::{Operator, OpType, Token, TokenType, Loc}, lerror}; use crate::{constants::{Operator, OpType, Token, TokenType, Loc, KeywordType, InstructionType}, lerror};
use color_eyre::Result; use color_eyre::Result;
use eyre::eyre; use eyre::eyre;
@ -9,12 +9,13 @@ pub fn cross_ref(mut program: Vec<Operator>) -> Result<Vec<Operator>> {
for ip in 0..program.len() { for ip in 0..program.len() {
let op = &program.clone()[ip]; let op = &program.clone()[ip];
match op.typ { match op.typ {
OpType::If | OpType::While => { OpType::Keyword(KeywordType::If) |
OpType::Keyword(KeywordType::While) => {
stack.push(ip); stack.push(ip);
} }
OpType::Else => { OpType::Keyword(KeywordType::Else) => {
let if_ip = stack.pop().unwrap(); let if_ip = stack.pop().unwrap();
if program[if_ip].typ != OpType::If { if program[if_ip].typ != OpType::Keyword(KeywordType::If) {
lerror!(&op.clone().loc,"'end' can only close 'if' blocks"); lerror!(&op.clone().loc,"'end' can only close 'if' blocks");
return Err(eyre!("Bad block")); return Err(eyre!("Bad block"));
} }
@ -22,16 +23,16 @@ pub fn cross_ref(mut program: Vec<Operator>) -> Result<Vec<Operator>> {
program[if_ip].jmp = ip + 1; program[if_ip].jmp = ip + 1;
stack.push(ip); stack.push(ip);
}, },
OpType::End => { OpType::Keyword(KeywordType::End) => {
let block_ip = stack.pop().unwrap(); let block_ip = stack.pop().unwrap();
if program[block_ip].typ == OpType::If || if program[block_ip].typ == OpType::Keyword(KeywordType::If) ||
program[block_ip].typ == OpType::Else { program[block_ip].typ == OpType::Keyword(KeywordType::Else) {
program[block_ip].jmp = ip; program[block_ip].jmp = ip;
program[ip].jmp = ip + 1; program[ip].jmp = ip + 1;
} else if program[block_ip].typ == OpType::Do { } else if program[block_ip].typ == OpType::Keyword(KeywordType::Do) {
program[ip].jmp = program[block_ip].jmp; program[ip].jmp = program[block_ip].jmp;
program[block_ip].jmp = ip + 1; program[block_ip].jmp = ip + 1;
} else { } else {
@ -40,7 +41,7 @@ pub fn cross_ref(mut program: Vec<Operator>) -> Result<Vec<Operator>> {
} }
} }
OpType::Do => { OpType::Keyword(KeywordType::Do) => {
let while_ip = stack.pop().unwrap(); let while_ip = stack.pop().unwrap();
program[ip].jmp = while_ip; program[ip].jmp = while_ip;
stack.push(ip); stack.push(ip);
@ -82,10 +83,10 @@ impl Parser {
tokens.push(Operator::new(word_type, 0, token.text.clone(), token.file.clone(), token.line, token.col)); tokens.push(Operator::new(word_type, 0, token.text.clone(), token.file.clone(), token.line, token.col));
}, },
TokenType::Int => {// negative numbers not yet implemented TokenType::Int => {// negative numbers not yet implemented
tokens.push(Operator::new(OpType::PushInt, token.text.parse::<usize>()?, String::new(), token.file.clone(), token.line, token.col)); tokens.push(Operator::new(OpType::Instruction(InstructionType::PushInt), token.text.parse::<usize>()?, String::new(), token.file.clone(), token.line, token.col));
}, },
TokenType::String => { TokenType::String => {
tokens.push(Operator::new(OpType::PushStr, 0, token.text.clone(), token.file.clone(), token.line, token.col)); tokens.push(Operator::new(OpType::Instruction(InstructionType::PushStr), 0, token.text.clone(), token.file.clone(), token.line, token.col));
} }
TokenType::Char => { TokenType::Char => {
let c = token.text.clone(); let c = token.text.clone();
@ -94,7 +95,7 @@ impl Parser {
return Err(eyre!("")); return Err(eyre!(""));
} }
tokens.push(Operator::new(OpType::PushInt, token.text.chars().next().unwrap() as usize, String::new(), token.file.clone(), token.line, token.col)); tokens.push(Operator::new(OpType::Instruction(InstructionType::PushInt), token.text.chars().next().unwrap() as usize, String::new(), token.file.clone(), token.line, token.col));
} }
}; };
@ -110,53 +111,52 @@ impl Parser {
pub fn lookup_word<P: Deref<Target = Loc>>(s: &str, _pos: P) -> OpType { pub fn lookup_word<P: Deref<Target = Loc>>(s: &str, _pos: P) -> OpType {
match s { match s {
//stack //stack
"print" => OpType::Print, "print" => OpType::Instruction(InstructionType::Print),
"dup" => OpType::Dup, "dup" => OpType::Instruction(InstructionType::Dup),
"drop" => OpType::Drop, "drop" => OpType::Instruction(InstructionType::Drop),
"2dup" => OpType::Dup2, "rot" => OpType::Instruction(InstructionType::Rot),
"rot" => OpType::Rot, "over" => OpType::Instruction(InstructionType::Over),
"over" => OpType::Over, "swap" => OpType::Instruction(InstructionType::Swap),
"swap" => OpType::Swap,
// comp and math // comp and math
"+" => OpType::Plus, "+" => OpType::Instruction(InstructionType::Plus),
"-" => OpType::Minus, "-" => OpType::Instruction(InstructionType::Minus),
"=" => OpType::Equals, "=" => OpType::Instruction(InstructionType::Equals),
"!=" => OpType::NotEquals, "!=" => OpType::Instruction(InstructionType::NotEquals),
">" => OpType::Gt, ">" => OpType::Instruction(InstructionType::Gt),
"<" => OpType::Lt, "<" => OpType::Instruction(InstructionType::Lt),
">=" => OpType::Ge, ">=" => OpType::Instruction(InstructionType::Ge),
"<=" => OpType::Le, "<=" => OpType::Instruction(InstructionType::Le),
"band" => OpType::Band, "band" => OpType::Instruction(InstructionType::Band),
"bor" => OpType::Bor, "bor" => OpType::Instruction(InstructionType::Bor),
"shr" => OpType::Shr, "shr" => OpType::Instruction(InstructionType::Shr),
"shl" => OpType::Shl, "shl" => OpType::Instruction(InstructionType::Shl),
"divmod" => OpType::DivMod, "divmod" => OpType::Instruction(InstructionType::DivMod),
"*" => OpType::Mul, "*" => OpType::Instruction(InstructionType::Mul),
// block // block
"if" => OpType::If, "if" => OpType::Keyword(KeywordType::If),
"else" => OpType::Else, "else" => OpType::Keyword(KeywordType::Else),
"end" => OpType::End, "end" => OpType::Keyword(KeywordType::End),
"while" => OpType::While, "while" => OpType::Keyword(KeywordType::While),
"do" => OpType::Do, "do" => OpType::Keyword(KeywordType::Do),
"macro" => OpType::Macro, "macro" => OpType::Keyword(KeywordType::Macro),
"include" => OpType::Include, "include" => OpType::Keyword(KeywordType::Include),
// mem // mem
"mem" => OpType::Mem, "mem" => OpType::Instruction(InstructionType::Mem),
"!8" => OpType::Load8, "!8" => OpType::Instruction(InstructionType::Load8),
"@8" => OpType::Store8, "@8" => OpType::Instruction(InstructionType::Store8),
"syscall0" => OpType::Syscall0, "syscall0" => OpType::Instruction(InstructionType::Syscall0),
"syscall1" => OpType::Syscall1, "syscall1" => OpType::Instruction(InstructionType::Syscall1),
"syscall2" => OpType::Syscall2, "syscall2" => OpType::Instruction(InstructionType::Syscall2),
"syscall3" => OpType::Syscall3, "syscall3" => OpType::Instruction(InstructionType::Syscall3),
"syscall4" => OpType::Syscall4, "syscall4" => OpType::Instruction(InstructionType::Syscall4),
"syscall5" => OpType::Syscall5, "syscall5" => OpType::Instruction(InstructionType::Syscall5),
"syscall6" => OpType::Syscall6, "syscall6" => OpType::Instruction(InstructionType::Syscall6),
_ => OpType::None _ => OpType::Instruction(InstructionType::None)
} }
} }

20
src/preprocessor.rs
View File

@ -4,7 +4,7 @@ use std::path::PathBuf;
use color_eyre::Result; use color_eyre::Result;
use eyre::eyre; use eyre::eyre;
use crate::constants::{Token, Loc, OpType, TokenType}; use crate::constants::{Token, Loc, OpType, TokenType, KeywordType, InstructionType};
use crate::lexer::lex; use crate::lexer::lex;
use crate::{lerror, lnote, Args, warn}; use crate::{lerror, lnote, Args, warn};
use crate::parser::lookup_word; use crate::parser::lookup_word;
@ -26,7 +26,7 @@ pub fn preprocess(tokens: Vec<Token>, args: &Args) -> Result<Vec<Token>>{
let op_type = lookup_word(&token.text, &token.loc()); let op_type = lookup_word(&token.text, &token.loc());
match token.clone() { match token.clone() {
_ if op_type == OpType::Macro => { _ if op_type == OpType::Keyword(KeywordType::Macro) => {
if rtokens.is_empty(){ if rtokens.is_empty(){
lerror!(&token.loc(), "Macro name not found, expected {} but found nothing", TokenType::Word.human()); lerror!(&token.loc(), "Macro name not found, expected {} but found nothing", TokenType::Word.human());
return Err(eyre!("")); return Err(eyre!(""));
@ -38,7 +38,7 @@ pub fn preprocess(tokens: Vec<Token>, args: &Args) -> Result<Vec<Token>>{
return Err(eyre!("")); return Err(eyre!(""));
} }
let word = lookup_word(&macro_name.text, &macro_name.loc()); let word = lookup_word(&macro_name.text, &macro_name.loc());
if word != OpType::None { if word != OpType::Instruction(InstructionType::None) {
lerror!(&macro_name.loc(), "Macro name cannot be a built in word, got '{}'", word.human()); lerror!(&macro_name.loc(), "Macro name cannot be a built in word, got '{}'", word.human());
return Err(eyre!("")); return Err(eyre!(""));
} }
@ -55,12 +55,12 @@ pub fn preprocess(tokens: Vec<Token>, args: &Args) -> Result<Vec<Token>>{
while !rtokens.is_empty() { while !rtokens.is_empty() {
let t = rtokens.pop().unwrap(); let t = rtokens.pop().unwrap();
let typ = lookup_word(&t.text, &t.loc()); let typ = lookup_word(&t.text, &t.loc());
if typ == OpType::End && depth == 0 { if typ == OpType::Keyword(KeywordType::End) && depth == 0 {
break; break;
} else if typ == OpType::End && depth != 0 { } else if typ == OpType::Keyword(KeywordType::End) && depth != 0 {
depth -= 1; depth -= 1;
macr.tokens.push(t); macr.tokens.push(t);
} else if typ == OpType::If || typ == OpType::Do { } else if typ == OpType::Keyword(KeywordType::If) || typ == OpType::Keyword(KeywordType::Do) {
macr.tokens.push(t); macr.tokens.push(t);
depth += 1; depth += 1;
} else { } else {
@ -75,7 +75,7 @@ pub fn preprocess(tokens: Vec<Token>, args: &Args) -> Result<Vec<Token>>{
} }
_ if op_type == OpType::Include => { _ if op_type == OpType::Keyword(KeywordType::Include) => {
if rtokens.is_empty() { if rtokens.is_empty() {
lerror!(&token.loc(), "Include path not found, expected {} but found nothing", TokenType::String.human()); lerror!(&token.loc(), "Include path not found, expected {} but found nothing", TokenType::String.human());
return Err(eyre!("")); return Err(eyre!(""));
@ -127,10 +127,10 @@ pub fn preprocess(tokens: Vec<Token>, args: &Args) -> Result<Vec<Token>>{
if f.typ == TokenType::Word { if f.typ == TokenType::Word {
lookup_word(&f.text, &f.loc()) lookup_word(&f.text, &f.loc())
} else { } else {
OpType::PushInt // i hate myself, this is a randomly picked optype so its happy and works OpType::Instruction(InstructionType::PushInt) // i hate myself, this is a randomly picked optype so its happy and works
} }
}).collect::<Vec<OpType>>().contains(&OpType::None){ }).collect::<Vec<OpType>>().contains(&OpType::Instruction(InstructionType::None)){
if times >= 50 { if times >= 50 {
warn!("File import depth maxed out, if the program crashes try reducing the import depth, good luck youll need it"); warn!("File import depth maxed out, if the program crashes try reducing the import depth, good luck youll need it");
@ -155,7 +155,7 @@ pub fn expand_macros(tokens: Vec<Token>, macros: &HashMap<String, Macro>) -> Res
let op_type = lookup_word(&op.text, &op.loc()); let op_type = lookup_word(&op.text, &op.loc());
if op.typ == TokenType::Word { if op.typ == TokenType::Word {
match op_type { match op_type {
OpType::None => { OpType::Instruction(InstructionType::None) => {
let m = macros.get(&op.text); let m = macros.get(&op.text);
if m.is_some() { if m.is_some() {
if let Some(m) = m { if let Some(m) = m {