msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

"Committed_by_peb"

Browse Source
This commit is contained in:
peb
2005-06-23 12:23:01 +00:00
parent aab06133c6
commit 6c5ce5fd9b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/GF/Canon/CMacros.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/06/17 14:15:17 $ -- > CVS $Date: 2005/06/23 13:23:01 $
-- > CVS $Author: bringert $ -- > CVS $Author: peb $
-- > CVS $Revision: 1.25 $ -- > CVS $Revision: 1.26 $
-- --
-- Macros for building and analysing terms in GFC concrete syntax. -- Macros for building and analysing terms in GFC concrete syntax.
-- --
@@ -290,4 +290,7 @@ composOp co trm =
do do
as' <- mapM co as as' <- mapM co as
return (FV as') return (FV as')
-- peb tried to do this, but then there were errors in GF.Canon.Look.ccompute:
-- V x as -> do as' <- mapM co as
-- return (V x as')
_ -> return trm -- covers Arg, I, LI, K, E _ -> return trm -- covers Arg, I, LI, K, E

9
src/GF/Conversion/GFCtoSimple.hs
View File

@@ -4,9 +4,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/06/23 09:43:40 $ -- > CVS $Date: 2005/06/23 13:23:01 $
-- > CVS $Author: peb $ -- > CVS $Author: peb $
-- > CVS $Revision: 1.10 $ -- > CVS $Revision: 1.11 $
-- --
-- Converting GFC to SimpleGFC -- Converting GFC to SimpleGFC
-- --
@@ -94,7 +94,10 @@ convertConcrete gram (Abs decl args name) = Cnc ltyp largs term
ltyp : largs = map (convertCType gram . lookupCType gram) (decl : args) ltyp : largs = map (convertCType gram . lookupCType gram) (decl : args)
expandTerm :: Env -> A.Term -> A.Term expandTerm :: Env -> A.Term -> A.Term
expandTerm gram term = err error id $ expandLinTables (fst gram) term expandTerm gram term = tracePrt "expanded term" prt $
err error id $ expandLinTables (fst gram) $
tracePrt "initial term" prt $
term
convertCType :: Env -> A.CType -> SLinType convertCType :: Env -> A.CType -> SLinType
convertCType gram (A.RecType rec) = RecT [ (lbl, convertCType gram ctype) | A.Lbg lbl ctype <- rec ] convertCType gram (A.RecType rec) = RecT [ (lbl, convertCType gram ctype) | A.Lbg lbl ctype <- rec ]