janis/from-scratch
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix ast gen with nested binary ops

Browse source
This commit is contained in:
janis 2025-11-02 00:30:00 +01:00
parent a0f4b56c64
commit b9712dacfb
Signed by: janis
SSH key fingerprint: SHA256:bB1qbbqmDXZNT0KKD5c2Dfjg53JGhj7B3CFcLIzSqq8
2 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lang/src/ast.asm
View file

@ -4,11 +4,11 @@ default rel
%include "src/ast.inc" %include "src/ast.inc"
section .rdata section .rdata
PRECEDENCE_ADD equ 90 PRECEDENCE_ADD dw 90
PRECEDENCE_SUB equ 90 PRECEDENCE_SUB dw 90
PRECEDENCE_MUL equ 100 PRECEDENCE_MUL dw 100
PRECEDENCE_DIV equ 100 PRECEDENCE_DIV dw 100
PRECEDENCE_REM equ 100 PRECEDENCE_REM dw 100
section .text section .text
extern vec_init_with extern vec_init_with
@ -28,6 +28,7 @@ extern tokeniser_init
extern find_lexeme extern find_lexeme
extern peek_lexeme extern peek_lexeme
extern expect_token extern expect_token
extern skip_token
extern unwrap_token extern unwrap_token
extern peek_expect_token extern peek_expect_token
@ -400,6 +401,7 @@ parse_primary_expr:
parse_binary_expr: parse_binary_expr:
push rbp push rbp
mov rbp, rsp mov rbp, rsp
push rbx
; size: 24, align: 8 ; size: 24, align: 8
; start-structs ; start-structs
@ -438,40 +440,19 @@ parse_binary_expr:
lea rdi, [rsp + 32] ; lexeme lea rdi, [rsp + 32] ; lexeme
call peek_lexeme call peek_lexeme
mov rax, [rsp + 32] mov rax, [rsp + 32]
mov byte [rsp + 16], al ; operator
mov bx, -1
cmp al, TOKEN_PLUS cmp al, TOKEN_PLUS
je .add cmove bx, word [rel PRECEDENCE_ADD]
cmp al, TOKEN_MINUS cmp al, TOKEN_MINUS
je .sub cmove bx, word [rel PRECEDENCE_SUB]
cmp al, TOKEN_STAR cmp al, TOKEN_STAR
je .mul cmove bx, word [rel PRECEDENCE_MUL]
cmp al, TOKEN_SLASH cmp al, TOKEN_SLASH
je .div cmove bx, word [rel PRECEDENCE_DIV]
jmp .done cmp bx, -1
je .done
.add: mov byte [rsp + 18], bl
mov dil, TOKEN_PLUS
call unwrap_token
mov byte [rsp + 16], TOKEN_PLUS
mov byte [rsp + 18], PRECEDENCE_ADD
jmp .right
.sub:
mov dil, TOKEN_MINUS
call unwrap_token
mov byte [rsp + 16], TOKEN_MINUS
mov byte [rsp + 18], PRECEDENCE_SUB
jmp .right
.mul:
mov dil, TOKEN_STAR
call unwrap_token
mov byte [rsp + 16], TOKEN_STAR
mov byte [rsp + 18], PRECEDENCE_MUL
jmp .right
.div:
mov dil, TOKEN_SLASH
call unwrap_token
mov byte [rsp + 16], TOKEN_SLASH
mov byte [rsp + 18], PRECEDENCE_DIV
jmp .right
.right: .right:
mov dil, [rsp + 17] mov dil, [rsp + 17]
@ -479,6 +460,8 @@ parse_binary_expr:
cmp al, dil ; our_precedence <= upper_precedence cmp al, dil ; our_precedence <= upper_precedence
jle .done jle .done
call skip_token ; consume operator
mov rdi, [rsp] ; Ast mov rdi, [rsp] ; Ast
mov sil, [rsp + 18] mov sil, [rsp + 18]
call parse_binary_expr call parse_binary_expr
@ -529,6 +512,7 @@ parse_binary_expr:
mov rax, [rsp + 8] ; left mov rax, [rsp + 8] ; left
movzx rdx, byte [rsp + 19] ; left_placeness movzx rdx, byte [rsp + 19] ; left_placeness
add rsp, 64 add rsp, 64
pop rbx
pop rbp pop rbp
ret ret

5
lang/tests/ast.rs
View file

@ -60,6 +60,11 @@ fn main() {
}; };
} }
print_ast(
b"fn main() -> void { return 1 * 2 + 3 * 4; }",
|ast| unsafe { parse_func(ast) },
);
print_ast(b"3 + 4", |ast| unsafe { parse_expr(ast) }); print_ast(b"3 + 4", |ast| unsafe { parse_expr(ast) });
print_ast(b"fn main() -> void { return 1 + 2; }", |ast| unsafe { print_ast(b"fn main() -> void { return 1 + 2; }", |ast| unsafe {
parse_func(ast) parse_func(ast)