Merge branch 'master' into bump-haskell-tree-sitter

src/Data/Syntax/Expression.hs

@@ -29,6 +29,7 @@ data Comparison a
   | GreaterThan !a !a
   | GreaterThanEqual !a !a
   | Equal !a !a
+  | StrictEqual !a !a
   | Comparison !a !a
   deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Hashable1, Mergeable, Ord, Show, Traversable, FreeVariables1, Declarations1)
 
@@ -45,7 +46,10 @@ instance Evaluatable Comparison where
       (LessThanEqual a b)    -> liftComparison (Concrete (<=)) a b
       (GreaterThan a b)      -> liftComparison (Concrete (>)) a b
       (GreaterThanEqual a b) -> liftComparison (Concrete (>=)) a b
+      -- TODO: in PHP and JavaScript, the equals operator performs type coercion.
+      -- We need some mechanism to customize this behavior per-language.
       (Equal a b)            -> liftComparison (Concrete (==)) a b
+      (StrictEqual a b)      -> liftComparison (Concrete (==)) a b
       (Comparison a b)       -> liftComparison Generalized a b
 
 -- | Binary arithmetic operators.

src/Language/PHP/Assignment.hs

@@ -243,8 +243,10 @@ binaryExpression = makeTerm' <$> symbol BinaryExpression <*> children (infixTerm
   , (inject .) . Expression.BXOr               <$ symbol AnonCaret
   , (inject .) . Expression.BAnd               <$ symbol AnonAmpersand
   , (inject .) . Expression.Or                 <$ symbol AnonQuestionQuestion -- Not sure if this is right.
-  , (inject .) . Expression.Equal            <$ (symbol AnonEqualEqual <|> symbol AnonEqualEqualEqual)
+  , (inject .) . Expression.Equal              <$ symbol AnonEqualEqual
+  , (inject .) . Expression.StrictEqual        <$ symbol AnonEqualEqualEqual
   , (inject .) . invert Expression.Equal       <$ (symbol AnonBangEqual <|> symbol AnonLAngleRAngle <|> symbol AnonBangEqualEqual)
+  , (inject .) . invert Expression.StrictEqual <$ symbol AnonBangEqualEqual
   , (inject .) . Expression.LessThan           <$ symbol AnonLAngle
   , (inject .) . Expression.GreaterThan        <$ symbol AnonRAngle
   , (inject .) . Expression.LessThanEqual      <$ symbol AnonLAngleEqual

src/Language/Ruby/Assignment.hs

@@ -455,6 +455,10 @@ binary = makeTerm' <$> symbol Binary <*> children (infixTerm expression expressi
   , (inject .) . Ruby.Syntax.LowOr           <$ symbol AnonOr
   , (inject .) . Expression.BOr              <$ symbol AnonPipe
   , (inject .) . Expression.BXOr             <$ symbol AnonCaret
+  -- TODO: AnonEqualEqualEqual corresponds to Ruby's "case equality"
+  -- function, which (unless overridden) is true if b is an instance
+  -- of or inherits from a. We need a custom equality operator
+  -- for this situation.
   , (inject .) . Expression.Equal            <$ (symbol AnonEqualEqual <|> symbol AnonEqualEqualEqual)
   , (inject .) . invert Expression.Equal     <$ symbol AnonBangEqual
   , (inject .) . Expression.LShift           <$ symbol AnonLAngleLAngle

src/Language/TypeScript/Assignment.hs

@@ -844,8 +844,10 @@ binaryExpression = makeTerm' <$> symbol BinaryExpression <*> children (infixTerm
   , (inject .) . Expression.BOr                <$ symbol AnonPipe
   , (inject .) . Expression.BXOr               <$ symbol AnonCaret
   , (inject .) . Expression.InstanceOf         <$ symbol AnonInstanceof
-  , (inject .) . Expression.Equal            <$ (symbol AnonEqualEqual <|> symbol AnonEqualEqualEqual)
-  , (inject .) . invert Expression.Equal     <$ (symbol AnonBangEqual <|> symbol AnonBangEqualEqual)
+  , (inject .) . Expression.Equal              <$ symbol AnonEqualEqual
+  , (inject .) . Expression.StrictEqual        <$ symbol AnonEqualEqualEqual
+  , (inject .) . invert Expression.Equal       <$ symbol AnonBangEqual
+  , (inject .) . invert Expression.StrictEqual <$ symbol AnonBangEqualEqual
   , (inject .) . Expression.LShift             <$ symbol AnonLAngleLAngle
   , (inject .) . Expression.RShift             <$ symbol AnonRAngleRAngle
   , (inject .) . Expression.UnsignedRShift     <$ symbol AnonRAngleRAngleRAngle

test/fixtures/javascript/corpus/break.diffA-B.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/break.diffB-A.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/break.parseA.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/break.parseB.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/continue.diffA-B.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/continue.diffB-A.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/continue.parseA.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/javascript/corpus/continue.parseB.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/break.diffA-B.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/break.diffB-A.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/break.parseA.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/break.parseB.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/continue.diffA-B.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/continue.diffB-A.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/continue.parseA.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (

test/fixtures/typescript/corpus/continue.parseB.txt

@@ -10,7 +10,7 @@
       (Identifier))
     (
       (If
-        (Equal
+        (StrictEqual
           (Identifier)
           (Float))
         (