From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Tue, 4 Oct 2011 18:28:56 +0000 (-0500)
Subject: allow either <[]> or <{}> at the type level
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=f9c3194e1d4f0f1c370fd059192565b1e7943bf1;ds=sidebyside

allow either <[]> or <{}> at the type level
---

diff --git a/compiler/hetmet b/compiler/hetmet
index 025c2de..15997af 160000
--- a/compiler/hetmet
+++ b/compiler/hetmet
@@ -1 +1 @@
-Subproject commit 025c2de2effdd7177ca875998b65f51236c8c7c6
+Subproject commit 15997af66c1c4e0202a9fbed37af35fa67187aea
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 0604d22..a827ee4 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -1033,6 +1033,7 @@ atype :: { LHsType RdrName }
 	| '(#' comma_types1 '#)'	{ LL $ HsTupleTy Unboxed $2     }
 	| '[' ctype ']'			{ LL $ HsListTy  $2 }
 	| '<{' ctype '}>' '@' tyvar     { LL $ HsModalBoxType  (unLoc $5) $2 }
+	| '<[' ctype ']>' '@' tyvar     { LL $ HsModalBoxType  (unLoc $5) $2 }
 	| '[:' ctype ':]'		{ LL $ HsPArrTy  $2 }
 	| '(' ctype ')'		        { LL $ HsParTy   $2 }
 	| '(' ctype '::' kind ')'	{ LL $ HsKindSig $2 (unLoc $4) }