Fix x instanceof Foo && otherExpr

Author: Dinnerbone

crates/rascal/src/internal/as2/lexer/snapshots/rascal__internal__as2__lexer__tests__all_samples@op_precedence__instanceof.as.snap

@@ -0,0 +1,80 @@
+---
+source: crates/rascal/src/internal/as2/lexer/tests.rs
+expression: tokens
+input_file: samples/as2/op_precedence/instanceof.as
+---
+- kind:
+    Keyword: Var
+  span:
+    start: 0
+    end: 3
+  raw: var
+- kind: Identifier
+  span:
+    start: 4
+    end: 5
+  raw: x
+- kind:
+    Operator: Assign
+  span:
+    start: 6
+    end: 7
+  raw: "="
+- kind: Identifier
+  span:
+    start: 8
+    end: 17
+  raw: toCompare
+- kind:
+    Keyword: InstanceOf
+  span:
+    start: 18
+    end: 28
+  raw: instanceof
+- kind: Identifier
+  span:
+    start: 29
+    end: 32
+  raw: Foo
+- kind:
+    Operator: LogicalAnd
+  span:
+    start: 33
+    end: 35
+  raw: "&&"
+- kind: Identifier
+  span:
+    start: 36
+    end: 45
+  raw: toCompare
+- kind: Period
+  span:
+    start: 45
+    end: 46
+  raw: "."
+- kind: Identifier
+  span:
+    start: 46
+    end: 47
+  raw: x
+- kind:
+    Operator: Equal
+  span:
+    start: 48
+    end: 50
+  raw: "=="
+- kind: Integer
+  span:
+    start: 51
+    end: 54
+  raw: "123"
+- kind: Semicolon
+  span:
+    start: 54
+    end: 55
+  raw: ;
+- kind: Newline
+  span:
+    start: 55
+    end: 56
+  raw: "\n"

crates/rascal/src/internal/as2/parser/expression.rs

@@ -1327,6 +1327,40 @@ mod tests {
         )
     }
 
+    #[test]
+    fn test_instanceof_and_equality_precedence() {
+        let tokens = build_tokens(&[
+            (TokenKind::Identifier, "toCompare"),
+            (TokenKind::Keyword(Keyword::InstanceOf), "instanceof"),
+            (TokenKind::Identifier, "Foo"),
+            (TokenKind::Operator(Operator::LogicalAnd), "&&"),
+            (TokenKind::Identifier, "toCompare"),
+            (TokenKind::Period, "."),
+            (TokenKind::Identifier, "x"),
+            (TokenKind::Operator(Operator::Equal), "=="),
+            (TokenKind::Integer, "123"),
+        ]);
+        assert_eq!(
+            parse_expr(&tokens),
+            Ok(ex(ExprKind::BinaryOperator(
+                BinaryOperator::LogicalAnd,
+                Box::new(ex(ExprKind::BinaryOperator(
+                    BinaryOperator::InstanceOf,
+                    Box::new(id("toCompare")),
+                    Box::new(id("Foo")),
+                ))),
+                Box::new(ex(ExprKind::BinaryOperator(
+                    BinaryOperator::Equal,
+                    Box::new(ex(ExprKind::Field(
+                        Box::new(id("toCompare")),
+                        Box::new(s("x"))
+                    ))),
+                    Box::new(ex(ExprKind::Constant(ConstantKind::Integer(123)))),
+                ))),
+            )))
+        )
+    }
+
     #[test]
     fn test_parenthesis() {
         let tokens = build_tokens(&[

crates/rascal/src/internal/as2/parser/operator.rs

@@ -77,7 +77,7 @@ impl BinaryOperator {
             | BinaryOperator::BitShiftLeftAssign
             | BinaryOperator::BitShiftRightAssign
             | BinaryOperator::BitShiftRightUnsignedAssign => OperatorPrecedence::Assignment,
-            BinaryOperator::InstanceOf => OperatorPrecedence::Other,
+            BinaryOperator::InstanceOf => OperatorPrecedence::Comparison,
         }
     }
 }

crates/rascal/src/snapshots/rascal__program__tests__all_samples@op_precedence__instanceof.as.snap

@@ -0,0 +1,71 @@
+---
+source: crates/rascal/src/program.rs
+expression: parsed
+input_file: samples/as2/op_precedence/instanceof.as
+---
+Ok:
+  initial_script:
+    - Declare:
+        name:
+          span:
+            start: 4
+            end: 5
+          value: x
+        value:
+          span:
+            start: 8
+            end: 54
+          value:
+            BinaryOperator:
+              - LogicalAnd
+              - span:
+                  start: 8
+                  end: 32
+                value:
+                  BinaryOperator:
+                    - InstanceOf
+                    - span:
+                        start: 8
+                        end: 17
+                      value:
+                        Constant:
+                          Identifier: toCompare
+                    - span:
+                        start: 29
+                        end: 32
+                      value:
+                        Constant:
+                          Identifier: Foo
+              - span:
+                  start: 45
+                  end: 54
+                value:
+                  BinaryOperator:
+                    - Equal
+                    - span:
+                        start: 45
+                        end: 47
+                      value:
+                        Field:
+                          - span:
+                              start: 36
+                              end: 45
+                            value:
+                              Constant:
+                                Identifier: toCompare
+                          - span:
+                              start: 46
+                              end: 47
+                            value:
+                              Constant:
+                                String: x
+                    - span:
+                        start: 51
+                        end: 54
+                      value:
+                        Constant:
+                          Integer: 123
+        type_name: ~
+  interfaces: []
+  classes: []
+  custom_pcodes: []

crates/rascal/src/snapshots/rascal__tests__all_samples@op_precedence__instanceof.as.snap

@@ -0,0 +1,39 @@
+---
+source: crates/rascal/src/tests.rs
+expression: result
+input_file: samples/as2/op_precedence/instanceof.as
+---
+initializer:
+  actions:
+    - ConstantPool:
+        - x
+        - toCompare
+        - Foo
+    - Push:
+        - Constant: 0
+        - Constant: 1
+    - GetVariable
+    - Push:
+        - Constant: 2
+    - GetVariable
+    - InstanceOf
+    - PushDuplicate
+    - Not
+    - If: loc0000
+    - Pop
+    - Push:
+        - Constant: 1
+    - GetVariable
+    - Push:
+        - Constant: 0
+    - GetMember
+    - Push:
+        - Integer: 123
+    - Equals2
+    - DefineLocal
+  label_positions:
+    loc0000: 16
+extra_modules: []
+compile_options:
+  swf_version: 15
+custom_pcodes: []

samples/as2/op_precedence/instanceof.as

@@ -0,0 +1 @@
+var x = toCompare instanceof Foo && toCompare.x == 123;