path in file name test in ReadFiles

2 files changed, 6 insertions, 2 deletions

diff --git a/src/GF/Grammar/Lookup.hs b/src/GF/Grammar/Lookup.hs
index 05b0bf39e..f735730df 100644
--- a/src/GF/Grammar/Lookup.hs
+++ b/src/GF/Grammar/Lookup.hs
@@ -101,6 +101,9 @@ qualifAnnotPar m t = case t of
 
 
 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
   mi <- lookupModule gr m
   case mi of
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs
index b1440ee4b..8d835284d 100644
--- a/src/GF/Infra/ReadFiles.hs
+++ b/src/GF/Infra/ReadFiles.hs
@@ -161,8 +161,9 @@ getImports ps = get [] where
     let name = fileBody file0
     (p,s) <- tryRead name
     let ((typ,mname),imps) = importsOfFile s
-    ioeErr $ testErr  (mname == name) $ 
-             "module name differs from file name in" +++ name
+    let namebody = justFileName name
+    ioeErr $ testErr  (mname == namebody) $ 
+             "module name" +++ mname +++ "differs from file name" +++ namebody
     case imps of
       _ | elem name (map (snd . fst . fst) ds) -> return ds  --- file already read
       [] -> return $ (((typ,name),[]),p):ds