Menu
▾
▴
[hoc-cvs] [hoc] r404 committed - fix various warnings, unused imports
|
From: <cod...@go...> - 2009-08-17 17:32:31
|
Revision: 404 Author: wol...@gm... Date: Mon Aug 17 10:31:23 2009 Log: fix various warnings, unused imports http://code.google.com/p/hoc/source/detail?r=404 Modified: /trunk/hoc/HOC/HOC/Arguments.hs /trunk/hoc/HOC/HOC/Base.hs /trunk/hoc/HOC/HOC/CEnum.hs /trunk/hoc/HOC/HOC/CStruct.hs /trunk/hoc/HOC/HOC/CannedCIFs.hs /trunk/hoc/HOC/HOC/DeclareClass.hs /trunk/hoc/HOC/HOC/DeclareSelector.hs /trunk/hoc/HOC/HOC/Dyld.hs /trunk/hoc/HOC/HOC/ExportClass.hs /trunk/hoc/HOC/HOC/ExternFunctions.hs /trunk/hoc/HOC/HOC/FFICallInterface.hs /trunk/hoc/HOC/HOC/ID.hs /trunk/hoc/HOC/HOC/MsgSend.hs /trunk/hoc/HOC/HOC/NewClass.hs /trunk/hoc/HOC/HOC/NewlyAllocated.hs /trunk/hoc/HOC/HOC/SelectorMarshaller.hs /trunk/hoc/HOC/HOC/SelectorNameMangling.hs /trunk/hoc/HOC/HOC/StdArgumentTypes.hs /trunk/hoc/HOC/HOC/THDebug.hs /trunk/hoc/HOC/HOC/Unicode.hs /trunk/hoc/HOC/HOC/Utilities.hs /trunk/hoc/HOC/HOC.hs /trunk/hoc/InterfaceGenerator2/BinaryInstances.hs /trunk/hoc/InterfaceGenerator2/THTraversal.hs /trunk/hoc/InterfaceGenerator2/Traversals.hs ======================================= --- /trunk/hoc/HOC/HOC/Arguments.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/Arguments.hs Mon Aug 17 10:31:23 2009 @@ -3,11 +3,9 @@ UndecidableInstances, ScopedTypeVariables #-} module HOC.Arguments where -import HOC.Base import HOC.FFICallInterface import Foreign.Storable -import Foreign.ForeignPtr import Foreign.Ptr import Foreign.Marshal.Array import System.IO.Unsafe(unsafePerformIO) @@ -67,8 +65,8 @@ `appT` ty `appT` ty) `whereQ` [d| {- withExportedArgument = flip ($) -} - exportArgument = return - importArgument = return + exportArgument x = return x + importArgument x = return x objCTypeString _ = str |] return [argInst] ======================================= --- /trunk/hoc/HOC/HOC/Base.hs Sun Dec 21 13:42:00 2008 +++ /trunk/hoc/HOC/HOC/Base.hs Mon Aug 17 10:31:23 2009 @@ -3,7 +3,6 @@ import Foreign import Foreign.C.String -import Control.Monad(when) import Control.Exception(bracket) -- The SEL Type ======================================= --- /trunk/hoc/HOC/HOC/CEnum.hs Sat Nov 1 06:12:45 2008 +++ /trunk/hoc/HOC/HOC/CEnum.hs Mon Aug 17 10:31:23 2009 @@ -58,8 +58,8 @@ ], instanceD (cxt []) (conT ''ObjCArgument `appT` conT typ `appT` [t| CInt |]) `whereQ` [d| - exportArgument = return . fromCEnum - importArgument = return . toCEnum + exportArgument x = return (fromCEnum x) + importArgument x = return (toCEnum x) objCTypeString _ = "i" |] ] ++ [ ======================================= --- /trunk/hoc/HOC/HOC/CStruct.hs Tue Oct 7 16:07:50 2008 +++ /trunk/hoc/HOC/HOC/CStruct.hs Mon Aug 17 10:31:23 2009 @@ -1,4 +1,4 @@ -{-# OPTIONS -fglasgow-exts -fth #-} +{-# LANGUAGE TemplateHaskell #-} module HOC.CStruct( declareCStruct, declareCStructWithTag ) where import HOC.Arguments ( ObjCArgument(..) ) @@ -7,7 +7,6 @@ import HOC.FFICallInterface import Control.Monad.State -import Data.Bits import Data.Maybe ( fromMaybe ) import Foreign ======================================= --- /trunk/hoc/HOC/HOC/CannedCIFs.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/CannedCIFs.hs Mon Aug 17 10:31:23 2009 @@ -5,13 +5,11 @@ import HOC.Arguments ( getCifForSelector ) import HOC.ID ( ID ) import HOC.TH ( fromSameModuleAs_v ) -import HOC.THDebug -import Control.Monad (when) +-- import HOC.THDebug import Data.List ( intersperse ) import Data.Maybe ( catMaybes, fromMaybe ) import Data.Word ( Word ) -import Data.Generics import Foreign ( Ptr ) import Foreign.C import Language.Haskell.TH ======================================= --- /trunk/hoc/HOC/HOC/DeclareClass.hs Sun Dec 21 13:42:00 2008 +++ /trunk/hoc/HOC/HOC/DeclareClass.hs Mon Aug 17 10:31:23 2009 @@ -1,15 +1,11 @@ {-# LANGUAGE TemplateHaskell #-} module HOC.DeclareClass(declareClass) where -import HOC.Base -import HOC.Arguments import HOC.Class import HOC.Super import HOC.TH -import Foreign.Ptr - declareClass :: String -> String -> Q [Dec] declareClass name super = sequence $ [ ======================================= --- /trunk/hoc/HOC/HOC/DeclareSelector.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/DeclareSelector.hs Mon Aug 17 10:31:23 2009 @@ -1,22 +1,17 @@ {-# LANGUAGE TemplateHaskell, EmptyDataDecls #-} module HOC.DeclareSelector where -import HOC.Base import HOC.Arguments -import HOC.Class import HOC.Invocation import HOC.SelectorNameMangling -import HOC.MsgSend -import HOC.FFICallInterface import HOC.SelectorMarshaller -import HOC.StdArgumentTypes +import HOC.StdArgumentTypes () import HOC.ID -import HOC.NewlyAllocated(NewlyAllocated) +import HOC.NewlyAllocated (NewlyAllocated) import HOC.Super import HOC.CannedCIFs import HOC.MessageTarget -import Data.Char(isUpper, toLower, toUpper) import Data.Maybe(fromMaybe) import Control.Monad(MonadPlus(mplus)) @@ -29,6 +24,7 @@ data Retained a $(makeMarshallers 4) +marshallersUpTo :: Int marshallersUpTo = 4 {-# NOINLINE method0 #-} @@ -77,7 +73,7 @@ className = "Has_" ++ haskellName imptypeName = "ImpType_" ++ haskellName - nArgs = countArgs typeSig + nArgs = countArgs typeSig :: Int -- isPure is a boolean that indicates if the resultType of our type -- signature is not in the IO mondad ======================================= --- /trunk/hoc/HOC/HOC/Dyld.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/Dyld.hs Mon Aug 17 10:31:23 2009 @@ -6,7 +6,6 @@ import GHC.Exts(Ptr(..), Addr#) import Foreign -import Foreign.C.String import System.Posix.DynamicLinker lookupSymbol :: String -> IO (FunPtr a) ======================================= --- /trunk/hoc/HOC/HOC/ExportClass.hs Thu Aug 13 08:45:30 2009 +++ /trunk/hoc/HOC/HOC/ExportClass.hs Mon Aug 17 10:31:23 2009 @@ -1,7 +1,6 @@ {-# LANGUAGE TemplateHaskell, MultiParamTypeClasses, FunctionalDependencies #-} module HOC.ExportClass where -import Foreign import Foreign.C.String import Control.Concurrent.MVar import Data.Dynamic @@ -10,10 +9,10 @@ import Data.Char(toUpper) import HOC.Base -import HOC.ID import HOC.MessageTarget import HOC.Arguments import HOC.Invocation +import HOC.ID import HOC.SelectorMarshaller import HOC.Class import HOC.NewClass ======================================= --- /trunk/hoc/HOC/HOC/ExternFunctions.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/ExternFunctions.hs Mon Aug 17 10:31:23 2009 @@ -52,7 +52,7 @@ -- ### FIXME: Code Duplication from DeclareSelector.hs countArgs (ForallT vars ctxt ty) = countArgs ty countArgs ((ArrowT `AppT` _) `AppT` rest) = 1 + countArgs rest - countArgs other = 0 + countArgs other = 0 :: Int resultType (ForallT vars ctxt ty) = resultType ty resultType ((ArrowT `AppT` _) `AppT` rest) = resultType rest ======================================= --- /trunk/hoc/HOC/HOC/FFICallInterface.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/FFICallInterface.hs Mon Aug 17 10:31:23 2009 @@ -75,10 +75,6 @@ promotedPeek p = peek (castPtr p :: Ptr CLong) >>= return . fromIntegral - where - size = sizeOf (pointee p) - pointee :: Ptr p -> p - pointee = undefined promotedAlloca f = alloca (\intPtr -> f $ castPtr (intPtr :: Ptr CLong)) ======================================= --- /trunk/hoc/HOC/HOC/ID.hs Thu Aug 13 08:45:30 2009 +++ /trunk/hoc/HOC/HOC/ID.hs Mon Aug 17 10:31:23 2009 @@ -7,17 +7,17 @@ import HOC.FFICallInterface(FFICif) import Control.Concurrent.MVar -import Control.Exception(evaluate,assert) -import Control.Monad(when, join) +import Control.Exception(evaluate) +import Control.Monad(when) import System.IO.Unsafe(unsafePerformIO) import System.Mem.Weak import Foreign.Ptr import Foreign.StablePtr -import Foreign.C.Types(CInt,CUInt,CChar {- ObjC BOOL is typedefed to char -}) +import Foreign.C.Types(CInt,CUInt) import Foreign.Storable import Foreign.Marshal.Alloc(alloca) import Data.Dynamic -import Data.Maybe(fromMaybe, isJust) +import Data.Maybe(fromMaybe) data ID a = ID HSO | Nil ======================================= --- /trunk/hoc/HOC/HOC/MsgSend.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/MsgSend.hs Mon Aug 17 10:31:23 2009 @@ -12,7 +12,6 @@ import HOC.Invocation import Foreign -import Control.Monad.Fix(mfix) objSendMessageWithRetval :: ObjCArgument a b ======================================= --- /trunk/hoc/HOC/HOC/NewClass.hs Thu Aug 13 08:45:30 2009 +++ /trunk/hoc/HOC/HOC/NewClass.hs Mon Aug 17 10:31:23 2009 @@ -18,7 +18,6 @@ import HOC.ID import HOC.FFICallInterface import HOC.Arguments -import HOC.Class import Foreign.C.String import Foreign.C.Types ======================================= --- /trunk/hoc/HOC/HOC/NewlyAllocated.hs Wed Dec 10 06:52:25 2008 +++ /trunk/hoc/HOC/HOC/NewlyAllocated.hs Mon Aug 17 10:31:23 2009 @@ -17,13 +17,11 @@ import HOC.Arguments ( ObjCArgument(..) ) import HOC.Class import HOC.ID -import HOC.MessageTarget( Object(..), MessageTarget(..) ) +import HOC.MessageTarget( MessageTarget(..) ) import HOC.MsgSend import HOC.Super import Foreign.Ptr ( Ptr, nullPtr ) -import System.IO.Unsafe ( unsafePerformIO ) - data NewlyAllocated a = NewlyAllocated (Ptr ObjCObject) ======================================= --- /trunk/hoc/HOC/HOC/SelectorMarshaller.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/SelectorMarshaller.hs Mon Aug 17 10:31:23 2009 @@ -9,16 +9,12 @@ ) where import HOC.Base -import HOC.Arguments import HOC.ID -import HOC.Class import HOC.Invocation -import HOC.SelectorNameMangling -import HOC.MsgSend import HOC.FFICallInterface import HOC.MessageTarget -import Foreign ( withArray, Ptr, nullPtr ) +import Foreign ( withArray ) import System.IO.Unsafe ( unsafePerformIO ) import GHC.Base ( unpackCString# ) ======================================= --- /trunk/hoc/HOC/HOC/SelectorNameMangling.hs Sun Sep 28 10:35:32 2008 +++ /trunk/hoc/HOC/HOC/SelectorNameMangling.hs Mon Aug 17 10:31:23 2009 @@ -1,6 +1,5 @@ module HOC.SelectorNameMangling where -import Data.List(intersperse) import Data.Char(isUpper, toUpper, toLower) -- addObject:forKey: -> addObjectForKey ======================================= --- /trunk/hoc/HOC/HOC/StdArgumentTypes.hs Fri Jan 9 17:28:12 2009 +++ /trunk/hoc/HOC/HOC/StdArgumentTypes.hs Mon Aug 17 10:31:23 2009 @@ -5,14 +5,12 @@ module HOC.StdArgumentTypes where import HOC.Base -import HOC.Invocation import HOC.Arguments import HOC.FFICallInterface import Control.Exception ( bracket ) import Foreign import Foreign.C.Types -import Foreign.C.String import HOC.Unicode ======================================= --- /trunk/hoc/HOC/HOC/THDebug.hs Sun Aug 24 21:31:51 2008 +++ /trunk/hoc/HOC/HOC/THDebug.hs Mon Aug 17 10:31:23 2009 @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-monomorphism-restriction #-} +{-# LANGUAGE NoMonomorphismRestriction #-} module HOC.THDebug ( ======================================= --- /trunk/hoc/HOC/HOC/Unicode.hs Thu Mar 16 21:32:04 2006 +++ /trunk/hoc/HOC/HOC/Unicode.hs Mon Aug 17 10:31:23 2009 @@ -53,7 +53,6 @@ ) where -import Data.Char( toUpper ) import Data.Word( Word8 ) -- ------------------------------------------------------------ @@ -143,7 +142,7 @@ -- | -- conversion from Unicode strings (UString) to UTF8 encoded strings. -unicodeToUtf8 :: String -> UTF8String +unicodeToUtf8 :: UString -> UTF8String unicodeToUtf8 = concatMap unicodeCharToUtf8 -- | ======================================= --- /trunk/hoc/HOC/HOC/Utilities.hs Sat Nov 1 04:27:26 2008 +++ /trunk/hoc/HOC/HOC/Utilities.hs Mon Aug 17 10:31:23 2009 @@ -3,7 +3,6 @@ import HOC.Base import HOC.Arguments -import HOC.ID import HOC.TH import HOC.ExportClass import Foreign.Ptr ======================================= --- /trunk/hoc/HOC/HOC.hs Sun Dec 21 13:42:00 2008 +++ /trunk/hoc/HOC/HOC.hs Mon Aug 17 10:31:23 2009 @@ -69,15 +69,12 @@ import HOC.Base import HOC.Arguments -import HOC.Invocation import HOC.ID import HOC.MessageTarget import HOC.Class import HOC.DeclareClass import HOC.ExportClass -import HOC.SelectorMarshaller import HOC.DeclareSelector -import HOC.StdArgumentTypes import HOC.ExportClass import HOC.Utilities import HOC.NewlyAllocated ======================================= --- /trunk/hoc/InterfaceGenerator2/BinaryInstances.hs Wed Oct 1 14:40:28 2008 +++ /trunk/hoc/InterfaceGenerator2/BinaryInstances.hs Mon Aug 17 10:31:23 2009 @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards, PatternSignatures, ExistentialQuantification #-} +{-# LANGUAGE PatternGuards, ScopedTypeVariables, ExistentialQuantification #-} module BinaryInstances() where import Data.Binary ======================================= --- /trunk/hoc/InterfaceGenerator2/THTraversal.hs Sun Dec 23 16:43:07 2007 +++ /trunk/hoc/InterfaceGenerator2/THTraversal.hs Mon Aug 17 10:31:23 2009 @@ -1,4 +1,4 @@ -{-# OPTIONS -fth #-} +{-# LANGUAGE TemplateHaskell #-} module THTraversal where import Language.Haskell.TH ======================================= --- /trunk/hoc/InterfaceGenerator2/Traversals.hs Sun Dec 23 16:43:07 2007 +++ /trunk/hoc/InterfaceGenerator2/Traversals.hs Mon Aug 17 10:31:23 2009 @@ -1,4 +1,4 @@ -{-# OPTIONS -cpp -fth -fglasgow-exts #-} +{-# LANGUAGE CPP, TemplateHaskell, RelaxedPolyRec #-} module Traversals where #define TEMPLATES 1 |
