From: simonpj Date: Wed, 11 Dec 2002 12:01:20 +0000 (+0000) Subject: [project @ 2002-12-11 12:01:20 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~1369 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=62bcbe780c51da5ce7bb08f70b08c7cafd7b2e7a;p=ghc-hetmet.git [project @ 2002-12-11 12:01:20 by simonpj] Change interface to mkIfaceOrig --- diff --git a/ghc/compiler/parser/ParserCore.y b/ghc/compiler/parser/ParserCore.y index 7e3ad74..a249ac6 100644 --- a/ghc/compiler/parser/ParserCore.y +++ b/ghc/compiler/parser/ParserCore.y @@ -229,19 +229,19 @@ modid :: { ModuleName } qname :: { RdrName } -- Includes data constructors : name { $1 } - | mname '.' NAME { mkIfaceOrig varName (mkFastString $1,mkFastString $3) } + | mname '.' NAME { mkIfaceOrig varName (mkFastString $1) (mkFastString $3) } | q_d_name { $1 } -- Type constructor q_tc_name :: { RdrName } : mname '.' cname - { mkIfaceOrig tcName (mkFastString $1,mkFastString $3) } + { mkIfaceOrig tcName (mkFastString $1) (mkFastString $3) } -- Data constructor q_d_name :: { RdrName } : mname '.' cname - { mkIfaceOrig dataName (mkFastString $1,mkFastString $3) } + { mkIfaceOrig dataName (mkFastString $1) (mkFastString $3) } { @@ -253,7 +253,7 @@ convIntLit i (HsTyVar n) | n == intPrimRdrName = MachInt i | n == wordPrimRdrName = MachWord i convIntLit i aty - = pprPanic "Unknown literal type" (ppr aty) + = pprPanic "Unknown literal type" (ppr aty $$ ppr intPrimRdrName) wordPrimRdrName :: RdrName wordPrimRdrName = nameRdrName wordPrimTyConName