summaryrefslogtreecommitdiff
path: root/compiler/parser
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-06-14 12:46:48 +0100
committerIan Lynagh <igloo@earth.li>2012-06-14 12:46:48 +0100
commit0f3d8ab9f8c174f9aba5764a6b1edaf2c873b8c6 (patch)
tree495a31e7dbb51aa89a9103d62ca12e4475cf6c15 /compiler/parser
parent82a8ffd8179e0f99271a608e52f083d7a09d24ee (diff)
parent1e9a2d34ae6996b6872ee4cc87bc8218360fcaf9 (diff)
downloadhaskell-0f3d8ab9f8c174f9aba5764a6b1edaf2c873b8c6.tar.gz
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'compiler/parser')
-rw-r--r--compiler/parser/Parser.y.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp
index 759d5449f9..21f8782f6f 100644
--- a/compiler/parser/Parser.y.pp
+++ b/compiler/parser/Parser.y.pp
@@ -1762,10 +1762,10 @@ dbinds :: { Located [LIPBind RdrName] }
-- | {- empty -} { [] }
dbind :: { LIPBind RdrName }
-dbind : ipvar '=' exp { LL (IPBind (unLoc $1) $3) }
+dbind : ipvar '=' exp { LL (IPBind (Left (unLoc $1)) $3) }
-ipvar :: { Located (IPName RdrName) }
- : IPDUPVARID { L1 (IPName (mkUnqual varName (getIPDUPVARID $1))) }
+ipvar :: { Located HsIPName }
+ : IPDUPVARID { L1 (HsIPName (getIPDUPVARID $1)) }
-----------------------------------------------------------------------------
-- Warnings and deprecations