diff options
| author | aarne <unknown> | 2005-04-28 15:42:47 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-04-28 15:42:47 +0000 |
| commit | 830f7c14bc0a7c9a22ec73759e315087a658f8ee (patch) | |
| tree | 9ebbbc2fe852c4a93dcf3b93e0ef5486a64b38e3 /src/GF/Compile/CheckGrammar.hs | |
| parent | 8b7e450f1cf8d88909b8ce78218c44b9b102e928 (diff) | |
library adjustments, error message clean-up
Diffstat (limited to 'src/GF/Compile/CheckGrammar.hs')
| -rw-r--r-- | src/GF/Compile/CheckGrammar.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs index 718260f68..59c0aec0b 100644 --- a/src/GF/Compile/CheckGrammar.hs +++ b/src/GF/Compile/CheckGrammar.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/25 18:19:32 $ +-- > CVS $Date: 2005/04/28 16:42:48 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.24 $ +-- > CVS $Revision: 1.25 $ -- -- AR 4\/12\/1999 -- 1\/4\/2000 -- 8\/9\/2001 -- 15\/5\/2002 -- 27\/11\/2002 -- 18\/6\/2003 -- @@ -125,12 +125,12 @@ checkCompleteGrammar abs cnc = do foldM checkOne js fs where checkOne js i@(c,info) = case info of - AbsFun (Yes _) _ -> case lookupTree prt c js of + AbsFun (Yes _) _ -> case lookupIdent c js of Ok _ -> return js _ -> do checkWarn $ "Warning: no linearization of" +++ prt c return js - AbsCat (Yes _) _ -> case lookupTree prt c js of + AbsCat (Yes _) _ -> case lookupIdent c js of Ok _ -> return js _ -> do checkWarn $ @@ -259,7 +259,7 @@ computeLType gr t = do Q m c | elem c [cPredef,cPredefAbs] -> return ty - Q m ident -> checkIn ("Q" +++ show m) $ do + Q m ident -> checkIn ("module" +++ prt m) $ do ty' <- checkErr (lookupResDef gr m ident) if ty' == ty then return ty else comp ty' --- is this necessary to test? @@ -359,7 +359,7 @@ inferLType gr trm = case trm of (t',ty) <- infer t --- ?? ty' <- comp ty termWith (P t' i) $ checkErr $ case ty' of - RecType ts -> maybeErr ("unknown label" +++ show i +++ "in" +++ show ty') $ + RecType ts -> maybeErr ("unknown label" +++ prt i +++ "in" +++ prt ty') $ lookup i ts _ -> prtBad ("record type expected for" +++ prt t +++ "instead of") ty' |
