diff options
| author | bringert <bringert@cs.chalmers.se> | 2007-12-21 17:25:35 +0000 |
|---|---|---|
| committer | bringert <bringert@cs.chalmers.se> | 2007-12-21 17:25:35 +0000 |
| commit | 093633a216537b6c68632af1e1d0bd6d7af6efb1 (patch) | |
| tree | 7758d1390ae24b30252ab55e3e223114696fb2b2 | |
| parent | 24c456cadfc3f207beda732ced664c62bedbebe0 (diff) | |
Merge abstract and global flags and put them at the top level in GFCC files.
| -rw-r--r-- | src/GF/GFCC/Raw/ConvertGFCC.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/GF/GFCC/Raw/ConvertGFCC.hs b/src/GF/GFCC/Raw/ConvertGFCC.hs index 96a66f151..325d6ea6d 100644 --- a/src/GF/GFCC/Raw/ConvertGFCC.hs +++ b/src/GF/GFCC/Raw/ConvertGFCC.hs @@ -13,7 +13,6 @@ toGFCC (Grm [ App (CId "flags") gfs, ab@( App (CId "abstract") [ - App (CId "flags") afls, App (CId "fun") fs, App (CId "cat") cts ]), @@ -24,7 +23,7 @@ toGFCC (Grm [ gflags = fromAscList [(f,v) | App f [AStr v] <- gfs], abstract = let - aflags = fromAscList [(f,v) | App f [AStr v] <- afls] + aflags = fromAscList [(f,v) | App f [AStr v] <- gfs] lfuns = [(f,(toType typ,toExp def)) | App f [typ, def] <- fs] funs = fromAscList lfuns lcats = [(c, Prelude.map toHypo hyps) | App c hyps <- cts] @@ -102,9 +101,8 @@ toTerm e = case e of fromGFCC :: GFCC -> Grammar fromGFCC gfcc0 = Grm [ app "grammar" (AId (absname gfcc) : lmap AId (cncnames gfcc)), - app "flags" [App f [AStr v] | (f,v) <- toList (gflags gfcc)], + app "flags" [App f [AStr v] | (f,v) <- toList (gflags gfcc `union` aflags agfcc)], app "abstract" [ - app "flags" [App f [AStr v] | (f,v) <- toList (aflags agfcc)], app "fun" [App f [fromType t,fromExp d] | (f,(t,d)) <- toList (funs agfcc)], app "cat" [App f (lmap fromHypo hs) | (f,hs) <- toList (cats agfcc)] ], |