From 85d777e068cbcb822f31b496f00bd86925ad6ee5 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 14 Jan 2012 17:06:54 +0000 Subject: [PATCH] sorted the list of funs and cats in GrammatToPGF to get the predef categories in proper place and get gr, ai, gt work properly --- src/compiler/GF/Compile/GrammarToPGF.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Compile/GrammarToPGF.hs b/src/compiler/GF/Compile/GrammarToPGF.hs index 167f7a489..c30afb0ee 100644 --- a/src/compiler/GF/Compile/GrammarToPGF.hs +++ b/src/compiler/GF/Compile/GrammarToPGF.hs @@ -52,10 +52,10 @@ mkCanon2pgf opts gr am = do flags = Map.fromList [(mkCId f,C.LStr x) | (f,x) <- optionsPGF aflags] - funs = Map.fromAscList [(i2i f, (mkType [] ty, mkArrity ma, mkDef pty, 0)) | + funs = Map.fromList [(i2i f, (mkType [] ty, mkArrity ma, mkDef pty, 0)) | ((m,f),AbsFun (Just (L _ ty)) ma pty _) <- adefs] - cats = Map.fromAscList [(i2i c, (snd (mkContext [] cont),catfuns c)) | + cats = Map.fromList [(i2i c, (snd (mkContext [] cont),catfuns c)) | ((m,c),AbsCat (Just (L _ cont))) <- adefs] catfuns cat =