X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FUgenAll.lhs;h=c6ddcdd5750fd885ca0d8adf616040720358ac3e;hb=19a86f31f2e5623d0f9ca25838fd6e2aa52456eb;hp=3a5f86c95410447048c543bfd2593f23c366f252;hpb=26741ec416bae2c502ef00a2ba0e79050a32cb67;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/UgenAll.lhs b/ghc/compiler/parser/UgenAll.lhs
index 3a5f86c..c6ddcdd 100644
--- a/ghc/compiler/parser/UgenAll.lhs
+++ b/ghc/compiler/parser/UgenAll.lhs
@@ -1,77 +1,29 @@
 Stuff the Ugenny things show to the parser.
 
 \begin{code}
-#include "HsVersions.h"
-
 module UgenAll (
-	-- re-exported Prelude stuff
-	returnUgn, thenUgn,
-
 	-- stuff defined in utils module
-#if (! defined(REALLY_HASKELL_1_3)) || PATRICK_FIXES_MODULE_DOTDOT_THING
-	EXP_MODULE(UgenUtil) ,
+	module UgenUtil,
 
 	-- re-exported ugen-generated stuff
-	EXP_MODULE(U_binding) ,
-	EXP_MODULE(U_constr) ,
-	EXP_MODULE(U_entidt) ,
-	EXP_MODULE(U_list) ,
-	EXP_MODULE(U_literal) ,
-	EXP_MODULE(U_maybe) ,
-	EXP_MODULE(U_either) ,
-	EXP_MODULE(U_pbinding) ,
-	EXP_MODULE(U_qid) ,
-	EXP_MODULE(U_tree) ,
-	EXP_MODULE(U_ttype)
-#else
-	SYN_IE(ParseTree),
-	SYN_IE(U_VOID_STAR),
-	U_binding (..),
-	U_constr (..),
-	U_either (..),
-	U_entidt (..),
-	SYN_IE(U_hstring),
-	U_list (..),
-	U_literal (..),
-	SYN_IE(U_long),
-	U_maybe (..),
-	SYN_IE(U_numId),
-	U_pbinding (..),
-	U_qid (..),
-	SYN_IE(U_stringId),
-	U_tree (..),
-	U_ttype (..),
-	SYN_IE(UgnM),
-	getSrcFileUgn,
-	getSrcLocUgn,
-	getSrcModUgn,
-	initUgn,
-	ioToUgnM,
-	mkSrcLocUgn,
-	rdU_VOID_STAR,
-	rdU_binding,
-	rdU_constr,
-	rdU_either,
-	rdU_entidt,
-	rdU_hstring,
-	rdU_list,
-	rdU_literal,
-	rdU_long,
-	rdU_maybe,
-	rdU_numId,
-	rdU_pbinding,
-	rdU_qid,
-	rdU_stringId,
-	rdU_tree,
-	rdU_ttype,
-	setSrcFileUgn,
-	setSrcModUgn
-#endif
+	module U_binding,
+	module U_constr,
+	module U_entidt,
+	module U_list,
+	module U_literal,
+	module U_maybe,
+	module U_either,
+	module U_grhsb,
+	module U_gdexp,
+	module U_match,
+	module U_qid,
+	module U_tree,
+	module U_ttype
     ) where
 
-import PreludeGlaST
+#include "HsVersions.h"
 
-IMP_Ubiq(){-uitous-}
+import GlaExts
 
 -- friends:
 import U_binding
@@ -81,7 +33,9 @@ import U_list
 import U_literal
 import U_maybe
 import U_either
-import U_pbinding
+import U_gdexp
+import U_grhsb
+import U_match
 import U_qid
 import U_tree
 import U_ttype