diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2015-12-30 18:51:53 +0200 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2015-12-31 11:52:52 +0200 |
| commit | 25e4556d97429e95ddb5972f6e7e6599ef902e9c (patch) | |
| tree | 1a17292a9fcf9f91e0dce42d1d70f4e6bded12d7 /compiler/parser | |
| parent | bb7f2e33197e667eb694bd1243f125c722a0a868 (diff) | |
| download | haskell-25e4556d97429e95ddb5972f6e7e6599ef902e9c.tar.gz | |
Various API Annotations fixes
- Export unicodeAnn from GHC
- unicodeAnn for Annlarrowtail was wrong
- Use actual source for a CImport SourceText
Diffstat (limited to 'compiler/parser')
| -rw-r--r-- | compiler/parser/ApiAnnotation.hs | 2 | ||||
| -rw-r--r-- | compiler/parser/RdrHsSyn.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/parser/ApiAnnotation.hs b/compiler/parser/ApiAnnotation.hs index b5214c17b3..73490e4fc5 100644 --- a/compiler/parser/ApiAnnotation.hs +++ b/compiler/parser/ApiAnnotation.hs @@ -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 diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs index f423c6e71b..0f380862a4 100644 --- a/compiler/parser/RdrHsSyn.hs +++ b/compiler/parser/RdrHsSyn.hs @@ -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 })) |