summaryrefslogtreecommitdiff
path: root/src/GF/Compile/GrammarToCanon.hs
diff options
context:
space:
mode:
authoraarne <unknown>2003-10-08 10:09:58 +0000
committeraarne <unknown>2003-10-08 10:09:58 +0000
commita979508aa75a3f2b93072d214ca9c75ed874a39c (patch)
tree74add47e62a9b5fdb1720a365754f738c3de4b93 /src/GF/Compile/GrammarToCanon.hs
parent889e5a92e4e0c40ab249f9f86d0fa2647132d87a (diff)
Restored printnames.
Diffstat (limited to 'src/GF/Compile/GrammarToCanon.hs')
-rw-r--r--src/GF/Compile/GrammarToCanon.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/GF/Compile/GrammarToCanon.hs b/src/GF/Compile/GrammarToCanon.hs
index b097405de..23833a3c2 100644
--- a/src/GF/Compile/GrammarToCanon.hs
+++ b/src/GF/Compile/GrammarToCanon.hs
@@ -74,22 +74,22 @@ redInfo am (c,info) = errIn ("translating definition of" +++ prt c) $ do
ps' <- mapM redParam ps
returns c' $ C.ResPar ps'
- CncCat pty ptr ppr -> case (pty,ptr) of
- (Yes ty, Yes (Abs _ t)) -> do
+ CncCat pty ptr ppr -> case (pty,ptr,ppr) of
+ (Yes ty, Yes (Abs _ t), Yes pr) -> do
ty' <- redCType ty
trm' <- redCTerm t
- ppr' <- return $ G.FV [] ---- redCTerm
- return [(c', C.CncCat ty' trm' ppr')]
+ pr' <- redCTerm pr
+ return [(c', C.CncCat ty' trm' pr')]
_ -> prtBad "cannot reduce rule for" c
- CncFun mt ptr ppr -> case (mt,ptr) of
- (Just (cat,_), Yes trm) -> do
+ CncFun mt ptr ppr -> case (mt,ptr,ppr) of
+ (Just (cat,_), Yes trm, Yes pr) -> do
cat' <- redIdent cat
(xx,body,_) <- termForm trm
xx' <- mapM redArgvar xx
body' <- errIn (prt body) $ redCTerm body ---- debug
- ppr' <- return $ G.FV [] ---- redCTerm
- return [(c',C.CncFun (G.CIQ am cat') xx' body' ppr')]
+ pr' <- redCTerm pr
+ return [(c',C.CncFun (G.CIQ am cat') xx' body' pr')]
_ -> prtBad ("cannot reduce rule" +++ show info +++ "for") c ---- debug
AnyInd s b -> do