From: simonmar <unknown>
Date: Thu, 18 Oct 2001 09:17:04 +0000 (+0000)
Subject: [project @ 2001-10-18 09:17:04 by simonmar]
X-Git-Tag: Approximately_9120_patches~799
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9b6eccb535f4d0a950f6320080bf72e905b7890a;p=ghc-hetmet.git

[project @ 2001-10-18 09:17:04 by simonmar]
- use var_fs instead of just VARID for type variables, so that
  specialids (as, qualified, hiding, forall etc.) don't confuse the
  interface file parser.

- remove superfluous '!' in var_fs rule.  This was necessary to avoid
  conflicts caused by the previous change.
---

diff --git a/ghc/compiler/rename/ParseIface.y b/ghc/compiler/rename/ParseIface.y
index 78553df..96b701e 100644
--- a/ghc/compiler/rename/ParseIface.y
+++ b/ghc/compiler/rename/ParseIface.y
@@ -601,9 +601,8 @@ mod_name	:: { ModuleName }
 
 
 ---------------------------------------------------
-var_fs		:: { EncodedFS }
+var_fs          :: { EncodedFS }
 		: VARID			{ $1 }
-		| '!'	  		{ SLIT("!") }
 		| 'as'			{ SLIT("as") }
 		| 'qualified'		{ SLIT("qualified") }
 		| 'hiding'		{ SLIT("hiding") }
@@ -694,7 +693,7 @@ qcls_name	:: { RdrName }
 
 ---------------------------------------------------
 tv_name		:: { RdrName }
-		:  VARID 		{ mkRdrUnqual (mkSysOccFS tvName $1) }
+		:  var_fs 		{ mkRdrUnqual (mkSysOccFS tvName $1) }
 
 tv_bndr		:: { HsTyVarBndr RdrName }
 		:  tv_name '::' akind	{ IfaceTyVar $1 $3 }