Regenerated transfer bnfc stuff with latest bnfc, happy and alex, to be able to compile on GHC CVS.

1 files changed, 69 insertions, 68 deletions

diff --git a/src/Transfer/Core/Abs.hs b/src/Transfer/Core/Abs.hs
index 8e4de4057..8306d5b46 100644
--- a/src/Transfer/Core/Abs.hs
+++ b/src/Transfer/Core/Abs.hs
@@ -196,71 +196,72 @@ johnMajorEq _ _ = False
 
 instance Ord (Tree c) where
   compare x y = compare (index x) (index y) `mappend` compareSame x y
-    where
-    index (Module _) = 0
-    index (DataDecl _ _ _) = 1
-    index (TypeDecl _ _) = 2
-    index (ValueDecl _ _) = 3
-    index (ConsDecl _ _) = 4
-    index (PCons _ _) = 5
-    index (PVar _) = 6
-    index (PRec _) = 7
-    index (PStr _) = 8
-    index (PInt _) = 9
-    index (FieldPattern _ _) = 10
-    index (PVVar _) = 11
-    index (PVWild ) = 12
-    index (ELet _ _) = 13
-    index (ECase _ _) = 14
-    index (EAbs _ _) = 15
-    index (EPi _ _ _) = 16
-    index (EApp _ _) = 17
-    index (EProj _ _) = 18
-    index (ERecType _) = 19
-    index (ERec _) = 20
-    index (EVar _) = 21
-    index (EType ) = 22
-    index (EStr _) = 23
-    index (EInteger _) = 24
-    index (EDouble _) = 25
-    index (EMeta _) = 26
-    index (LetDef _ _) = 27
-    index (Case _ _ _) = 28
-    index (FieldType _ _) = 29
-    index (FieldValue _ _) = 30
-    index (TMeta _) = 31
-    index (CIdent _) = 32
-    compareSame (Module decls) (Module decls_) = compare decls decls_
-    compareSame (DataDecl cident exp consdecls) (DataDecl cident_ exp_ consdecls_) = mappend (compare cident cident_) (mappend (compare exp exp_) (compare consdecls consdecls_))
-    compareSame (TypeDecl cident exp) (TypeDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (ValueDecl cident exp) (ValueDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (ConsDecl cident exp) (ConsDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (PCons cident patterns) (PCons cident_ patterns_) = mappend (compare cident cident_) (compare patterns patterns_)
-    compareSame (PVar patternvariable) (PVar patternvariable_) = compare patternvariable patternvariable_
-    compareSame (PRec fieldpatterns) (PRec fieldpatterns_) = compare fieldpatterns fieldpatterns_
-    compareSame (PStr str) (PStr str_) = compare str str_
-    compareSame (PInt n) (PInt n_) = compare n n_
-    compareSame (FieldPattern cident pattern) (FieldPattern cident_ pattern_) = mappend (compare cident cident_) (compare pattern pattern_)
-    compareSame (PVVar cident) (PVVar cident_) = compare cident cident_
-    compareSame PVWild PVWild = EQ
-    compareSame (ELet letdefs exp) (ELet letdefs_ exp_) = mappend (compare letdefs letdefs_) (compare exp exp_)
-    compareSame (ECase exp cases) (ECase exp_ cases_) = mappend (compare exp exp_) (compare cases cases_)
-    compareSame (EAbs patternvariable exp) (EAbs patternvariable_ exp_) = mappend (compare patternvariable patternvariable_) (compare exp exp_)
-    compareSame (EPi patternvariable exp0 exp1) (EPi patternvariable_ exp0_ exp1_) = mappend (compare patternvariable patternvariable_) (mappend (compare exp0 exp0_) (compare exp1 exp1_))
-    compareSame (EApp exp0 exp1) (EApp exp0_ exp1_) = mappend (compare exp0 exp0_) (compare exp1 exp1_)
-    compareSame (EProj exp cident) (EProj exp_ cident_) = mappend (compare exp exp_) (compare cident cident_)
-    compareSame (ERecType fieldtypes) (ERecType fieldtypes_) = compare fieldtypes fieldtypes_
-    compareSame (ERec fieldvalues) (ERec fieldvalues_) = compare fieldvalues fieldvalues_
-    compareSame (EVar cident) (EVar cident_) = compare cident cident_
-    compareSame EType EType = EQ
-    compareSame (EStr str) (EStr str_) = compare str str_
-    compareSame (EInteger n) (EInteger n_) = compare n n_
-    compareSame (EDouble d) (EDouble d_) = compare d d_
-    compareSame (EMeta tmeta) (EMeta tmeta_) = compare tmeta tmeta_
-    compareSame (LetDef cident exp) (LetDef cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (Case pattern exp0 exp1) (Case pattern_ exp0_ exp1_) = mappend (compare pattern pattern_) (mappend (compare exp0 exp0_) (compare exp1 exp1_))
-    compareSame (FieldType cident exp) (FieldType cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (FieldValue cident exp) (FieldValue cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
-    compareSame (TMeta str) (TMeta str_) = compare str str_
-    compareSame (CIdent str) (CIdent str_) = compare str str_
-    compareSame x y = error "BNFC error:" compareSame
+index :: Tree c -> Int
+index (Module _) = 0
+index (DataDecl _ _ _) = 1
+index (TypeDecl _ _) = 2
+index (ValueDecl _ _) = 3
+index (ConsDecl _ _) = 4
+index (PCons _ _) = 5
+index (PVar _) = 6
+index (PRec _) = 7
+index (PStr _) = 8
+index (PInt _) = 9
+index (FieldPattern _ _) = 10
+index (PVVar _) = 11
+index (PVWild ) = 12
+index (ELet _ _) = 13
+index (ECase _ _) = 14
+index (EAbs _ _) = 15
+index (EPi _ _ _) = 16
+index (EApp _ _) = 17
+index (EProj _ _) = 18
+index (ERecType _) = 19
+index (ERec _) = 20
+index (EVar _) = 21
+index (EType ) = 22
+index (EStr _) = 23
+index (EInteger _) = 24
+index (EDouble _) = 25
+index (EMeta _) = 26
+index (LetDef _ _) = 27
+index (Case _ _ _) = 28
+index (FieldType _ _) = 29
+index (FieldValue _ _) = 30
+index (TMeta _) = 31
+index (CIdent _) = 32
+compareSame :: Tree c -> Tree c -> Ordering
+compareSame (Module decls) (Module decls_) = compare decls decls_
+compareSame (DataDecl cident exp consdecls) (DataDecl cident_ exp_ consdecls_) = mappend (compare cident cident_) (mappend (compare exp exp_) (compare consdecls consdecls_))
+compareSame (TypeDecl cident exp) (TypeDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (ValueDecl cident exp) (ValueDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (ConsDecl cident exp) (ConsDecl cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (PCons cident patterns) (PCons cident_ patterns_) = mappend (compare cident cident_) (compare patterns patterns_)
+compareSame (PVar patternvariable) (PVar patternvariable_) = compare patternvariable patternvariable_
+compareSame (PRec fieldpatterns) (PRec fieldpatterns_) = compare fieldpatterns fieldpatterns_
+compareSame (PStr str) (PStr str_) = compare str str_
+compareSame (PInt n) (PInt n_) = compare n n_
+compareSame (FieldPattern cident pattern) (FieldPattern cident_ pattern_) = mappend (compare cident cident_) (compare pattern pattern_)
+compareSame (PVVar cident) (PVVar cident_) = compare cident cident_
+compareSame PVWild PVWild = EQ
+compareSame (ELet letdefs exp) (ELet letdefs_ exp_) = mappend (compare letdefs letdefs_) (compare exp exp_)
+compareSame (ECase exp cases) (ECase exp_ cases_) = mappend (compare exp exp_) (compare cases cases_)
+compareSame (EAbs patternvariable exp) (EAbs patternvariable_ exp_) = mappend (compare patternvariable patternvariable_) (compare exp exp_)
+compareSame (EPi patternvariable exp0 exp1) (EPi patternvariable_ exp0_ exp1_) = mappend (compare patternvariable patternvariable_) (mappend (compare exp0 exp0_) (compare exp1 exp1_))
+compareSame (EApp exp0 exp1) (EApp exp0_ exp1_) = mappend (compare exp0 exp0_) (compare exp1 exp1_)
+compareSame (EProj exp cident) (EProj exp_ cident_) = mappend (compare exp exp_) (compare cident cident_)
+compareSame (ERecType fieldtypes) (ERecType fieldtypes_) = compare fieldtypes fieldtypes_
+compareSame (ERec fieldvalues) (ERec fieldvalues_) = compare fieldvalues fieldvalues_
+compareSame (EVar cident) (EVar cident_) = compare cident cident_
+compareSame EType EType = EQ
+compareSame (EStr str) (EStr str_) = compare str str_
+compareSame (EInteger n) (EInteger n_) = compare n n_
+compareSame (EDouble d) (EDouble d_) = compare d d_
+compareSame (EMeta tmeta) (EMeta tmeta_) = compare tmeta tmeta_
+compareSame (LetDef cident exp) (LetDef cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (Case pattern exp0 exp1) (Case pattern_ exp0_ exp1_) = mappend (compare pattern pattern_) (mappend (compare exp0 exp0_) (compare exp1 exp1_))
+compareSame (FieldType cident exp) (FieldType cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (FieldValue cident exp) (FieldValue cident_ exp_) = mappend (compare cident cident_) (compare exp exp_)
+compareSame (TMeta str) (TMeta str_) = compare str str_
+compareSame (CIdent str) (CIdent str_) = compare str str_
+compareSame x y = error "BNFC error:" compareSame