From f9c3194e1d4f0f1c370fd059192565b1e7943bf1 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Tue, 4 Oct 2011 13:28:56 -0500 Subject: [PATCH] allow either <[]> or <{}> at the type level --- compiler/hetmet | 2 +- compiler/parser/Parser.y.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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) } -- 1.7.10.4