X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fparser%2FParser.y.pp;h=abfc2582d36893b2d7b92a0a0f04b6d05e31bda2;hb=3d8dbba7d24c9139b800f4ccf31c50b11596fc2e;hp=ffc1f44053a3a3a534cbf361ecc5e07d3ea9dbd8;hpb=90dc9026b091be5cca5da4c6cbd3713ecc493361;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index ffc1f44..abfc258 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -52,6 +52,17 @@ import Control.Monad    ( mplus )
 
 {-
 -----------------------------------------------------------------------------
+24 Februar 2006
+
+Conflicts: 33 shift/reduce
+           1 reduce/reduce
+
+The reduce/reduce conflict is weird.  It's between tyconsym and consym, and I
+would think the two should never occur in the same context.
+
+  -=chak
+
+-----------------------------------------------------------------------------
 31 December 2006
 
 Conflicts: 34 shift/reduce
@@ -1309,7 +1320,7 @@ aexp	:: { LHsExpr RdrName }
 
 aexp1	:: { LHsExpr RdrName }
         : aexp1 '{' fbinds '}' 	{% do { r <- mkRecConstrOrUpdate $1 (comb2 $2 $4) 
-							(reverse $3);
+							$3;
 				        return (LL r) }}
   	| aexp2			{ $1 }
 
@@ -1352,8 +1363,9 @@ aexp2	:: { LHsExpr RdrName }
 	| '[|' exp '|]'         { LL $ HsBracket (ExpBr $2) }                       
 	| '[t|' ctype '|]'      { LL $ HsBracket (TypBr $2) }                       
 	| '[p|' infixexp '|]'   {% checkPattern $2 >>= \p ->
-					   return (LL $ HsBracket (PatBr p)) }
-	| '[d|' cvtopbody '|]'	{ LL $ HsBracket (DecBr (mkGroup $2)) }
+					return (LL $ HsBracket (PatBr p)) }
+	| '[d|' cvtopbody '|]'	{% checkDecBrGroup $2 >>= \g -> 
+					return (LL $ HsBracket (DecBr g)) }
 
 	-- arrow notation extension
 	| '(|' aexp2 cmdargs '|)'	{ LL $ HsArrForm $2 Nothing (reverse $3) }
@@ -1434,12 +1446,12 @@ quals :: { Located [LStmt RdrName] }
 
 parr :: { LHsExpr RdrName }
 	: 				{ noLoc (ExplicitPArr placeHolderType []) }
-	| exp				{ L1 $ ExplicitPArr placeHolderType [$1] }
+	| texp				{ L1 $ ExplicitPArr placeHolderType [$1] }
 	| lexps 			{ L1 $ ExplicitPArr placeHolderType 
 						       (reverse (unLoc $1)) }
-	| exp '..' exp	 		{ LL $ PArrSeq noPostTcExpr (FromTo $1 $3) }
-	| exp ',' exp '..' exp		{ LL $ PArrSeq noPostTcExpr (FromThenTo $1 $3 $5) }
-	| exp pquals			{ sL (comb2 $1 $>) $ mkHsDo PArrComp (reverse (unLoc $2)) $1 }
+	| texp '..' exp	 		{ LL $ PArrSeq noPostTcExpr (FromTo $1 $3) }
+	| texp ',' exp '..' exp		{ LL $ PArrSeq noPostTcExpr (FromThenTo $1 $3 $5) }
+	| texp pquals			{ sL (comb2 $1 $>) $ mkHsDo PArrComp (reverse (unLoc $2)) $1 }
 
 -- We are reusing `lexps' and `pquals' from the list case.
 
@@ -1535,10 +1547,10 @@ qual  :: { LStmt RdrName }
 -- Record Field Update/Construction
 
 fbinds 	:: { HsRecordBinds RdrName }
-	: fbinds1			{ $1 }
-  	| {- empty -}			{ [] }
+	: fbinds1			{ HsRecordBinds (reverse $1) }
+  	| {- empty -}			{ HsRecordBinds [] }
 
-fbinds1	:: { HsRecordBinds RdrName }
+fbinds1	:: { [(Located id, LHsExpr id)] }
 	: fbinds1 ',' fbind		{ $3 : $1 }
 	| fbind				{ [$1] }