2156fdc · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

use new NameKind constructor, add some missing Functor constraints

commit2156fdcb844361b53a35223ade6cc57e38452b91 authorU-CIQDEV\gbazerman <gbazerman@GBAZERMAN-T35.ciqdev.com> dateMon 8 Jun 2015, 16:59 (11 years ago) parent74a8dc0

2 files changed+4−4

compare with golang

unifiedsplit

src/Language/PureScript/Sugar/TypeClasses.hs+1−1 src/Language/PureScript/TypeChecker/Deriving.hs+3−3

src/Language/PureScript/Sugar/TypeClasses.hs+1−1

@@ -234,7 +234,7 @@ fillDerivingDecls className tys tyDecls decls = do

234234 let missingDecls = mapMaybe declName tyDecls \\ mapMaybe declName decls

235235 let mkMissingDecl cls fun =

236236 case tys of

237− [TypeConstructor t] | unQualify className == ProperName cls && Ident fun `elem` missingDecls -> return [ValueDeclaration (Ident fun) Value [] (Right $ TypeClassInstanceMemberFunction (Ident fun) className t)]

237+ [TypeConstructor t] | unQualify className == ProperName cls && Ident fun `elem` missingDecls -> return [ValueDeclaration (Ident fun) Public [] (Right $ TypeClassInstanceMemberFunction (Ident fun) className t)]

238238 _ -> return []

239239 extraDecls <- concat <$> mapM (uncurry mkMissingDecl)

240240 [("Generic","toSpine")

src/Language/PureScript/TypeChecker/Deriving.hs+3−3

@@ -44,7 +44,7 @@ elaborateInstance (TypeClassInstanceMemberFunction funName className t) =

4444 ,((ProperName "Generic", Ident "toSignature"), mkSignatureFunction t)]

4545elaborateInstance e = return e

4646

47−mkSpineFunction :: MonadState CheckState m => Qualified ProperName -> m Expr

47+mkSpineFunction :: (Functor m, MonadState CheckState m) => Qualified ProperName -> m Expr

4848mkSpineFunction t = do

4949 ctors <- M.toList . dataConstructors <$> getEnv

5050 tcs <- M.toList . typeClasses <$> getEnv

@@ -64,7 +64,7 @@ mkSpineFunction t = do

6464

6565 return . lamCase "x" . map mkCtorClause . constructorsForType t $ ctors

6666

67−mkSignatureFunction :: MonadState CheckState m => Qualified ProperName -> m Expr

67+mkSignatureFunction :: (Functor m, MonadState CheckState m) => Qualified ProperName -> m Expr

6868mkSignatureFunction t = do

6969 ctors <- M.toList . dataConstructors <$> getEnv

7070 envtyps <- M.toList . types <$> getEnv

@@ -84,7 +84,7 @@ mkSignatureFunction t = do

8484

8585 return . lam "x" . mkSigProd . map mkProdClause . constructorsForType t $ ctors

8686

87−mkFromSpineFunction :: MonadState CheckState m => Qualified ProperName -> m Expr

87+mkFromSpineFunction :: (Functor m, MonadState CheckState m) => Qualified ProperName -> m Expr

8888mkFromSpineFunction t = do

8989 ctors <- M.toList . dataConstructors <$> getEnv

9090 tcs <- M.toList . typeClasses <$> getEnv