diff options
| author | krasimir <krasimir@chalmers.se> | 2009-09-20 10:28:27 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-09-20 10:28:27 +0000 |
| commit | a29a8e4f60960122874c737d32e9d41a3575208b (patch) | |
| tree | 01bc816779410a378df386eaca2a5ae354ae5a10 /src/GF/Compile | |
| parent | 81ca1a57445bbf68d40d2812ee6ef521f9f81240 (diff) | |
rename MetaSymb in GF.Grammar.Grammar to MetaId to match the convention in PGF
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/GrammarToGFCC.hs | 2 | ||||
| -rw-r--r-- | src/GF/Compile/TC.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index a2b03ab63..aa84f820c 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -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 = diff --git a/src/GF/Compile/TC.hs b/src/GF/Compile/TC.hs index 7ee3e9755..3999c223b 100644 --- a/src/GF/Compile/TC.hs +++ b/src/GF/Compile/TC.hs @@ -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) |