diff --git a/configure b/configure --- a/configure +++ b/configure @@ -12,7 +12,7 @@ #-------------------------------------------------------------------- # Versioning #-------------------------------------------------------------------- -version="0.10.1" +version="0.10.2" release="0" #-------------------------------------------------------------------- @@ -86,10 +86,10 @@ #-------------------------------------------------------------------- # macosx: wx-config might be not in the path -if findprogram "$wxconfig"; then :; else - if test -x "/usr/local/wxhaskell/bin/wx-config"; then - wxconfig="/usr/local/wxhaskell/bin/wx-config" - else +if test -x "/usr/local/wxhaskell/bin/wx-config"; then + wxconfig="/usr/local/wxhaskell/bin/wx-config" +else + if findprogram "$wxconfig"; then :; else if test -x "/usr/local/bin/wx-config"; then wxconfig="/usr/local/bin/wx-config" fi @@ -343,9 +343,14 @@ -exec-prefix=*|--exec-prefix=*) execprefix="$arg" execprefix_doc="$arg";; + -bindir=*|--bindir=*) + bindir="$arg" + bindir_doc="$arg";; -libdir=*|--libdir=*) libdir="$arg" libdir_doc="$arg";; + -datadir=*|--datadir=*) ;; # just for cabal + -libexecdir=*|--libexecdir=*) ;; # just for cabal -shared-prefix=*|--shared-prefix=*) sharedprefix="$arg";; -enable-strip|--enable-strip) @@ -774,6 +779,10 @@ date="" fi +if ! test "$bindir"; then + bindir=$execprefix/bin +fi + #echo " makefile configuration" echo " config/config.mk" cat > config/config.mk << EOF @@ -800,7 +809,7 @@ CXX=$cxx # Installation -BINDIR=$execprefix/bin +BINDIR=$bindir LIBDIR=$libdir SHARED-PREFIX=$sharedprefix CONFIG-FLAGS=$configflags diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -260,7 +260,7 @@ .PHONY: help doc webdoc clean realclean # global variables -OUTDIR = out +OUTDIR = dist # clean clean: wxc-clean wxd-clean wxcore-clean wx-clean @@ -273,13 +273,6 @@ #-------------------------------------------------------------------------- # Install (unfortunately with extra clauses for the mac) #-------------------------------------------------------------------------- -copy: - $(MAKE) install prefix=$(destdir)/$(prefix) \ - bindir=$(destdir)/$(bindir) \ - libdir=$(destdir)/$(libdir) \ - datadir=$(destdir)/$(datadir) \ - libexecdir=$(destdir)/$(libexecdir) - register: wxcore-register install: wxcore-install-files wxcore-register @@ -312,20 +305,21 @@ #.PHONY: wxc-dist wxd-dist wxcore-dist wx-dist #.PHONY: wxc-bindist wxcore-bindist wx-bindist WXHASKELLVER =wxhaskell-$(VERSION) +WXCOREVER =wxcore-$(VERSION) BIN-VERSION =$(TOOLKIT)$(WXWIN-VERSION)-$(VERSION) REL-VERSION =$(TOOLKIT)$(WXWIN-VERSION)-$(HCBASENAME)$(HCVERSION)-$(VERSION)-$(RELEASE) - DIST-OUTDIR =$(OUTDIR) DIST-DOC =$(DIST-OUTDIR)/wxhaskell-doc-$(VERSION).zip DIST-SRC =$(DIST-OUTDIR)/wxhaskell-src-$(VERSION).zip DIST-HACKAGE =$(DIST-OUTDIR)/wxcore-$(VERSION).tar.gz DIST-BIN =$(DIST-OUTDIR)/wxhaskell-bin-$(REL-VERSION).zip -DISTS =$(DIST-DOC) $(DIST-SRC) $(DIST-BIN) +DISTS =$(DIST-DOC) $(DIST-SRC) $(DIST-BIN) $(DIST-HACKAGE) SRCDIST-OUTDIR =$(DIST-OUTDIR)/srcdist SRCDIST-SRCDIR =$(SRCDIST-OUTDIR)/$(WXHASKELLVER) -HACKAGEDIST-SRCDIR =$(SRCDIST-OUTDIR)/wxcore-$(VERSION) +HACKAGEDIST-OUTDIR =$(DIST-OUTDIR)/hackagedist +HACKAGEDIST-SRCDIR =$(HACKAGEDIST-OUTDIR)/$(WXCOREVER) DOCDIST-OUTDIR =$(DIST-OUTDIR)/docdist DOCDIST-SRCDIR =$(DOCDIST-OUTDIR)/$(WXHASKELLVER) @@ -339,8 +333,6 @@ before-dist: wxcore-unregister wxcore-uninstall-files wxcore # full distribution -dist: srcdist - fulldist: dist-dirs all srcdist bindist docdist dist-dirs: @@ -355,13 +347,6 @@ @$(call cp-srcdist, $(SAMPLE-SOURCES)) @echo zipping: $(DIST-SRC) @$(CD) $(SRCDIST-OUTDIR) && $(call zip-add-rec,$(DIST-SRC),$(WXHASKELLVER)) - @$(call cp-hackagedist, $(WXCORE)) - @$(call cp-hackagedist, $(WXC)) - @$(call cp-hackagedist, $(WXD)) - @$(call cp-hackagedist, $(WXHASKELL-SOURCES)) - @$(call cp-hackagedist, $(SAMPLE-SOURCES)) - @echo tarring: $(DIST-HACKAGE) - @$(CD) $(SRCDIST-OUTDIR) && $(call tgz-add-rec,$(DIST-HACKAGE),wxcore-$(VERSION)) srcdist-clean: -@$(call full-remove-dir,$(SRCDIST-OUTDIR)) @@ -426,8 +411,6 @@ bin/macosx-builddmg $(PACKAGEDIR) $(OUTDIR) @mv -f $(OUTDIR)/$(WXHASKELLINS).dmg $(WXHASKELLDMG) echo "created: $(WXHASKELLDMG)" - - #-------------------------------------------------------------------------- # wxdirect: generates haskell marshall modules #-------------------------------------------------------------------------- @@ -789,18 +772,25 @@ #-------------------------------------------------------------------------- # Documentation #-------------------------------------------------------------------------- -DOC-OUTDIR =$(OUTDIR)/doc -DOCFILE =$(DOC-OUTDIR)/wxhaskell.haddock -HDOCFLAGS = --odir $(DOC-OUTDIR) --dump-interface=$(DOCFILE) --prologue=config/prologue.txt --html $(HDOCBASES) -DOCSOURCES = $(WX-DOCS) $(WXCORE-DOCS) +DOC-OUTDIR =$(OUTDIR)/doc/html +WXCORE-DOC-OUTDIR =$(DOC-OUTDIR)/wxcore +WX-DOC-OUTDIR =$(DOC-OUTDIR)/wx +WXCORE-DOCFILE =$(WXCORE-DOC-OUTDIR)/wxcore.haddock +WX-DOCFILE =$(WX-DOC-OUTDIR)/wx.haddock +HDOCFLAGS = --prologue=config/prologue.txt --html $(HDOCBASES) +WXCORE-DOCSOURCES = $(WXCORE-DOCS) +WX-DOCSOURCES = $(WX-DOCS) -doc: doc-dirs $(DOCFILE) +doc: doc-dirs $(WXCORE-DOCFILE) $(WX-DOCFILE) + doc-dirs: - @$(call ensure-dir,$(DOC-OUTDIR)) + @$(call ensure-dir,$(WXCORE-DOC-OUTDIR)) + @$(call ensure-dir,$(WX-DOC-OUTDIR)) doc-clean: - -@$(call full-remove-dir,$(DOC-OUTDIR)) + -@$(call full-remove-dir,$(WXCORE-DOC-OUTDIR)) + -@$(call full-remove-dir,$(WX-DOC-OUTDIR)) # copy documentation to the wxhaskell website webdoc: doc @@ -826,5 +816,40 @@ # generate documentation with haddock -$(DOCFILE): config/prologue.txt $(DOCSOURCES) - $(HDOC) $(HDOCFLAGS) $(DOCSOURCES) +$(WXCORE-DOCFILE): config/prologue.txt $(WXCORE-DOCSOURCES) + $(HDOC) --odir $(WXCORE-DOC-OUTDIR) --dump-interface=$(WXCORE-DOCFILE) $(HDOCFLAGS) $(WXCORE-DOCSOURCES) + +$(WX-DOCFILE): config/prologue.txt $(WX-DOCSOURCES) + $(HDOC) --odir $(WX-DOC-OUTDIR) --dump-interface=$(WX-DOCFILE) $(HDOCFLAGS) $(WX-DOCSOURCES) + +#-------------------------------------------------------------------------- +# Cabal / Hackage stuff +#-------------------------------------------------------------------------- + +# for hackage +dist: hackagedist + +hackagedist: hackagedist-clean dist-dirs + @$(call cp-hackagedist, $(WXC)) + @$(call cp-hackagedist, $(WXD)) + @$(call cp-hackagedist, $(WXCORE)) + @$(call cp-hackagedist, $(WXHASKELL-SOURCES)) + @$(call cp-hackagedist, $(SAMPLE-SOURCES)) + @echo tarring: $(DIST-HACKAGE) + @$(CD) $(HACKAGEDIST-OUTDIR) && $(call tgz-add-rec,$(DIST-HACKAGE),$(WXCOREVER)) + +hackagedist-clean: + -@$(call full-remove-dir,$(HACKAGEDIST-OUTDIR)) + -@$(call safe-remove-file,$(DIST-HACKAGE)) + +copy: + $(MAKE) install prefix=$(destdir)/$(prefix) \ + bindir=$(destdir)/$(bindir) \ + libdir=$(destdir)/$(libdir) \ + datadir=$(destdir)/$(datadir) \ + libexecdir=$(destdir)/$(libexecdir) + +# this is the same as the doc target below (no 's') +docs: wxd-dirs doc-dirs $(WXCORE-DOCFILE) + + diff --git a/wx/wx.cabal b/wx/wx.cabal --- a/wx/wx.cabal +++ b/wx/wx.cabal @@ -1,14 +1,14 @@ Name: wx -Version: 0.10.1 +Version: 0.10.2 License: LGPL License-file: license.txt Author: Daan Leijen Build-Type: Simple Category: GUI Cabal-Version: >= 1.2 -Description: wxHaskell +Description: wxHaskell is a portable and native GUI library for Haskell. It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X. At present, it works with wxWidgets 2.6 (and sadly, not with with wxWidgets 2.8) Maintainer: wxhaskell-users@lists.sourceforge.net -Synopsis: wxHaskell is a portable and native GUI library for Haskell. +Synopsis: wxHaskell Data-Files: wx.cabal Flag splitBase diff --git a/wxcore.cabal b/wxcore.cabal --- a/wxcore.cabal +++ b/wxcore.cabal @@ -1,10 +1,10 @@ Name: wxcore -Version: 0.10.1 +Version: 0.10.2 License: LGPL License-file: license.txt Author: Daan Leijen Build-Type: Make -Description: wxHaskell is a portable and native GUI library for Haskell. It is built on top of wxWidgets – a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X. +Description: wxHaskell is a portable and native GUI library for Haskell. It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X. At present, it works with wxWidgets 2.6 (and sadly, not with with wxWidgets 2.8) Maintainer: wxhaskell-users@lists.sourceforge.net Cabal-Version: >= 1.2 Category: GUI @@ -14,9 +14,9 @@ Description: Choose the new smaller, split-up base package. Library if flag(splitBase) - build-depends: base >= 3, parsec, array, directory, old-time + build-depends: base >= 3, parsec, array, directory, old-time, time else - build-depends: base < 3, haskell98, parsec + build-depends: base < 3, parsec, time Exposed-Modules: Graphics.UI.WXCore Graphics.UI.WXCore.WxcObject @@ -42,4 +42,5 @@ Graphics.UI.WXCore.OpenGL Graphics.UI.WXCore.WxcClassInfo Graphics.UI.WXCore.Defines + Hs-Source-Dirs: wxcore/src diff --git a/wxcore/src/Graphics/UI/WXCore/Db.hs b/wxcore/src/Graphics/UI/WXCore/Db.hs --- a/wxcore/src/Graphics/UI/WXCore/Db.hs +++ b/wxcore/src/Graphics/UI/WXCore/Db.hs @@ -175,9 +175,9 @@ import Graphics.UI.WXCore.WxcClasses import Graphics.UI.WXCore.Types -import IO( catch, ioError, isUserError, ioeGetErrorString) -import List( isPrefixOf ) -import Char( isDigit ) +import System.IO.Error( catch, ioError, isUserError, ioeGetErrorString) +import Data.List( isPrefixOf ) +import Data.Char( isDigit ) import Foreign import Foreign.Ptr import Foreign.C.String diff --git a/wxcore/src/Graphics/UI/WXCore/Dialogs.hs b/wxcore/src/Graphics/UI/WXCore/Dialogs.hs --- a/wxcore/src/Graphics/UI/WXCore/Dialogs.hs +++ b/wxcore/src/Graphics/UI/WXCore/Dialogs.hs @@ -34,7 +34,7 @@ , fileDialog ) where -import List( intersperse ) +import Data.List( intersperse ) import Graphics.UI.WXCore.WxcTypes import Graphics.UI.WXCore.WxcDefs import Graphics.UI.WXCore.WxcClasses diff --git a/wxcore/src/Graphics/UI/WXCore/Events.hs b/wxcore/src/Graphics/UI/WXCore/Events.hs --- a/wxcore/src/Graphics/UI/WXCore/Events.hs +++ b/wxcore/src/Graphics/UI/WXCore/Events.hs @@ -231,7 +231,7 @@ , unsafeWindowGetHandlerState ) where -import List( intersperse, findIndex ) +import Data.List( intersperse, findIndex ) import System.Environment( getProgName, getArgs ) import Foreign.StablePtr import Foreign.Ptr diff --git a/wxcore/src/Graphics/UI/WXCore/Image.hs b/wxcore/src/Graphics/UI/WXCore/Image.hs --- a/wxcore/src/Graphics/UI/WXCore/Image.hs +++ b/wxcore/src/Graphics/UI/WXCore/Image.hs @@ -51,7 +51,7 @@ , pixelBufferGetSize ) where -import Char( toLower ) +import Data.Char( toLower ) import Data.Array import Foreign.Marshal.Array import Foreign.C.String diff --git a/wxcore/src/Graphics/UI/WXCore/Layout.hs b/wxcore/src/Graphics/UI/WXCore/Layout.hs --- a/wxcore/src/Graphics/UI/WXCore/Layout.hs +++ b/wxcore/src/Graphics/UI/WXCore/Layout.hs @@ -167,7 +167,7 @@ , valignTop, valignCentre, valignCenter, valignBottom ) where -import List( transpose ) +import Data.List( transpose ) import Graphics.UI.WXCore.WxcTypes import Graphics.UI.WXCore.WxcDefs import Graphics.UI.WXCore.WxcClasses diff --git a/wxcore/src/Graphics/UI/WXCore/Types.hs b/wxcore/src/Graphics/UI/WXCore/Types.hs --- a/wxcore/src/Graphics/UI/WXCore/Types.hs +++ b/wxcore/src/Graphics/UI/WXCore/Types.hs @@ -77,7 +77,7 @@ ) where -import List( (\\) ) +import Data.List( (\\) ) import Graphics.UI.WXCore.WxcTypes import Graphics.UI.WXCore.WxcDefs import Graphics.UI.WXCore.WxcClasses( wxcSystemSettingsGetColour ) @@ -88,7 +88,7 @@ import Data.Bits import Data.IORef import qualified Control.Exception as CE -import qualified Monad as M +import qualified Control.Monad as M infixl 5 .+. diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcClassInfo.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:42:47.345 UTC@ + * @2008-02-16 12:00:53.332222 UTC@ And contains 368 class info definitions. -} diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:38:18.672572 UTC@ + * @2008-02-16 11:57:01.519295 UTC@ From the files: @@ -2138,7 +2138,7 @@ import Graphics.UI.WXCore.WxcObject classTypesVersion :: String -classTypesVersion = "2008-02-14 17:38:18.672566 UTC" +classTypesVersion = "2008-02-16 11:57:01.507275 UTC" -- | Pointer to an object of type 'ConfigBase'. type ConfigBase a = Object (CConfigBase a) diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs b/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcClasses.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:38:35.336936 UTC@ + * @2008-02-16 11:57:06.031944 UTC@ From the files: @@ -35,5 +35,5 @@ import Graphics.UI.WXCore.WxcClassTypes versionWxcClasses :: String -versionWxcClasses = "2008-02-14 17:38:34.340081 UTC" +versionWxcClasses = "2008-02-16 11:57:05.13215 UTC" diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcClassesAL.hs @@ -13,7 +13,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:38:34.340084 UTC@ + * @2008-02-16 11:57:05.132154 UTC@ From the files: @@ -1606,7 +1606,7 @@ import Graphics.UI.WXCore.WxcClassTypes versionWxcClassesAL :: String -versionWxcClassesAL = "2008-02-14 17:38:34.340081 UTC" +versionWxcClassesAL = "2008-02-16 11:57:05.13215 UTC" -- | usage: (@acceleratorEntryCreate flags keyCode cmd@). acceleratorEntryCreate :: Int -> Int -> Int -> IO (AcceleratorEntry ()) diff --git a/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs b/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcClassesMZ.hs @@ -13,7 +13,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:38:34.986066 UTC@ + * @2008-02-16 11:57:05.714377 UTC@ From the files: @@ -2090,7 +2090,7 @@ import Graphics.UI.WXCore.WxcClassTypes versionWxcClassesMZ :: String -versionWxcClassesMZ = "2008-02-14 17:38:34.340081 UTC" +versionWxcClassesMZ = "2008-02-16 11:57:05.13215 UTC" -- | usage: (@managedPtrCreateFromBitmap obj@). managedPtrCreateFromBitmap :: Bitmap a -> IO (WxManagedPtr ()) diff --git a/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs b/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs --- a/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs +++ b/wxcore/src/Graphics/UI/WXCore/WxcDefs.hs @@ -12,7 +12,7 @@ Do not edit this file manually! This file was automatically generated by wxDirect on: - * @2008-02-14 17:43:00.88153 UTC@ + * @2008-02-16 12:01:05.699612 UTC@ From the files: diff --git a/wxdirect/src/Classes.hs b/wxdirect/src/Classes.hs --- a/wxdirect/src/Classes.hs +++ b/wxdirect/src/Classes.hs @@ -23,8 +23,8 @@ ) where import System( getEnv ) -import Char( isUpper ) -import List( sort, sortBy ) +import Data.Char( isUpper ) +import Data.List( sort, sortBy ) import qualified Set import qualified Map import HaskellNames( haskellTypeName, isBuiltin ) diff --git a/wxdirect/src/CompileClassInfo.hs b/wxdirect/src/CompileClassInfo.hs --- a/wxdirect/src/CompileClassInfo.hs +++ b/wxdirect/src/CompileClassInfo.hs @@ -12,8 +12,8 @@ ----------------------------------------------------------------------------------------- module CompileClassInfo( compileClassInfo ) where -import Char( toLower ) -import List( sortBy, sort ) +import Data.Char( toLower ) +import Data.List( sortBy, sort ) import Types import HaskellNames diff --git a/wxdirect/src/CompileClasses.hs b/wxdirect/src/CompileClasses.hs --- a/wxdirect/src/CompileClasses.hs +++ b/wxdirect/src/CompileClasses.hs @@ -18,8 +18,8 @@ import qualified MultiSet import Data.Time( getCurrentTime ) -import Char( toUpper, isUpper, toLower ) --toLower, toUpper, isSpace, isLower, isUpper ) -import List( isPrefixOf, sort, sortBy, intersperse, zipWith4 ) +import Data.Char( toUpper, isUpper, toLower ) --toLower, toUpper, isSpace, isLower, isUpper ) +import Data.List( isPrefixOf, sort, sortBy, intersperse, zipWith4 ) import Types import HaskellNames diff --git a/wxdirect/src/CompileDefs.hs b/wxdirect/src/CompileDefs.hs --- a/wxdirect/src/CompileDefs.hs +++ b/wxdirect/src/CompileDefs.hs @@ -12,7 +12,7 @@ ----------------------------------------------------------------------------------------- module CompileDefs( compileDefs ) where -import List( sortBy, sort ) +import Data.List( sortBy, sort ) import Types import HaskellNames diff --git a/wxdirect/src/CompileHeader.hs b/wxdirect/src/CompileHeader.hs --- a/wxdirect/src/CompileHeader.hs +++ b/wxdirect/src/CompileHeader.hs @@ -17,8 +17,8 @@ import qualified MultiSet import Data.Time( getCurrentTime) -import Char( toUpper, isUpper ) -import List( isPrefixOf, sort, sortBy, intersperse, zipWith4 ) +import Data.Char( toUpper, isUpper ) +import Data.List( isPrefixOf, sort, sortBy, intersperse, zipWith4 ) import Types import HaskellNames diff --git a/wxdirect/src/DeriveTypes.hs b/wxdirect/src/DeriveTypes.hs --- a/wxdirect/src/DeriveTypes.hs +++ b/wxdirect/src/DeriveTypes.hs @@ -19,8 +19,8 @@ import qualified Set import qualified Map -import Char( toLower, toUpper, isSpace, isLower, isUpper ) -import List( isPrefixOf, sort, sortBy, intersperse ) +import Data.Char( toLower, toUpper, isSpace, isLower, isUpper ) +import Data.List( isPrefixOf, sort, sortBy, intersperse ) import Types import HaskellNames diff --git a/wxdirect/src/HaskellNames.hs b/wxdirect/src/HaskellNames.hs --- a/wxdirect/src/HaskellNames.hs +++ b/wxdirect/src/HaskellNames.hs @@ -18,9 +18,9 @@ ) where import qualified Set -import Char( toLower, toUpper, isLower, isUpper ) +import Data.Char( toLower, toUpper, isLower, isUpper ) import Data.Time( getCurrentTime ) -import List( isPrefixOf ) +import Data.List( isPrefixOf ) {----------------------------------------------------------------------------------------- diff --git a/wxdirect/src/Main.hs b/wxdirect/src/Main.hs --- a/wxdirect/src/Main.hs +++ b/wxdirect/src/Main.hs @@ -17,7 +17,7 @@ ----------------------------------------------------------------------------------------- module Main where -import List( isPrefixOf ) +import Data.List( isPrefixOf ) import System( getEnv ) import System.Environment( getArgs ) diff --git a/wxdirect/src/ParseC.hs b/wxdirect/src/ParseC.hs --- a/wxdirect/src/ParseC.hs +++ b/wxdirect/src/ParseC.hs @@ -12,8 +12,8 @@ ----------------------------------------------------------------------------------------- module ParseC( parseC, readHeaderFile ) where -import Char( isSpace ) -import List( isPrefixOf ) +import Data.Char( isSpace ) +import Data.List( isPrefixOf ) import Text.ParserCombinators.Parsec import qualified Text.ParserCombinators.Parsec.Token as P import Text.ParserCombinators.Parsec.Language diff --git a/wxdirect/src/ParseEiffel.hs b/wxdirect/src/ParseEiffel.hs --- a/wxdirect/src/ParseEiffel.hs +++ b/wxdirect/src/ParseEiffel.hs @@ -12,7 +12,7 @@ ----------------------------------------------------------------------------------------- module ParseEiffel( parseEiffel ) where -import Char( digitToInt ) +import Data.Char( digitToInt ) import Text.ParserCombinators.Parsec import qualified Text.ParserCombinators.Parsec.Token as P import Text.ParserCombinators.Parsec.Language diff --git a/wxdirect/src/Types.hs b/wxdirect/src/Types.hs --- a/wxdirect/src/Types.hs +++ b/wxdirect/src/Types.hs