[Gtk2hs-commit] gtk2hs/tools/c2hs/base/graphs Marks.hs,1.1.1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/graphs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15642/base/graphs

Modified Files:
	Marks.hs 
Log Message:
add Axel's --precomp patches with a binary serialisation framework derived from
the one used in ghc. This required makeing Position a proper data type.
Also converted to using Data.FiniteMap rather than the CTK FiniteMaps module.


Index: Marks.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/base/graphs/Marks.hs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Marks.hs	13 Nov 2004 16:42:49 -0000	1.1.1.1
+++ Marks.hs	13 Nov 2004 17:26:50 -0000	1.2
@@ -42,7 +42,7 @@
 module Marks (Marks, newMarks, mark, isMarked) 
 where
 
-import Sets	  (Set, zeroSet, addToSet, elemSet)
+import Data.Set	  (Set, emptySet, addToSet, elementOf)
 import Attributes (Attrs, Attributed(..))
 
 
@@ -55,15 +55,15 @@
 -- get a new collection of marks (EXPORTED)
 --
 newMarks :: Attributed a => Marks a
-newMarks  = Marks zeroSet
+newMarks  = Marks emptySet
 
 -- mark an entity in a specific collection of marks (EXPORTED)
 --
 mark              :: Attributed a => Marks a -> a -> Marks a
-mark (Marks ms) e  = Marks $ addToSet (attrsOf e) ms
+mark (Marks ms) e  = Marks $ addToSet ms (attrsOf e)
 
 -- test whether a given entity is marked in a given collection of marks
 -- (EXPORTED) 
 --
 isMarked              :: Attributed a => Marks a -> a -> Bool
-isMarked (Marks ms) e  = (attrsOf e) `elemSet` ms
+isMarked (Marks ms) e  = (attrsOf e) `elementOf` ms