Regenerate Transfer abstract syntaxes with updated BNFC.

1 files changed, 38 insertions, 56 deletions

diff --git a/src/Transfer/Core/Abs.hs b/src/Transfer/Core/Abs.hs
index dbc20b4bb..fd6a382b1 100644
--- a/src/Transfer/Core/Abs.hs
+++ b/src/Transfer/Core/Abs.hs
@@ -1,7 +1,8 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
-module Transfer.Core.Abs where
+module Transfer.Core.Abs (Tree(..), Module, Decl, ConsDecl, Pattern, FieldPattern, PatternVariable, Exp, LetDef, Case, FieldType, FieldValue, TMeta, CIdent, composOp, composOpM, composOpM_, composOpMPlus, composOpMonoid, composOpFold, compos, johnMajorEq) where
 
 import Control.Monad (ap,MonadPlus,msum,mplus,mzero)
+import Control.Monad.Identity
 import Data.Monoid
 
 -- Haskell module generated by the BNF converter
@@ -70,7 +71,10 @@ data Tree :: * -> * where
     CIdent :: String -> Tree CIdent_
 
 composOp :: (forall a. Tree a -> Tree a) -> Tree c -> Tree c
-composOp f = head . composOpM (\x -> [f x])
+composOp f = runIdentity . composOpM (Identity . f)
+
+composOpM :: Monad m => (forall a. Tree a -> m (Tree a)) -> Tree c -> m (Tree c)
+composOpM = compos return ap
 
 composOpM_ :: Monad m => (forall a. Tree a -> m ()) -> Tree c -> m ()
 composOpM_ = composOpFold (return ()) (>>)
@@ -81,61 +85,39 @@ composOpMPlus = composOpFold mzero mplus
 composOpMonoid :: Monoid m => (forall a. Tree a -> m) -> Tree c -> m
 composOpMonoid = composOpFold mempty mappend
 
-composOpM :: Monad m => (forall a. Tree a -> m (Tree a)) -> Tree c -> m (Tree c)
-composOpM f t = case t of
-    Module decls -> return Module `ap` mapM f decls
-    DataDecl cident exp consdecls -> return DataDecl `ap` f cident `ap` f exp `ap` mapM f consdecls
-    TypeDecl cident exp -> return TypeDecl `ap` f cident `ap` f exp
-    ValueDecl cident exp -> return ValueDecl `ap` f cident `ap` f exp
-    ConsDecl cident exp -> return ConsDecl `ap` f cident `ap` f exp
-    PCons cident patterns -> return PCons `ap` f cident `ap` mapM f patterns
-    PVar patternvariable -> return PVar `ap` f patternvariable
-    PRec fieldpatterns -> return PRec `ap` mapM f fieldpatterns
-    FieldPattern cident pattern -> return FieldPattern `ap` f cident `ap` f pattern
-    PVVar cident -> return PVVar `ap` f cident
-    ELet letdefs exp -> return ELet `ap` mapM f letdefs `ap` f exp
-    ECase exp cases -> return ECase `ap` f exp `ap` mapM f cases
-    EAbs patternvariable exp -> return EAbs `ap` f patternvariable `ap` f exp
-    EPi patternvariable exp0 exp1 -> return EPi `ap` f patternvariable `ap` f exp0 `ap` f exp1
-    EApp exp0 exp1 -> return EApp `ap` f exp0 `ap` f exp1
-    EProj exp cident -> return EProj `ap` f exp `ap` f cident
-    ERecType fieldtypes -> return ERecType `ap` mapM f fieldtypes
-    ERec fieldvalues -> return ERec `ap` mapM f fieldvalues
-    EVar cident -> return EVar `ap` f cident
-    EMeta tmeta -> return EMeta `ap` f tmeta
-    LetDef cident exp -> return LetDef `ap` f cident `ap` f exp
-    Case pattern exp0 exp1 -> return Case `ap` f pattern `ap` f exp0 `ap` f exp1
-    FieldType cident exp -> return FieldType `ap` f cident `ap` f exp
-    FieldValue cident exp -> return FieldValue `ap` f cident `ap` f exp
-    _ -> return t
-
+newtype C b a = C { unC :: b }
 composOpFold :: b -> (b -> b -> b) -> (forall a. Tree a -> b) -> Tree c -> b
-composOpFold zero combine f t = case t of
-    Module decls -> foldr combine zero (map f decls)
-    DataDecl cident exp consdecls -> f cident `combine` f exp `combine` foldr combine zero (map f consdecls)
-    TypeDecl cident exp -> f cident `combine` f exp
-    ValueDecl cident exp -> f cident `combine` f exp
-    ConsDecl cident exp -> f cident `combine` f exp
-    PCons cident patterns -> f cident `combine` foldr combine zero (map f patterns)
-    PVar patternvariable -> f patternvariable
-    PRec fieldpatterns -> foldr combine zero (map f fieldpatterns)
-    FieldPattern cident pattern -> f cident `combine` f pattern
-    PVVar cident -> f cident
-    ELet letdefs exp -> foldr combine zero (map f letdefs) `combine` f exp
-    ECase exp cases -> f exp `combine` foldr combine zero (map f cases)
-    EAbs patternvariable exp -> f patternvariable `combine` f exp
-    EPi patternvariable exp0 exp1 -> f patternvariable `combine` f exp0 `combine` f exp1
-    EApp exp0 exp1 -> f exp0 `combine` f exp1
-    EProj exp cident -> f exp `combine` f cident
-    ERecType fieldtypes -> foldr combine zero (map f fieldtypes)
-    ERec fieldvalues -> foldr combine zero (map f fieldvalues)
-    EVar cident -> f cident
-    EMeta tmeta -> f tmeta
-    LetDef cident exp -> f cident `combine` f exp
-    Case pattern exp0 exp1 -> f pattern `combine` f exp0 `combine` f exp1
-    FieldType cident exp -> f cident `combine` f exp
-    FieldValue cident exp -> f cident `combine` f exp
-    _ -> zero
+composOpFold z c f = unC . compos (\_ -> C z) (\(C x) (C y) -> C (c x y)) (C . f)
+
+compos :: (forall a. a -> m a) 
+       -> (forall a b. m (a -> b) -> m a -> m b) 
+       -> (forall a. Tree a -> m (Tree a)) -> Tree c -> m (Tree c)
+compos r a f t = case t of
+    Module decls -> r Module `a` foldr (a . a (r (:)) . f) (r []) decls
+    DataDecl cident exp consdecls -> r DataDecl `a` f cident `a` f exp `a` foldr (a . a (r (:)) . f) (r []) consdecls
+    TypeDecl cident exp -> r TypeDecl `a` f cident `a` f exp
+    ValueDecl cident exp -> r ValueDecl `a` f cident `a` f exp
+    ConsDecl cident exp -> r ConsDecl `a` f cident `a` f exp
+    PCons cident patterns -> r PCons `a` f cident `a` foldr (a . a (r (:)) . f) (r []) patterns
+    PVar patternvariable -> r PVar `a` f patternvariable
+    PRec fieldpatterns -> r PRec `a` foldr (a . a (r (:)) . f) (r []) fieldpatterns
+    FieldPattern cident pattern -> r FieldPattern `a` f cident `a` f pattern
+    PVVar cident -> r PVVar `a` f cident
+    ELet letdefs exp -> r ELet `a` foldr (a . a (r (:)) . f) (r []) letdefs `a` f exp
+    ECase exp cases -> r ECase `a` f exp `a` foldr (a . a (r (:)) . f) (r []) cases
+    EAbs patternvariable exp -> r EAbs `a` f patternvariable `a` f exp
+    EPi patternvariable exp0 exp1 -> r EPi `a` f patternvariable `a` f exp0 `a` f exp1
+    EApp exp0 exp1 -> r EApp `a` f exp0 `a` f exp1
+    EProj exp cident -> r EProj `a` f exp `a` f cident
+    ERecType fieldtypes -> r ERecType `a` foldr (a . a (r (:)) . f) (r []) fieldtypes
+    ERec fieldvalues -> r ERec `a` foldr (a . a (r (:)) . f) (r []) fieldvalues
+    EVar cident -> r EVar `a` f cident
+    EMeta tmeta -> r EMeta `a` f tmeta
+    LetDef cident exp -> r LetDef `a` f cident `a` f exp
+    Case pattern exp0 exp1 -> r Case `a` f pattern `a` f exp0 `a` f exp1
+    FieldType cident exp -> r FieldType `a` f cident `a` f exp
+    FieldValue cident exp -> r FieldValue `a` f cident `a` f exp
+    _ -> r t
 
 instance Show (Tree c) where
   showsPrec n t = case t of