X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FParser.y.pp;h=83b299a7b86243d55515b2b60aa01e93396a30a1;hb=252abd9e355fe12e8f6f1e0192542a0df6ddccac;hp=4f7890de998cbf9303c12f5d61f00fae65f82832;hpb=8000acbfde9bf677123fa28b59835535a2fb1e2f;p=ghc-hetmet.git

diff --git a/ghc/compiler/parser/Parser.y.pp b/ghc/compiler/parser/Parser.y.pp
index 4f7890d..83b299a 100644
--- a/ghc/compiler/parser/Parser.y.pp
+++ b/ghc/compiler/parser/Parser.y.pp
@@ -21,7 +21,7 @@ import RdrName
 import TysWiredIn	( unitTyCon, unitDataCon, tupleTyCon, tupleCon, nilDataCon,
 			  listTyCon_RDR, parrTyCon_RDR, consDataCon_RDR )
 import Type		( funTyCon )
-import ForeignCall	( Safety(..), CExportSpec(..), 
+import ForeignCall	( Safety(..), CExportSpec(..), CLabelString,
 			  CCallConv(..), CCallTarget(..), defaultCCallConv
 			)
 import OccName		( UserFS, varName, dataName, tcClsName, tvName )
@@ -38,7 +38,6 @@ import OrdList
 import Bag		( emptyBag )
 import Panic
 
-import CStrings		( CLabelString )
 import FastString
 import Maybes		( orElse )
 import Outputable
@@ -942,7 +941,7 @@ deriving :: { Located (Maybe [LHsType RdrName]) }
 
 decl 	:: { Located (OrdList (LHsDecl RdrName)) }
 	: sigdecl			{ $1 }
-	| infixexp opt_sig rhs		{% do { r <- checkValDef $1 $2 (unLoc $3);
+	| infixexp opt_sig rhs		{% do { r <- checkValDef $1 $2 $3;
 						return (LL $ unitOL (LL $ ValD r)) } }
 
 rhs	:: { Located (GRHSs RdrName) }
@@ -1076,7 +1075,7 @@ aexp2	:: { LHsExpr RdrName }
 	| '$(' exp ')'   	{ LL $ HsSpliceE (mkHsSplice $2) }               -- $( exp )
 
 	| TH_VAR_QUOTE qvar 	{ LL $ HsBracket (VarBr (unLoc $2)) }
-	| TH_VAR_QUOTE qcon 	{ LL $ HsBracket (VarBr (unLoc $2)) }
+	| TH_VAR_QUOTE gcon 	{ LL $ HsBracket (VarBr (unLoc $2)) }
 	| TH_TY_QUOTE tyvar 	{ LL $ HsBracket (VarBr (unLoc $2)) }
  	| TH_TY_QUOTE gtycon	{ LL $ HsBracket (VarBr (unLoc $2)) }
 	| '[|' exp '|]'         { LL $ HsBracket (ExpBr $2) }