From: simonpj@microsoft.com <unknown>
Date: Tue, 30 Jan 2007 16:13:30 +0000 (+0000)
Subject: Fix Trac #1122; spot absence of TyCon in data/newtype header
X-Git-Tag: 2007-02-05~32
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3bec818f91e382b882f8de4bdab8036884eb657f

Fix Trac #1122; spot absence of TyCon in data/newtype header
---

diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs
index 895c8a8..ddff68f 100644
--- a/compiler/parser/RdrHsSyn.lhs
+++ b/compiler/parser/RdrHsSyn.lhs
@@ -54,7 +54,7 @@ module RdrHsSyn (
 #include "HsVersions.h"
 
 import HsSyn		-- Lots of it
-import RdrName		( RdrName, isRdrTyVar, mkUnqual, rdrNameOcc, 
+import RdrName		( RdrName, isRdrTyVar, isRdrTc, mkUnqual, rdrNameOcc, 
 			  isRdrDataCon, isUnqual, getRdrName, isQual,
 			  setRdrNameSpace )
 import BasicTypes	( maxPrecedence, Activation, InlineSpec(..), alwaysInlineSpec, neverInlineSpec )
@@ -468,13 +468,12 @@ checkTyClHdr (L l cxt) ty
   where
     gol (L l ty) acc = go l ty acc
 
-    go l (HsTyVar tc)    acc 
-	| not (isRdrTyVar tc)   = do
-				    tvs <- extractTyVars acc
-				    return (L l tc, tvs, acc)
-    go l (HsOpTy t1 tc t2) acc  = do
-				    tvs <- extractTyVars (t1:t2:acc)
-				    return (tc, tvs, acc)
+    go l (HsTyVar tc) acc 
+	| isRdrTc tc 		= do tvs <- extractTyVars acc
+				     return (L l tc, tvs, acc)
+    go l (HsOpTy t1 ltc@(L _ tc) t2) acc
+	| isRdrTc tc		= do tvs <- extractTyVars (t1:t2:acc)
+				     return (ltc, tvs, acc)
     go l (HsParTy ty)    acc    = gol ty acc
     go l (HsAppTy t1 t2) acc    = gol t1 (t2:acc)
     go l other	         acc    =