From: simonmar Date: Mon, 28 Feb 2000 09:17:54 +0000 (+0000) Subject: [project @ 2000-02-28 09:17:54 by simonmar] X-Git-Tag: Approximately_9120_patches~5092 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c5535e01e9d2808da9a38a6bc1e6af48140398c8;p=ghc-hetmet.git [project @ 2000-02-28 09:17:54 by simonmar] 'IPVARID :: type' moved from btype to type, to reduce conflicts. --- diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index 771748e..12a9e6e 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.24 2000/02/25 14:55:42 panne Exp $ +$Id: Parser.y,v 1.25 2000/02/28 09:17:54 simonmar Exp $ Haskell grammar. @@ -515,11 +515,11 @@ ctype :: { RdrNameHsType } type :: { RdrNameHsType } : btype '->' type { MonoFunTy $1 $3 } + | IPVARID '::' type { MonoIParamTy (mkSrcUnqual ipName $1) $3 } | btype { $1 } btype :: { RdrNameHsType } : btype atype { MonoTyApp $1 $2 } - | IPVARID '::' type { MonoIParamTy (mkSrcUnqual ipName $1) $3 } | atype { $1 } atype :: { RdrNameHsType }