new constructs in gfcc, removed lambda

1 files changed, 325 insertions, 275 deletions

diff --git a/src/GF/Canon/GFCC/ParGFCC.hs b/src/GF/Canon/GFCC/ParGFCC.hs
index 85e5c6e6a..99c734ffa 100644
--- a/src/GF/Canon/GFCC/ParGFCC.hs
+++ b/src/GF/Canon/GFCC/ParGFCC.hs
@@ -3,8 +3,8 @@
 module GF.Canon.GFCC.ParGFCC where
 import GF.Canon.GFCC.AbsGFCC
 import GF.Canon.GFCC.LexGFCC
-import GF.Data.Operations
-import Data.Array
+import GF.Canon.GFCC.ErrM
+import Array
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Exts
 #else
@@ -26,132 +26,138 @@ happyIn24 x = unsafeCoerce# x
 happyOut24 :: (HappyAbsSyn ) -> (Integer)
 happyOut24 x = unsafeCoerce# x
 {-# INLINE happyOut24 #-}
-happyIn25 :: (CId) -> (HappyAbsSyn )
+happyIn25 :: (Double) -> (HappyAbsSyn )
 happyIn25 x = unsafeCoerce# x
 {-# INLINE happyIn25 #-}
-happyOut25 :: (HappyAbsSyn ) -> (CId)
+happyOut25 :: (HappyAbsSyn ) -> (Double)
 happyOut25 x = unsafeCoerce# x
 {-# INLINE happyOut25 #-}
-happyIn26 :: (Grammar) -> (HappyAbsSyn )
+happyIn26 :: (CId) -> (HappyAbsSyn )
 happyIn26 x = unsafeCoerce# x
 {-# INLINE happyIn26 #-}
-happyOut26 :: (HappyAbsSyn ) -> (Grammar)
+happyOut26 :: (HappyAbsSyn ) -> (CId)
 happyOut26 x = unsafeCoerce# x
 {-# INLINE happyOut26 #-}
-happyIn27 :: (Header) -> (HappyAbsSyn )
+happyIn27 :: (Grammar) -> (HappyAbsSyn )
 happyIn27 x = unsafeCoerce# x
 {-# INLINE happyIn27 #-}
-happyOut27 :: (HappyAbsSyn ) -> (Header)
+happyOut27 :: (HappyAbsSyn ) -> (Grammar)
 happyOut27 x = unsafeCoerce# x
 {-# INLINE happyOut27 #-}
-happyIn28 :: (Abstract) -> (HappyAbsSyn )
+happyIn28 :: (Header) -> (HappyAbsSyn )
 happyIn28 x = unsafeCoerce# x
 {-# INLINE happyIn28 #-}
-happyOut28 :: (HappyAbsSyn ) -> (Abstract)
+happyOut28 :: (HappyAbsSyn ) -> (Header)
 happyOut28 x = unsafeCoerce# x
 {-# INLINE happyOut28 #-}
-happyIn29 :: (Concrete) -> (HappyAbsSyn )
+happyIn29 :: (Abstract) -> (HappyAbsSyn )
 happyIn29 x = unsafeCoerce# x
 {-# INLINE happyIn29 #-}
-happyOut29 :: (HappyAbsSyn ) -> (Concrete)
+happyOut29 :: (HappyAbsSyn ) -> (Abstract)
 happyOut29 x = unsafeCoerce# x
 {-# INLINE happyOut29 #-}
-happyIn30 :: (AbsDef) -> (HappyAbsSyn )
+happyIn30 :: (Concrete) -> (HappyAbsSyn )
 happyIn30 x = unsafeCoerce# x
 {-# INLINE happyIn30 #-}
-happyOut30 :: (HappyAbsSyn ) -> (AbsDef)
+happyOut30 :: (HappyAbsSyn ) -> (Concrete)
 happyOut30 x = unsafeCoerce# x
 {-# INLINE happyOut30 #-}
-happyIn31 :: (CncDef) -> (HappyAbsSyn )
+happyIn31 :: (AbsDef) -> (HappyAbsSyn )
 happyIn31 x = unsafeCoerce# x
 {-# INLINE happyIn31 #-}
-happyOut31 :: (HappyAbsSyn ) -> (CncDef)
+happyOut31 :: (HappyAbsSyn ) -> (AbsDef)
 happyOut31 x = unsafeCoerce# x
 {-# INLINE happyOut31 #-}
-happyIn32 :: (Type) -> (HappyAbsSyn )
+happyIn32 :: (CncDef) -> (HappyAbsSyn )
 happyIn32 x = unsafeCoerce# x
 {-# INLINE happyIn32 #-}
-happyOut32 :: (HappyAbsSyn ) -> (Type)
+happyOut32 :: (HappyAbsSyn ) -> (CncDef)
 happyOut32 x = unsafeCoerce# x
 {-# INLINE happyOut32 #-}
-happyIn33 :: (Exp) -> (HappyAbsSyn )
+happyIn33 :: (Type) -> (HappyAbsSyn )
 happyIn33 x = unsafeCoerce# x
 {-# INLINE happyIn33 #-}
-happyOut33 :: (HappyAbsSyn ) -> (Exp)
+happyOut33 :: (HappyAbsSyn ) -> (Type)
 happyOut33 x = unsafeCoerce# x
 {-# INLINE happyOut33 #-}
-happyIn34 :: (Atom) -> (HappyAbsSyn )
+happyIn34 :: (Exp) -> (HappyAbsSyn )
 happyIn34 x = unsafeCoerce# x
 {-# INLINE happyIn34 #-}
-happyOut34 :: (HappyAbsSyn ) -> (Atom)
+happyOut34 :: (HappyAbsSyn ) -> (Exp)
 happyOut34 x = unsafeCoerce# x
 {-# INLINE happyOut34 #-}
-happyIn35 :: (Term) -> (HappyAbsSyn )
+happyIn35 :: (Atom) -> (HappyAbsSyn )
 happyIn35 x = unsafeCoerce# x
 {-# INLINE happyIn35 #-}
-happyOut35 :: (HappyAbsSyn ) -> (Term)
+happyOut35 :: (HappyAbsSyn ) -> (Atom)
 happyOut35 x = unsafeCoerce# x
 {-# INLINE happyOut35 #-}
-happyIn36 :: (Tokn) -> (HappyAbsSyn )
+happyIn36 :: (Term) -> (HappyAbsSyn )
 happyIn36 x = unsafeCoerce# x
 {-# INLINE happyIn36 #-}
-happyOut36 :: (HappyAbsSyn ) -> (Tokn)
+happyOut36 :: (HappyAbsSyn ) -> (Term)
 happyOut36 x = unsafeCoerce# x
 {-# INLINE happyOut36 #-}
-happyIn37 :: (Variant) -> (HappyAbsSyn )
+happyIn37 :: (Tokn) -> (HappyAbsSyn )
 happyIn37 x = unsafeCoerce# x
 {-# INLINE happyIn37 #-}
-happyOut37 :: (HappyAbsSyn ) -> (Variant)
+happyOut37 :: (HappyAbsSyn ) -> (Tokn)
 happyOut37 x = unsafeCoerce# x
 {-# INLINE happyOut37 #-}
-happyIn38 :: ([Concrete]) -> (HappyAbsSyn )
+happyIn38 :: (Variant) -> (HappyAbsSyn )
 happyIn38 x = unsafeCoerce# x
 {-# INLINE happyIn38 #-}
-happyOut38 :: (HappyAbsSyn ) -> ([Concrete])
+happyOut38 :: (HappyAbsSyn ) -> (Variant)
 happyOut38 x = unsafeCoerce# x
 {-# INLINE happyOut38 #-}
-happyIn39 :: ([AbsDef]) -> (HappyAbsSyn )
+happyIn39 :: ([Concrete]) -> (HappyAbsSyn )
 happyIn39 x = unsafeCoerce# x
 {-# INLINE happyIn39 #-}
-happyOut39 :: (HappyAbsSyn ) -> ([AbsDef])
+happyOut39 :: (HappyAbsSyn ) -> ([Concrete])
 happyOut39 x = unsafeCoerce# x
 {-# INLINE happyOut39 #-}
-happyIn40 :: ([CncDef]) -> (HappyAbsSyn )
+happyIn40 :: ([AbsDef]) -> (HappyAbsSyn )
 happyIn40 x = unsafeCoerce# x
 {-# INLINE happyIn40 #-}
-happyOut40 :: (HappyAbsSyn ) -> ([CncDef])
+happyOut40 :: (HappyAbsSyn ) -> ([AbsDef])
 happyOut40 x = unsafeCoerce# x
 {-# INLINE happyOut40 #-}
-happyIn41 :: ([CId]) -> (HappyAbsSyn )
+happyIn41 :: ([CncDef]) -> (HappyAbsSyn )
 happyIn41 x = unsafeCoerce# x
 {-# INLINE happyIn41 #-}
-happyOut41 :: (HappyAbsSyn ) -> ([CId])
+happyOut41 :: (HappyAbsSyn ) -> ([CncDef])
 happyOut41 x = unsafeCoerce# x
 {-# INLINE happyOut41 #-}
-happyIn42 :: ([Term]) -> (HappyAbsSyn )
+happyIn42 :: ([CId]) -> (HappyAbsSyn )
 happyIn42 x = unsafeCoerce# x
 {-# INLINE happyIn42 #-}
-happyOut42 :: (HappyAbsSyn ) -> ([Term])
+happyOut42 :: (HappyAbsSyn ) -> ([CId])
 happyOut42 x = unsafeCoerce# x
 {-# INLINE happyOut42 #-}
-happyIn43 :: ([Exp]) -> (HappyAbsSyn )
+happyIn43 :: ([Term]) -> (HappyAbsSyn )
 happyIn43 x = unsafeCoerce# x
 {-# INLINE happyIn43 #-}
-happyOut43 :: (HappyAbsSyn ) -> ([Exp])
+happyOut43 :: (HappyAbsSyn ) -> ([Term])
 happyOut43 x = unsafeCoerce# x
 {-# INLINE happyOut43 #-}
-happyIn44 :: ([String]) -> (HappyAbsSyn )
+happyIn44 :: ([Exp]) -> (HappyAbsSyn )
 happyIn44 x = unsafeCoerce# x
 {-# INLINE happyIn44 #-}
-happyOut44 :: (HappyAbsSyn ) -> ([String])
+happyOut44 :: (HappyAbsSyn ) -> ([Exp])
 happyOut44 x = unsafeCoerce# x
 {-# INLINE happyOut44 #-}
-happyIn45 :: ([Variant]) -> (HappyAbsSyn )
+happyIn45 :: ([String]) -> (HappyAbsSyn )
 happyIn45 x = unsafeCoerce# x
 {-# INLINE happyIn45 #-}
-happyOut45 :: (HappyAbsSyn ) -> ([Variant])
+happyOut45 :: (HappyAbsSyn ) -> ([String])
 happyOut45 x = unsafeCoerce# x
 {-# INLINE happyOut45 #-}
+happyIn46 :: ([Variant]) -> (HappyAbsSyn )
+happyIn46 x = unsafeCoerce# x
+{-# INLINE happyIn46 #-}
+happyOut46 :: (HappyAbsSyn ) -> ([Variant])
+happyOut46 x = unsafeCoerce# x
+{-# INLINE happyOut46 #-}
 happyInTok :: Token -> (HappyAbsSyn )
 happyInTok x = unsafeCoerce# x
 {-# INLINE happyInTok #-}
@@ -160,21 +166,21 @@ happyOutTok x = unsafeCoerce# x
 {-# INLINE happyOutTok #-}
 
 happyActOffsets :: HappyAddr
-happyActOffsets = HappyA# "\xee\x00\xee\x00\xed\x00\xeb\x00\xe8\x00\xe8\x00\x00\x00\x0d\x00\xa0\x00\x15\x00\x68\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x00\x00\x00\x00\x00\xe7\x00\xe5\x00\x00\x00\xe6\x00\x9d\x00\xe3\x00\x9b\x00\xff\xff\x00\x00\x00\x00\x00\x00\x99\x00\x00\x00\xe3\x00\x15\x00\x05\x00\xa4\x00\x15\x00\x00\x00\x00\x00\xef\xff\xef\xff\xef\xff\x62\x00\xe3\x00\xe3\x00\xe4\x00\x1f\x00\x00\x00\x00\x00\x00\x00\xe2\x00\xe2\x00\x00\x00\xa0\x00\xe2\x00\x37\x00\xe1\x00\xe0\x00\xdf\x00\xde\x00\xde\x00\xdd\x00\xdc\x00\xdb\x00\xd9\x00\xd8\x00\xd3\x00\xda\x00\xd1\x00\xd7\x00\x00\x00\xd6\x00\x00\x00\x15\x00\x00\x00\xd0\x00\x00\x00\x15\x00\x00\x00\xd5\x00\xd4\x00\xd2\x00\xcf\x00\x00\x00\x00\x00\xce\x00\xc9\x00\xcc\x00\xcd\x00\x15\x00\x00\x00\x00\x00\x00\x00\x98\x00\x00\x00\xbd\x00\x00\x00\x00\x00\x15\x00\x15\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x65\x00\x7d\x00\x10\x00\x00\x00\xc8\x00\xc7\x00\x00\x00\x24\x00\x00\x00\xcb\x00\x00\x00\x06\x00\xca\x00\x08\x00\x0d\x00\x00\x00\x00\x00\x98\x00\xa2\x00\xa1\x00\x00\x00\x00\x00\xc5\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3d\x00\x00\x00\xc3\x00\x00\x00\x00\x00"#
+happyActOffsets = HappyA# "\x12\x01\x12\x01\x13\x01\x0b\x01\x3a\x00\x30\x00\x00\x00\x25\x00\x60\x00\x1e\x00\x55\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x09\x01\x0c\x01\x00\x00\x06\x01\x64\x00\x08\x01\x9d\x00\xff\xff\x00\x00\x00\x00\x00\x00\xbb\x00\x00\x00\x08\x01\x1e\x00\x06\x00\x0a\x01\x1e\x00\x00\x00\x00\x00\xb5\x00\x2b\x00\x2a\x00\xb2\x00\x05\x01\x05\x01\x07\x01\x4e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x01\x00\x00\x00\x00\x04\x01\x00\x00\x60\x00\x04\x01\x38\x00\x03\x01\x02\x01\x01\x01\xfb\x00\x00\x01\xff\x00\xfe\x00\xfd\x00\xfa\x00\xfc\x00\xf9\x00\xf8\x00\xf5\x00\xf6\x00\xf4\x00\xf3\x00\x00\x00\xef\x00\xf7\x00\x00\x00\xf2\x00\x1e\x00\x00\x00\xec\x00\x00\x00\x1e\x00\x00\x00\xf1\x00\xf0\x00\xed\x00\xee\x00\x00\x00\xea\x00\xeb\x00\xba\x00\xe9\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x23\x00\x00\x00\xe7\x00\x00\x00\x00\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x44\x00\xab\x00\x0b\x00\x00\x00\xe5\x00\xe4\x00\xe3\x00\xe2\x00\x00\x00\x29\x00\x00\x00\xe8\x00\x00\x00\x07\x00\xe6\x00\x28\x00\x00\x00\x25\x00\x00\x00\x00\x00\x00\x00\x23\x00\xb9\x00\x80\x00\x00\x00\x00\x00\xe1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x27\x00\x00\x00\xdc\x00\x00\x00\x00\x00"#
 
 happyGotoOffsets :: HappyAddr
-happyGotoOffsets = HappyA# "\xb5\x00\xc6\x00\xc4\x00\xc2\x00\xac\x00\x45\x00\xfa\xff\x83\x00\x8f\x00\x69\x00\x63\x00\x91\x00\xb8\x00\xb6\x00\xb4\x00\xb1\x00\x49\x00\xb0\x00\xad\x00\x8b\x00\x00\x00\x00\x00\x00\x00\xc1\x00\x00\x00\xc1\x00\x7e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x44\x00\x35\x00\x32\x00\x30\x00\x00\x00\x00\x00\xbe\x00\x02\x00\x90\x00\xb9\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x8a\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xbb\x00\x00\x00\x00\x00\x00\x00\xaf\x00\x00\x00\x00\x00\xb7\x00\x00\x00\x9f\x00\x00\x00\xf9\xff\x66\x00\x00\x00\x96\x00\x7f\x00\x60\x00\x93\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x2d\x00\x00\x00\x00\x00\x8e\x00\x88\x00\x00\x00\x7c\x00\x00\x00\x00\x00\x58\x00\x52\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7c\x00\x00\x00\x7e\x00\x00\x00\x00\x00\x00\x00\x5e\x00\x90\x00\x4b\x00\x00\x00\x4c\x00\x03\x00\x00\x00\x02\x00\x77\x00\x00\x00\x00\x00\x86\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x46\x00\x00\x00\x00\x00\x00\x00\x00\x00"#
+happyGotoOffsets = HappyA# "\x8c\x00\xdf\x00\xe0\x00\xde\x00\xc9\x00\x31\x00\x74\x00\xad\x00\xbe\x00\x98\x00\x04\x00\x53\x00\xdb\x00\xd2\x00\xd0\x00\xce\x00\x63\x00\xcb\x00\xc8\x00\xac\x00\x00\x00\x00\x00\x00\x00\xdd\x00\x00\x00\xdd\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x51\x00\x4d\x00\xda\x00\x49\x00\x00\x00\x00\x00\xd9\x00\x03\x00\xa1\x00\xd8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb1\x00\x00\x00\xd7\x00\x00\x00\x00\x00\xd6\x00\x00\x00\x00\x00\xd5\x00\x00\x00\xd4\x00\x00\x00\x00\x00\x00\x00\xd3\x00\x00\x00\x00\x00\xcf\x00\x00\x00\xc2\x00\x00\x00\x00\x00\x6a\x00\x00\x00\x89\x00\x00\x00\xc5\x00\xbf\x00\x85\x00\xb3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x94\x00\x7e\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x81\x00\x72\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x9a\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x6c\x00\x00\x00\x68\x00\x46\x00\xa1\x00\x17\x00\x00\x00\xf7\xff\x08\x00\x00\x00\x03\x00\x00\x00\x9c\x00\x00\x00\x00\x00\x00\x00\x58\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00"#
 
 happyDefActions :: HappyAddr
-happyDefActions = HappyA# "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc8\xff\x00\x00\x00\x00\x00\x00\x00\x00\xc1\xff\xce\xff\xcc\xff\xca\xff\xc8\xff\xc6\xff\xc3\xff\xc1\xff\xc1\xff\x00\x00\xeb\xff\xbe\xff\x00\x00\x00\x00\x00\x00\x00\x00\xd1\xff\xd7\xff\xd6\xff\xc5\xff\xd9\xff\x00\x00\xc6\xff\xc6\xff\x00\x00\xc6\xff\xea\xff\xe9\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xde\xff\xdd\xff\xdf\xff\x00\x00\x00\x00\xe0\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcc\xff\x00\x00\xc8\xff\x00\x00\xc7\xff\x00\x00\xc3\xff\x00\x00\xc1\xff\x00\x00\x00\x00\x00\x00\x00\x00\xd8\xff\xd5\xff\x00\x00\xd1\xff\xd6\xff\x00\x00\xc6\xff\xc2\xff\xc0\xff\xc1\xff\xbf\xff\xbd\xff\xcf\xff\xc4\xff\xda\xff\x00\x00\x00\x00\xdc\xff\xd3\xff\xc9\xff\xcb\xff\xcd\xff\x00\x00\x00\x00\x00\x00\xe2\xff\xe3\xff\x00\x00\xca\xff\x00\x00\xc8\xff\x00\x00\xce\xff\x00\x00\x00\x00\x00\x00\x00\x00\xe1\xff\xdb\xff\xbf\xff\x00\x00\x00\x00\xd4\xff\xd2\xff\x00\x00\xe4\xff\xe5\xff\xe6\xff\xe7\xff\x00\x00\xe8\xff\x00\x00\xd0\xff"#
+happyDefActions = HappyA# "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc4\xff\x00\x00\x00\x00\x00\x00\x00\x00\xbd\xff\xca\xff\xc8\xff\xc6\xff\xc4\xff\xc2\xff\xbf\xff\xbd\xff\xbd\xff\x00\x00\xeb\xff\xba\xff\x00\x00\x00\x00\x00\x00\x00\x00\xcd\xff\xd2\xff\xd1\xff\xc1\xff\xd4\xff\x00\x00\xc2\xff\xc2\xff\x00\x00\xc2\xff\xea\xff\xe8\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdb\xff\xda\xff\xd9\xff\xdc\xff\x00\x00\xd8\xff\xe9\xff\x00\x00\xdd\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc8\xff\x00\x00\x00\x00\xc4\xff\x00\x00\x00\x00\xc3\xff\x00\x00\xbf\xff\x00\x00\xbd\xff\x00\x00\x00\x00\x00\x00\x00\x00\xd3\xff\x00\x00\xcd\xff\xc1\xff\x00\x00\xc2\xff\xbe\xff\xbc\xff\xbd\xff\xbb\xff\xb9\xff\xcb\xff\xc0\xff\xd5\xff\x00\x00\x00\x00\xd7\xff\xd0\xff\xc5\xff\xc7\xff\xc9\xff\x00\x00\x00\x00\x00\x00\xdf\xff\xe1\xff\x00\x00\x00\x00\x00\x00\xc6\xff\x00\x00\xc4\xff\x00\x00\xca\xff\x00\x00\x00\x00\x00\x00\xe2\xff\x00\x00\xe0\xff\xde\xff\xd6\xff\xbb\xff\x00\x00\x00\x00\xce\xff\xcf\xff\x00\x00\xe3\xff\xe4\xff\xe5\xff\xe6\xff\x00\x00\xe7\xff\x00\x00\xcc\xff"#
 
 happyCheck :: HappyAddr
-happyCheck = HappyA# "\xff\xff\x02\x00\x09\x00\x09\x00\x02\x00\x02\x00\x17\x00\x02\x00\x19\x00\x03\x00\x08\x00\x12\x00\x12\x00\x05\x00\x09\x00\x02\x00\x0b\x00\x0c\x00\x02\x00\x03\x00\x15\x00\x16\x00\x17\x00\x02\x00\x19\x00\x14\x00\x15\x00\x16\x00\x17\x00\x17\x00\x09\x00\x17\x00\x0b\x00\x0c\x00\x15\x00\x16\x00\x17\x00\x15\x00\x16\x00\x17\x00\x09\x00\x05\x00\x15\x00\x16\x00\x17\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x19\x00\x0c\x00\x0d\x00\x17\x00\x0c\x00\x0d\x00\x01\x00\x08\x00\x13\x00\x0c\x00\x0d\x00\x13\x00\x00\x00\x01\x00\x02\x00\x02\x00\x13\x00\x00\x00\x01\x00\x02\x00\x06\x00\x08\x00\x17\x00\x12\x00\x0c\x00\x0d\x00\x00\x00\x01\x00\x02\x00\x0c\x00\x0d\x00\x13\x00\x00\x00\x01\x00\x02\x00\x0f\x00\x13\x00\x12\x00\x0c\x00\x0d\x00\x00\x00\x01\x00\x02\x00\x00\x00\x0c\x00\x0d\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x0c\x00\x0d\x00\x09\x00\x11\x00\x0d\x00\x09\x00\x0c\x00\x0d\x00\x12\x00\x0c\x00\x0d\x00\x00\x00\x01\x00\x02\x00\x15\x00\x19\x00\x00\x00\x15\x00\x00\x00\x01\x00\x02\x00\x0a\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x09\x00\x0a\x00\x0a\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x0a\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x02\x00\x14\x00\x0e\x00\x0b\x00\x0e\x00\x07\x00\x02\x00\x0e\x00\x0b\x00\x15\x00\x16\x00\x15\x00\x16\x00\x0e\x00\x15\x00\x16\x00\x09\x00\x15\x00\x03\x00\x03\x00\x15\x00\x0f\x00\x15\x00\x10\x00\x09\x00\x09\x00\x0f\x00\x15\x00\x02\x00\x10\x00\x15\x00\x02\x00\x15\x00\x07\x00\x19\x00\x15\x00\x16\x00\x17\x00\x03\x00\x04\x00\x16\x00\x17\x00\x05\x00\x02\x00\x02\x00\x06\x00\x02\x00\x00\x00\x15\x00\x12\x00\x14\x00\x11\x00\x10\x00\x0f\x00\x06\x00\x05\x00\x04\x00\x01\x00\x01\x00\x0a\x00\x07\x00\x0a\x00\x03\x00\x09\x00\x15\x00\x01\x00\x08\x00\x01\x00\x01\x00\x0e\x00\x0a\x00\x02\x00\x04\x00\x01\x00\x0d\x00\xff\xff\xff\xff\x04\x00\xff\xff\xff\xff\x11\x00\xff\xff\xff\xff\x06\x00\xff\xff\x17\x00\x07\x00\xff\xff\xff\xff\xff\xff\x19\x00\xff\xff\xff\xff\x17\x00\xff\xff\xff\xff\x19\x00\xff\xff\x17\x00\x19\x00\x10\x00\x19\x00\x14\x00\x19\x00\x15\x00\x19\x00\x19\x00\x12\x00\x11\x00\x17\x00\x19\x00\x13\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"#
+happyCheck = HappyA# "\xff\xff\x02\x00\x00\x00\x01\x00\x00\x00\x03\x00\x03\x00\x10\x00\x02\x00\x0a\x00\x03\x00\x03\x00\x09\x00\x02\x00\x03\x00\x0d\x00\x0e\x00\x0b\x00\x0e\x00\x0d\x00\x0e\x00\x0a\x00\x14\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x07\x00\x1d\x00\x17\x00\x18\x00\x19\x00\x02\x00\x1b\x00\x1b\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x02\x00\x01\x00\x0b\x00\x13\x00\x0d\x00\x0e\x00\x05\x00\x05\x00\x0a\x00\x08\x00\x08\x00\x08\x00\x08\x00\x03\x00\x12\x00\x18\x00\x19\x00\x08\x00\x1b\x00\x09\x00\x18\x00\x15\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x09\x00\x08\x00\x1b\x00\x1b\x00\x1b\x00\x1b\x00\x1d\x00\x1d\x00\x00\x00\x01\x00\x1b\x00\x03\x00\x00\x00\x01\x00\x0b\x00\x03\x00\x00\x00\x01\x00\x1b\x00\x03\x00\x1b\x00\x0d\x00\x0e\x00\x12\x00\x0b\x00\x0d\x00\x0e\x00\x18\x00\x14\x00\x0d\x00\x0e\x00\x0b\x00\x14\x00\x0f\x00\x00\x00\x01\x00\x14\x00\x03\x00\x0f\x00\x00\x00\x16\x00\x0a\x00\x1d\x00\x00\x00\x18\x00\x16\x00\x17\x00\x0d\x00\x0e\x00\x00\x00\x01\x00\x0a\x00\x03\x00\x12\x00\x14\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x18\x00\x13\x00\x0a\x00\x0d\x00\x0e\x00\x00\x00\x01\x00\x03\x00\x03\x00\x00\x00\x01\x00\x13\x00\x03\x00\x00\x00\x01\x00\x0b\x00\x03\x00\x0f\x00\x0d\x00\x0e\x00\x04\x00\x05\x00\x0d\x00\x0e\x00\x16\x00\x17\x00\x0d\x00\x0e\x00\x00\x00\x01\x00\x00\x00\x03\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x01\x00\x02\x00\x03\x00\x03\x00\x0d\x00\x0e\x00\x0b\x00\x0c\x00\x08\x00\x16\x00\x0b\x00\x0c\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x01\x00\x02\x00\x03\x00\x18\x00\x0b\x00\x0c\x00\x0b\x00\x0c\x00\x1d\x00\x0f\x00\x03\x00\x0c\x00\x00\x00\x01\x00\x02\x00\x03\x00\x16\x00\x17\x00\x0b\x00\x0b\x00\x0b\x00\x15\x00\x03\x00\x16\x00\x0c\x00\x11\x00\x03\x00\x13\x00\x13\x00\x1d\x00\x1b\x00\x08\x00\x1d\x00\x11\x00\x15\x00\x06\x00\x03\x00\x03\x00\x03\x00\x03\x00\x03\x00\x01\x00\x03\x00\x00\x00\x16\x00\x07\x00\x15\x00\x13\x00\x12\x00\x11\x00\x05\x00\x07\x00\x06\x00\x01\x00\x0c\x00\x01\x00\x07\x00\x10\x00\x03\x00\x0c\x00\x01\x00\xff\xff\x0b\x00\x01\x00\x01\x00\x04\x00\xff\xff\x02\x00\x0c\x00\x01\x00\xff\xff\x07\x00\x18\x00\x10\x00\x18\x00\x0f\x00\x07\x00\x18\x00\x04\x00\x06\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x1b\x00\x14\x00\xff\xff\x07\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x1d\x00\x1b\x00\xff\xff\xff\xff\x1d\x00\x1d\x00\x1b\x00\x13\x00\x1b\x00\x1d\x00\x1b\x00\x1d\x00\x17\x00\x1d\x00\x15\x00\x1d\x00\x1d\x00\x19\x00\x18\x00\x1d\x00\x1d\x00\x14\x00\x16\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"#
 
 happyTable :: HappyAddr
-happyTable = HappyA# "\x00\x00\x36\x00\x6e\x00\x36\x00\x38\x00\x4a\x00\x27\x00\x22\x00\xff\xff\x84\x00\x51\x00\x37\x00\x37\x00\x82\x00\x23\x00\x36\x00\x24\x00\x25\x00\x36\x00\x79\x00\x16\x00\x26\x00\x27\x00\x22\x00\xff\xff\x4f\x00\x16\x00\x26\x00\x27\x00\x27\x00\x23\x00\x27\x00\x24\x00\x25\x00\x16\x00\x26\x00\x27\x00\x16\x00\x26\x00\x27\x00\x4e\x00\x76\x00\x16\x00\x26\x00\x27\x00\x1b\x00\x1c\x00\x1d\x00\x1b\x00\x1c\x00\x1d\x00\x53\x00\x54\x00\x1b\x00\x1c\x00\x1d\x00\xff\xff\x1e\x00\x1f\x00\x27\x00\x1e\x00\x1f\x00\x86\x00\x4c\x00\x60\x00\x1e\x00\x1f\x00\x52\x00\x56\x00\x1c\x00\x57\x00\x38\x00\x55\x00\x1b\x00\x1c\x00\x1d\x00\x4f\x00\x39\x00\x27\x00\x3e\x00\x1e\x00\x1f\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x58\x00\x1b\x00\x1c\x00\x1d\x00\x84\x00\x20\x00\x74\x00\x7b\x00\x1f\x00\x1b\x00\x1c\x00\x1d\x00\x1b\x00\x7c\x00\x1f\x00\x1b\x00\x1c\x00\x1d\x00\x1b\x00\x1c\x00\x1d\x00\x6a\x00\x1f\x00\x7b\x00\x76\x00\x2c\x00\x2e\x00\x6d\x00\x1f\x00\x3e\x00\x2e\x00\x1f\x00\x2f\x00\x30\x00\x31\x00\x16\x00\xff\xff\x5b\x00\x16\x00\x2f\x00\x30\x00\x31\x00\x80\x00\x34\x00\x2f\x00\x30\x00\x31\x00\x4e\x00\x7a\x00\x5a\x00\x34\x00\x2f\x00\x30\x00\x31\x00\x33\x00\x34\x00\x2f\x00\x30\x00\x31\x00\x3a\x00\x6b\x00\x16\x00\x4c\x00\x16\x00\x50\x00\x6c\x00\x16\x00\x32\x00\x17\x00\x7f\x00\x17\x00\x5e\x00\x2b\x00\x17\x00\x18\x00\x4e\x00\x5f\x00\x7e\x00\x7f\x00\x17\x00\xc1\xff\x69\x00\x5a\x00\x4e\x00\x4e\x00\x5d\x00\xc1\xff\x3a\x00\x70\x00\x16\x00\x45\x00\x16\x00\x3b\x00\xff\xff\x16\x00\x26\x00\x27\x00\x42\x00\x43\x00\x26\x00\x27\x00\x72\x00\x47\x00\x4a\x00\x4f\x00\x4a\x00\x5b\x00\x19\x00\x27\x00\x1a\x00\x28\x00\x29\x00\x2a\x00\x3c\x00\x3e\x00\x40\x00\x83\x00\x74\x00\x88\x00\x78\x00\x87\x00\x62\x00\x4e\x00\x16\x00\x67\x00\x63\x00\x68\x00\x69\x00\x64\x00\x65\x00\x72\x00\x70\x00\x45\x00\x66\x00\x00\x00\x00\x00\x47\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x49\x00\x00\x00\x27\x00\x4a\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x27\x00\x00\x00\x00\x00\xff\xff\x00\x00\x27\x00\xff\xff\x5e\x00\xff\xff\x4f\x00\xff\xff\x16\x00\xff\xff\xff\xff\x3e\x00\x40\x00\x27\x00\xbf\xff\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"#
+happyTable = HappyA# "\x00\x00\x39\x00\x1b\x00\x1c\x00\x1b\x00\x1d\x00\x3b\x00\x8e\x00\x22\x00\x35\x00\x8e\x00\x51\x00\x58\x00\x39\x00\x83\x00\x1e\x00\x1f\x00\x23\x00\x2c\x00\x24\x00\x25\x00\x35\x00\x66\x00\x16\x00\x26\x00\x36\x00\x27\x00\x56\x00\xff\xff\x56\x00\x16\x00\x26\x00\x22\x00\x27\x00\x27\x00\x16\x00\x26\x00\x36\x00\x27\x00\x39\x00\x90\x00\x23\x00\x7c\x00\x24\x00\x25\x00\x8c\x00\x7e\x00\x35\x00\x3e\x00\x41\x00\x41\x00\x3e\x00\x3b\x00\xbd\xff\x16\x00\x26\x00\x3e\x00\x27\x00\x3c\x00\xbd\xff\x43\x00\x16\x00\x26\x00\x36\x00\x27\x00\x53\x00\x41\x00\x27\x00\x27\x00\x27\x00\x27\x00\xff\xff\xff\xff\x1b\x00\x1c\x00\x27\x00\x1d\x00\x1b\x00\x1c\x00\x85\x00\x1d\x00\x5c\x00\x1c\x00\x27\x00\x1d\x00\x27\x00\x1e\x00\x1f\x00\x7e\x00\x55\x00\x1e\x00\x1f\x00\x16\x00\x59\x00\x5d\x00\x1f\x00\x2e\x00\x5b\x00\x2b\x00\x1b\x00\x1c\x00\x5e\x00\x1d\x00\x16\x00\x7f\x00\x17\x00\x35\x00\xff\xff\x81\x00\x16\x00\x17\x00\x89\x00\x1e\x00\x1f\x00\x1b\x00\x1c\x00\x75\x00\x1d\x00\x63\x00\x20\x00\x16\x00\x26\x00\x36\x00\x27\x00\x16\x00\x3a\x00\x39\x00\x85\x00\x1f\x00\x1b\x00\x1c\x00\x88\x00\x1d\x00\x1b\x00\x1c\x00\x3a\x00\x1d\x00\x1b\x00\x1c\x00\x55\x00\x1d\x00\x16\x00\x86\x00\x1f\x00\x47\x00\x48\x00\x70\x00\x1f\x00\x17\x00\x64\x00\x73\x00\x1f\x00\x1b\x00\x1c\x00\x61\x00\x1d\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x3e\x00\x2e\x00\x1f\x00\x8a\x00\x37\x00\x57\x00\x65\x00\x60\x00\x37\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x16\x00\x55\x00\x84\x00\x36\x00\x37\x00\xff\xff\x16\x00\x89\x00\x53\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x17\x00\x18\x00\x55\x00\x55\x00\x55\x00\x43\x00\x72\x00\x6f\x00\x33\x00\x69\x00\x3e\x00\x60\x00\x60\x00\xff\xff\x27\x00\x3f\x00\xff\xff\x78\x00\x71\x00\x7a\x00\x4a\x00\x4c\x00\x4d\x00\x4f\x00\x51\x00\x5a\x00\x51\x00\x61\x00\x19\x00\x56\x00\x1a\x00\x27\x00\x28\x00\x29\x00\x45\x00\x41\x00\x43\x00\x8d\x00\x92\x00\x7c\x00\x81\x00\x2a\x00\x68\x00\x91\x00\x6d\x00\x00\x00\x55\x00\x6e\x00\x6f\x00\x78\x00\x00\x00\x7a\x00\x6b\x00\x4a\x00\x00\x00\x75\x00\x16\x00\x6a\x00\x16\x00\x6c\x00\x77\x00\x16\x00\x4c\x00\x4f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x27\x00\x45\x00\x00\x00\x51\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x27\x00\x00\x00\x00\x00\xff\xff\xff\xff\x27\x00\x64\x00\x27\x00\xff\xff\x27\x00\xff\xff\x56\x00\xff\xff\x43\x00\xff\xff\xff\xff\x26\x00\x16\x00\xff\xff\xbb\xff\x45\x00\x47\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"#
 
-happyReduceArr = array (20, 66) [
+happyReduceArr = array (20, 70) [
 	(20 , happyReduce_20),
 	(21 , happyReduce_21),
 	(22 , happyReduce_22),
@@ -221,11 +227,15 @@ happyReduceArr = array (20, 66) [
 	(63 , happyReduce_63),
 	(64 , happyReduce_64),
 	(65 , happyReduce_65),
-	(66 , happyReduce_66)
+	(66 , happyReduce_66),
+	(67 , happyReduce_67),
+	(68 , happyReduce_68),
+	(69 , happyReduce_69),
+	(70 , happyReduce_70)
 	]
 
-happy_n_terms = 26 :: Int
-happy_n_nonterms = 23 :: Int
+happy_n_terms = 30 :: Int
+happy_n_nonterms = 24 :: Int
 
 happyReduce_20 = happySpecReduce_1 0# happyReduction_20
 happyReduction_20 happy_x_1
@@ -243,249 +253,285 @@ happyReduction_21 happy_x_1
 
 happyReduce_22 = happySpecReduce_1 2# happyReduction_22
 happyReduction_22 happy_x_1
-	 =  case happyOutTok happy_x_1 of { (PT _ (T_CId happy_var_1)) -> 
+	 =  case happyOutTok happy_x_1 of { (PT _ (TD happy_var_1)) -> 
 	happyIn25
+		 ((read happy_var_1) :: Double
+	)}
+
+happyReduce_23 = happySpecReduce_1 3# happyReduction_23
+happyReduction_23 happy_x_1
+	 =  case happyOutTok happy_x_1 of { (PT _ (T_CId happy_var_1)) -> 
+	happyIn26
 		 (CId (happy_var_1)
 	)}
 
-happyReduce_23 = happyReduce 6# 3# happyReduction_23
-happyReduction_23 (happy_x_6 `HappyStk`
+happyReduce_24 = happyReduce 6# 4# happyReduction_24
+happyReduction_24 (happy_x_6 `HappyStk`
 	happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut27 happy_x_1 of { happy_var_1 -> 
-	case happyOut28 happy_x_3 of { happy_var_3 -> 
-	case happyOut38 happy_x_5 of { happy_var_5 -> 
-	happyIn26
+	 = case happyOut28 happy_x_1 of { happy_var_1 -> 
+	case happyOut29 happy_x_3 of { happy_var_3 -> 
+	case happyOut39 happy_x_5 of { happy_var_5 -> 
+	happyIn27
 		 (Grm happy_var_1 happy_var_3 (reverse happy_var_5)
 	) `HappyStk` happyRest}}}
 
-happyReduce_24 = happyReduce 5# 4# happyReduction_24
-happyReduction_24 (happy_x_5 `HappyStk`
+happyReduce_25 = happyReduce 5# 5# happyReduction_25
+happyReduction_25 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut25 happy_x_2 of { happy_var_2 -> 
-	case happyOut41 happy_x_4 of { happy_var_4 -> 
-	happyIn27
+	 = case happyOut26 happy_x_2 of { happy_var_2 -> 
+	case happyOut42 happy_x_4 of { happy_var_4 -> 
+	happyIn28
 		 (Hdr happy_var_2 (reverse happy_var_4)
 	) `HappyStk` happyRest}}
 
-happyReduce_25 = happyReduce 5# 5# happyReduction_25
-happyReduction_25 (happy_x_5 `HappyStk`
+happyReduce_26 = happyReduce 5# 6# happyReduction_26
+happyReduction_26 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut39 happy_x_3 of { happy_var_3 -> 
-	happyIn28
+	 = case happyOut40 happy_x_3 of { happy_var_3 -> 
+	happyIn29
 		 (Abs (reverse happy_var_3)
 	) `HappyStk` happyRest}
 
-happyReduce_26 = happyReduce 5# 6# happyReduction_26
-happyReduction_26 (happy_x_5 `HappyStk`
+happyReduce_27 = happyReduce 5# 7# happyReduction_27
+happyReduction_27 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut25 happy_x_2 of { happy_var_2 -> 
-	case happyOut40 happy_x_4 of { happy_var_4 -> 
-	happyIn29
+	 = case happyOut26 happy_x_2 of { happy_var_2 -> 
+	case happyOut41 happy_x_4 of { happy_var_4 -> 
+	happyIn30
 		 (Cnc happy_var_2 (reverse happy_var_4)
 	) `HappyStk` happyRest}}
 
-happyReduce_27 = happyReduce 5# 7# happyReduction_27
-happyReduction_27 (happy_x_5 `HappyStk`
+happyReduce_28 = happyReduce 5# 8# happyReduction_28
+happyReduction_28 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut25 happy_x_1 of { happy_var_1 -> 
-	case happyOut32 happy_x_3 of { happy_var_3 -> 
-	case happyOut33 happy_x_5 of { happy_var_5 -> 
-	happyIn30
+	 = case happyOut26 happy_x_1 of { happy_var_1 -> 
+	case happyOut33 happy_x_3 of { happy_var_3 -> 
+	case happyOut34 happy_x_5 of { happy_var_5 -> 
+	happyIn31
 		 (Fun happy_var_1 happy_var_3 happy_var_5
 	) `HappyStk` happyRest}}}
 
-happyReduce_28 = happySpecReduce_3 8# happyReduction_28
-happyReduction_28 happy_x_3
+happyReduce_29 = happyReduce 4# 8# happyReduction_29
+happyReduction_29 (happy_x_4 `HappyStk`
+	happy_x_3 `HappyStk`
+	happy_x_2 `HappyStk`
+	happy_x_1 `HappyStk`
+	happyRest)
+	 = case happyOut26 happy_x_2 of { happy_var_2 -> 
+	case happyOut23 happy_x_4 of { happy_var_4 -> 
+	happyIn31
+		 (AFl happy_var_2 happy_var_4
+	) `HappyStk` happyRest}}
+
+happyReduce_30 = happySpecReduce_3 9# happyReduction_30
+happyReduction_30 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut25 happy_x_1 of { happy_var_1 -> 
-	case happyOut35 happy_x_3 of { happy_var_3 -> 
-	happyIn31
+	 =  case happyOut26 happy_x_1 of { happy_var_1 -> 
+	case happyOut36 happy_x_3 of { happy_var_3 -> 
+	happyIn32
 		 (Lin happy_var_1 happy_var_3
 	)}}
 
-happyReduce_29 = happySpecReduce_3 9# happyReduction_29
-happyReduction_29 happy_x_3
+happyReduce_31 = happyReduce 4# 9# happyReduction_31
+happyReduction_31 (happy_x_4 `HappyStk`
+	happy_x_3 `HappyStk`
+	happy_x_2 `HappyStk`
+	happy_x_1 `HappyStk`
+	happyRest)
+	 = case happyOut26 happy_x_2 of { happy_var_2 -> 
+	case happyOut23 happy_x_4 of { happy_var_4 -> 
+	happyIn32
+		 (CFl happy_var_2 happy_var_4
+	) `HappyStk` happyRest}}
+
+happyReduce_32 = happySpecReduce_3 10# happyReduction_32
+happyReduction_32 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut41 happy_x_1 of { happy_var_1 -> 
-	case happyOut25 happy_x_3 of { happy_var_3 -> 
-	happyIn32
+	 =  case happyOut42 happy_x_1 of { happy_var_1 -> 
+	case happyOut26 happy_x_3 of { happy_var_3 -> 
+	happyIn33
 		 (Typ (reverse happy_var_1) happy_var_3
 	)}}
 
-happyReduce_30 = happyReduce 4# 10# happyReduction_30
-happyReduction_30 (happy_x_4 `HappyStk`
+happyReduce_33 = happyReduce 4# 11# happyReduction_33
+happyReduction_33 (happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut34 happy_x_2 of { happy_var_2 -> 
-	case happyOut43 happy_x_3 of { happy_var_3 -> 
-	happyIn33
+	 = case happyOut35 happy_x_2 of { happy_var_2 -> 
+	case happyOut44 happy_x_3 of { happy_var_3 -> 
+	happyIn34
 		 (Tr happy_var_2 (reverse happy_var_3)
 	) `HappyStk` happyRest}}
 
-happyReduce_31 = happySpecReduce_1 10# happyReduction_31
-happyReduction_31 happy_x_1
-	 =  case happyOut34 happy_x_1 of { happy_var_1 -> 
-	happyIn33
+happyReduce_34 = happySpecReduce_1 11# happyReduction_34
+happyReduction_34 happy_x_1
+	 =  case happyOut35 happy_x_1 of { happy_var_1 -> 
+	happyIn34
 		 (trA_ happy_var_1
 	)}
 
-happyReduce_32 = happySpecReduce_1 11# happyReduction_32
-happyReduction_32 happy_x_1
-	 =  case happyOut25 happy_x_1 of { happy_var_1 -> 
-	happyIn34
+happyReduce_35 = happySpecReduce_1 12# happyReduction_35
+happyReduction_35 happy_x_1
+	 =  case happyOut26 happy_x_1 of { happy_var_1 -> 
+	happyIn35
 		 (AC happy_var_1
 	)}
 
-happyReduce_33 = happySpecReduce_1 11# happyReduction_33
-happyReduction_33 happy_x_1
+happyReduce_36 = happySpecReduce_1 12# happyReduction_36
+happyReduction_36 happy_x_1
 	 =  case happyOut23 happy_x_1 of { happy_var_1 -> 
-	happyIn34
+	happyIn35
 		 (AS happy_var_1
 	)}
 
-happyReduce_34 = happySpecReduce_1 11# happyReduction_34
-happyReduction_34 happy_x_1
+happyReduce_37 = happySpecReduce_1 12# happyReduction_37
+happyReduction_37 happy_x_1
 	 =  case happyOut24 happy_x_1 of { happy_var_1 -> 
-	happyIn34
+	happyIn35
 		 (AI happy_var_1
 	)}
 
-happyReduce_35 = happySpecReduce_3 12# happyReduction_35
-happyReduction_35 happy_x_3
+happyReduce_38 = happySpecReduce_1 12# happyReduction_38
+happyReduction_38 happy_x_1
+	 =  case happyOut25 happy_x_1 of { happy_var_1 -> 
+	happyIn35
+		 (AF happy_var_1
+	)}
+
+happyReduce_39 = happySpecReduce_1 12# happyReduction_39
+happyReduction_39 happy_x_1
+	 =  happyIn35
+		 (AM
+	)
+
+happyReduce_40 = happySpecReduce_3 13# happyReduction_40
+happyReduction_40 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut42 happy_x_2 of { happy_var_2 -> 
-	happyIn35
+	 =  case happyOut43 happy_x_2 of { happy_var_2 -> 
+	happyIn36
 		 (R happy_var_2
 	)}
 
-happyReduce_36 = happyReduce 4# 12# happyReduction_36
-happyReduction_36 (happy_x_4 `HappyStk`
+happyReduce_41 = happyReduce 4# 13# happyReduction_41
+happyReduction_41 (happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut35 happy_x_1 of { happy_var_1 -> 
-	case happyOut35 happy_x_3 of { happy_var_3 -> 
-	happyIn35
+	 = case happyOut36 happy_x_1 of { happy_var_1 -> 
+	case happyOut36 happy_x_3 of { happy_var_3 -> 
+	happyIn36
 		 (P happy_var_1 happy_var_3
 	) `HappyStk` happyRest}}
 
-happyReduce_37 = happySpecReduce_3 12# happyReduction_37
-happyReduction_37 happy_x_3
+happyReduce_42 = happySpecReduce_3 13# happyReduction_42
+happyReduction_42 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut42 happy_x_2 of { happy_var_2 -> 
-	happyIn35
+	 =  case happyOut43 happy_x_2 of { happy_var_2 -> 
+	happyIn36
 		 (S happy_var_2
 	)}
 
-happyReduce_38 = happySpecReduce_1 12# happyReduction_38
-happyReduction_38 happy_x_1
-	 =  case happyOut36 happy_x_1 of { happy_var_1 -> 
-	happyIn35
+happyReduce_43 = happySpecReduce_1 13# happyReduction_43
+happyReduction_43 happy_x_1
+	 =  case happyOut37 happy_x_1 of { happy_var_1 -> 
+	happyIn36
 		 (K happy_var_1
 	)}
 
-happyReduce_39 = happySpecReduce_2 12# happyReduction_39
-happyReduction_39 happy_x_2
+happyReduce_44 = happySpecReduce_2 13# happyReduction_44
+happyReduction_44 happy_x_2
 	happy_x_1
 	 =  case happyOut24 happy_x_2 of { happy_var_2 -> 
-	happyIn35
+	happyIn36
 		 (V happy_var_2
 	)}
 
-happyReduce_40 = happySpecReduce_1 12# happyReduction_40
-happyReduction_40 happy_x_1
+happyReduce_45 = happySpecReduce_1 13# happyReduction_45
+happyReduction_45 happy_x_1
 	 =  case happyOut24 happy_x_1 of { happy_var_1 -> 
-	happyIn35
+	happyIn36
 		 (C happy_var_1
 	)}
 
-happyReduce_41 = happySpecReduce_1 12# happyReduction_41
-happyReduction_41 happy_x_1
-	 =  case happyOut25 happy_x_1 of { happy_var_1 -> 
-	happyIn35
+happyReduce_46 = happySpecReduce_1 13# happyReduction_46
+happyReduction_46 happy_x_1
+	 =  case happyOut26 happy_x_1 of { happy_var_1 -> 
+	happyIn36
 		 (F happy_var_1
 	)}
 
-happyReduce_42 = happySpecReduce_2 12# happyReduction_42
-happyReduction_42 happy_x_2
+happyReduce_47 = happySpecReduce_3 13# happyReduction_47
+happyReduction_47 happy_x_3
+	happy_x_2
 	happy_x_1
-	 =  case happyOut25 happy_x_2 of { happy_var_2 -> 
-	happyIn35
-		 (L happy_var_2
+	 =  case happyOut43 happy_x_2 of { happy_var_2 -> 
+	happyIn36
+		 (FV happy_var_2
 	)}
 
-happyReduce_43 = happyReduce 5# 12# happyReduction_43
-happyReduction_43 (happy_x_5 `HappyStk`
+happyReduce_48 = happyReduce 5# 13# happyReduction_48
+happyReduction_48 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut25 happy_x_2 of { happy_var_2 -> 
-	case happyOut35 happy_x_4 of { happy_var_4 -> 
-	happyIn35
-		 (A happy_var_2 happy_var_4
+	 = case happyOut23 happy_x_2 of { happy_var_2 -> 
+	case happyOut36 happy_x_4 of { happy_var_4 -> 
+	happyIn36
+		 (W happy_var_2 happy_var_4
 	) `HappyStk` happyRest}}
 
-happyReduce_44 = happySpecReduce_3 12# happyReduction_44
-happyReduction_44 happy_x_3
-	happy_x_2
-	happy_x_1
-	 =  case happyOut42 happy_x_2 of { happy_var_2 -> 
-	happyIn35
-		 (FV happy_var_2
-	)}
-
-happyReduce_45 = happyReduce 5# 12# happyReduction_45
-happyReduction_45 (happy_x_5 `HappyStk`
+happyReduce_49 = happyReduce 5# 13# happyReduction_49
+happyReduction_49 (happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
 	happy_x_3 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut23 happy_x_2 of { happy_var_2 -> 
-	case happyOut35 happy_x_4 of { happy_var_4 -> 
-	happyIn35
-		 (W happy_var_2 happy_var_4
+	 = case happyOut36 happy_x_2 of { happy_var_2 -> 
+	case happyOut36 happy_x_4 of { happy_var_4 -> 
+	happyIn36
+		 (RP happy_var_2 happy_var_4
 	) `HappyStk` happyRest}}
 
-happyReduce_46 = happySpecReduce_1 13# happyReduction_46
-happyReduction_46 happy_x_1
+happyReduce_50 = happySpecReduce_1 14# happyReduction_50
+happyReduction_50 happy_x_1
 	 =  case happyOut23 happy_x_1 of { happy_var_1 -> 
-	happyIn36
+	happyIn37
 		 (KS happy_var_1
 	)}
 
-happyReduce_47 = happyReduce 7# 13# happyReduction_47
-happyReduction_47 (happy_x_7 `HappyStk`
+happyReduce_51 = happyReduce 7# 14# happyReduction_51
+happyReduction_51 (happy_x_7 `HappyStk`
 	happy_x_6 `HappyStk`
 	happy_x_5 `HappyStk`
 	happy_x_4 `HappyStk`
@@ -493,44 +539,29 @@ happyReduction_47 (happy_x_7 `HappyStk`
 	happy_x_2 `HappyStk`
 	happy_x_1 `HappyStk`
 	happyRest)
-	 = case happyOut44 happy_x_3 of { happy_var_3 -> 
-	case happyOut45 happy_x_5 of { happy_var_5 -> 
-	happyIn36
+	 = case happyOut45 happy_x_3 of { happy_var_3 -> 
+	case happyOut46 happy_x_5 of { happy_var_5 -> 
+	happyIn37
 		 (KP (reverse happy_var_3) happy_var_5
 	) `HappyStk` happyRest}}
 
-happyReduce_48 = happySpecReduce_3 14# happyReduction_48
-happyReduction_48 happy_x_3
-	happy_x_2
-	happy_x_1
-	 =  case happyOut44 happy_x_1 of { happy_var_1 -> 
-	case happyOut44 happy_x_3 of { happy_var_3 -> 
-	happyIn37
-		 (Var (reverse happy_var_1) (reverse happy_var_3)
-	)}}
-
-happyReduce_49 = happySpecReduce_0 15# happyReduction_49
-happyReduction_49  =  happyIn38
-		 ([]
-	)
-
-happyReduce_50 = happySpecReduce_3 15# happyReduction_50
-happyReduction_50 happy_x_3
+happyReduce_52 = happySpecReduce_3 15# happyReduction_52
+happyReduction_52 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut38 happy_x_1 of { happy_var_1 -> 
-	case happyOut29 happy_x_2 of { happy_var_2 -> 
+	 =  case happyOut45 happy_x_1 of { happy_var_1 -> 
+	case happyOut45 happy_x_3 of { happy_var_3 -> 
 	happyIn38
-		 (flip (:) happy_var_1 happy_var_2
+		 (Var (reverse happy_var_1) (reverse happy_var_3)
 	)}}
 
-happyReduce_51 = happySpecReduce_0 16# happyReduction_51
-happyReduction_51  =  happyIn39
+happyReduce_53 = happySpecReduce_0 16# happyReduction_53
+happyReduction_53  =  happyIn39
 		 ([]
 	)
 
-happyReduce_52 = happySpecReduce_3 16# happyReduction_52
-happyReduction_52 happy_x_3
+happyReduce_54 = happySpecReduce_3 16# happyReduction_54
+happyReduction_54 happy_x_3
 	happy_x_2
 	happy_x_1
 	 =  case happyOut39 happy_x_1 of { happy_var_1 -> 
@@ -539,13 +570,13 @@ happyReduction_52 happy_x_3
 		 (flip (:) happy_var_1 happy_var_2
 	)}}
 
-happyReduce_53 = happySpecReduce_0 17# happyReduction_53
-happyReduction_53  =  happyIn40
+happyReduce_55 = happySpecReduce_0 17# happyReduction_55
+happyReduction_55  =  happyIn40
 		 ([]
 	)
 
-happyReduce_54 = happySpecReduce_3 17# happyReduction_54
-happyReduction_54 happy_x_3
+happyReduce_56 = happySpecReduce_3 17# happyReduction_56
+happyReduction_56 happy_x_3
 	happy_x_2
 	happy_x_1
 	 =  case happyOut40 happy_x_1 of { happy_var_1 -> 
@@ -554,94 +585,109 @@ happyReduction_54 happy_x_3
 		 (flip (:) happy_var_1 happy_var_2
 	)}}
 
-happyReduce_55 = happySpecReduce_0 18# happyReduction_55
-happyReduction_55  =  happyIn41
+happyReduce_57 = happySpecReduce_0 18# happyReduction_57
+happyReduction_57  =  happyIn41
 		 ([]
 	)
 
-happyReduce_56 = happySpecReduce_2 18# happyReduction_56
-happyReduction_56 happy_x_2
+happyReduce_58 = happySpecReduce_3 18# happyReduction_58
+happyReduction_58 happy_x_3
+	happy_x_2
 	happy_x_1
 	 =  case happyOut41 happy_x_1 of { happy_var_1 -> 
-	case happyOut25 happy_x_2 of { happy_var_2 -> 
+	case happyOut32 happy_x_2 of { happy_var_2 -> 
 	happyIn41
 		 (flip (:) happy_var_1 happy_var_2
 	)}}
 
-happyReduce_57 = happySpecReduce_0 19# happyReduction_57
-happyReduction_57  =  happyIn42
+happyReduce_59 = happySpecReduce_0 19# happyReduction_59
+happyReduction_59  =  happyIn42
 		 ([]
 	)
 
-happyReduce_58 = happySpecReduce_1 19# happyReduction_58
-happyReduction_58 happy_x_1
-	 =  case happyOut35 happy_x_1 of { happy_var_1 -> 
+happyReduce_60 = happySpecReduce_2 19# happyReduction_60
+happyReduction_60 happy_x_2
+	happy_x_1
+	 =  case happyOut42 happy_x_1 of { happy_var_1 -> 
+	case happyOut26 happy_x_2 of { happy_var_2 -> 
 	happyIn42
+		 (flip (:) happy_var_1 happy_var_2
+	)}}
+
+happyReduce_61 = happySpecReduce_0 20# happyReduction_61
+happyReduction_61  =  happyIn43
+		 ([]
+	)
+
+happyReduce_62 = happySpecReduce_1 20# happyReduction_62
+happyReduction_62 happy_x_1
+	 =  case happyOut36 happy_x_1 of { happy_var_1 -> 
+	happyIn43
 		 ((:[]) happy_var_1
 	)}
 
-happyReduce_59 = happySpecReduce_3 19# happyReduction_59
-happyReduction_59 happy_x_3
+happyReduce_63 = happySpecReduce_3 20# happyReduction_63
+happyReduction_63 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut35 happy_x_1 of { happy_var_1 -> 
-	case happyOut42 happy_x_3 of { happy_var_3 -> 
-	happyIn42
+	 =  case happyOut36 happy_x_1 of { happy_var_1 -> 
+	case happyOut43 happy_x_3 of { happy_var_3 -> 
+	happyIn43
 		 ((:) happy_var_1 happy_var_3
 	)}}
 
-happyReduce_60 = happySpecReduce_0 20# happyReduction_60
-happyReduction_60  =  happyIn43
+happyReduce_64 = happySpecReduce_0 21# happyReduction_64
+happyReduction_64  =  happyIn44
 		 ([]
 	)
 
-happyReduce_61 = happySpecReduce_2 20# happyReduction_61
-happyReduction_61 happy_x_2
+happyReduce_65 = happySpecReduce_2 21# happyReduction_65
+happyReduction_65 happy_x_2
 	happy_x_1
-	 =  case happyOut43 happy_x_1 of { happy_var_1 -> 
-	case happyOut33 happy_x_2 of { happy_var_2 -> 
-	happyIn43
+	 =  case happyOut44 happy_x_1 of { happy_var_1 -> 
+	case happyOut34 happy_x_2 of { happy_var_2 -> 
+	happyIn44
 		 (flip (:) happy_var_1 happy_var_2
 	)}}
 
-happyReduce_62 = happySpecReduce_0 21# happyReduction_62
-happyReduction_62  =  happyIn44
+happyReduce_66 = happySpecReduce_0 22# happyReduction_66
+happyReduction_66  =  happyIn45
 		 ([]
 	)
 
-happyReduce_63 = happySpecReduce_2 21# happyReduction_63
-happyReduction_63 happy_x_2
+happyReduce_67 = happySpecReduce_2 22# happyReduction_67
+happyReduction_67 happy_x_2
 	happy_x_1
-	 =  case happyOut44 happy_x_1 of { happy_var_1 -> 
+	 =  case happyOut45 happy_x_1 of { happy_var_1 -> 
 	case happyOut23 happy_x_2 of { happy_var_2 -> 
-	happyIn44
+	happyIn45
 		 (flip (:) happy_var_1 happy_var_2
 	)}}
 
-happyReduce_64 = happySpecReduce_0 22# happyReduction_64
-happyReduction_64  =  happyIn45
+happyReduce_68 = happySpecReduce_0 23# happyReduction_68
+happyReduction_68  =  happyIn46
 		 ([]
 	)
 
-happyReduce_65 = happySpecReduce_1 22# happyReduction_65
-happyReduction_65 happy_x_1
-	 =  case happyOut37 happy_x_1 of { happy_var_1 -> 
-	happyIn45
+happyReduce_69 = happySpecReduce_1 23# happyReduction_69
+happyReduction_69 happy_x_1
+	 =  case happyOut38 happy_x_1 of { happy_var_1 -> 
+	happyIn46
 		 ((:[]) happy_var_1
 	)}
 
-happyReduce_66 = happySpecReduce_3 22# happyReduction_66
-happyReduction_66 happy_x_3
+happyReduce_70 = happySpecReduce_3 23# happyReduction_70
+happyReduction_70 happy_x_3
 	happy_x_2
 	happy_x_1
-	 =  case happyOut37 happy_x_1 of { happy_var_1 -> 
-	case happyOut45 happy_x_3 of { happy_var_3 -> 
-	happyIn45
+	 =  case happyOut38 happy_x_1 of { happy_var_1 -> 
+	case happyOut46 happy_x_3 of { happy_var_3 -> 
+	happyIn46
 		 ((:) happy_var_1 happy_var_3
 	)}}
 
 happyNewToken action sts stk [] =
-	happyDoAction 25# (error "reading EOF!") action sts stk []
+	happyDoAction 29# (error "reading EOF!") action sts stk []
 
 happyNewToken action sts stk (tk:tks) =
 	let cont i = happyDoAction i tk action sts stk tks in
@@ -653,23 +699,27 @@ happyNewToken action sts stk (tk:tks) =
 	PT _ (TS "}") -> cont 5#;
 	PT _ (TS ":") -> cont 6#;
 	PT _ (TS "=") -> cont 7#;
-	PT _ (TS "->") -> cont 8#;
-	PT _ (TS "[") -> cont 9#;
-	PT _ (TS "]") -> cont 10#;
-	PT _ (TS "$") -> cont 11#;
-	PT _ (TS "[|") -> cont 12#;
-	PT _ (TS "|]") -> cont 13#;
-	PT _ (TS "+") -> cont 14#;
-	PT _ (TS "/") -> cont 15#;
-	PT _ (TS ",") -> cont 16#;
-	PT _ (TS "abstract") -> cont 17#;
-	PT _ (TS "concrete") -> cont 18#;
-	PT _ (TS "grammar") -> cont 19#;
-	PT _ (TS "pre") -> cont 20#;
-	PT _ (TL happy_dollar_dollar) -> cont 21#;
-	PT _ (TI happy_dollar_dollar) -> cont 22#;
-	PT _ (T_CId happy_dollar_dollar) -> cont 23#;
-	_ -> cont 24#;
+	PT _ (TS "%") -> cont 8#;
+	PT _ (TS "->") -> cont 9#;
+	PT _ (TS "?") -> cont 10#;
+	PT _ (TS "[") -> cont 11#;
+	PT _ (TS "]") -> cont 12#;
+	PT _ (TS "$") -> cont 13#;
+	PT _ (TS "[|") -> cont 14#;
+	PT _ (TS "|]") -> cont 15#;
+	PT _ (TS "+") -> cont 16#;
+	PT _ (TS "@") -> cont 17#;
+	PT _ (TS "/") -> cont 18#;
+	PT _ (TS ",") -> cont 19#;
+	PT _ (TS "abstract") -> cont 20#;
+	PT _ (TS "concrete") -> cont 21#;
+	PT _ (TS "grammar") -> cont 22#;
+	PT _ (TS "pre") -> cont 23#;
+	PT _ (TL happy_dollar_dollar) -> cont 24#;
+	PT _ (TI happy_dollar_dollar) -> cont 25#;
+	PT _ (TD happy_dollar_dollar) -> cont 26#;
+	PT _ (T_CId happy_dollar_dollar) -> cont 27#;
+	_ -> cont 28#;
 	_ -> happyError' (tk:tks)
 	}
 
@@ -686,64 +736,64 @@ happyError' :: () => [Token] -> Err a
 happyError' = happyError
 
 pGrammar tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 0# tks) (\x -> happyReturn (happyOut26 x))
+  happySomeParser = happyThen (happyParse 0# tks) (\x -> happyReturn (happyOut27 x))
 
 pHeader tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 1# tks) (\x -> happyReturn (happyOut27 x))
+  happySomeParser = happyThen (happyParse 1# tks) (\x -> happyReturn (happyOut28 x))
 
 pAbstract tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 2# tks) (\x -> happyReturn (happyOut28 x))
+  happySomeParser = happyThen (happyParse 2# tks) (\x -> happyReturn (happyOut29 x))
 
 pConcrete tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 3# tks) (\x -> happyReturn (happyOut29 x))
+  happySomeParser = happyThen (happyParse 3# tks) (\x -> happyReturn (happyOut30 x))
 
 pAbsDef tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 4# tks) (\x -> happyReturn (happyOut30 x))
+  happySomeParser = happyThen (happyParse 4# tks) (\x -> happyReturn (happyOut31 x))
 
 pCncDef tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 5# tks) (\x -> happyReturn (happyOut31 x))
+  happySomeParser = happyThen (happyParse 5# tks) (\x -> happyReturn (happyOut32 x))
 
 pType tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 6# tks) (\x -> happyReturn (happyOut32 x))
+  happySomeParser = happyThen (happyParse 6# tks) (\x -> happyReturn (happyOut33 x))
 
 pExp tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 7# tks) (\x -> happyReturn (happyOut33 x))
+  happySomeParser = happyThen (happyParse 7# tks) (\x -> happyReturn (happyOut34 x))
 
 pAtom tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 8# tks) (\x -> happyReturn (happyOut34 x))
+  happySomeParser = happyThen (happyParse 8# tks) (\x -> happyReturn (happyOut35 x))
 
 pTerm tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 9# tks) (\x -> happyReturn (happyOut35 x))
+  happySomeParser = happyThen (happyParse 9# tks) (\x -> happyReturn (happyOut36 x))
 
 pTokn tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 10# tks) (\x -> happyReturn (happyOut36 x))
+  happySomeParser = happyThen (happyParse 10# tks) (\x -> happyReturn (happyOut37 x))
 
 pVariant tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 11# tks) (\x -> happyReturn (happyOut37 x))
+  happySomeParser = happyThen (happyParse 11# tks) (\x -> happyReturn (happyOut38 x))
 
 pListConcrete tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 12# tks) (\x -> happyReturn (happyOut38 x))
+  happySomeParser = happyThen (happyParse 12# tks) (\x -> happyReturn (happyOut39 x))
 
 pListAbsDef tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 13# tks) (\x -> happyReturn (happyOut39 x))
+  happySomeParser = happyThen (happyParse 13# tks) (\x -> happyReturn (happyOut40 x))
 
 pListCncDef tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 14# tks) (\x -> happyReturn (happyOut40 x))
+  happySomeParser = happyThen (happyParse 14# tks) (\x -> happyReturn (happyOut41 x))
 
 pListCId tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 15# tks) (\x -> happyReturn (happyOut41 x))
+  happySomeParser = happyThen (happyParse 15# tks) (\x -> happyReturn (happyOut42 x))
 
 pListTerm tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 16# tks) (\x -> happyReturn (happyOut42 x))
+  happySomeParser = happyThen (happyParse 16# tks) (\x -> happyReturn (happyOut43 x))
 
 pListExp tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 17# tks) (\x -> happyReturn (happyOut43 x))
+  happySomeParser = happyThen (happyParse 17# tks) (\x -> happyReturn (happyOut44 x))
 
 pListString tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 18# tks) (\x -> happyReturn (happyOut44 x))
+  happySomeParser = happyThen (happyParse 18# tks) (\x -> happyReturn (happyOut45 x))
 
 pListVariant tks = happySomeParser where
-  happySomeParser = happyThen (happyParse 19# tks) (\x -> happyReturn (happyOut45 x))
+  happySomeParser = happyThen (happyParse 19# tks) (\x -> happyReturn (happyOut46 x))
 
 happySeq = happyDontSeq