hoc-cvs — CVS commit log messages

[hoc-cvs] hoc/Tests TestFoundation.hs,1.2,1.3

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9294

Modified Files:
	TestFoundation.hs 
Log Message:
Import HUnit is now part of the GHC distro, so import Test.HUnit


Index: TestFoundation.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Tests/TestFoundation.hs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TestFoundation.hs	12 Nov 2003 23:28:58 -0000	1.2
+++ TestFoundation.hs	31 Mar 2005 20:52:43 -0000	1.3
@@ -1,6 +1,6 @@
 module Main where
 
-import HUnit
+import Test.HUnit
 import Prelude hiding(init)
 import Foundation hiding(test)
 import Foundation.NSObject(init)

[hoc-cvs] hoc/InterfaceGenerator Headers.hs,1.3,1.4

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7563/InterfaceGenerator

Modified Files:
	Headers.hs 
Log Message:
*) Derrive Show instance for HeaderInfo (for debugging purposes)
*) make stripPreprocessor retain empty lines in place of preprocessor
   directives


Index: Headers.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Headers.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Headers.hs	5 Apr 2004 00:04:46 -0000	1.3
+++ Headers.hs	31 Mar 2005 20:50:32 -0000	1.4
@@ -12,6 +12,7 @@
 
 type ModuleName = String
 data HeaderInfo = HeaderInfo ModuleName [ModuleName] [Declaration]
+    deriving(Show)
 
 stripPreprocessor = unlines . stripPP . lines
     where
@@ -19,8 +20,8 @@
 		stripPP (x : xs) = x : stripPP xs
 		stripPP [] = []
 		dropPreprocessorLine x xs
-			| last x == '\\' = dropPreprocessorLine (head xs) (tail xs)
-			| otherwise = stripPP xs
+			| last x == '\\' = "" : dropPreprocessorLine (head xs) (tail xs)
+			| otherwise = "" : stripPP xs
 
 findImports = mapMaybe checkImport . lines
     where

[hoc-cvs] hoc/InterfaceGenerator PrepareDeclarations.hs,1.10,1.11

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7327/InterfaceGenerator

Modified Files:
	PrepareDeclarations.hs 
Log Message:
Improve error reporting a tiny little bit


Index: PrepareDeclarations.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/PrepareDeclarations.hs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PrepareDeclarations.hs	31 Mar 2005 15:30:19 -0000	1.10
+++ PrepareDeclarations.hs	31 Mar 2005 20:48:56 -0000	1.11
@@ -17,7 +17,8 @@
 import HOC.SelectorNameMangling(mangleSelectorName)
 
 import Control.Monad(when)
-import Data.Set hiding (map)
+import Data.Set(Set, mkSet, setToList, union, minusSet, unionManySets,
+                emptySet, elementOf)
 import Data.FiniteMap
 import qualified Data.HashTable as HashTable
 import Data.Maybe(maybeToList, fromMaybe, mapMaybe)
@@ -122,16 +123,19 @@
         case doneInfo of
             Just done -> return ()
             Nothing -> do
-                -- putStrLn $ "<" ++ name
-                Just ci <- HashTable.lookup inInfos name
-                (mbSuper, protocols, recheck) <- cleanSuper ci
-                if recheck
-                    then cleanClassInfo outInfos inInfos name
-                    else do
-                        -- putStrLn name
-                        let ci' = cleanClassInfo' ci mbSuper protocols
-                        HashTable.insert outInfos name ci'
-                                         
+                mbCi <- HashTable.lookup inInfos name
+                case mbCi of
+                    Just ci -> do
+                        (mbSuper, protocols, recheck) <- cleanSuper ci
+                        if recheck
+                            then cleanClassInfo outInfos inInfos name
+                            else do
+                                -- putStrLn name
+                                let ci' = cleanClassInfo' ci mbSuper protocols
+                                HashTable.insert outInfos name ci'
+                    Nothing -> do
+                        fail $ "Couldn't find class: " ++ name
+                        
     where
         cleanSuper ci = do
             (mbSuper,superRecheck) <- case (ciSuper ci) of
@@ -241,6 +245,7 @@
                                 | (name, mod) <- enumNamesAndLocations
                                                  ++ bsAdditionalTypes bindingScript ]
                                                             
+    print classNames
     putStrLn "collecting categories..."
     classHash <- HashTable.fromList HashTable.hashString classes
     mapM_ (updateClassInfoForCategory classHash) allDecls

[hoc-cvs] hoc/InterfaceGenerator Parser.hs,1.1.1.1,1.2

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6387/InterfaceGenerator

Modified Files:
	Parser.hs 
Log Message:
Parse some constant integer expressions for enum declarations.
(For now, it just supports the << operator).


Index: Parser.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Parser.hs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Parser.hs	27 Oct 2003 16:48:20 -0000	1.1.1.1
+++ Parser.hs	31 Mar 2005 20:48:18 -0000	1.2
@@ -2,10 +2,12 @@
 
 import Data.Maybe(catMaybes, isJust)
 import Data.Char(ord)
+import Data.Bits(shiftL)
 
 import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Token
 import Text.ParserCombinators.Parsec.Language(emptyDef)
+import Text.ParserCombinators.Parsec.Expr
 
 import SyntaxTree
 
@@ -167,6 +169,22 @@
                 (map (fromIntegral.ord) $ reverse chars)
                 (iterate (*256) 1)
         
+const_int_expr = buildExpressionParser optable basic
+    where
+        basic = fmap GivenValue (integer objc)
+            <|> fmap GivenValue multiCharConstant
+            <|> fmap TooComplicatedValue
+                     (many1 (satisfy (\x -> x /= ';' && x /= '}')))
+        optable = [ [Infix shiftLeft AssocLeft] ]
+        
+        shiftLeft = op "<<" (flip $ flip shiftL . fromIntegral)
+        
+        op str f = reservedOp objc str >> return (opFun f)
+        opFun f (GivenValue x) (GivenValue y) = GivenValue $ f x y
+        opFun f v@(TooComplicatedValue _) _ = v
+        opFun f _ v@(TooComplicatedValue _) = v
+        opFun f _ _ = TooComplicatedValue "..."
+        
 enum_type =
     do
         key <- reserved objc "enum"
@@ -179,10 +197,7 @@
             id <- identifier objc
             val <- (do
                     symbol objc "="
-                    val <- fmap GivenValue (integer objc)
-                        <|> fmap GivenValue multiCharConstant
-                        <|> fmap TooComplicatedValue (many1 (satisfy (\x -> x /= ';' && x /= '}')))
-                    return $ val
+                    const_int_expr
                 ) <|> return NextValue
             return (id,val)
     

[hoc-cvs] hoc/InterfaceGenerator CTypeToHaskell.hs,1.4,1.5

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5712/InterfaceGenerator

Modified Files:
	CTypeToHaskell.hs 
Log Message:
Derive a Show instance for TypeNameKind


Index: CTypeToHaskell.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/CTypeToHaskell.hs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CTypeToHaskell.hs	5 Apr 2004 00:04:46 -0000	1.4
+++ CTypeToHaskell.hs	31 Mar 2005 20:46:13 -0000	1.5
@@ -22,6 +22,7 @@
 import Debug.Trace
 
 data TypeNameKind = ClassTypeName | PlainTypeName
+    deriving (Show)
 
 newtype TypeEnvironment = TypeEnvironment (FiniteMap String (TypeNameKind, ModuleName))
     -- (Set String) -- known classes

[hoc-cvs] hoc/HOC/HOC ExportClass.hs,1.6,1.7

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4074/HOC/HOC

Modified Files:
	ExportClass.hs 
Log Message:
This is GHC 6.4 Template Haskell, so we don't need to reexport
the InstanceVariables class any more (and this also helps work around
a GHC 6.4 bug)


Index: ExportClass.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC/ExportClass.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ExportClass.hs	6 Dec 2004 03:46:51 -0000	1.6
+++ ExportClass.hs	31 Mar 2005 20:44:08 -0000	1.7
@@ -70,10 +70,16 @@
             [normalC (mkName instanceDataName) strictTypes] [''Typeable],
         valD (varP $ mkName tyConVar) (normalB [| mkTyCon instanceDataName |]) [],
         instanceD (cxt []) (conT ''InstanceVariables
-                            `appT` clsTy `appT` instTy) `whereQ`
-            [d|
-                initializeInstanceVariables = $(initIVars)
-            |]
+                            `appT` clsTy `appT` instTy) 
+                [
+--                  All we want to do is this:
+--                      initializeInstanceVariables = $(initIVars)
+--                  But we want the name initializeInstanceVariables refer directly
+--                  to this module, so that we don't have to export it, but keep it
+--                  private.
+                    do e <- initIVars
+                       return (ValD (VarP 'initializeInstanceVariables) (NormalB e) [])
+                ]
     ] ++ declaredIVars
     where
         exportFunName = "initializeClass_" ++ name

[hoc-cvs] hoc/HOC HOC.hs,1.8,1.9

[Wolfgang T. <wth...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4074/HOC

Modified Files:
	HOC.hs 
Log Message:
This is GHC 6.4 Template Haskell, so we don't need to reexport
the InstanceVariables class any more (and this also helps work around
a GHC 6.4 bug)


Index: HOC.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC.hs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- HOC.hs	31 Mar 2005 16:37:58 -0000	1.8
+++ HOC.hs	31 Mar 2005 20:44:10 -0000	1.9
@@ -35,12 +35,7 @@
         
         -- debugging & statistics:
         
-        objectMapStatistics,
-        
-        -- things that shouldn't really be exported
-        InstanceVariables(..),
-	initializeInstanceVariables,
-        Typeable(..)
+        objectMapStatistics
     ) where
 
 import HOC.Base
@@ -56,6 +51,3 @@
 import HOC.ExportClass
 import HOC.Utilities
 import HOC.NewlyAllocated
-
-import Data.Typeable
-

[hoc-cvs] hoc/InterfaceGenerator Makefile.in,1.5,1.6

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28186

Modified Files:
	Makefile.in 
Log Message:
Make Interface Generator Makefile use ../inplace.conf rather than old
../HOC/HOC-$(PLATFORM).conf-inplace



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/InterfaceGenerator/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.in	17 May 2004 18:31:32 -0000	1.5
+++ Makefile.in	31 Mar 2005 16:47:02 -0000	1.6
@@ -12,7 +12,7 @@
 	mkdir -p build
 	$(GHC) --make Main.hs	\
 		-odir build -hidir build \
-		-package-conf ../HOC/HOC-$(PLATFORM).conf-inplace \
+		-package-conf ../inplace.conf \
 		-o $@
 		
 clean:

[hoc-cvs] hoc/AppKit AppKit-macos.conf-inplace.in,NONE,1.1 AppKit-macos.conf.in,NONE,1.1 .cvsignore,1.1,1.2 AppKit-macos.conf,1.1,1.2 Makefile.in,1.6,1.7

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/AppKit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/AppKit

Modified Files:
	.cvsignore AppKit-macos.conf Makefile.in 
Added Files:
	AppKit-macos.conf-inplace.in AppKit-macos.conf.in 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	6 Dec 2004 03:46:49 -0000	1.6
+++ Makefile.in	31 Mar 2005 16:37:57 -0000	1.7
@@ -7,11 +7,11 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSAppKit.a HSAppKit.o ../inplace.conf
+all: libHSAppKit.a HSAppKit.o register-inplace
 
-../inplace.conf: AppKit.conf-inplace
-	$(GHC_PKG) unregister --force --package-conf=../inplace.conf AppKit || true
-	$(GHC_PKG) register AppKit.conf-inplace \
+register-inplace: AppKit.conf-inplace
+	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
+	$(GHC_PKG) update AppKit.conf-inplace \
 		--package-conf=../inplace.conf
 
 exposed-modules.txt:
@@ -22,8 +22,8 @@
 AppKit.conf-inplace: AppKit-$(PLATFORM).conf-inplace.in exposed-modules.txt
 	cat AppKit-$(PLATFORM).conf-inplace.in exposed-modules.txt > AppKit.conf-inplace
 
-AppKit.conf: AppKit-$(PLATFORM).conf.in exposed-modules.txt
-	cat AppKit-$(PLATFORM).conf.in exposed-modules.txt > AppKit.conf
+AppKit.conf: AppKit-$(PLATFORM).conf exposed-modules.txt
+	cat AppKit-$(PLATFORM).conf exposed-modules.txt > AppKit.conf
 
 ghcmake: ghcmake.build-stamp
 

--- NEW FILE: AppKit-macos.conf.in ---
name:               AppKit
maintainer:         wol...@gm...
exposed:            True

import-dirs:	    "@GHC_LIB_PATH@/AppKit/imports"
library-dirs:	    "@GHC_LIB_PATH@/AppKit/"
hs-libraries:	    "HSAppKit"
frameworks:         "AppKit"
depends:            HOC, Foundation

exposed-modules:
    AppKit

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:23 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:57 -0000	1.2
@@ -1,2 +1,7 @@
 build
 Makefile
+exposed-modules.txt
+ghcmake.build-stamp
+
+AppKit.conf
+AppKit.conf-inplace

Index: AppKit-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/AppKit/AppKit-macos.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AppKit-macos.conf	5 Apr 2004 00:04:46 -0000	1.1
+++ AppKit-macos.conf	31 Mar 2005 16:37:57 -0000	1.2
@@ -1,18 +1,12 @@
-Package
-{
-    name = "AppKit",
-    auto = True,
-    import_dirs = ["$libdir/AppKit/imports"],
-    source_dirs = [],
-    library_dirs = ["$libdir/AppKit/"],
-    hs_libraries = ["HSAppKit"],
-    extra_libraries = [],
-    include_dirs = [],
-    c_includes = [],
-    package_deps = ["Foundation"],
-    extra_ghc_opts = [],
-    extra_cc_opts = [],
-    extra_ld_opts = [],
-    framework_dirs = [],
-    extra_frameworks = ["AppKit"]
-}
+name:               AppKit
+maintainer:         wol...@gm...
+exposed:            True
+
+import-dirs:	    "/usr/local/lib/ghc-6.4/AppKit/imports"
+library-dirs:	    "/usr/local/lib/ghc-6.4/AppKit/"
+hs-libraries:	    "HSAppKit"
+frameworks:         "AppKit"
+depends:            HOC, Foundation
+
+exposed-modules:
+    AppKit

--- NEW FILE: AppKit-macos.conf-inplace.in ---
name:               AppKit
maintainer:         wol...@gm...
exposed:            True

import-dirs:	    "../AppKit/build/imports"
library-dirs:	    "../AppKit"
hs-libraries:	    "HSAppKit"
frameworks:         "AppKit"
depends:            HOC, Foundation

exposed-modules:
    AppKit

[hoc-cvs] hoc/Foundation .cvsignore,1.1,1.2 Foundation-macos.conf.in,1.2,1.3 Makefile.in,1.7,1.8

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Foundation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/Foundation

Modified Files:
	.cvsignore Foundation-macos.conf.in Makefile.in 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	31 Mar 2005 15:57:47 -0000	1.7
+++ Makefile.in	31 Mar 2005 16:37:57 -0000	1.8
@@ -9,10 +9,9 @@
 
 all: libHSFoundation.a HSFoundation.o register-inplace
 
-register-inplace:
+register-inplace: Foundation.conf-inplace
 	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
-	$(GHC_PKG) unregister --force --package-conf=../inplace.conf Foundation || true
-	$(GHC_PKG) register Foundation.conf-inplace \
+	$(GHC_PKG) update Foundation.conf-inplace \
 		--package-conf=../inplace.conf
 
 exposed-modules.txt:
@@ -23,8 +22,8 @@
 Foundation.conf-inplace: Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt
 	cat Foundation-$(PLATFORM).conf-inplace.in exposed-modules.txt > Foundation.conf-inplace
 
-Foundation.conf: Foundation-$(PLATFORM).conf.in exposed-modules.txt
-	cat Foundation-$(PLATFORM).conf.in exposed-modules.txt > Foundation.conf
+Foundation.conf: Foundation-$(PLATFORM).conf exposed-modules.txt
+	cat Foundation-$(PLATFORM).conf exposed-modules.txt > Foundation.conf
 
 ghcmake: ghcmake.build-stamp
 
@@ -73,5 +72,5 @@
 	cp -R libHSFoundation.a HSFoundation.o build/imports \
 		$(GHC_LIB_PATH)/Foundation/
 	ranlib $(GHC_LIB_PATH)/Foundation/libHSFoundation.a
-	$(GHC_PKG) register Foundation.conf
+	$(GHC_PKG) update Foundation.conf
 

Index: Foundation-macos.conf.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Foundation-macos.conf.in	31 Mar 2005 15:57:46 -0000	1.2
+++ Foundation-macos.conf.in	31 Mar 2005 16:37:57 -0000	1.3
@@ -2,8 +2,8 @@
 maintainer:         wol...@gm...
 exposed:            True
 
-import-dirs:	    "$libdir/Foundation/imports"
-library-dirs:	    "$libdir/Foundation/"
+import-dirs:	    "@GHC_LIB_PATH@/Foundation/imports"
+library-dirs:	    "@GHC_LIB_PATH@/Foundation/"
 hs-libraries:	    "HSFoundation"
 frameworks:         "Foundation"
 depends:            HOC

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:25 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:57 -0000	1.2
@@ -3,3 +3,5 @@
 Foundation.conf-inplace
 ghcmake.build-stamp
 Makefile
+Foundation-macos.conf
+Foundation.conf

[hoc-cvs] hoc/HOC HOC-macos.conf.in,NONE,1.1 .cvsignore,1.1,1.2 HOC.hs,1.7,1.8 Makefile.in,1.9,1.10 HOC-macos.conf,1.5,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/HOC

Modified Files:
	.cvsignore HOC.hs Makefile.in 
Added Files:
	HOC-macos.conf.in 
Removed Files:
	HOC-macos.conf 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	31 Mar 2005 15:58:12 -0000	1.9
+++ Makefile.in	31 Mar 2005 16:37:58 -0000	1.10
@@ -71,4 +71,4 @@
 	cp -R libHOC.a HOC.o build/imports \
 		$(GHC_LIB_PATH)/HOC/
 	ranlib $(GHC_LIB_PATH)/HOC/libHOC.a
-	$(GHC_PKG) register HOC-$(PLATFORM).conf
+	$(GHC_PKG) update HOC-$(PLATFORM).conf

Index: HOC.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC.hs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- HOC.hs	31 Mar 2005 15:30:18 -0000	1.7
+++ HOC.hs	31 Mar 2005 16:37:58 -0000	1.8
@@ -38,7 +38,8 @@
         objectMapStatistics,
         
         -- things that shouldn't really be exported
-        InstanceVariables,
+        InstanceVariables(..),
+	initializeInstanceVariables,
         Typeable(..)
     ) where
 
@@ -48,6 +49,7 @@
 import HOC.ID
 import HOC.Class
 import HOC.DeclareClass
+import HOC.ExportClass
 import HOC.SelectorMarshaller
 import HOC.DeclareSelector
 import HOC.StdArgumentTypes

--- NEW FILE: HOC-macos.conf.in ---
name:               HOC
maintainer:         wol...@gm...
exposed:            True

exposed-modules:
    HOC,
    HOC.SelectorNameMangling,
    HOC.Arguments,
    HOC.FFICallInterface,
    HOC.StdArgumentTypes,
    HOC.TH,
    HOC.DeclareClass,
    HOC.ID,
    HOC.Class,
    HOC.DeclareSelector,
    HOC.SelectorMarshaller,
    HOC.Base,
    HOC.NewlyAllocated,
    HOC.Invocation,
    HOC.MsgSend,
    HOC.Utilities,
    HOC.ExportClass,
    HOC.NewClass

import-dirs:        "@GHC_LIB_PATH@/HOC/imports"
library-dirs:       "@GHC_LIB_PATH@/HOC"

hs-libraries:       "HOC", "HOC_cbits"
extra-libraries:    "objc"
frameworks:         "Foundation"
depends:            base, template-haskell

Index: .cvsignore
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	31 Mar 2005 15:41:25 -0000	1.1
+++ .cvsignore	31 Mar 2005 16:37:58 -0000	1.2
@@ -1,3 +1,5 @@
 build
 ghcmake.build-stamp
 Makefile
+HOC-macos.conf
+

--- HOC-macos.conf DELETED ---

[hoc-cvs] hoc/Samples/Editor HaskellDocument.hs,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/Editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/Samples/Editor

Modified Files:
	HaskellDocument.hs 
Log Message:
More GHC 6.4 compilation fixes



Index: HaskellDocument.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Samples/Editor/HaskellDocument.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HaskellDocument.hs	3 Nov 2003 21:29:46 -0000	1.1
+++ HaskellDocument.hs	31 Mar 2005 16:37:58 -0000	1.2
@@ -5,9 +5,7 @@
 import Cocoa
 import Foundation.NSAttributedString (string)
 
-import Control.Monad(when)
-
--- import Selectors
+import Control.Monad (when)
 
 $(declareClass "HaskellDocument" "NSDocument")
 
@@ -40,3 +38,4 @@
     case mbStr of 
         Just str -> tv # textStorage >>= mutableString >>= setString str
         Nothing -> return ()
+

[hoc-cvs] hoc/Samples/ExpressionParser EPController.hs,1.3,1.4

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/ExpressionParser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/Samples/ExpressionParser

Modified Files:
	EPController.hs 
Log Message:
More GHC 6.4 compilation fixes



Index: EPController.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Samples/ExpressionParser/EPController.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EPController.hs	16 May 2004 16:21:49 -0000	1.3
+++ EPController.hs	31 Mar 2005 16:37:59 -0000	1.4
@@ -19,10 +19,9 @@
 obj #. var = obj # getIVar var
 
 ep_evaluateExpression _ self = do
-  expression <- self #. _expressionEntry >>= stringValue >>= haskellString
-  case (parse expr "" expression) of
-    Left e -> 
-      self #. _evaluation >>= setStringValue (toNSString $ "Error " ++ show e)
-    Right answer ->
-      self #. _evaluation >>= setStringValue (toNSString $ show answer)
-
+expression <- self #. _expressionEntry >>= stringValue >>= haskellString
+case (parse expr "" expression) of
+  Left e -> 
+    self #. _evaluation >>= setStringValue (toNSString $ "Error " ++ show e)
+  Right answer ->
+    self #. _evaluation >>= setStringValue (toNSString $ show answer)

[hoc-cvs] hoc/Tools .cvsignore,NONE,1.1

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694/Tools

Added Files:
	.cvsignore 
Log Message:
More GHC 6.4 compilation fixes



--- NEW FILE: .cvsignore ---
hocwrap
Makefile

[hoc-cvs] hoc Makefile.in,1.7,1.8 configure.ac,1.10,1.11

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23694

Modified Files:
	Makefile.in configure.ac 
Log Message:
More GHC 6.4 compilation fixes



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	19 May 2004 16:17:23 -0000	1.7
+++ Makefile.in	31 Mar 2005 16:37:57 -0000	1.8
@@ -55,15 +55,15 @@
 	( cd libffi-src/build && $(MAKE) )
 
 hoc-all:
-	for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) all) done
+	for dir in $(SUBDIRS); do (cd $$dir; echo "In directory $$dir"; $(MAKE) all) done
 	
 clean:
-	for dir in $(all_SUBDIRS); do (cd $$dir; $(MAKE) clean) done
+	for dir in $(all_SUBDIRS); do (cd $$dir; echo "In directory $$dir"; $(MAKE) clean) done
 	
 install:
-	for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) install) done
+	for dir in $(SUBDIRS); do (cd $$dir; echo "In directory $$dir"; $(MAKE) install) done
 
 .PHONY: samples
 samples:
-	for dir in $(Samples_SUBDIRS); do (cd $$dir; $(MAKE)) done
+	for dir in $(Samples_SUBDIRS); do (echo "In directory $$dir"; cd $$dir; $(MAKE)) done
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/hoc/hoc/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	31 Mar 2005 15:46:48 -0000	1.10
+++ configure.ac	31 Mar 2005 16:37:57 -0000	1.11
@@ -170,10 +170,13 @@
 AC_CONFIG_FILES([config.mk
                  Makefile
                  AppKit/Makefile
+                 AppKit/AppKit-macos.conf
                  Bindings/Makefile
                  docs/Makefile
                  Foundation/Makefile
+                 Foundation/Foundation-macos.conf
                  HOC/Makefile
+                 HOC/HOC-macos.conf
                  HOC_cbits/Makefile
                  InterfaceGenerator/Makefile
                  Tools/Makefile

[hoc-cvs] hoc/HOC Makefile.in,1.8,1.9

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2299

Modified Files:
	Makefile.in 
Log Message:
Don't overwrite inplace.conf if it already exists



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.in	31 Mar 2005 15:30:18 -0000	1.8
+++ Makefile.in	31 Mar 2005 15:58:12 -0000	1.9
@@ -14,7 +14,7 @@
 all: libHOC.a HOC.o ../inplace.conf
 
 ../inplace.conf: HOC-$(PLATFORM).conf-inplace
-	echo "[]" > $@
+	[ -f "$@" ] || echo '[]' > $@
 	$(GHC_PKG) register HOC-$(PLATFORM).conf-inplace \
 		--package-conf=../inplace.conf
 

[hoc-cvs] hoc/Foundation Foundation-macos.conf-inplace.in,1.1,1.2 Foundation-macos.conf.in,1.1,1.2 Makefile.in,1.6,1.7

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Foundation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102/Foundation

Modified Files:
	Foundation-macos.conf-inplace.in Foundation-macos.conf.in 
	Makefile.in 
Log Message:
Get Foundation/ directory compiling with GHC 6.4



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.in	6 Dec 2004 03:46:50 -0000	1.6
+++ Makefile.in	31 Mar 2005 15:57:47 -0000	1.7
@@ -7,9 +7,10 @@
 	Makefile.in \
 	$(NULL)
 
-all: libHSFoundation.a HSFoundation.o ../inplace.conf
+all: libHSFoundation.a HSFoundation.o register-inplace
 
-../inplace.conf: Foundation.conf-inplace
+register-inplace:
+	[ -f "../inplace.conf" ] || echo '[]' > ../inplace.conf
 	$(GHC_PKG) unregister --force --package-conf=../inplace.conf Foundation || true
 	$(GHC_PKG) register Foundation.conf-inplace \
 		--package-conf=../inplace.conf

Index: Foundation-macos.conf.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Foundation-macos.conf.in	6 Dec 2004 03:46:50 -0000	1.1
+++ Foundation-macos.conf.in	31 Mar 2005 15:57:46 -0000	1.2
@@ -5,7 +5,7 @@
 import-dirs:	    "$libdir/Foundation/imports"
 library-dirs:	    "$libdir/Foundation/"
 hs-libraries:	    "HSFoundation"
-extra-frameworks:   "Foundation"
+frameworks:         "Foundation"
 depends:            HOC
 
 exposed-modules:

Index: Foundation-macos.conf-inplace.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Foundation/Foundation-macos.conf-inplace.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Foundation-macos.conf-inplace.in	6 Dec 2004 03:46:50 -0000	1.1
+++ Foundation-macos.conf-inplace.in	31 Mar 2005 15:57:46 -0000	1.2
@@ -5,7 +5,7 @@
 import-dirs:	    "../Foundation/build/imports"
 library-dirs:	    "../Foundation"
 hs-libraries:	    "HSFoundation"
-extra-frameworks:   "Foundation"
+frameworks:         "Foundation"
 depends:            HOC
 
 exposed-modules:

[hoc-cvs] hoc/Samples/UniqSort Makefile,1.2,1.3 Makefile.in,1.3,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/UniqSort
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/Samples/UniqSort

Added Files:
	Makefile 
Removed Files:
	Makefile.in 
Log Message:
Don't use Makefile.in's in Samples/ directory (keeps things a bit simpler)



--- Makefile.in DELETED ---

--- NEW FILE: Makefile ---
include ../../config.mk

dist_srcdir = Samples/UniqSort
dist_FILES = \
	$(wildcard *.hs) \
	Makefile.in \
	$(NULL)

all: uniqsort

uniqsort: UniqSort.hs
	ghc -o $@ --make $<
	
clean:
	-rm uniqsort *.o *.hi

[hoc-cvs] hoc configure.ac,1.9,1.10

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464

Modified Files:
	configure.ac 
Log Message:
Don't use Makefile.in's in Samples/ directory (keeps things a bit simpler)



Index: configure.ac
===================================================================
RCS file: /cvsroot/hoc/hoc/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	31 Mar 2005 15:34:28 -0000	1.9
+++ configure.ac	31 Mar 2005 15:46:48 -0000	1.10
@@ -176,10 +176,6 @@
                  HOC/Makefile
                  HOC_cbits/Makefile
                  InterfaceGenerator/Makefile
-                 Samples/Browser/Makefile
-                 Samples/ExpressionParser/Makefile
-                 Samples/Editor/Makefile
-                 Samples/UniqSort/Makefile
                  Tools/Makefile
                 ])
 

[hoc-cvs] hoc/Samples/ExpressionParser Makefile,1.2,1.3 Makefile.in,1.2,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/ExpressionParser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/Samples/ExpressionParser

Added Files:
	Makefile 
Removed Files:
	Makefile.in 
Log Message:
Don't use Makefile.in's in Samples/ directory (keeps things a bit simpler)



--- Makefile.in DELETED ---

--- NEW FILE: Makefile ---
include ../../config.mk

dist_srcdir = Samples/ExpressionParser
dist_FILES = \
	Contents \
	$(wildcard *.hs) \
	Makefile.in \
	$(NULL)

all: ExpressionParser.app

ExpressionParser.app: ExpressionParser
	hocwrap ExpressionParser

ExpressionParser: *.hs
	mkdir -p build
	ghc --make Main.hs -odir build -hidir build -O -o $@

interpret:
	mkdir -p build
	hocwrap -i -- Main.hs -odir build -hidir build

zerolink: nolink interpret

nolink:
	mkdir -p build
	ghc --make Main.hs -odir build -hidir build -O -pgml true

clean:
	rm -rf build/ ExpressionParser ExpressionParser.app/ 'Interactive Haskell Application.app/'

[hoc-cvs] hoc/Samples/Browser Makefile,1.4,1.5 Makefile.in,1.3,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/Browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/Samples/Browser

Added Files:
	Makefile 
Removed Files:
	Makefile.in 
Log Message:
Don't use Makefile.in's in Samples/ directory (keeps things a bit simpler)



--- Makefile.in DELETED ---

--- NEW FILE: Makefile ---
include ../../config.mk

dist_srcdir = Samples/Browser
dist_FILES = \
	Contents \
	$(wildcard *.hs) \
	Makefile.in \
	$(NULL)

all: Browser.app

Browser.app: Browser Contents/Resources/all-selectors.txt
	hocwrap Browser

Browser: *.hs
	mkdir -p build
	ghc --make -fglasgow-exts Main.hs -odir build -hidir build -O -o Browser

interpret:
	mkdir -p build
	hocwrap -i -- -fglasgow-exts Main.hs -odir build -hidir build

zerolink: nolink interpret

nolink:
	mkdir -p build
	ghc --make -fglasgow-exts Main.hs -odir build -hidir build -O -pgml true

Contents/Resources/all-selectors.txt: ../../Bindings/all-selectors.txt
	cp $< $@

clean:
	rm -rf build/ Browser Browser.app/ 'Interpreted Haskell Application.app/' Contents/Resources/all-selectors.txt
	

[hoc-cvs] hoc/Samples/Editor Makefile,1.3,1.4 Makefile.in,1.3,NONE

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/Samples/Editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/Samples/Editor

Added Files:
	Makefile 
Removed Files:
	Makefile.in 
Log Message:
Don't use Makefile.in's in Samples/ directory (keeps things a bit simpler)



--- Makefile.in DELETED ---

--- NEW FILE: Makefile ---
include ../../config.mk

dist_srcdir = Samples/Editor
dist_FILES = \
	Contents \
	$(wildcard *.hs) \
	Makefile.in \
	$(NULL)

all: Editor.app

Editor.app: Editor
	hocwrap Editor

Editor: *.hs
	mkdir -p build
	ghc --make -fglasgow-exts Main.hs -odir build -hidir build -O -o Editor 

interpret:
	mkdir -p build
	hocwrap -i -- -fglasgow-exts Main.hs -odir build -hidir build

zerolink: nolink interpret

nolink:
	mkdir -p build
	ghc --make -fglasgow-exts Main.hs -odir build -hidir build -O -pgml true
clean:
	rm -rf build Editor Editor.app 'Interpreted Haskell Application.app/'

[hoc-cvs] hoc/InterfaceGenerator .cvsignore,NONE,1.1

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/InterfaceGenerator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/InterfaceGenerator

Added Files:
	.cvsignore 
Log Message:
Added .cvsignore files, so I can grok 'cvs update' output



--- NEW FILE: .cvsignore ---
build
ghcmake.build-stamp
ifgen
Makefile

[hoc-cvs] hoc/docs .cvsignore,NONE,1.1

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/docs

Added Files:
	.cvsignore 
Log Message:
Added .cvsignore files, so I can grok 'cvs update' output



--- NEW FILE: .cvsignore ---
HOC.html
Makefile

[hoc-cvs] hoc/HOC_cbits .cvsignore,NONE,1.1

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC_cbits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25052/HOC_cbits

Added Files:
	.cvsignore 
Log Message:
Added .cvsignore files, so I can grok 'cvs update' output



--- NEW FILE: .cvsignore ---
depend
Makefile