X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=compiler%2Fparser%2FParser.y.pp;h=2f1166d420c7e3c24c626dd28c6ae9700857c3a4;hb=abc32aba7135136c89e089296e296fbb380bda39;hp=b51edf247646a9c553210c875838523b02f82d21;hpb=5d786b6a2e591628468068265820a447e35e4cc9;p=ghc-hetmet.git

diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index b51edf2..2f1166d 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -314,6 +314,8 @@ incorrect.
  QCONID  	{ L _ (ITqconid   _) }
  QVARSYM 	{ L _ (ITqvarsym  _) }
  QCONSYM 	{ L _ (ITqconsym  _) }
+ PREFIXQVARSYM  { L _ (ITprefixqvarsym  _) }
+ PREFIXQCONSYM  { L _ (ITprefixqconsym  _) }
 
  IPDUPVARID   	{ L _ (ITdupipvarid   _) }		-- GHC extension
 
@@ -1739,6 +1741,7 @@ qtyconop :: { Located RdrName }	-- Qualified or unqualified
 
 qtycon :: { Located RdrName }	-- Qualified or unqualified
 	: QCONID			{ L1 $! mkQual tcClsName (getQCONID $1) }
+        | PREFIXQCONSYM                 { L1 $! mkQual tcClsName (getPREFIXQCONSYM $1) }
 	| tycon				{ $1 }
 
 tycon 	:: { Located RdrName }	-- Unqualified
@@ -1819,17 +1822,15 @@ qvar 	:: { Located RdrName }
 
 qvarid :: { Located RdrName }
 	: varid			{ $1 }
-	| QVARID		{ L1 $ mkQual varName (getQVARID $1) }
+	| QVARID		{ L1 $! mkQual varName (getQVARID $1) }
+        | PREFIXQVARSYM         { L1 $! mkQual varName (getPREFIXQVARSYM $1) }
 
 varid :: { Located RdrName }
-	: varid_no_unsafe 	{ $1 }
+	: VARID			{ L1 $! mkUnqual varName (getVARID $1) }
+	| special_id		{ L1 $! mkUnqual varName (unLoc $1) }
 	| '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") }
 
@@ -1878,7 +1879,8 @@ special_sym : '!'	{ L1 (fsLit "!") }
 
 qconid :: { Located RdrName }	-- Qualified or unqualified
 	: conid			{ $1 }
-	| QCONID		{ L1 $ mkQual dataName (getQCONID $1) }
+	| QCONID		{ L1 $! mkQual dataName (getQCONID $1) }
+        | PREFIXQCONSYM         { L1 $! mkQual dataName (getPREFIXQCONSYM $1) }
 
 conid 	:: { Located RdrName }
 	: CONID			{ L1 $ mkUnqual dataName (getCONID $1) }
@@ -1987,6 +1989,8 @@ getQVARID  	(L _ (ITqvarid   x)) = x
 getQCONID  	(L _ (ITqconid   x)) = x
 getQVARSYM 	(L _ (ITqvarsym  x)) = x
 getQCONSYM 	(L _ (ITqconsym  x)) = x
+getPREFIXQVARSYM (L _ (ITprefixqvarsym  x)) = x
+getPREFIXQCONSYM (L _ (ITprefixqconsym  x)) = x
 getIPDUPVARID   (L _ (ITdupipvarid   x)) = x
 getCHAR		(L _ (ITchar     x)) = x
 getSTRING	(L _ (ITstring   x)) = x