diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-05-31 14:40:46 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-05-31 14:40:46 +0000 |
| commit | 9229c157642c3503d365f42fe5ecac414958ab9b (patch) | |
| tree | 422dd9f790ddc0d970e6a03783486616d7c4eb14 /src-3.0/GF/Source | |
| parent | 66c04672013a8d031ffe53012ed7e843bb54b750 (diff) | |
added positions to Module record; avoided Module constructor where possible; moved Refresh to Compile/
Diffstat (limited to 'src-3.0/GF/Source')
| -rw-r--r-- | src-3.0/GF/Source/SourceToGrammar.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src-3.0/GF/Source/SourceToGrammar.hs b/src-3.0/GF/Source/SourceToGrammar.hs index 2ab1d58ac..ca4f488ea 100644 --- a/src-3.0/GF/Source/SourceToGrammar.hs +++ b/src-3.0/GF/Source/SourceToGrammar.hs @@ -99,6 +99,8 @@ transModDef x = case x of mkBody (mstat', trDef, mtyp', id') body where + poss = emptyBinTree ---- + mkBody xx@(mstat', trDef, mtyp', id') bod = case bod of MNoBody incls -> do mkBody xx $ MBody (Ext incls) NoOpens [] @@ -108,13 +110,13 @@ transModDef x = case x of defs0 <- mapM trDef $ getTopDefs defs defs' <- U.buildAnyTree [d | Left ds <- defs0, d <- ds] flags' <- return $ concatModuleOptions [o | Right o <- defs0] - return (id',GM.ModMod (GM.Module mtyp' mstat' flags' extends' opens' defs')) + return (id',GM.ModMod (GM.Module mtyp' mstat' flags' extends' opens' defs' poss)) MReuse _ -> do - return (id', GM.ModMod (GM.Module mtyp' mstat' noModuleOptions [] [] emptyBinTree)) + return (id', GM.ModMod (GM.Module mtyp' mstat' noModuleOptions [] [] emptyBinTree poss)) MUnion imps -> do imps' <- mapM transIncluded imps return (id', - GM.ModMod (GM.Module (GM.MTUnion mtyp' imps') mstat' noModuleOptions [] [] emptyBinTree)) + GM.ModMod (GM.Module (GM.MTUnion mtyp' imps') mstat' noModuleOptions [] [] emptyBinTree poss)) MWith m insts -> mkBody xx $ MWithEBody [] m insts NoOpens [] MWithBody m insts opens defs -> mkBody xx $ MWithEBody [] m insts opens defs @@ -128,7 +130,7 @@ transModDef x = case x of defs' <- U.buildAnyTree [d | Left ds <- defs0, d <- ds] flags' <- return $ concatModuleOptions [o | Right o <- defs0] return (id', - GM.ModWith (GM.Module mtyp' mstat' flags' extends' opens' defs') m' insts') + GM.ModWith (GM.Module mtyp' mstat' flags' extends' opens' defs' poss) m' insts') mkModRes id mtyp body = do id' <- transIdent id |