shithub: MicroHs

Info  •  Files  •  Log  •  Branches

Merge branch 'master' into mrnf

--- a/src/MicroHs/TypeCheck.hs

+++ b/src/MicroHs/TypeCheck.hs

@@ -1060,7 +1060,7 @@

       let val i =

             case stLookup "" i vt of

               Right e -> ValueExport i e

-              _       -> impossible

+              _       -> impossibleShow i

       addAssocTable (qualIdent mn ti) (map val is)

     assocData (Constr _ _ c (Left _)) = [c]

@@ -1067,7 +1067,8 @@

     assocData (Constr _ _ c (Right its)) = c : map fst its

   case adef of

-    Data    (i, _) cs _ -> addAssoc i (nub $ concatMap assocData cs)

+    Data    (i, _) cs _ | not (isMatchDataTypeName i)

+                        -> addAssoc i (nub $ concatMap assocData cs)

     Newtype (i, _) c  _ -> addAssoc i (assocData c)

     Class _ (i, _) _ ms -> addAssoc i [ x | BSign ns _ <- ms, m <- ns, x <- [m, mkDefaultMethodId m] ]

     _                   -> return ()

@@ -2697,6 +2698,9 @@

 mkMatchDataTypeName :: Ident -> Ident

 mkMatchDataTypeName i = addIdentSuffix i "T"

+

+isMatchDataTypeName :: Ident -> Bool

+isMatchDataTypeName = isSuffixOf "%T" . unIdent

 -- A pattern synonym always has a type of the form

 --  forall vs1 . ctx1 => forall vs2 . ctx2 => ty