git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #605 from purescript/594
73a023fPhil Freeman
examples/failing/InstanceExport.pursnew file+15
compare with golang
unifiedsplit
@@ -0,0 +1,15 @@
1+module InstanceExport (S(..), f) where
2+
3+newtype S = S String
4+
5+class F a where
6+ f :: a -> String
7+
8+instance fs :: F S where
9+ f (S s) = s
10+
11+module Test where
12+
13+import InstanceExport
14+
15+test = f $ S "Test"
src/Language/PureScript.hs+1−1
@@ -94,7 +94,7 @@ compile' env opts ms prefix = do
94typeCheckModule :: Maybe ModuleName -> Module -> Check Module
94typeCheckModule :: Maybe ModuleName -> Module -> Check Module
95typeCheckModule mainModuleName (Module mn decls exps) = do
95typeCheckModule mainModuleName (Module mn decls exps) = do
96 modify (\s -> s { checkCurrentModule = Just mn })
96 modify (\s -> s { checkCurrentModule = Just mn })
97− decls' <- typeCheckAll mainModuleName mn decls
97+ decls' <- typeCheckAll mainModuleName mn exps decls
98 mapM_ checkTypesAreExported exps'
98 mapM_ checkTypesAreExported exps'
99 return $ Module mn decls' exps
99 return $ Module mn decls' exps
100 where
100 where
src/Language/PureScript/Sugar/TypeClasses.hs+26−14
@@ -151,36 +151,46 @@ desugarModule _ = error "Exports should have been elaborated in name desugaring"
151-- };
151-- };
152-}
152-}
153desugarDecl :: ModuleName -> [DeclarationRef] -> Declaration -> Desugar (Maybe DeclarationRef, [Declaration])
153desugarDecl :: ModuleName -> [DeclarationRef] -> Declaration -> Desugar (Maybe DeclarationRef, [Declaration])
154−desugarDecl mn _ d@(TypeClassDeclaration name args implies members) = do
154+desugarDecl mn exps = go
155− modify (M.insert (mn, name) d)
156− return $ (Nothing, d : typeClassDictionaryDeclaration name args implies members : map (typeClassMemberToDictionaryAccessor mn name args) members)
157−desugarDecl mn exps d@(TypeInstanceDeclaration name deps className tys members) = do
158− desugared <- lift $ desugarCases members
159− dictDecl <- typeInstanceDictionaryDeclaration name mn deps className tys desugared
160− let expRef = if isExportedClass className && all isExportedType (getConstructors `concatMap` tys)
161− then Just $ TypeInstanceRef name
162− else Nothing
163− return $ (expRef, [d, dictDecl])
164 where
155 where
156+ go d@(TypeClassDeclaration name args implies members) = do
157+ modify (M.insert (mn, name) d)
158+ return $ (Nothing, d : typeClassDictionaryDeclaration name args implies members : map (typeClassMemberToDictionaryAccessor mn name args) members)
159+ go d@(ExternInstanceDeclaration name _ className tys) = return (expRef name className tys, [d])
160+ go d@(TypeInstanceDeclaration name deps className tys members) = do
161+ desugared <- lift $ desugarCases members
162+ dictDecl <- typeInstanceDictionaryDeclaration name mn deps className tys desugared
163+ return $ (expRef name className tys, [d, dictDecl])
164+ go (PositionedDeclaration pos d) = do
165+ (dr, ds) <- rethrowWithPosition pos $ desugarDecl mn exps d
166+ return (dr, map (PositionedDeclaration pos) ds)
167+ go other = return (Nothing, [other])
168+
169+ expRef :: Ident -> Qualified ProperName -> [Type] -> Maybe DeclarationRef
170+ expRef name className tys
171+ | isExportedClass className && all isExportedType (getConstructors `concatMap` tys) = Just $ TypeInstanceRef name
172+ | otherwise = Nothing
173+
165 isExportedClass :: Qualified ProperName -> Bool
174 isExportedClass :: Qualified ProperName -> Bool
166 isExportedClass = isExported (elem . TypeClassRef)
175 isExportedClass = isExported (elem . TypeClassRef)
176+
167 isExportedType :: Qualified ProperName -> Bool
177 isExportedType :: Qualified ProperName -> Bool
168 isExportedType = isExported $ \pn -> isJust . find (matchesTypeRef pn)
178 isExportedType = isExported $ \pn -> isJust . find (matchesTypeRef pn)
179+
169 isExported :: (ProperName -> [DeclarationRef] -> Bool) -> Qualified ProperName -> Bool
180 isExported :: (ProperName -> [DeclarationRef] -> Bool) -> Qualified ProperName -> Bool
170 isExported test (Qualified (Just mn') pn) = mn /= mn' || test pn exps
181 isExported test (Qualified (Just mn') pn) = mn /= mn' || test pn exps
171 isExported _ _ = error "Names should have been qualified in name desugaring"
182 isExported _ _ = error "Names should have been qualified in name desugaring"
183+
172 matchesTypeRef :: ProperName -> DeclarationRef -> Bool
184 matchesTypeRef :: ProperName -> DeclarationRef -> Bool
173 matchesTypeRef pn (TypeRef pn' _) = pn == pn'
185 matchesTypeRef pn (TypeRef pn' _) = pn == pn'
174 matchesTypeRef _ _ = False
186 matchesTypeRef _ _ = False
187+
175 getConstructors :: Type -> [Qualified ProperName]
188 getConstructors :: Type -> [Qualified ProperName]
176 getConstructors = everythingOnTypes (++) getConstructor
189 getConstructors = everythingOnTypes (++) getConstructor
190+
177 getConstructor :: Type -> [Qualified ProperName]
191 getConstructor :: Type -> [Qualified ProperName]
178 getConstructor (TypeConstructor tcname) = [tcname]
192 getConstructor (TypeConstructor tcname) = [tcname]
179 getConstructor _ = []
193 getConstructor _ = []
180−desugarDecl mn exps (PositionedDeclaration pos d) = do
181− (dr, ds) <- rethrowWithPosition pos $ desugarDecl mn exps d
182− return (dr, map (PositionedDeclaration pos) ds)
183−desugarDecl _ _ other = return (Nothing, [other])
184
194
185memberToNameAndType :: Declaration -> (Ident, Type)
195memberToNameAndType :: Declaration -> (Ident, Type)
186memberToNameAndType (TypeDeclaration ident ty) = (ident, ty)
196memberToNameAndType (TypeDeclaration ident ty) = (ident, ty)
@@ -275,3 +285,5 @@ typeInstanceDictionaryDeclaration name mn deps className tys decls =
275 typeInstanceDictionaryEntryValue (ValueDeclaration _ _ [] _ val) = val
285 typeInstanceDictionaryEntryValue (ValueDeclaration _ _ [] _ val) = val
276 typeInstanceDictionaryEntryValue (PositionedDeclaration pos d) = PositionedValue pos (typeInstanceDictionaryEntryValue d)
286 typeInstanceDictionaryEntryValue (PositionedDeclaration pos d) = PositionedValue pos (typeInstanceDictionaryEntryValue d)
277 typeInstanceDictionaryEntryValue _ = error "Invalid declaration in type instance definition"
287 typeInstanceDictionaryEntryValue _ = error "Invalid declaration in type instance definition"
288+
289+
src/Language/PureScript/TypeChecker.hs+116−100
@@ -119,112 +119,128 @@ checkTypeClassInstance _ ty = throwError $ mkErrorStack "Type class instance hea
119--
119--
120-- * Process module imports
120-- * Process module imports
121--
121--
122−typeCheckAll :: Maybe ModuleName -> ModuleName -> [Declaration] -> Check [Declaration]
122+typeCheckAll :: Maybe ModuleName -> ModuleName -> Maybe [DeclarationRef] -> [Declaration] -> Check [Declaration]
123−typeCheckAll _ _ [] = return []
124−typeCheckAll mainModuleName moduleName (d@(DataDeclaration dtype name args dctors) : rest) = do
123+typeCheckAll mainModuleName moduleName exps = go
125− rethrow (strMsg ("Error in type constructor " ++ show name) <>) $ do
126− when (dtype == Newtype) $ checkNewtype dctors
127− checkDuplicateTypeArguments args
128− ctorKind <- kindsOf True moduleName name args (concatMap snd dctors)
129− addDataType moduleName dtype name args dctors ctorKind
130− ds <- typeCheckAll mainModuleName moduleName rest
131− return $ d : ds
132 where
124 where
133− checkNewtype :: [(ProperName, [Type])] -> Check ()
125+ go :: [Declaration] -> Check [Declaration]
134− checkNewtype [(_, [_])] = return ()
126+ go [] = return []
135− checkNewtype [(_, _)] = throwError . strMsg $ "newtypes constructors must have a single argument"
127+ go (d@(DataDeclaration dtype name args dctors) : rest) = do
136− checkNewtype _ = throwError . strMsg $ "newtypes must have a single constructor"
137−typeCheckAll mainModuleName moduleName (d@(DataBindingGroupDeclaration tys) : rest) = do
138− rethrow (strMsg "Error in data binding group" <>) $ do
128+ rethrow (strMsg ("Error in type constructor " ++ show name) <>) $ do
139− let syns = mapMaybe toTypeSynonym tys
129+ when (dtype == Newtype) $ checkNewtype dctors
140− let dataDecls = mapMaybe toDataDecl tys
141− (syn_ks, data_ks) <- kindsOfAll moduleName syns (map (\(_, name, args, dctors) -> (name, args, concatMap snd dctors)) dataDecls)
142− forM_ (zip dataDecls data_ks) $ \((dtype, name, args, dctors), ctorKind) -> do
143 checkDuplicateTypeArguments args
130 checkDuplicateTypeArguments args
131+ ctorKind <- kindsOf True moduleName name args (concatMap snd dctors)
144 addDataType moduleName dtype name args dctors ctorKind
132 addDataType moduleName dtype name args dctors ctorKind
133+ ds <- go rest
134+ return $ d : ds
135+ where
136+ checkNewtype :: [(ProperName, [Type])] -> Check ()
137+ checkNewtype [(_, [_])] = return ()
138+ checkNewtype [(_, _)] = throwError . strMsg $ "newtypes constructors must have a single argument"
139+ checkNewtype _ = throwError . strMsg $ "newtypes must have a single constructor"
140+ go (d@(DataBindingGroupDeclaration tys) : rest) = do
141+ rethrow (strMsg "Error in data binding group" <>) $ do
142+ let syns = mapMaybe toTypeSynonym tys
143+ let dataDecls = mapMaybe toDataDecl tys
144+ (syn_ks, data_ks) <- kindsOfAll moduleName syns (map (\(_, name, args, dctors) -> (name, args, concatMap snd dctors)) dataDecls)
145+ forM_ (zip dataDecls data_ks) $ \((dtype, name, args, dctors), ctorKind) -> do
146+ checkDuplicateTypeArguments args
147+ addDataType moduleName dtype name args dctors ctorKind
145− forM_ (zip syns syn_ks) $ \((name, args, ty), kind) -> do
148+ forM_ (zip syns syn_ks) $ \((name, args, ty), kind) -> do
149+ checkDuplicateTypeArguments args
150+ addTypeSynonym moduleName name args ty kind
151+ ds <- go rest
152+ return $ d : ds
153+ where
154+ toTypeSynonym (TypeSynonymDeclaration nm args ty) = Just (nm, args, ty)
155+ toTypeSynonym (PositionedDeclaration _ d') = toTypeSynonym d'
156+ toTypeSynonym _ = Nothing
157+ toDataDecl (DataDeclaration dtype nm args dctors) = Just (dtype, nm, args, dctors)
158+ toDataDecl (PositionedDeclaration _ d') = toDataDecl d'
159+ toDataDecl _ = Nothing
160+ go (d@(TypeSynonymDeclaration name args ty) : rest) = do
161+ rethrow (strMsg ("Error in type synonym " ++ show name) <>) $ do
146 checkDuplicateTypeArguments args
162 checkDuplicateTypeArguments args
163+ kind <- kindsOf False moduleName name args [ty]
147 addTypeSynonym moduleName name args ty kind
164 addTypeSynonym moduleName name args ty kind
148− ds <- typeCheckAll mainModuleName moduleName rest
165+ ds <- go rest
149− return $ d : ds
166+ return $ d : ds
150− where
151− toTypeSynonym (TypeSynonymDeclaration nm args ty) = Just (nm, args, ty)
152− toTypeSynonym (PositionedDeclaration _ d') = toTypeSynonym d'
153− toTypeSynonym _ = Nothing
154− toDataDecl (DataDeclaration dtype nm args dctors) = Just (dtype, nm, args, dctors)
155− toDataDecl (PositionedDeclaration _ d') = toDataDecl d'
156− toDataDecl _ = Nothing
157−typeCheckAll mainModuleName moduleName (d@(TypeSynonymDeclaration name args ty) : rest) = do
158− rethrow (strMsg ("Error in type synonym " ++ show name) <>) $ do
159− checkDuplicateTypeArguments args
160− kind <- kindsOf False moduleName name args [ty]
161− addTypeSynonym moduleName name args ty kind
162− ds <- typeCheckAll mainModuleName moduleName rest
163− return $ d : ds
164−typeCheckAll _ _ (TypeDeclaration _ _ : _) = error "Type declarations should have been removed"
167+ go (TypeDeclaration _ _ : _) = error "Type declarations should have been removed"
165−typeCheckAll mainModuleName moduleName (ValueDeclaration name nameKind [] Nothing val : rest) = do
168+ go (ValueDeclaration name nameKind [] Nothing val : rest) = do
166− d <- rethrow (strMsg ("Error in declaration " ++ show name) <>) $ do
169+ d <- rethrow (strMsg ("Error in declaration " ++ show name) <>) $ do
167− valueIsNotDefined moduleName name
168− [(_, (val', ty))] <- typesOf mainModuleName moduleName [(name, val)]
169− addValue moduleName name ty nameKind
170− return $ ValueDeclaration name nameKind [] Nothing val'
171− ds <- typeCheckAll mainModuleName moduleName rest
172− return $ d : ds
173−typeCheckAll _ _ (ValueDeclaration{} : _) = error "Binders were not desugared"
174−typeCheckAll mainModuleName moduleName (BindingGroupDeclaration vals : rest) = do
175− d <- rethrow (strMsg ("Error in binding group " ++ show (map (\(ident, _, _) -> ident) vals)) <>) $ do
176− forM_ (map (\(ident, _, _) -> ident) vals) $ \name ->
177 valueIsNotDefined moduleName name
170 valueIsNotDefined moduleName name
178− tys <- typesOf mainModuleName moduleName $ map (\(ident, _, ty) -> (ident, ty)) vals
171+ [(_, (val', ty))] <- typesOf mainModuleName moduleName [(name, val)]
179− vals' <- forM (zipWith (\(name, nameKind, _) (_, (val, ty)) -> (name, val, nameKind, ty)) vals tys) $ \(name, val, nameKind, ty) -> do
180 addValue moduleName name ty nameKind
172 addValue moduleName name ty nameKind
181− return (name, nameKind, val)
173+ return $ ValueDeclaration name nameKind [] Nothing val'
182− return $ BindingGroupDeclaration vals'
174+ ds <- go rest
183− ds <- typeCheckAll mainModuleName moduleName rest
184− return $ d : ds
175+ return $ d : ds
185−typeCheckAll mainModuleName moduleName (d@(ExternDataDeclaration name kind) : rest) = do
176+ go (ValueDeclaration{} : _) = error "Binders were not desugared"
186− env <- getEnv
177+ go (BindingGroupDeclaration vals : rest) = do
187− putEnv $ env { types = M.insert (Qualified (Just moduleName) name) (kind, ExternData) (types env) }
188− ds <- typeCheckAll mainModuleName moduleName rest
189− return $ d : ds
190−typeCheckAll mainModuleName moduleName (d@(ExternDeclaration importTy name _ ty) : rest) = do
191− rethrow (strMsg ("Error in foreign import declaration " ++ show name) <>) $ do
178+ d <- rethrow (strMsg ("Error in binding group " ++ show (map (\(ident, _, _) -> ident) vals)) <>) $ do
179+ forM_ (map (\(ident, _, _) -> ident) vals) $ \name ->
180+ valueIsNotDefined moduleName name
181+ tys <- typesOf mainModuleName moduleName $ map (\(ident, _, ty) -> (ident, ty)) vals
182+ vals' <- forM (zipWith (\(name, nameKind, _) (_, (val, ty)) -> (name, val, nameKind, ty)) vals tys) $ \(name, val, nameKind, ty) -> do
183+ addValue moduleName name ty nameKind
184+ return (name, nameKind, val)
185+ return $ BindingGroupDeclaration vals'
186+ ds <- go rest
187+ return $ d : ds
188+ go (d@(ExternDataDeclaration name kind) : rest) = do
192 env <- getEnv
189 env <- getEnv
190+ putEnv $ env { types = M.insert (Qualified (Just moduleName) name) (kind, ExternData) (types env) }
191+ ds <- go rest
192+ return $ d : ds
193+ go (d@(ExternDeclaration importTy name _ ty) : rest) = do
194+ rethrow (strMsg ("Error in foreign import declaration " ++ show name) <>) $ do
195+ env <- getEnv
193− kind <- kindOf moduleName ty
196+ kind <- kindOf moduleName ty
194− guardWith (strMsg "Expected kind *") $ kind == Star
197+ guardWith (strMsg "Expected kind *") $ kind == Star
195− case M.lookup (moduleName, name) (names env) of
198+ case M.lookup (moduleName, name) (names env) of
196− Just _ -> throwError . strMsg $ show name ++ " is already defined"
199+ Just _ -> throwError . strMsg $ show name ++ " is already defined"
197− Nothing -> putEnv (env { names = M.insert (moduleName, name) (ty, Extern importTy, Defined) (names env) })
200+ Nothing -> putEnv (env { names = M.insert (moduleName, name) (ty, Extern importTy, Defined) (names env) })
198− ds <- typeCheckAll mainModuleName moduleName rest
201+ ds <- go rest
199− return $ d : ds
202+ return $ d : ds
200−typeCheckAll mainModuleName moduleName (d@(FixityDeclaration _ name) : rest) = do
203+ go (d@(FixityDeclaration _ name) : rest) = do
201− ds <- typeCheckAll mainModuleName moduleName rest
204+ ds <- go rest
202− env <- getEnv
205+ env <- getEnv
203− guardWith (strMsg ("Fixity declaration with no binding: " ++ name)) $ M.member (moduleName, Op name) $ names env
206+ guardWith (strMsg ("Fixity declaration with no binding: " ++ name)) $ M.member (moduleName, Op name) $ names env
204− return $ d : ds
207+ return $ d : ds
205−typeCheckAll mainModuleName currentModule (d@(ImportDeclaration moduleName _ _) : rest) = do
208+ go (d@(ImportDeclaration importedModule _ _) : rest) = do
206− tcds <- getTypeClassDictionaries
209+ tcds <- getTypeClassDictionaries
207− let instances = filter (\tcd -> let Qualified (Just mn) _ = tcdName tcd in moduleName == mn) tcds
210+ let instances = filter (\tcd -> let Qualified (Just mn) _ = tcdName tcd in importedModule == mn) tcds
208− addTypeClassDictionaries [ tcd { tcdName = Qualified (Just currentModule) ident, tcdType = TCDAlias (canonicalizeDictionary tcd) }
211+ addTypeClassDictionaries [ tcd { tcdName = Qualified (Just moduleName) ident, tcdType = TCDAlias (canonicalizeDictionary tcd) }
209− | tcd <- instances
212+ | tcd <- instances
213+ , tcdExported tcd
210− , let (Qualified _ ident) = tcdName tcd
214+ , let (Qualified _ ident) = tcdName tcd
211− ]
215+ ]
212− ds <- typeCheckAll mainModuleName currentModule rest
216+ ds <- go rest
213− return $ d : ds
217+ return $ d : ds
214−typeCheckAll mainModuleName moduleName (d@(TypeClassDeclaration pn args implies tys) : rest) = do
218+ go (d@(TypeClassDeclaration pn args implies tys) : rest) = do
215− addTypeClass moduleName pn args implies tys
219+ addTypeClass moduleName pn args implies tys
216− ds <- typeCheckAll mainModuleName moduleName rest
220+ ds <- go rest
217− return $ d : ds
221+ return $ d : ds
218−typeCheckAll mainModuleName moduleName (TypeInstanceDeclaration dictName deps className tys _ : rest) = do
222+ go (TypeInstanceDeclaration dictName deps className tys _ : rest) = do
219− typeCheckAll mainModuleName moduleName (ExternInstanceDeclaration dictName deps className tys : rest)
223+ go (ExternInstanceDeclaration dictName deps className tys : rest)
220−typeCheckAll mainModuleName moduleName (d@(ExternInstanceDeclaration dictName deps className tys) : rest) = do
224+ go (d@(ExternInstanceDeclaration dictName deps className tys) : rest) = do
221− mapM_ (checkTypeClassInstance moduleName) tys
225+ mapM_ (checkTypeClassInstance moduleName) tys
222− forM_ deps $ mapM_ (checkTypeClassInstance moduleName) . snd
226+ forM_ deps $ mapM_ (checkTypeClassInstance moduleName) . snd
223− addTypeClassDictionaries [TypeClassDictionaryInScope (Qualified (Just moduleName) dictName) className tys (Just deps) TCDRegular]
227+ addTypeClassDictionaries [TypeClassDictionaryInScope (Qualified (Just moduleName) dictName) className tys (Just deps) TCDRegular isInstanceExported]
224− ds <- typeCheckAll mainModuleName moduleName rest
228+ ds <- go rest
225− return $ d : ds
229+ return $ d : ds
230+ where
231+ isInstanceExported :: Bool
232+ isInstanceExported = maybe True (any exportsInstance) exps
233+
234+ exportsInstance :: DeclarationRef -> Bool
235+ exportsInstance (TypeInstanceRef name) | name == dictName = True
236+ exportsInstance (PositionedDeclarationRef _ r) = exportsInstance r
237+ exportsInstance _ = False
238+
226−typeCheckAll mainModuleName moduleName (PositionedDeclaration pos d : rest) =
239+ go (PositionedDeclaration pos d : rest) =
227− rethrowWithPosition pos $ do
240+ rethrowWithPosition pos $ do
228− (d' : rest') <- typeCheckAll mainModuleName moduleName (d : rest)
241+ (d' : rest') <- go (d : rest)
229− return (PositionedDeclaration pos d' : rest')
242+ return (PositionedDeclaration pos d' : rest')
243+
244+
245+
230
246
src/Language/PureScript/TypeChecker/Types.hs+2−1
@@ -865,7 +865,7 @@ check' val t@(ConstrainedType constraints ty) = do
865 n <- liftCheck freshDictionaryName
865 n <- liftCheck freshDictionaryName
866 return $ Ident $ "__dict_" ++ className ++ "_" ++ show n
866 return $ Ident $ "__dict_" ++ className ++ "_" ++ show n
867 val' <- makeBindingGroupVisible $ withTypeClassDictionaries (zipWith (\name (className, instanceTy) ->
867 val' <- makeBindingGroupVisible $ withTypeClassDictionaries (zipWith (\name (className, instanceTy) ->
868− TypeClassDictionaryInScope name className instanceTy Nothing TCDRegular) (map (Qualified Nothing) dictNames)
868+ TypeClassDictionaryInScope name className instanceTy Nothing TCDRegular False) (map (Qualified Nothing) dictNames)
869 constraints) $ check val ty
869 constraints) $ check val ty
870 return $ TypedValue True (foldr (Abs . Left) val' dictNames) t
870 return $ TypedValue True (foldr (Abs . Left) val' dictNames) t
871check' val (SaturatedTypeSynonym name args) = do
871check' val (SaturatedTypeSynonym name args) = do
@@ -1148,3 +1148,4 @@ meet e1 e2 t1 t2 = do
1148
1148
1149
1149
1150
1150
1151+
src/Language/PureScript/TypeClassDictionaries.hs+4
@@ -46,6 +46,10 @@ data TypeClassDictionaryInScope
46 -- The type of this dictionary
46 -- The type of this dictionary
47 --
47 --
48 , tcdType :: TypeClassDictionaryType
48 , tcdType :: TypeClassDictionaryType
49+ -- |
50+ -- Is this instance exported by its module?
51+ --
52+ , tcdExported :: Bool
49 } deriving (Show, Data, Typeable)
53 } deriving (Show, Data, Typeable)
50
54
51-- |
55-- |