Skip to content
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

Fix incorrect unary precedence #297

Merged
merged 10 commits into from
Jun 9, 2024
Merged

Fix incorrect unary precedence #297

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
71f1e32
Add test
chriscerie Apr 7, 2024
f52d390
Fix unary precedence
chriscerie Apr 7, 2024
760c3c5
Fix fail case
chriscerie Apr 7, 2024
8fee5c2
Update luau test
chriscerie Apr 7, 2024
54278a0
Update comments
chriscerie Apr 7, 2024
abe5dbf
Move precedence back to unary
chriscerie Jun 1, 2024
0cd0e0e
Add multiline expression test
chriscerie Jun 1, 2024
3f30684
Accept test
chriscerie Jun 1, 2024
5182b15
Fix unix
chriscerie Jun 1, 2024
04329d0
Merge branch 'main' of https://github.com/Kampfkarren/full-moon into …
JohnnyMorganz Jun 9, 2024
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
7 changes: 6 additions & 1 deletion full-moon/src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,7 @@ macro_rules! make_bin_op {
}

impl BinOp {
/// The precedence of the operator, from a scale of 1 to 10. The larger the number, the higher the precedence.
/// The precedence of non-unary operator, from a scale of 1 to 10. The larger the number, the higher the precedence.
pub fn precedence_of_token(token: &TokenReference) -> Option<u8> {
match token.token_type() {
TokenType::Symbol { symbol } => match symbol {
Expand All @@ -2074,6 +2074,11 @@ macro_rules! make_bin_op {
}
}

/// The precedence of unary operators
pub fn precedence_of_unary() -> u8 {
11
}
chriscerie marked this conversation as resolved.
Show resolved Hide resolved

/// The token associated with this operator
pub fn token(&self) -> &TokenReference {
match self {
Expand Down
21 changes: 20 additions & 1 deletion full-moon/src/ast/parsers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,26 @@ fn parse_unary_expression(
_ => unreachable!(),
};

let expression = match parse_expression(state) {
let primary_expression = match parse_primary_expression(state) {
ParserResult::Value(expression) => expression,
ParserResult::NotFound => {
state.token_error(
unary_operator.token().clone(),
format!(
"expected an expression after {}",
unary_operator.token().token()
),
);
return ParserResult::NotFound;
}
ParserResult::LexerMoved => return ParserResult::LexerMoved,
};

let expression = match parse_expression_with_precedence(
state,
primary_expression,
ast::BinOp::precedence_of_unary(),
chriscerie marked this conversation as resolved.
Show resolved Hide resolved
) {
ParserResult::Value(expression) => expression,
ParserResult::LexerMoved => return ParserResult::LexerMoved,
ParserResult::NotFound => {
Expand Down
155 changes: 153 additions & 2 deletions full-moon/tests/cases/pass/negative-numbers/ast.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: full-moon/tests/pass_cases.rs
assertion_line: 52
expression: ast.nodes()
input_file: full-moon/tests/cases/pass/negative-numbers
---
Expand Down Expand Up @@ -441,4 +440,156 @@ stmts:
text: "3"
trailing_trivia: []
- ~

- - LocalAssignment:
local_token:
leading_trivia: []
token:
start_position:
bytes: 45
line: 4
character: 1
end_position:
bytes: 50
line: 4
character: 6
token_type:
type: Symbol
symbol: local
trailing_trivia:
- start_position:
bytes: 50
line: 4
character: 6
end_position:
bytes: 51
line: 4
character: 7
token_type:
type: Whitespace
characters: " "
name_list:
pairs:
- End:
leading_trivia: []
token:
start_position:
bytes: 51
line: 4
character: 7
end_position:
bytes: 54
line: 4
character: 10
token_type:
type: Identifier
identifier: foo
trailing_trivia:
- start_position:
bytes: 54
line: 4
character: 10
end_position:
bytes: 55
line: 4
character: 11
token_type:
type: Whitespace
characters: " "
equal_token:
leading_trivia: []
token:
start_position:
bytes: 55
line: 4
character: 11
end_position:
bytes: 56
line: 4
character: 12
token_type:
type: Symbol
symbol: "="
trailing_trivia:
- start_position:
bytes: 56
line: 4
character: 12
end_position:
bytes: 57
line: 4
character: 13
token_type:
type: Whitespace
characters: " "
expr_list:
pairs:
- End:
BinaryOperator:
lhs:
UnaryOperator:
unop:
Minus:
leading_trivia: []
token:
start_position:
bytes: 57
line: 4
character: 13
end_position:
bytes: 58
line: 4
character: 14
token_type:
type: Symbol
symbol: "-"
trailing_trivia: []
expression:
Var:
Name:
leading_trivia: []
token:
start_position:
bytes: 58
line: 4
character: 14
end_position:
bytes: 59
line: 4
character: 15
token_type:
type: Identifier
identifier: x
trailing_trivia: []
binop:
Plus:
leading_trivia: []
token:
start_position:
bytes: 59
line: 4
character: 15
end_position:
bytes: 60
line: 4
character: 16
token_type:
type: Symbol
symbol: +
trailing_trivia: []
rhs:
Number:
leading_trivia: []
token:
start_position:
bytes: 60
line: 4
character: 16
end_position:
bytes: 61
line: 4
character: 17
token_type:
type: Number
text: "1"
trailing_trivia: []
- ~
1 change: 1 addition & 0 deletions full-moon/tests/cases/pass/negative-numbers/source.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
local foo = x-1
local foo = x -1
print(1+-3)
local foo = -x+1
116 changes: 112 additions & 4 deletions full-moon/tests/cases/pass/negative-numbers/tokens.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
source: full-moon/tests/pass_cases.rs
expression: tokens
input_file: full-moon/tests/cases/pass/negative-numbers

---
- start_position:
bytes: 0
Expand Down Expand Up @@ -328,9 +327,118 @@ input_file: full-moon/tests/cases/pass/negative-numbers
line: 4
character: 1
end_position:
bytes: 45
bytes: 50
line: 4
character: 1
character: 6
token_type:
type: Symbol
symbol: local
- start_position:
bytes: 50
line: 4
character: 6
end_position:
bytes: 51
line: 4
character: 7
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 51
line: 4
character: 7
end_position:
bytes: 54
line: 4
character: 10
token_type:
type: Identifier
identifier: foo
- start_position:
bytes: 54
line: 4
character: 10
end_position:
bytes: 55
line: 4
character: 11
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 55
line: 4
character: 11
end_position:
bytes: 56
line: 4
character: 12
token_type:
type: Symbol
symbol: "="
- start_position:
bytes: 56
line: 4
character: 12
end_position:
bytes: 57
line: 4
character: 13
token_type:
type: Whitespace
characters: " "
- start_position:
bytes: 57
line: 4
character: 13
end_position:
bytes: 58
line: 4
character: 14
token_type:
type: Symbol
symbol: "-"
- start_position:
bytes: 58
line: 4
character: 14
end_position:
bytes: 59
line: 4
character: 15
token_type:
type: Identifier
identifier: x
- start_position:
bytes: 59
line: 4
character: 15
end_position:
bytes: 60
line: 4
character: 16
token_type:
type: Symbol
symbol: +
- start_position:
bytes: 60
line: 4
character: 16
end_position:
bytes: 61
line: 4
character: 17
token_type:
type: Number
text: "1"
- start_position:
bytes: 61
line: 4
character: 17
end_position:
bytes: 61
line: 4
character: 17
token_type:
type: Eof

Loading
Loading