Commit 25e4556d authored by Alan Zimmerman's avatar Alan Zimmerman
Browse files

Various API Annotations fixes

- Export unicodeAnn from GHC
- unicodeAnn for Annlarrowtail was wrong
- Use actual source for a CImport SourceText
parent bb7f2e33
......@@ -272,6 +272,7 @@ module GHC (
ApiAnns,AnnKeywordId(..),AnnotationComment(..),
getAnnotation, getAndRemoveAnnotation,
getAnnotationComments, getAndRemoveAnnotationComments,
unicodeAnn,
-- * Miscellaneous
--sessionHscEnv,
......
......@@ -324,7 +324,7 @@ unicodeAnn AnnDcolon = AnnDcolonU
unicodeAnn AnnLarrow = AnnLarrowU
unicodeAnn AnnRarrow = AnnRarrowU
unicodeAnn AnnDarrow = AnnDarrowU
unicodeAnn Annlarrowtail = AnnLarrowtailU
unicodeAnn Annlarrowtail = AnnlarrowtailU
unicodeAnn Annrarrowtail = AnnrarrowtailU
unicodeAnn AnnLarrowtail = AnnLarrowtailU
unicodeAnn AnnRarrowtail = AnnRarrowtailU
......
......@@ -1268,7 +1268,7 @@ mkImport (L lc cconv) (L ls safety) (L loc (StringLiteral esrc entity), v, ty)
| cconv == PrimCallConv = do
let funcTarget = CFunction (StaticTarget esrc entity Nothing True)
importSpec = CImport (L lc PrimCallConv) (L ls safety) Nothing funcTarget
(L loc (unpackFS entity))
(L loc esrc)
return (ForD (ForeignImport { fd_name = v, fd_sig_ty = ty
, fd_co = noForeignImportCoercionYet
, fd_fi = importSpec }))
......
......@@ -142,7 +142,7 @@
((Test11018.hs:43:11-17,AnnOpenP), [Test11018.hs:43:11]),
((Test11018.hs:43:12,AnnComma), [Test11018.hs:43:13]),
((Test11018.hs:43:14,AnnComma), [Test11018.hs:43:15]),
((Test11018.hs:43:22-34,AnnLarrowtailU), [Test11018.hs:43:30]),
((Test11018.hs:43:22-34,AnnlarrowtailU), [Test11018.hs:43:30]),
((Test11018.hs:43:32-34,AnnVal), [Test11018.hs:43:33]),
((Test11018.hs:45:1-36,AnnDcolon), [Test11018.hs:45:5-6]),
((Test11018.hs:45:1-36,AnnSemi), [Test11018.hs:46:1]),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment