X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=c9e843edaf7831cf495dc1507f8daa5b433dc9dc;hb=657cc0243be3956a3481fd09feb4a4f7c43fc898;hp=06e55ff9f522f073b8d093762e1079878feb847e;hpb=403e810b5684fa88360ce974696aa3517a002d88;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 06e55ff..c9e843e 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -18,9 +18,6 @@
 module Parser ( parseModule, parseStmt, parseIdentifier, parseType,
 		parseHeader ) where
 
-#define INCLUDE #include 
-INCLUDE "HsVersions.h"
-
 import HsSyn
 import RdrHsSyn
 import HscTypes		( IsBootInterface, DeprecTxt )
@@ -824,7 +821,7 @@ where_inst :: { Located (OrdList (LHsDecl RdrName)) }	-- Reversed
 decls 	:: { Located (OrdList (LHsDecl RdrName)) }	
 	: decls ';' decl		{ let { this = unLoc $3;
                                     rest = unLoc $1;
-                                    these = unLoc $1 `appOL` unLoc $3 }
+                                    these = rest `appOL` this }
                               in rest `seq` this `seq` these `seq`
                                     LL these }
 	| decls ';'			{ LL (unLoc $1) }
@@ -1231,7 +1228,7 @@ decl 	:: { Located (OrdList (LHsDecl RdrName)) }
         | docdecl                       { LL $ unitOL $1 }
 
 rhs	:: { Located (GRHSs RdrName) }
-	: '=' exp wherebinds	{ L (comb3 $1 $2 $3) $ GRHSs (unguardedRHS $2) (unLoc $3) }
+	: '=' exp wherebinds	{ sL (comb3 $1 $2 $3) $ GRHSs (unguardedRHS $2) (unLoc $3) }
 	| gdrhs	wherebinds	{ LL $ GRHSs (reverse (unLoc $1)) (unLoc $2) }
 
 gdrhs :: { Located [LGRHS RdrName] }
@@ -1441,7 +1438,7 @@ list :: { LHsExpr RdrName }
 	| texp '|' flattenedpquals	{ sL (comb2 $1 $>) $ mkHsDo ListComp (unLoc $3) $1 }
 
 lexps :: { Located [LHsExpr RdrName] }
-	: lexps ',' texp 		{ LL ($3 : unLoc $1) }
+	: lexps ',' texp 		{ LL (((:) $! $3) $! unLoc $1) }
 	| texp ',' texp			{ LL [$3,$1] }
 
 -----------------------------------------------------------------------------
@@ -1756,9 +1753,9 @@ tyvarop : '`' tyvarid '`'	{ LL (unLoc $2) }
 tyvarid	:: { Located RdrName }
 	: VARID			{ L1 $! mkUnqual tvName (getVARID $1) }
 	| special_id		{ L1 $! mkUnqual tvName (unLoc $1) }
-	| 'unsafe' 		{ L1 $! mkUnqual tvName FSLIT("unsafe") }
-	| 'safe' 		{ L1 $! mkUnqual tvName FSLIT("safe") }
-	| 'threadsafe' 		{ L1 $! mkUnqual tvName FSLIT("threadsafe") }
+	| 'unsafe' 		{ L1 $! mkUnqual tvName (fsLit "unsafe") }
+	| 'safe' 		{ L1 $! mkUnqual tvName (fsLit "safe") }
+	| 'threadsafe' 		{ L1 $! mkUnqual tvName (fsLit "threadsafe") }
 
 tyvarsym :: { Located RdrName }
 -- Does not include "!", because that is used for strictness marks
@@ -1787,15 +1784,15 @@ qvarid :: { Located RdrName }
 
 varid :: { Located RdrName }
 	: varid_no_unsafe 	{ $1 }
-	| 'unsafe'		{ L1 $! mkUnqual varName FSLIT("unsafe") }
-	| 'safe'		{ L1 $! mkUnqual varName FSLIT("safe") }
-	| 'threadsafe'		{ L1 $! mkUnqual varName FSLIT("threadsafe") }
+	| 'unsafe'		{ L1 $! mkUnqual varName (fsLit "unsafe") }
+	| 'safe'		{ L1 $! mkUnqual varName (fsLit "safe") }
+	| 'threadsafe'		{ L1 $! mkUnqual varName (fsLit "threadsafe") }
 
 varid_no_unsafe :: { Located RdrName }
 	: VARID			{ L1 $! mkUnqual varName (getVARID $1) }
 	| special_id		{ L1 $! mkUnqual varName (unLoc $1) }
-	| 'forall'		{ L1 $! mkUnqual varName FSLIT("forall") }
-	| 'family'              { L1 $! mkUnqual varName FSLIT("family") }
+	| 'forall'		{ L1 $! mkUnqual varName (fsLit "forall") }
+	| 'family'              { L1 $! mkUnqual varName (fsLit "family") }
 
 qvarsym :: { Located RdrName }
 	: varsym		{ $1 }
@@ -1810,7 +1807,7 @@ qvarsym1 : QVARSYM		{ L1 $ mkQual varName (getQVARSYM $1) }
 
 varsym :: { Located RdrName }
 	: varsym_no_minus 	{ $1 }
-	| '-'			{ L1 $ mkUnqual varName FSLIT("-") }
+	| '-'			{ L1 $ mkUnqual varName (fsLit "-") }
 
 varsym_no_minus :: { Located RdrName } -- varsym not including '-'
 	: VARSYM		{ L1 $ mkUnqual varName (getVARSYM $1) }
@@ -1823,19 +1820,19 @@ varsym_no_minus :: { Located RdrName } -- varsym not including '-'
 -- depending on context 
 special_id :: { Located FastString }
 special_id
-	: 'as'			{ L1 FSLIT("as") }
-	| 'qualified'		{ L1 FSLIT("qualified") }
-	| 'hiding'		{ L1 FSLIT("hiding") }
-	| 'export'		{ L1 FSLIT("export") }
-	| 'label'		{ L1 FSLIT("label")  }
-	| 'dynamic'		{ L1 FSLIT("dynamic") }
-	| 'stdcall'             { L1 FSLIT("stdcall") }
-	| 'ccall'               { L1 FSLIT("ccall") }
+	: 'as'			{ L1 (fsLit "as") }
+	| 'qualified'		{ L1 (fsLit "qualified") }
+	| 'hiding'		{ L1 (fsLit "hiding") }
+	| 'export'		{ L1 (fsLit "export") }
+	| 'label'		{ L1 (fsLit "label")  }
+	| 'dynamic'		{ L1 (fsLit "dynamic") }
+	| 'stdcall'             { L1 (fsLit "stdcall") }
+	| 'ccall'               { L1 (fsLit "ccall") }
 
 special_sym :: { Located FastString }
-special_sym : '!'	{ L1 FSLIT("!") }
-	    | '.' 	{ L1 FSLIT(".") }
- 	    | '*' 	{ L1 FSLIT("*") }
+special_sym : '!'	{ L1 (fsLit "!") }
+	    | '.' 	{ L1 (fsLit ".") }
+ 	    | '*' 	{ L1 (fsLit "*") }
 
 -----------------------------------------------------------------------------
 -- Data constructors