GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-22 17:42:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

path in file name test in ReadFiles

Browse Source
This commit is contained in:
aarne
2004-06-17 14:10:06 +00:00
parent a77519ba10
commit 94f8d310cb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/GF/Grammar/Lookup.hs
View File

@@ -101,6 +101,9 @@ qualifAnnotPar m t = case t of
lookupLincat :: SourceGrammar -> Ident -> Ident -> Err Type lookupLincat :: SourceGrammar -> Ident -> Ident -> Err Type
lookupLincat gr m c | elem c [zIdent "String", zIdent "Int"] =
return defLinType --- ad hoc; not needed?
lookupLincat gr m c = do lookupLincat gr m c = do
mi <- lookupModule gr m mi <- lookupModule gr m
case mi of case mi of

5
src/GF/Infra/ReadFiles.hs
View File

@@ -161,8 +161,9 @@ getImports ps = get [] where
let name = fileBody file0 let name = fileBody file0
(p,s) <- tryRead name (p,s) <- tryRead name
let ((typ,mname),imps) = importsOfFile s let ((typ,mname),imps) = importsOfFile s
ioeErr $ testErr (mname == name) $ let namebody = justFileName name
"module name differs from file name in" +++ name ioeErr $ testErr (mname == namebody) $
"module name" +++ mname +++ "differs from file name" +++ namebody
case imps of case imps of
_ | elem name (map (snd . fst . fst) ds) -> return ds --- file already read _ | elem name (map (snd . fst . fst) ds) -> return ds --- file already read
[] -> return $ (((typ,name),[]),p):ds [] -> return $ (((typ,name),[]),p):ds