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

sort records so that s field is first (use Macros.sortRec)

Browse Source
This commit is contained in:
aarne
2008-05-24 07:44:16 +00:00
parent 1eb1d7e055
commit 77178cd2ab
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-3.0/GF/Compile/GrammarToGFCC.hs
View File

@@ -399,7 +399,7 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of
App _ _ -> mkValCase (unrec tr)
QC _ _ -> mkValCase tr
R rs -> R [(mkLab i, (Nothing, t2t t)) |
(i,(l,(_,t))) <- zip [0..] (sort (unlock rs))]
(i,(l,(_,t))) <- zip [0..] (GM.sortRec (unlock rs))]
P t l -> r2r tr
PI t l i -> EInt $ toInteger i
@@ -529,7 +529,7 @@ notlock (l, t) = case t of --- need not look at l
_ -> True
unlockTy ty = case ty of
RecType ls -> RecType $ sort [(l, unlockTy t) | (l,t) <- ls, notlock (l,t)]
RecType ls -> RecType $ GM.sortRec [(l, unlockTy t) | (l,t) <- ls, notlock (l,t)]
_ -> GM.composSafeOp unlockTy ty