X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=42cb96f1016b1486c48cff56d57c0620753d7c7e;hp=c56b0c10018d3a1c86cee526828810d821b904e8;hb=0a5613f40b0e32cf59966e6b56b807cdbe80aa7b;hpb=6f8ff0bbad3b9fa389c960ad1b5a267a1ae502f1

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index c56b0c1..42cb96f 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -1014,11 +1014,9 @@ atype :: { LHsType RdrName }
 	| '(' ctype ')'		        { LL $ HsParTy   $2 }
 	| '(' ctype '::' kind ')'	{ LL $ HsKindSig $2 (unLoc $4) }
 	| quasiquote       	        { L1 (HsQuasiQuoteTy (unLoc $1)) }
-	| '$(' exp ')'	      		{ LL $ HsSpliceTy (mkHsSplice $2 ) }
-	| TH_ID_SPLICE	      		{ LL $ HsSpliceTy (mkHsSplice 
-					         (L1 $ HsVar (mkUnqual varName 
-							        (getTH_ID_SPLICE $1)))) } -- $x
-
+	| '$(' exp ')'	      		{ LL $ mkHsSpliceTy $2 }
+	| TH_ID_SPLICE	      		{ LL $ mkHsSpliceTy $ L1 $ HsVar $ 
+					  mkUnqual varName (getTH_ID_SPLICE $1) }
 -- Generics
         | INTEGER                       { L1 (HsNumTy (getINTEGER $1)) }
 
@@ -1046,7 +1044,7 @@ tv_bndrs :: { [LHsTyVarBndr RdrName] }
 	 | {- empty -}			{ [] }
 
 tv_bndr :: { LHsTyVarBndr RdrName }
-	: tyvar				{ L1 (UserTyVar (unLoc $1)) }
+	: tyvar				{ L1 (UserTyVar (unLoc $1) placeHolderKind) }
 	| '(' tyvar '::' kind ')'	{ LL (KindedTyVar (unLoc $2) 
 							  (unLoc $4)) }
 
@@ -1364,8 +1362,8 @@ aexp2	:: { LHsExpr RdrName }
 	-- Template Haskell Extension
 	| TH_ID_SPLICE          { L1 $ HsSpliceE (mkHsSplice 
 					(L1 $ HsVar (mkUnqual varName 
-							(getTH_ID_SPLICE $1)))) } -- $x
-	| '$(' exp ')'   	{ LL $ HsSpliceE (mkHsSplice $2) }               -- $( exp )
+							(getTH_ID_SPLICE $1)))) } 
+	| '$(' exp ')'   	{ LL $ HsSpliceE (mkHsSplice $2) }               
 
 
 	| TH_VAR_QUOTE qvar 	{ LL $ HsBracket (VarBr (unLoc $2)) }
@@ -1635,11 +1633,10 @@ fbinds1	:: { ([HsRecField RdrName (LHsExpr RdrName)], Bool) }
 	| '..'				{ ([],   True) }
   
 fbind	:: { HsRecField RdrName (LHsExpr RdrName) }
-	: qvar '=' exp	{ HsRecField $1 $3 False }
-        | qvar          { HsRecField $1 (L (getLoc $1) placeHolderPunRhs) True }
-			-- Here's where we say that plain 'x'
-			-- means exactly 'x = x'.  The pun-flag boolean is
-			-- there so we can still print it right
+	: qvar '=' exp	{ HsRecField $1 $3                False }
+        | qvar          { HsRecField $1 placeHolderPunRhs True }
+			-- In the punning case, use a place-holder
+                        -- The renamer fills in the final value
 
 -----------------------------------------------------------------------------
 -- Implicit Parameter Bindings