Assign primitive constructor identifiers

src/Language/Haskell/Assignment.hs

@@ -174,6 +174,7 @@ expressionChoices = [
                     , operator
                     , parenthesizedTypePattern
                     , pragma
+                    , primitiveConstructorIdentifier
                     , qualifiedModuleIdentifier
                     , qualifiedTypeConstructorIdentifier
                     , quotedName
@@ -316,6 +317,9 @@ parenthesizedTypePattern = symbol ParenthesizedTypePattern *> children expressio
 pragma :: Assignment
 pragma = makeTerm <$> symbol Pragma <*> (Syntax.Pragma <$> source)
 
+primitiveConstructorIdentifier :: Assignment
+primitiveConstructorIdentifier = makeTerm <$> symbol PrimitiveConstructorIdentifier <*> (Syntax.Identifier . Name.name <$> source)
+
 qualifiedModuleIdentifier :: Assignment
 qualifiedModuleIdentifier = makeTerm <$> symbol QualifiedModuleIdentifier <*> children (Syntax.QualifiedModuleIdentifier <$> someTerm' expression)
 
@@ -335,7 +339,7 @@ strictType :: Assignment
 strictType = makeTerm'
           <$> symbol StrictType
           <*> children (  (inject <$> (Syntax.StrictType <$> typeConstructor <*> typeParameters))
-                      <|> (inject <$> (Syntax.StrictTypeVariable <$> typeVariableIdentifier)))
+                      <|> (inject <$> (Syntax.StrictTypeVariable <$> expression)))
 
 string :: Assignment
 string = makeTerm <$> symbol String <*> (Literal.TextElement <$> source)

test/fixtures/haskell/corpus/algebraic-datatype-declarations.A.hs

@@ -26,3 +26,5 @@ data (Eq (f a), Functor f) => N f a = N f a
 
 data Foo bar = HasCallStack => Foo bar
 data Baz foo = Show foo => Baz foo
+
+data Foo = Foo !Double#

test/fixtures/haskell/corpus/algebraic-datatype-declarations.B.hs

@@ -26,3 +26,6 @@ data (Eq (f a), Applicative f) => N f a = N f a
 
 data Foo bar = HasCallStack => Wiz bar
 data Baz a = Show a => Baz a
+
+
+data Bar = Bar !Double#

test/fixtures/haskell/corpus/algebraic-datatype-declarations.diffA-B.txt

@@ -423,4 +423,19 @@
         (TypeParameters
         { (Identifier)
         ->(Identifier) }))
+      (Empty))
+    (Datatype
+      (Empty)
+      (Type
+      { (Identifier)
+      ->(Identifier) }
+        (TypeParameters)
+        (Empty))
+      (Constructor
+        (Empty)
+      { (Identifier)
+      ->(Identifier) }
+        (TypeParameters
+          (StrictTypeVariable
+            (Identifier))))
       (Empty))))

test/fixtures/haskell/corpus/algebraic-datatype-declarations.diffB-A.txt

@@ -420,4 +420,19 @@
         (TypeParameters
         { (Identifier)
         ->(Identifier) }))
+      (Empty))
+    (Datatype
+      (Empty)
+      (Type
+      { (Identifier)
+      ->(Identifier) }
+        (TypeParameters)
+        (Empty))
+      (Constructor
+        (Empty)
+      { (Identifier)
+      ->(Identifier) }
+        (TypeParameters
+          (StrictTypeVariable
+            (Identifier))))
       (Empty))))

test/fixtures/haskell/corpus/algebraic-datatype-declarations.parseA.txt

@@ -354,4 +354,17 @@
         (Identifier)
         (TypeParameters
           (Identifier)))
+      (Empty))
+    (Datatype
+      (Empty)
+      (Type
+        (Identifier)
+        (TypeParameters)
+        (Empty))
+      (Constructor
+        (Empty)
+        (Identifier)
+        (TypeParameters
+          (StrictTypeVariable
+            (Identifier))))
       (Empty))))

test/fixtures/haskell/corpus/algebraic-datatype-declarations.parseB.txt

@@ -354,4 +354,17 @@
         (Identifier)
         (TypeParameters
           (Identifier)))
+      (Empty))
+    (Datatype
+      (Empty)
+      (Type
+        (Identifier)
+        (TypeParameters)
+        (Empty))
+      (Constructor
+        (Empty)
+        (Identifier)
+        (TypeParameters
+          (StrictTypeVariable
+            (Identifier))))
       (Empty))))