Skip to content

refactor: reorganize expression parser with proper precedence hierarchy #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LunaStev merged 1 commit into from
Dec 24, 2025
Merged

refactor: reorganize expression parser with proper precedence hierarchy #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions front/lexer/src/lexer/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,13 @@ impl<'a> Lexer<'a> {
line: self.line,
},
'<' => {
if self.match_next('=') {
if self.match_next('<') {
Token {
token_type: TokenType::Rol,
lexeme: "<<".to_string(),
line: self.line,
}
} else if self.match_next('=') {
Token {
token_type: TokenType::LchevrEq,
lexeme: "<=".to_string(),
Expand All @@ -321,7 +327,13 @@ impl<'a> Lexer<'a> {
}
}
'>' => {
if self.match_next('=') {
if self.match_next('>') {
Token {
token_type: TokenType::Ror,
lexeme: ">>".to_string(),
line: self.line,
}
} else if self.match_next('=') {
Token {
token_type: TokenType::RchevrEq,
lexeme: ">=".to_string(),
Expand Down Expand Up @@ -586,16 +598,6 @@ impl<'a> Lexer<'a> {
lexeme: "asm".to_string(),
line: self.line,
},
"<<" => Token {
token_type: TokenType::Rol,
lexeme: "<<".to_string(),
line: self.line,
},
">>" => Token {
token_type: TokenType::Ror,
lexeme: ">>".to_string(),
line: self.line,
},
"xnand" => Token {
token_type: TokenType::Xnand,
lexeme: "xnand".to_string(),
Expand Down Expand Up @@ -784,6 +786,23 @@ impl<'a> Lexer<'a> {
}
}
'0'..='9' => {
if c == '0' && (self.peek() == 'b' || self.peek() == 'B') {
self.advance(); // consume 'b' or 'B'

let mut bin_str = String::new();
while self.peek() == '0' || self.peek() == '1' {
bin_str.push(self.advance());
}

let value = i64::from_str_radix(&bin_str, 2).unwrap_or(0);

return Token {
token_type: TokenType::Number(value),
lexeme: format!("0b{}", bin_str),
line: self.line,
}
}

if c == '0' && (self.peek() == 'x' || self.peek() == 'X') {
self.advance(); // consume 'x' or 'X'

Expand Down
1 change: 1 addition & 0 deletions front/parser/src/parser/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ pub enum Operator {
BitwiseXor,
LogicalNot,
BitwiseNot,
Not,
}

#[derive(Debug, Clone)]
Expand Down
Loading