Wed Oct 8 16:13:56 EDT 2008 Peter Gavin <pg...@gm...>
* add HAVE_NEW_CONTROL_EXCEPTION define to configure.ac; modify several files to import OldException when it's defined
ghc 6.10 introduces a new exception system, with several functions that are different from the original Control.Exception module.
This new Control.Exception module is in base>=4.0. That version moved the old exception interface to the module Control.OldException.
When we get around to fixing everything for real, grepping for OldException should list the modules that need changing.
move ./gnomevfs/System/Gnome/VFS/Error.hs ./gnomevfs/System/Gnome/VFS/Error.hs.pp
move ./gtk/Graphics/UI/Gtk/Gdk/GC.chs ./gtk/Graphics/UI/Gtk/Gdk/GC.chs.pp
hunk ./Makefile.am 583
- gtk/Graphics/UI/Gtk/Gdk/GC.chs \
+ gtk/Graphics/UI/Gtk/Gdk/GC.chs.pp \
hunk ./Makefile.am 1747
- gnomevfs/System/Gnome/VFS/Error.hs \
+ gnomevfs/System/Gnome/VFS/Error.hs.pp \
hunk ./configure.ac 221
+AC_DEFINE(HAVE_NEW_CONTROL_EXCEPTION,[1],[Define if you have the new Control.Exception module (from GHC 6.10)]))
hunk ./glib/System/Glib/GError.chs.pp 91
+#if HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException
+#else
hunk ./glib/System/Glib/GError.chs.pp 95
+#endif
+
hunk ./glib/System/Glib/StoreValue.hsc 36
-import Control.Exception (throw, Exception(AssertionFailed))
+
+#if HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException
+#else
+import Control.Exception
+ (throw, Exception(AssertionFailed))
+#endif
hunk ./gnomevfs/System/Gnome/VFS/Error.hs.pp 43
+#ifdef HAVE_NEW_CONTROL_EXCEPTION
+import qualified Control.OldException as E
+#else
hunk ./gnomevfs/System/Gnome/VFS/Error.hs.pp 47
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs.pp 80
+#ifdef HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException (handle)
+#else
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs.pp 84
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 97
+#ifdef HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException
+#else
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 101
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/GlyphStorage.chs.pp 48
+#ifdef HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException ( Exception(ArrayException),
+ ArrayException(IndexOutOfBounds) )
+#else
hunk ./gtk/Graphics/UI/Gtk/Pango/GlyphStorage.chs.pp 54
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Layout.chs.pp 139
+#ifdef HAVE_NEW_CONTROL_EXCEPTION
+import Control.OldException ( Exception(ArrayException),
+ ArrayException(IndexOutOfBounds),
+ throwIO )
+#else
hunk ./gtk/Graphics/UI/Gtk/Pango/Layout.chs.pp 145
- ArrayException(IndexOutOfBounds) )
-import Control.Exception (throwIO)
+ ArrayException(IndexOutOfBounds),
+ throwIO )
+#endif
|
