Merge branch 'master' into php-strict-equal-assignment

Author: Patrick Thomson

src/Data/Abstract/AccessControls/Instances.hs

@@ -398,6 +398,7 @@ instance AccessControls1 PHP.IncludeOnce
 instance AccessControls1 PHP.ArrayElement
 instance AccessControls1 PHP.GlobalDeclaration
 instance AccessControls1 PHP.SimpleVariable
+instance AccessControls1 PHP.Concat
 instance AccessControls1 PHP.CastType
 instance AccessControls1 PHP.ErrorControl
 instance AccessControls1 PHP.Clone

src/Language/PHP/Assignment.hs

@@ -146,6 +146,7 @@ type Syntax = '[
   , Syntax.ReturnType
   , Syntax.ScalarType
   , Syntax.ShellCommand
+  , Syntax.Concat
   , Syntax.SimpleVariable
   , Syntax.Static
   , Syntax.Text
@@ -233,7 +234,7 @@ augmentedAssignmentExpression = makeTerm' <$> symbol AugmentedAssignmentExpressi
   , assign Expression.DividedBy <$ symbol AnonSlashEqual
   , assign Expression.Plus <$ symbol AnonPlusEqual
   , assign Expression.Minus <$ symbol AnonMinusEqual
-  , assign Expression.Times <$ symbol AnonDotEqual
+  , assign Syntax.Concat <$ symbol AnonDotEqual
   , assign Expression.LShift <$ symbol AnonLAngleLAngleEqual
   , assign Expression.RShift <$ symbol AnonRAngleRAngleEqual
   , assign Expression.BAnd <$ symbol AnonAmpersandEqual
@@ -266,7 +267,8 @@ binaryExpression = makeTerm' <$> symbol BinaryExpression <*> children (infixTerm
   , (inject .) . Expression.RShift             <$ symbol AnonRAngleRAngle
   , (inject .) . Expression.Plus               <$ symbol AnonPlus
   , (inject .) . Expression.Minus              <$ symbol AnonMinus
-  , (inject .) . Expression.Times              <$ (symbol AnonStar <|> symbol AnonDot)
+  , (inject .) . Expression.Times              <$ symbol AnonStar
+  , (inject .) . Syntax.Concat                 <$ symbol AnonDot
   , (inject .) . Expression.DividedBy          <$ symbol AnonSlash
   , (inject .) . Expression.Modulo             <$ symbol AnonPercent
   , (inject .) . Expression.InstanceOf         <$ symbol AnonInstanceof

src/Language/PHP/Syntax.hs

@@ -128,6 +128,12 @@ newtype SimpleVariable a = SimpleVariable { value :: a }
 
 instance Evaluatable SimpleVariable
 
+data Concat a = Concat { lhs :: a, rhs :: a }
+  deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Ord, Show, ToJSONFields1, Traversable, NFData1)
+  deriving (Eq1, Show1, Ord1) via Generically Concat
+
+instance Evaluatable Concat
+
 -- | TODO: Unify with TypeScript's PredefinedType
 newtype CastType a = CastType { _castType :: T.Text }
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Ord, Show, ToJSONFields1, Traversable, NFData1)

src/Tags/Taggable.hs

@@ -551,6 +551,7 @@ instance Taggable PHP.IncludeOnce
 instance Taggable PHP.ArrayElement
 instance Taggable PHP.GlobalDeclaration
 instance Taggable PHP.SimpleVariable
+instance Taggable PHP.Concat
 instance Taggable PHP.CastType
 instance Taggable PHP.ErrorControl
 instance Taggable PHP.Clone