[clean ups
John Meacham <john@repetae.net>**20100727212409
 Ignore-this: 676945d483ba01ab9123badeb92bbc95
] hunk ./src/E/Type.hs 196
-        {-!derive: update, Functor, Foldable, Traversable !-}
+    deriving(Functor,Foldable,Traversable)
+        {-!derive: update !-}
hunk ./src/FrontEnd/Desugar.hs 3
--- The general desugaring routine creates selectors for data 
+-- The general desugaring routine creates selectors for data
hunk ./src/FrontEnd/Desugar.hs 59
-    (ds', _) = runState (dsm (hsModuleDecls m))   (0::Int)
+    (ds', _) = runState (dsm (hsModuleDecls m)) (0::Int)
hunk ./src/FrontEnd/Desugar.hs 176
-desugarRhs  = traverseHsRhsHsExp desugarExp 
+desugarRhs  = traverseHsRhsHsExp desugarExp
hunk ./src/FrontEnd/Desugar.hs 272
-    f (gen:HsQualifier q1:HsQualifier q2:ss)  = f (gen:HsQualifier (hsApp (HsVar f_and) [q1,q2]):ss)
+    f (gen:HsQualifier q1:HsQualifier q2:ss)  = f (gen:HsQualifier (hsApp (HsVar v_and) [q1,q2]):ss)
hunk ./src/FrontEnd/Desugar.hs 276
-        return $ hsParen $ HsVar f_map `app` HsLambda srcLoc [pat] exp' `app` e
+        return $ hsParen $ HsVar v_map `app` HsLambda srcLoc [pat] exp' `app` e
hunk ./src/FrontEnd/Desugar.hs 280
-        return $ hsApp (HsVar f_foldr)  [HsLambda srcLoc [pat,HsPVar npvar] $ hsIf q (hsApp (HsCon con_cons) [exp',HsVar npvar]) (HsVar npvar), HsList [],e]
+        return $ hsApp (HsVar v_foldr)  [HsLambda srcLoc [pat,HsPVar npvar] $ hsIf q (hsApp (HsCon dc_Cons) [exp',HsVar npvar]) (HsVar npvar), HsList [],e]
hunk ./src/FrontEnd/Desugar.hs 283
-        return $ hsParen $ HsVar f_concatMap `app`  HsLambda srcLoc [pat] ss' `app` e
+        return $ hsParen $ HsVar v_concatMap `app`  HsLambda srcLoc [pat] ss' `app` e
hunk ./src/FrontEnd/Desugar.hs 290
-        return $ hsParen $ HsVar f_concatMap `app`  HsLambda srcLoc [HsPVar npvar] kase `app`  e
+        return $ hsParen $ HsVar v_concatMap `app`  HsLambda srcLoc [HsPVar npvar] kase `app`  e
hunk ./src/FrontEnd/Desugar.hs 297
-        return $ hsParen $ HsVar f_concatMap `app` HsLambda srcLoc [HsPVar npvar] kase `app` e
+        return $ hsParen $ HsVar v_concatMap `app` HsLambda srcLoc [HsPVar npvar] kase `app` e
hunk ./src/FrontEnd/Desugar.hs 303
-        return $ hsParen $ HsVar f_map `app` HsLambda srcLoc [HsPVar npvar] kase `app` e
+        return $ hsParen $ HsVar v_map `app` HsLambda srcLoc [HsPVar npvar] kase `app` e
hunk ./src/FrontEnd/Desugar.hs 310
-    f_concatMap = nameName v_concatMap
-    f_map = nameName v_map
-    f_foldr = nameName v_foldr
-    f_and = nameName v_and
-    con_cons = nameName dc_Cons
hunk ./src/FrontEnd/HsParser.y 111
-      'derive'        { KW_Derive }
hunk ./src/FrontEnd/HsParser.y 139
+      'closed'        { KW_Closed }
hunk ./src/FrontEnd/HsParser.y 946
+      | 'closed'              { toName UnknownType "closed" }
hunk ./src/FrontEnd/HsParser.y 951
-      | 'derive'              { derive_name }
hunk ./src/FrontEnd/Lexer.hs 101
-	| KW_Derive
hunk ./src/FrontEnd/Lexer.hs 123
+        | KW_Closed
hunk ./src/FrontEnd/Lexer.hs 197
+ ( "closed", 	KW_Closed ),
hunk ./src/FrontEnd/Lexer.hs 199
- ( "derive",    KW_Derive ),