projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments only
[ghc-hetmet.git]
/
compiler
/
parser
/
ParserCore.y
diff --git
a/compiler/parser/ParserCore.y
b/compiler/parser/ParserCore.y
index
0f2bb97
..
0289cfc
100644
(file)
--- a/
compiler/parser/ParserCore.y
+++ b/
compiler/parser/ParserCore.y
@@
-16,8
+16,9
@@
import RdrName
import OccName
import Type ( Kind,
liftedTypeKindTyCon, openTypeKindTyCon, unliftedTypeKindTyCon,
import OccName
import Type ( Kind,
liftedTypeKindTyCon, openTypeKindTyCon, unliftedTypeKindTyCon,
- argTypeKindTyCon, ubxTupleKindTyCon, mkArrowKind, mkTyConApp
+ argTypeKindTyCon, ubxTupleKindTyCon, mkTyConApp
)
)
+import Coercion( mkArrowKind )
import Name( Name, nameOccName, nameModule, mkExternalName )
import Module
import ParserCoreUtils
import Name( Name, nameOccName, nameModule, mkExternalName )
import Module
import ParserCoreUtils
@@
-29,7
+30,7
@@
import TysPrim( wordPrimTyCon, intPrimTyCon, charPrimTyCon,
import TyCon ( TyCon, tyConName )
import FastString
import Outputable
import TyCon ( TyCon, tyConName )
import FastString
import Outputable
-import Char
+import Data.Char
import Unique
#include "../HsVersions.h"
import Unique
#include "../HsVersions.h"
@@
-269,13
+270,14
@@
exp :: { IfaceExpr }
| '%case' '(' ty ')' aexp '%of' id_bndr
'{' alts1 '}' { IfaceCase $5 (fst $7) $3 $9 }
| '%cast' aexp aty { IfaceCast $2 $3 }
| '%case' '(' ty ')' aexp '%of' id_bndr
'{' alts1 '}' { IfaceCase $5 (fst $7) $3 $9 }
| '%cast' aexp aty { IfaceCast $2 $3 }
- | '%note' STRING exp
- { case $2 of
- --"SCC" -> IfaceNote (IfaceSCC "scc") $3
- "InlineMe" -> IfaceNote IfaceInlineMe $3
- }
+-- No InlineMe any more
+-- | '%note' STRING exp
+-- { case $2 of
+-- --"SCC" -> IfaceNote (IfaceSCC "scc") $3
+-- "InlineMe" -> IfaceNote IfaceInlineMe $3
+-- }
| '%external' STRING aty { IfaceFCall (ForeignCall.CCall
| '%external' STRING aty { IfaceFCall (ForeignCall.CCall
- (CCallSpec (StaticTarget (mkFastString $2))
+ (CCallSpec (StaticTarget (mkFastString $2) Nothing)
CCallConv (PlaySafe False)))
$3 }
CCallConv (PlaySafe False)))
$3 }