Fix incorrect unary precedence

CHANGELOG.md

@@ -23,7 +23,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Punctuated<T>` now implements `Default` for all `T`, rather than if `T: Default`.
 
 ### Removed
-- Removed `UnOp::precedence`, as unary operators do not traditionally use precedence in the same way binary operators do.
 - Removed `TokenizerErrorType::UnexpectedShebang`.
 - Removed `stacker` feature flag, as rewrites to the parser should make it unnecessary.
 

full-moon/src/ast/mod.rs

@@ -2055,7 +2055,8 @@ 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. The larger the number, the higher the precedence.
+                /// Shares the same precedence table as unary operators.
                 pub fn precedence_of_token(token: &TokenReference) -> Option<u8> {
                     match token.token_type() {
                         TokenType::Symbol { symbol } => match symbol {
@@ -2203,6 +2204,12 @@ impl UnOp {
             UnOp::Tilde(token) => token,
         }
     }
+
+    /// The precedence of unary operator. The larger the number, the higher the precedence.
+    /// Shares the same precedence table as binary operators.
+    pub fn precedence() -> u8 {
+        11
+    }
 }
 
 /// An error that occurs when creating the AST.

full-moon/src/ast/parsers.rs

@@ -1818,7 +1818,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::UnOp::precedence(),
+    ) {
         ParserResult::Value(expression) => expression,
         ParserResult::LexerMoved => return ParserResult::LexerMoved,
         ParserResult::NotFound => {

full-moon/tests/cases/pass/negative-numbers/ast.snap

@@ -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
 ---
@@ -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: []
+    - ~

full-moon/tests/cases/pass/negative-numbers/source.lua

@@ -1,3 +1,4 @@
 local foo = x-1
 local foo = x -1
 print(1+-3)
+local foo = -x+1

full-moon/tests/cases/pass/negative-numbers/tokens.snap

@@ -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
@@ -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
-