diff options
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/GetGrammar.hs | 3 | ||||
| -rw-r--r-- | src/GF/Compile/Rename.hs | 4 | ||||
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/GF/Compile/GetGrammar.hs b/src/GF/Compile/GetGrammar.hs index a9a40ee06..32efb960b 100644 --- a/src/GF/Compile/GetGrammar.hs +++ b/src/GF/Compile/GetGrammar.hs @@ -79,4 +79,5 @@ oldLexer = map change . L.tokens where (L.PT p (L.TS s)) | elem s new -> (L.PT p (L.TV (init s ++ "Z"))) _ -> t new = words $ "abstract concrete interface incomplete " ++ - "instance out open resource reuse transfer with" + "instance out open resource reuse transfer with where" + diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs index 49e08ab6e..3a0bf5c52 100644 --- a/src/GF/Compile/Rename.hs +++ b/src/GF/Compile/Rename.hs @@ -76,11 +76,11 @@ renameIdentTerm :: Status -> Term -> Err Term renameIdentTerm env@(act,imps) t = errIn ("atomic term" +++ prt t +++ "given" +++ unwords (map (prt . fst) qualifs)) $ case t of + Vr (IC "Int") -> return $ Q cPredefAbs cInt -- Int and String are predefined cats + Vr (IC "String") -> return $ Q cPredefAbs cString Vr c -> do f <- lookupTreeMany prt opens c return $ f c - Vr (IC "Int") -> return $ Q cPredefAbs cInt -- Int and String are predefined cats - Vr (IC "String") -> return $ Q cPredefAbs cString Cn c -> do f <- lookupTreeMany prt opens c return $ f c diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index ad1566f1f..4d0c8b260 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -133,7 +133,7 @@ updateShellState opts sh (gr,(sgr,rts)) = do canModules = cgr, srcModules = src, cfs = zip concrs cfs, - morphos = zip concrs (repeat emptyMorpho), + morphos = zip concrs (map (mkMorpho cgr) concrs), gloptions = options (M.allFlags src), ---- canModules readFiles = [ft | ft@(f,_) <- readFiles sh, notInrts f] ++ rts, absCats = csi, |