X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=eec611675970a9de96e239a2576a99132b39ad04;hb=dce3fd4efcb90f61b115a400559ef687a11f2c53;hp=55f8cf293ba2b102ca2aed5b3b8e6e50a13ac4c0;hpb=e3dd39bf230380f02d73efc287226117bb2eb47f;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 55f8cf2..eec6116 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 }
 
@@ -1325,6 +1336,9 @@ aexp2	:: { LHsExpr RdrName }
 	: ipvar				{ L1 (HsIPVar $! unLoc $1) }
 	| qcname			{ L1 (HsVar   $! unLoc $1) }
 	| literal			{ L1 (HsLit   $! unLoc $1) }
+-- This will enable overloaded strings permanently.  Normally the renamer turns HsString
+-- into HsOverLit when -foverloaded-strings is on.
+--	| STRING			{ L1 (HsOverLit $! mkHsIsString (getSTRING $1)) }
 	| INTEGER			{ L1 (HsOverLit $! mkHsIntegral (getINTEGER $1)) }
 	| RATIONAL			{ L1 (HsOverLit $! mkHsFractional (getRATIONAL $1)) }
 	| '(' exp ')'			{ LL (HsPar $2) }
@@ -1431,12 +1445,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.
 
@@ -1532,10 +1546,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] }
   
@@ -1776,7 +1790,7 @@ consym :: { Located RdrName }
 
 literal :: { Located HsLit }
 	: CHAR 			{ L1 $ HsChar       $ getCHAR $1 }
-	| STRING		{ L1 $ HsString     $ getSTRING $1 }
+	| STRING 		{ L1 $ HsString     $ getSTRING $1 }
 	| PRIMINTEGER		{ L1 $ HsIntPrim    $ getPRIMINTEGER $1 }
 	| PRIMCHAR		{ L1 $ HsCharPrim   $ getPRIMCHAR $1 }
 	| PRIMSTRING		{ L1 $ HsStringPrim $ getPRIMSTRING $1 }