GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

printname cat bug fixed

Browse Source
This commit is contained in:
aarne
2005-06-22 07:52:02 +00:00
parent 5398983836
commit 20f694b8e9
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/GF/Compile/CheckGrammar.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/05/30 18:39:43 $ -- > CVS $Date: 2005/06/22 08:52:02 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.27 $ -- > CVS $Revision: 1.28 $
-- --
-- AR 4\/12\/1999 -- 1\/4\/2000 -- 8\/9\/2001 -- 15\/5\/2002 -- 27\/11\/2002 -- 18\/6\/2003 -- AR 4\/12\/1999 -- 1\/4\/2000 -- 8\/9\/2001 -- 15\/5\/2002 -- 27\/11\/2002 -- 18\/6\/2003
-- --
@@ -131,7 +131,12 @@ checkCompleteGrammar abs cnc = do
checkWarn $ "Warning: no linearization of" +++ prt c checkWarn $ "Warning: no linearization of" +++ prt c
return js return js
AbsCat (Yes _) _ -> case lookupIdent c js of AbsCat (Yes _) _ -> case lookupIdent c js of
Ok _ -> return js Ok (CncCat (Yes _) _ _) -> return js
Ok (CncCat _ mt mp) -> do
checkWarn $
"Warning: no linearization type for" +++ prt c ++
", inserting default {s : Str}"
return $ updateTree (c,CncCat (Yes defLinType) mt mp) js
_ -> do _ -> do
checkWarn $ checkWarn $
"Warning: no linearization type for" +++ prt c ++ "Warning: no linearization type for" +++ prt c ++

8
src/GF/Compile/GrammarToCanon.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/06/17 14:15:18 $ -- > CVS $Date: 2005/06/22 08:52:02 $
-- > CVS $Author: bringert $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.21 $ -- > CVS $Revision: 1.22 $
-- --
-- Code generator from optimized GF source code to GFC. -- Code generator from optimized GF source code to GFC.
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ redInfo am (c,info) = errIn ("translating definition of" +++ prt c) $ do
trm' <- redCTerm t trm' <- redCTerm t
pr' <- redCTerm pr pr' <- redCTerm pr
return [(c', C.CncCat ty' trm' pr')] return [(c', C.CncCat ty' trm' pr')]
_ -> prtBad "cannot reduce rule for" c _ -> prtBad ("cannot reduce rule for") c
CncFun mt ptr ppr -> case (mt,ptr,ppr) of CncFun mt ptr ppr -> case (mt,ptr,ppr) of
(Just (cat,_), Yes trm, Yes pr) -> do (Just (cat,_), Yes trm, Yes pr) -> do