Add Generic representations of # -> * and * -> * args.

A comment in Prelude observes that higher-kinded args can't be handled
in general; my interpretation is that this is because the lack of
poly-kinded constructors means we can't have a
`ConArg :: (k -> *) -> *`.  But if we really want them, we can have any
particular kind.  I really want these two particular kinds, so I added
them.

Author: awpr

src/Libraries/Base1/Prelude.bs

@@ -254,7 +254,8 @@ package Prelude(
 
         -- Generics
         Generic(..), Conc(..), ConcPrim(..), ConcPoly(..),
-        Meta(..), MetaData(..), StarArg(..), NumArg(..), StrArg(..), ConArg(..),
+        Meta(..), MetaData(..), StarArg(..), NumArg(..), StrArg(..),
+        NumConArg(..), StarConArg(..), ConArg(..),
         MetaConsNamed(..), MetaConsAnon(..), MetaField(..),
 
         primMethod, WrapField(..), WrapMethod(..), WrapPorts(..),
@@ -4414,6 +4415,10 @@ data (NumArg :: # -> *) i = NumArg
   deriving (FShow)
 data (StrArg :: $ -> *) i = StrArg
   deriving (FShow)
+data (StarConArg :: (* -> *) -> *) i = StarConArg
+  deriving (FShow)
+data (NumConArg :: (# -> *) -> *) i = NumConArg
+  deriving (FShow)
 data ConArg = ConArg
   deriving (FShow)
 

src/comp/Deriving.hs

@@ -16,7 +16,7 @@ import PreIds(
               -- type constructors
               idBit, idAdd, idMax,
               idConc, idConcPrim, idConcPoly, idMeta,
-              idMetaData, idStarArg, idNumArg, idStrArg, idConArg,
+              idMetaData, idStarArg, idNumArg, idStrArg, idStarConArg, idNumConArg, idConArg,
               idMetaConsNamed, idMetaConsAnon, idMetaField,
               -- classes that the compiler can derive
               idEq, idBits, idFShow, idBounded, idDefaultValue,
@@ -766,6 +766,8 @@ mkGenericInstance r packageid dpos i vs isData summands =
                 Just KStar -> cTApplys (cTCon idStarArg) [v]
                 Just KNum -> cTApplys (cTCon idNumArg) [v]
                 Just KStr -> cTApplys (cTCon idStrArg) [v]
+                Just (Kfun KStar KStar) -> cTApplys (cTCon idStarConArg) [v]
+                Just (Kfun KNum KStar) -> cTApplys (cTCon idNumConArg) [v]
                 _ -> cTCon idConArg
              | v <- vs],
             cTNum (toInteger $ length summands) dpos],

src/comp/PreIds.hs

@@ -219,11 +219,13 @@ idConc = prelude_id_no fsConc
 idConcPrim = prelude_id_no fsConcPrim
 idConcPoly = prelude_id_no fsConcPoly
 idMeta = prelude_id_no fsMeta
-idMetaData, idStarArg, idNumArg, idStrArg, idConArg, idMetaConsNamed, idMetaConsAnon, idMetaField :: Id
+idMetaData, idStarArg, idNumArg, idStrArg, idStarConArg, idNumConArg, idConArg, idMetaConsNamed, idMetaConsAnon, idMetaField :: Id
 idMetaData = prelude_id_no fsMetaData
 idStarArg = prelude_id_no fsStarArg
 idNumArg = prelude_id_no fsNumArg
 idStrArg = prelude_id_no fsStrArg
+idStarConArg = prelude_id_no fsStarConArg
+idNumConArg = prelude_id_no fsNumConArg
 idConArg = prelude_id_no fsConArg
 idMetaConsNamed = prelude_id_no fsMetaConsNamed
 idMetaConsAnon = prelude_id_no fsMetaConsAnon

src/comp/PreStrings.hs

@@ -339,6 +339,8 @@ fsMetaData         = mkFString "MetaData"
 fsStarArg          = mkFString "StarArg"
 fsNumArg           = mkFString "NumArg"
 fsStrArg           = mkFString "StrArg"
+fsStarConArg       = mkFString "StarConArg"
+fsNumConArg        = mkFString "NumConArg"
 fsConArg           = mkFString "ConArg"
 fsMetaConsNamed    = mkFString "MetaConsNamed"
 fsMetaConsAnon     = mkFString "MetaConsAnon"