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

gfcc with lindef (_dCat)

Browse Source
This commit is contained in:
aarne
2006-12-19 15:34:52 +00:00
parent 4dbfe518e5
commit 3fffa1489f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bronzeage/BronzeageI.gf
View File

@@ -1,7 +1,7 @@
incomplete concrete BronzeageI of Bronzeage = open Lang in { incomplete concrete BronzeageI of Bronzeage = open Lang in {
flags flags
startcat = Phr ; optimize = share_subs ; startcat = Phr ; optimize = all_subs ; --optimize = share_subs ;
unlexer = text ; lexer = text ; unlexer = text ; lexer = text ;
lincat lincat

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

@@ -62,16 +62,19 @@ canon2gfcc cgr@(M.MGrammar ((a,M.ModMod abm):cms)) =
adefs = [C.Fun f' (mkType ty) (C.Tr (C.AC f') []) | adefs = [C.Fun f' (mkType ty) (C.Tr (C.AC f') []) |
(f,GFC.AbsFun ty _) <- tree2list (M.jments abm), let f' = i2i f] (f,GFC.AbsFun ty _) <- tree2list (M.jments abm), let f' = i2i f]
cncs = [C.Cnc (i2i lang) (concr m) | (lang,M.ModMod m) <- cms] cncs = [C.Cnc (i2i lang) (concr m) | (lang,M.ModMod m) <- cms]
concr mo = cats mo ++ concr mo = cats mo ++ lindefs mo ++
optConcrete optConcrete
[C.Lin (i2i f) (mkTerm tr) | [C.Lin (i2i f) (mkTerm tr) |
(f,GFC.CncFun _ _ tr _) <- tree2list (M.jments mo)] (f,GFC.CncFun _ _ tr _) <- tree2list (M.jments mo)]
cats mo = [C.Lin (i2ic c) (mkCType ty) | cats mo = [C.Lin (i2ic c) (mkCType ty) |
(c,GFC.CncCat ty _ _) <- tree2list (M.jments mo)] (c,GFC.CncCat ty _ _) <- tree2list (M.jments mo)]
lindefs mo = [C.Lin (i2id c) (mkTerm tr) |
(c,GFC.CncCat _ tr _) <- tree2list (M.jments mo)]
i2i :: Ident -> C.CId i2i :: Ident -> C.CId
i2i (IC c) = C.CId c i2i (IC c) = C.CId c
i2ic (IC c) = C.CId ("__" ++ c) -- for category symbols i2ic (IC c) = C.CId ("__" ++ c) -- for lincat of category symbols
i2id (IC c) = C.CId ("_d" ++ c) -- for lindef of category symbols
mkType :: A.Type -> C.Type mkType :: A.Type -> C.Type
mkType t = case GM.catSkeleton t of mkType t = case GM.catSkeleton t of
@@ -179,7 +182,7 @@ canon2canon = recollect . map cl2cl . repartition where
_ -> (c,m) _ -> (c,m)
j2j (f,j) = case j of j2j (f,j) = case j of
GFC.CncFun x y tr z -> (f,GFC.CncFun x y (t2t tr) z) GFC.CncFun x y tr z -> (f,GFC.CncFun x y (t2t tr) z)
GFC.CncCat ty x y -> (f,GFC.CncCat (ty2ty ty) x y) GFC.CncCat ty x y -> (f,GFC.CncCat (ty2ty ty) (t2t x) y)
_ -> (f,j) _ -> (f,j)
t2t = term2term cg pv t2t = term2term cg pv
ty2ty = type2type cg pv ty2ty = type2type cg pv