GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 17:12:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

data structures for param values with number, preparing optimized pattern matching in grammar compilation

Browse Source
This commit is contained in:
aarne
2008-12-08 07:15:19 +00:00
parent cbb495f5d9
commit de8bea8d69
8 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/GF/Grammar/Macros.hs
View File

@@ -437,7 +437,9 @@ linAsStr s = mkRecord linLabel [K s] -- default linearization {s = s}
term2patt :: Term -> Err Patt
term2patt trm = case termForm trm of
Ok ([], Vr x, []) -> return (PV x)
Ok ([], Val ty x, []) -> return (PVal ty x)
Ok ([], Val te ty x, []) -> do
te' <- term2patt te
return (PVal te' ty x)
Ok ([], Con c, aa) -> do
aa' <- mapM term2patt aa
return (PC c aa')
@@ -488,7 +490,7 @@ patt2term :: Patt -> Term
patt2term pt = case pt of
PV x -> Vr x
PW -> Vr identW --- not parsable, should not occur
PVal t i -> Val t i
PVal v t i -> Val (patt2term v) t i
PMacro c -> Cn c
PM p c -> Q p c
@@ -623,9 +625,10 @@ composOp co trm =
vs' <- mapM co vs
return (V ty' vs')
Val ty i ->
do ty' <- co ty
return (Val ty' i)
Val te ty i ->
do te' <- co te
ty' <- co ty
return (Val te' ty' i)
Let (x,(mt,a)) b ->
do a' <- co a