From f56ab96f3450e4205553db5f0d67074bc39d7ccf Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Thu, 23 Sep 2010 19:43:18 +0000 Subject: [PATCH] Make ascii clean and ghci clean, bump --- plugins.cabal | 7 ++++--- src/System/MkTemp.hs | 5 ++--- src/System/Plugins/Consts.hs | 1 + src/System/Plugins/Env.hs | 1 + src/System/Plugins/Load.hs | 11 +++++++---- src/System/Plugins/Make.hs | 3 ++- src/System/Plugins/PackageAPI.hs | 1 + src/System/Plugins/ParsePkgConfCabal.hs | 1 + src/System/Plugins/Parser.hs | 3 ++- src/System/Plugins/Process.hs | 1 + src/System/Plugins/Utils.hs | 1 + 11 files changed, 23 insertions(+), 12 deletions(-) diff --git a/plugins.cabal b/plugins.cabal index 885ede4..cdec389 100644 --- a/plugins.cabal +++ b/plugins.cabal @@ -1,5 +1,5 @@ name: plugins -version: 1.5.1 +version: 1.5.1.1 homepage: http://code.haskell.org/~dons/code/hs-plugins synopsis: Dynamic linking for Haskell and C objects description: Dynamic linking and runtime evaluation of Haskell, @@ -10,7 +10,7 @@ description: Dynamic linking and runtime evaluation of Haskell, category: System license: BSD3 License-file: LICENSE -author: Don Stewart 2004-2009 +author: Don Stewart 2004..2010 maintainer: Don Stewart cabal-version: >= 1.6 build-type: Configure @@ -38,7 +38,8 @@ library System.Plugins.Process, System.Plugins.Utils - extensions: CPP, ForeignFunctionInterface + extensions: CPP, + ForeignFunctionInterface ghc-options: -Wall -funbox-strict-fields -fno-warn-missing-signatures hs-source-dirs: src build-depends: base >= 4 && < 5, diff --git a/src/System/MkTemp.hs b/src/System/MkTemp.hs index 89405bf..db507de 100644 --- a/src/System/MkTemp.hs +++ b/src/System/MkTemp.hs @@ -1,6 +1,5 @@ -{-# OPTIONS -fglasgow-exts #-} --- --- glaexts for I# ops +{-# LANGUAGE CPP #-} +{-# LANGUAGE MagicHash #-} -- -- Copyright (c) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons -- diff --git a/src/System/Plugins/Consts.hs b/src/System/Plugins/Consts.hs index e75b0b0..978d189 100644 --- a/src/System/Plugins/Consts.hs +++ b/src/System/Plugins/Consts.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- -- Copyright (C) 2004 Don Stewart - http://www.cse.unsw.edu.au/~dons -- diff --git a/src/System/Plugins/Env.hs b/src/System/Plugins/Env.hs index aa098a8..5b4742f 100644 --- a/src/System/Plugins/Env.hs +++ b/src/System/Plugins/Env.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- -- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons -- diff --git a/src/System/Plugins/Load.hs b/src/System/Plugins/Load.hs index b5ebe70..703b678 100644 --- a/src/System/Plugins/Load.hs +++ b/src/System/Plugins/Load.hs @@ -1,4 +1,7 @@ -{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- -- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons -- @@ -392,8 +395,8 @@ reload m@(Module{path = p, iface = hi}) sym = do Nothing -> LoadFailure ["load: couldn't find symbol <<"++sym++">>"] Just a -> LoadSuccess m' a --- --------------------------------------------------------------------- --- This is a stripped-down version of André Pang's runtime_loader, +-- +-- This is a stripped-down version of Andre Pang's runtime_loader, -- which in turn is based on GHC's ghci\/ObjLinker.lhs binding -- -- Load and unload\/Haskell modules at runtime. This is not really @@ -406,7 +409,7 @@ reload m@(Module{path = p, iface = hi}) sym = do -- -- read $fptools\/ghc\/compiler\/ghci\/ObjLinker.lhs for how to use this stuff -- ------------------------------------------------------------------------- + -- | Call the initLinker function first, before calling any of the other -- functions in this module - otherwise you\'ll get unresolved symbols. diff --git a/src/System/Plugins/Make.hs b/src/System/Plugins/Make.hs index ae4bdf3..4940db1 100644 --- a/src/System/Plugins/Make.hs +++ b/src/System/Plugins/Make.hs @@ -1,5 +1,6 @@ +{-# LANGUAGE CPP #-} -- --- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons +-- Copyright (C) 2004..2010 Don Stewart - http://www.cse.unsw.edu.au/~dons -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public diff --git a/src/System/Plugins/PackageAPI.hs b/src/System/Plugins/PackageAPI.hs index 7b4d79f..fe55234 100644 --- a/src/System/Plugins/PackageAPI.hs +++ b/src/System/Plugins/PackageAPI.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- -- Copyright (C) 2005 Sean Seefried - http://www.cse.unsw.edu.au/~sseefried -- diff --git a/src/System/Plugins/ParsePkgConfCabal.hs b/src/System/Plugins/ParsePkgConfCabal.hs index d1065ff..70ed785 100644 --- a/src/System/Plugins/ParsePkgConfCabal.hs +++ b/src/System/Plugins/ParsePkgConfCabal.hs @@ -1,4 +1,5 @@ {-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE CPP #-} {-# OPTIONS -w #-} module System.Plugins.ParsePkgConfCabal ( diff --git a/src/System/Plugins/Parser.hs b/src/System/Plugins/Parser.hs index dfafe74..556343e 100644 --- a/src/System/Plugins/Parser.hs +++ b/src/System/Plugins/Parser.hs @@ -1,4 +1,5 @@ -{-# OPTIONS -fglasgow-exts #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE PatternGuards #-} -- -- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons -- diff --git a/src/System/Plugins/Process.hs b/src/System/Plugins/Process.hs index a22ae5f..c9da315 100644 --- a/src/System/Plugins/Process.hs +++ b/src/System/Plugins/Process.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- -- | A Posix.popen compatibility mapping. -- diff --git a/src/System/Plugins/Utils.hs b/src/System/Plugins/Utils.hs index ed9e19b..ddd0058 100644 --- a/src/System/Plugins/Utils.hs +++ b/src/System/Plugins/Utils.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- -- Copyright (C) 2004 Don Stewart - http://www.cse.unsw.edu.au/~dons --