git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Breaking example and some refactoring
commit708edba47c1b2aae7a437f8603d71f6c9a837737 authorPhil Freeman <paf31@cantab.net> dateSat 20 Sep 2014, 14:56 (12 years ago) parentcaa1dc6
3 files changed+119−101
examples/failing/InstanceExport.purs+15 src/Language/PureScript.hs+1−1 src/Language/PureScript/TypeChecker.hs+103−100
examples/failing/InstanceExport.pursnew file+15
@@ -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
9494typeCheckModule :: Maybe ModuleName -> Module -> Check Module
9595typeCheckModule mainModuleName (Module mn decls exps) = do
9696 modify (\s -> s { checkCurrentModule = Just mn })
97− decls' <- typeCheckAll mainModuleName mn decls
97+ decls' <- typeCheckAll mainModuleName mn exps decls
9898 mapM_ checkTypesAreExported exps'
9999 return $ Module mn decls' exps
100100 where
src/Language/PureScript/TypeChecker.hs+103−100
@@ -119,112 +119,115 @@ checkTypeClassInstance _ ty = throwError $ mkErrorStack "Type class instance hea
119119--
120120-- * Process module imports
121121--
122−typeCheckAll :: Maybe ModuleName -> ModuleName -> [Declaration] -> Check [Declaration]
123−typeCheckAll _ _ [] = return []
124−typeCheckAll mainModuleName moduleName (d@(DataDeclaration dtype name args dctors) : rest) = do
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
122+typeCheckAll :: Maybe ModuleName -> ModuleName -> Maybe [DeclarationRef] -> [Declaration] -> Check [Declaration]
123+typeCheckAll mainModuleName moduleName exps = go
132124 where
133− checkNewtype :: [(ProperName, [Type])] -> Check ()
134− checkNewtype [(_, [_])] = return ()
135− checkNewtype [(_, _)] = throwError . strMsg $ "newtypes constructors must have a single argument"
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
139− let syns = mapMaybe toTypeSynonym tys
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
125+ go :: [Declaration] -> Check [Declaration]
126+ go [] = return []
127+ go (d@(DataDeclaration dtype name args dctors) : rest) = do
128+ rethrow (strMsg ("Error in type constructor " ++ show name) <>) $ do
129+ when (dtype == Newtype) $ checkNewtype dctors
143130 checkDuplicateTypeArguments args
131+ ctorKind <- kindsOf True moduleName name args (concatMap snd dctors)
144132 addDataType moduleName dtype name args dctors ctorKind
145− forM_ (zip syns syn_ks) $ \((name, args, ty), kind) -> do
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
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
146162 checkDuplicateTypeArguments args
163+ kind <- kindsOf False moduleName name args [ty]
147164 addTypeSynonym moduleName name args ty kind
148− ds <- typeCheckAll mainModuleName moduleName rest
149− 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"
165−typeCheckAll mainModuleName moduleName (ValueDeclaration name nameKind [] Nothing val : rest) = do
166− 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 ->
165+ ds <- go rest
166+ return $ d : ds
167+ go (TypeDeclaration _ _ : _) = error "Type declarations should have been removed"
168+ go (ValueDeclaration name nameKind [] Nothing val : rest) = do
169+ d <- rethrow (strMsg ("Error in declaration " ++ show name) <>) $ do
177170 valueIsNotDefined moduleName name
178− tys <- typesOf mainModuleName moduleName $ map (\(ident, _, ty) -> (ident, ty)) vals
179− vals' <- forM (zipWith (\(name, nameKind, _) (_, (val, ty)) -> (name, val, nameKind, ty)) vals tys) $ \(name, val, nameKind, ty) -> do
171+ [(_, (val', ty))] <- typesOf mainModuleName moduleName [(name, val)]
180172 addValue moduleName name ty nameKind
181− return (name, nameKind, val)
182− return $ BindingGroupDeclaration vals'
183− ds <- typeCheckAll mainModuleName moduleName rest
184− return $ d : ds
185−typeCheckAll mainModuleName moduleName (d@(ExternDataDeclaration name kind) : rest) = do
186− env <- getEnv
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
173+ return $ ValueDeclaration name nameKind [] Nothing val'
174+ ds <- go rest
175+ return $ d : ds
176+ go (ValueDeclaration{} : _) = error "Binders were not desugared"
177+ go (BindingGroupDeclaration vals : rest) = 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
192189 env <- getEnv
193− kind <- kindOf moduleName ty
194− guardWith (strMsg "Expected kind *") $ kind == Star
195− case M.lookup (moduleName, name) (names env) of
196− Just _ -> throwError . strMsg $ show name ++ " is already defined"
197− Nothing -> putEnv (env { names = M.insert (moduleName, name) (ty, Extern importTy, Defined) (names env) })
198− ds <- typeCheckAll mainModuleName moduleName rest
199− return $ d : ds
200−typeCheckAll mainModuleName moduleName (d@(FixityDeclaration _ name) : rest) = do
201− ds <- typeCheckAll mainModuleName moduleName rest
202− env <- getEnv
203− guardWith (strMsg ("Fixity declaration with no binding: " ++ name)) $ M.member (moduleName, Op name) $ names env
204− return $ d : ds
205−typeCheckAll mainModuleName currentModule (d@(ImportDeclaration moduleName _ _) : rest) = do
206− tcds <- getTypeClassDictionaries
207− let instances = filter (\tcd -> let Qualified (Just mn) _ = tcdName tcd in moduleName == mn) tcds
208− addTypeClassDictionaries [ tcd { tcdName = Qualified (Just currentModule) ident, tcdType = TCDAlias (canonicalizeDictionary tcd) }
209− | tcd <- instances
210− , let (Qualified _ ident) = tcdName tcd
211− ]
212− ds <- typeCheckAll mainModuleName currentModule rest
213− return $ d : ds
214−typeCheckAll mainModuleName moduleName (d@(TypeClassDeclaration pn args implies tys) : rest) = do
215− addTypeClass moduleName pn args implies tys
216− ds <- typeCheckAll mainModuleName moduleName rest
217− return $ d : ds
218−typeCheckAll mainModuleName moduleName (TypeInstanceDeclaration dictName deps className tys _ : rest) = do
219− typeCheckAll mainModuleName moduleName (ExternInstanceDeclaration dictName deps className tys : rest)
220−typeCheckAll mainModuleName moduleName (d@(ExternInstanceDeclaration dictName deps className tys) : rest) = do
221− mapM_ (checkTypeClassInstance moduleName) tys
222− forM_ deps $ mapM_ (checkTypeClassInstance moduleName) . snd
223− addTypeClassDictionaries [TypeClassDictionaryInScope (Qualified (Just moduleName) dictName) className tys (Just deps) TCDRegular]
224− ds <- typeCheckAll mainModuleName moduleName rest
225− return $ d : ds
226−typeCheckAll mainModuleName moduleName (PositionedDeclaration pos d : rest) =
227− rethrowWithPosition pos $ do
228− (d' : rest') <- typeCheckAll mainModuleName moduleName (d : rest)
229− return (PositionedDeclaration pos d' : rest')
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
196+ kind <- kindOf moduleName ty
197+ guardWith (strMsg "Expected kind *") $ kind == Star
198+ case M.lookup (moduleName, name) (names env) of
199+ Just _ -> throwError . strMsg $ show name ++ " is already defined"
200+ Nothing -> putEnv (env { names = M.insert (moduleName, name) (ty, Extern importTy, Defined) (names env) })
201+ ds <- go rest
202+ return $ d : ds
203+ go (d@(FixityDeclaration _ name) : rest) = do
204+ ds <- go rest
205+ env <- getEnv
206+ guardWith (strMsg ("Fixity declaration with no binding: " ++ name)) $ M.member (moduleName, Op name) $ names env
207+ return $ d : ds
208+ go (d@(ImportDeclaration importedModule _ _) : rest) = do
209+ tcds <- getTypeClassDictionaries
210+ let instances = filter (\tcd -> let Qualified (Just mn) _ = tcdName tcd in importedModule == mn) tcds
211+ addTypeClassDictionaries [ tcd { tcdName = Qualified (Just moduleName) ident, tcdType = TCDAlias (canonicalizeDictionary tcd) }
212+ | tcd <- instances
213+ , let (Qualified _ ident) = tcdName tcd
214+ ]
215+ ds <- go rest
216+ return $ d : ds
217+ go (d@(TypeClassDeclaration pn args implies tys) : rest) = do
218+ addTypeClass moduleName pn args implies tys
219+ ds <- go rest
220+ return $ d : ds
221+ go (TypeInstanceDeclaration dictName deps className tys _ : rest) = do
222+ go (ExternInstanceDeclaration dictName deps className tys : rest)
223+ go (d@(ExternInstanceDeclaration dictName deps className tys) : rest) = do
224+ mapM_ (checkTypeClassInstance moduleName) tys
225+ forM_ deps $ mapM_ (checkTypeClassInstance moduleName) . snd
226+ addTypeClassDictionaries [TypeClassDictionaryInScope (Qualified (Just moduleName) dictName) className tys (Just deps) TCDRegular]
227+ ds <- go rest
228+ return $ d : ds
229+ go (PositionedDeclaration pos d : rest) =
230+ rethrowWithPosition pos $ do
231+ (d' : rest') <- go (d : rest)
232+ return (PositionedDeclaration pos d' : rest')
230233