in stage1, we should get isPrint and isUpper from Compat.Unicode, not Data.Char

[ghc-hetmet.git] / ghc / compiler / parser / Parser.y.pp

diff --git a/ghc/compiler/parser/Parser.y.pp b/ghc/compiler/parser/Parser.y.pp
index 156cedc..3066a0f 100644 (file)
--- a/ghc/compiler/parser/Parser.y.pp
+++ b/ghc/compiler/parser/Parser.y.pp
@@ -275,7 +275,7 @@ TH_TY_QUOTE { L _ ITtyQuote       }      -- ''T
 %name parseIdentifier  identifier
 %name parseType ctype
 %partial parseHeader header
-%tokentype { Located Token }
+%tokentype { (Located Token) }
 %%
 
 -----------------------------------------------------------------------------
@@ -532,7 +532,7 @@ rule        :: { LHsDecl RdrName }
        : STRING activation rule_forall infixexp '=' exp
             { LL $ RuleD (HsRule (getSTRING $1) 
                                  ($2 `orElse` AlwaysActive) 
-                                 $3 $4 $6) }
+                                 $3 $4 placeHolderNames $6 placeHolderNames) }
 
 activation :: { Maybe Activation } 
         : {- empty -}                           { Nothing }