diff options
| author | bjorn <bjorn@bringert.net> | 2008-10-15 11:55:18 +0000 |
|---|---|---|
| committer | bjorn <bjorn@bringert.net> | 2008-10-15 11:55:18 +0000 |
| commit | 849642e9dd638082bb7b1d7b704200e01429233d (patch) | |
| tree | 214c5148df1604cac0dca88fd2aac6e190055a5d /src/GF/Infra/Modules.hs | |
| parent | 1ecb4f63e9765962aab570bf043cb65c22df1e45 (diff) | |
Merge ModuleOptions and Options.
Diffstat (limited to 'src/GF/Infra/Modules.hs')
| -rw-r--r-- | src/GF/Infra/Modules.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs index 6c40944da..9d8438f0f 100644 --- a/src/GF/Infra/Modules.hs +++ b/src/GF/Infra/Modules.hs @@ -66,7 +66,7 @@ data ModInfo i a = data Module i a = Module { mtype :: ModuleType i , mstatus :: ModuleStatus , - flags :: ModuleOptions, + flags :: Options, extend :: [(i,MInclude i)], opens :: [OpenSpec i] , jments :: BinTree i a , @@ -128,15 +128,15 @@ addOpenQualif :: i -> i -> Module i t -> Module i t addOpenQualif i j (Module mt ms fs me ops js ps) = Module mt ms fs me (oQualif i j : ops) js ps -addFlag :: ModuleOptions -> Module i t -> Module i t +addFlag :: Options -> Module i t -> Module i t addFlag f mo = mo {flags = flags mo `addOptions` f} -flagsModule :: (i,ModInfo i a) -> ModuleOptions +flagsModule :: (i,ModInfo i a) -> Options flagsModule (_,mi) = case mi of ModMod m -> flags m _ -> noOptions -allFlags :: MGrammar i a -> ModuleOptions +allFlags :: MGrammar i a -> Options allFlags gr = concatOptions $ map flags $ [m | (_, ModMod m) <- modules gr] mapModules :: (Module i a -> Module i a) |