X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=515c4744224e22b0215f97b9531137730b95c56d;hb=bf1cff988c19adb2937294e41f6d0a0f41f1168d;hp=1783ce384e55fa3ce7e24c72a22f1622dad2381f;hpb=55030d7a875891de3ae2ccf4673711d1eae090ce;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 1783ce3..515c474 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -337,6 +337,7 @@ TH_ID_SPLICE    { L _ (ITidEscape _)  }     -- $x
 '$('	        { L _ ITparenEscape   }     -- $( exp )
 TH_VAR_QUOTE	{ L _ ITvarQuote      }     -- 'x
 TH_TY_QUOTE	{ L _ ITtyQuote       }      -- ''T
+TH_QUASIQUOTE	{ L _ (ITquasiQuote _) }
 
 %monad { P } { >>= } { return }
 %lexer { lexer } { L _ ITeof }
@@ -1220,8 +1221,9 @@ decl 	:: { Located (OrdList (LHsDecl RdrName)) }
 					        return (LL $ unitOL $ LL $ ValD ( 
 							PatBind (LL $ BangPat pat) (unLoc $3)
 								placeHolderType placeHolderNames)) } }
-	| infixexp opt_sig rhs		{% do { r <- checkValDef $1 $2 $3;
-						return (LL $ unitOL (LL $ ValD r)) } }
+        | infixexp opt_sig rhs          {% do { r <- checkValDef $1 $2 $3;
+                                                let { l = comb2 $1 $> };
+                                                return $! (sL l (unitOL $! (sL l $ ValD r))) } }
         | docdecl                       { LL $ unitOL $1 }
 
 rhs	:: { Located (GRHSs RdrName) }
@@ -1368,6 +1370,11 @@ aexp2	:: { LHsExpr RdrName }
 							(getTH_ID_SPLICE $1)))) } -- $x
 	| '$(' exp ')'   	{ LL $ HsSpliceE (mkHsSplice $2) }               -- $( exp )
 
+	| TH_QUASIQUOTE       	{ let { loc = getLoc $1
+                                      ; ITquasiQuote (quoter, quote, quoteSpan) = unLoc $1
+                                      ; quoterId = mkUnqual varName quoter
+                                      }
+                                  in sL loc $ HsQuasiQuoteE (mkHsQuasiQuote quoterId quoteSpan quote) }
 	| TH_VAR_QUOTE qvar 	{ LL $ HsBracket (VarBr (unLoc $2)) }
 	| TH_VAR_QUOTE qcon 	{ LL $ HsBracket (VarBr (unLoc $2)) }
 	| TH_TY_QUOTE tyvar 	{ LL $ HsBracket (VarBr (unLoc $2)) }
@@ -1971,7 +1978,7 @@ comb4 a b c d = combineSrcSpans (getLoc a) $ combineSrcSpans (getLoc b) $
 -- strict constructor version:
 {-# INLINE sL #-}
 sL :: SrcSpan -> a -> Located a
-sL span a = span `seq` L span a
+sL span a = span `seq` a `seq` L span a
 
 -- Make a source location for the file.  We're a bit lazy here and just
 -- make a point SrcSpan at line 1, column 0.  Strictly speaking we should