rename MetaSymb in GF.Grammar.Grammar to MetaId to match the convention in PGF

This commit is contained in:
krasimir
2009-09-20 10:28:27 +00:00
parent 81ca1a5744
commit a29a8e4f60
9 changed files with 20 additions and 86 deletions

View File

@@ -139,7 +139,7 @@ mkExp scope t = case GM.termForm t of
EInt i -> C.ELit (C.LInt i)
EFloat f -> C.ELit (C.LFlt f)
K s -> C.ELit (C.LStr s)
Meta (MetaSymb i) -> C.EMeta i
Meta i -> C.EMeta i
_ -> C.EMeta 0
mkPatt scope p =

View File

@@ -37,7 +37,7 @@ data AExp =
| AInt Integer
| AFloat Double
| AStr String
| AMeta MetaSymb Val
| AMeta MetaId Val
| AApp AExp AExp Val
| AAbs Ident Val AExp
| AProd Ident AExp AExp
@@ -234,7 +234,7 @@ checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $
ps2ts k = foldr p2t ([],0,[],k)
p2t p (ps,i,g,k) = case p of
PW -> (Meta (MetaSymb i) : ps, i+1,g,k)
PW -> (Meta i : ps, i+1,g,k)
PV x -> (Vr x : ps, i, upd x k g,k+1)
PString s -> (K s : ps, i, g, k)
PInt n -> (EInt n : ps, i, g, k)