From: simonpj Date: Fri, 10 May 2002 13:34:18 +0000 (+0000) Subject: [project @ 2002-05-10 13:34:18 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~2045 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f11aea0fc01263ec50416631e0d57be20353e66f;p=ghc-hetmet.git [project @ 2002-05-10 13:34:18 by simonpj] Remove {| |} syntax from expressions; never fully implemented --- diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index 3ecaff1..7b26472 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.96 2002/04/29 14:03:57 simonmar Exp $ +$Id: Parser.y,v 1.97 2002/05/10 13:34:18 simonpj Exp $ Haskell grammar. @@ -1006,11 +1006,16 @@ aexp :: { RdrNameHsExpr } | aexp1 { $1 } aexp1 :: { RdrNameHsExpr } - : var_or_con '{|' gentype '|}' { (HsApp $1 (HsType $3)) } - | aexp1 '{' fbinds '}' {% (mkRecConstrOrUpdate $1 + : aexp1 '{' fbinds '}' {% (mkRecConstrOrUpdate $1 (reverse $3)) } | aexp2 { $1 } +-- Here was the syntax for type applications that I was planning +-- but there are difficulties (e.g. what order for type args) +-- so it's not enabled yet. +-- | var_or_con '{|' gentype '|}' { (HsApp $1 (HsType $3)) } + + var_or_con :: { RdrNameHsExpr } : qvar { HsVar $1 } | gcon { HsVar $1 }