Fix examples

norm2782 · Nov 1, 2010 · a82ab3a · a82ab3a
1 parent d76147d
commit a82ab3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/examples/Ex02AddingDatatypeSupport.hs b/examples/Ex02AddingDatatypeSupport.hs
@@ -25,8 +25,8 @@
 
 module Ex02AddingDatatypeSupport where
 
-import Generics.EMGM.Derive
-import qualified Generics.EMGM.Functions as G
+import qualified Generics.EMGM as G
+import Generics.EMGM.Base
 
 -- Using generic functions on your own datatypes
 
@@ -46,11 +46,12 @@ epTree = EP from' to' where
 conLeaf, conBranch :: ConDescr
 conLeaf = ConDescr {
   conName = "Leaf",
-  conArity = 1, conLabels = [], conFixity = Nonfix
+  conArity = 1, conRecord = False, conFixity = Prefix
   }
+
 conBranch = ConDescr {
   conName = "Branch",
-  conArity = 2, conLabels = [], conFixity = Nonfix
+  conArity = 2, conRecord = False, conFixity = Prefix
   }
 
 --    More structural definition:

diff --git a/examples/Ex03DefiningFunctions.hs b/examples/Ex03DefiningFunctions.hs
@@ -28,7 +28,6 @@ newtype Empty a = Empty { selEmpty :: a }
 
 -- Instance of Generic
 instance Generic Empty where
-  rconstant      = error "Unreachable"
   rint           = Empty 0
   rinteger       = Empty 0
   rfloat         = Empty 0