X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fparser%2FParser.y.pp;h=c0c783f8fed0f68abfdd0458b5a13545e27bbbcd;hb=15486d73d84483243f40fa245e63e7e88d5ed0ad;hp=c650a7c4bac4b68da3288cfdeadba02f10c78b41;hpb=7ab880e6cbce4e095d8316d4289066aa2d50419b;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index c650a7c..c0c783f 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -255,7 +255,6 @@ incorrect.
  QCONSYM 	{ L _ (ITqconsym  _) }
 
  IPDUPVARID   	{ L _ (ITdupipvarid   _) }		-- GHC extension
- IPSPLITVARID  	{ L _ (ITsplitipvarid _) }		-- GHC extension
 
  CHAR		{ L _ (ITchar     _) }
  STRING		{ L _ (ITstring   _) }
@@ -456,9 +455,8 @@ topdecl :: { OrdList (LHsDecl RdrName) }
   	: cl_decl			{ unitOL (L1 (TyClD (unLoc $1))) }
   	| ty_decl			{ unitOL (L1 (TyClD (unLoc $1))) }
 	| 'instance' inst_type where
-		{ let (binds, sigs, ats) = cvBindsAndSigs (unLoc $3)
-		  in unitOL (L (comb3 $1 $2 $3) 
-			    (InstD (InstDecl $2 binds sigs ats))) }
+		{ let (binds,sigs) = cvBindsAndSigs (unLoc $3)
+		  in unitOL (L (comb3 $1 $2 $3) (InstD (InstDecl $2 binds sigs))) }
 	| 'default' '(' comma_types0 ')'	{ unitOL (LL $ DefD (DefaultDecl $3)) }
 	| 'foreign' fdecl			{ unitOL (LL (unLoc $2)) }
 	| '{-# DEPRECATED' deprecations '#-}'	{ $2 }
@@ -1382,8 +1380,7 @@ dbind	:: { LIPBind RdrName }
 dbind	: ipvar '=' exp			{ LL (IPBind (unLoc $1) $3) }
 
 ipvar	:: { Located (IPName RdrName) }
-	: IPDUPVARID		{ L1 (Dupable (mkUnqual varName (getIPDUPVARID $1))) }
-	| IPSPLITVARID		{ L1 (Linear  (mkUnqual varName (getIPSPLITVARID $1))) }
+	: IPDUPVARID		{ L1 (IPName (mkUnqual varName (getIPDUPVARID $1))) }
 
 -----------------------------------------------------------------------------
 -- Deprecations
@@ -1648,7 +1645,6 @@ getQCONID  	(L _ (ITqconid   x)) = x
 getQVARSYM 	(L _ (ITqvarsym  x)) = x
 getQCONSYM 	(L _ (ITqconsym  x)) = x
 getIPDUPVARID   (L _ (ITdupipvarid   x)) = x
-getIPSPLITVARID (L _ (ITsplitipvarid x)) = x
 getCHAR		(L _ (ITchar     x)) = x
 getSTRING	(L _ (ITstring   x)) = x
 getINTEGER	(L _ (ITinteger  x)) = x