Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eta support #353

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Eta support #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09f228b
Added support for java calling covention
rahulmutt Feb 23, 2017
01d6f39
Allow constraints in FFI type sigs
rahulmutt Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Language/Haskell/Exts/ExactPrint.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2078,6 +2078,7 @@ instance ExactP CallConv where
exactP (CPlusPlus _) = printString "cplusplus"
exactP (DotNet _) = printString "dotnet"
exactP (Jvm _) = printString "jvm"
exactP (Java _) = printString "java"
exactP (Js _) = printString "js"
exactP (JavaScript _) = printString "javascript"
exactP (CApi _) = printString "capi"
Expand Down
3 changes: 3 additions & 0 deletions src/Language/Haskell/Exts/InternalLexer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ data Token
| KW_CPlusPlus
| KW_DotNet
| KW_Jvm
| KW_Java
| KW_Js
| KW_JavaScript
| KW_CApi
Expand Down Expand Up @@ -312,6 +313,7 @@ special_varids = [
( "cplusplus", (KW_CPlusPlus, Just (Any [ForeignFunctionInterface])) ),
( "dotnet", (KW_DotNet, Just (Any [ForeignFunctionInterface])) ),
( "jvm", (KW_Jvm, Just (Any [ForeignFunctionInterface])) ),
( "java", (KW_Java, Just (Any [ForeignFunctionInterface])) ),
( "js", (KW_Js, Just (Any [ForeignFunctionInterface])) ),
( "javascript", (KW_JavaScript, Just (Any [ForeignFunctionInterface])) ),
( "capi", (KW_CApi, Just (Any [CApiFFI])) )
Expand Down Expand Up @@ -1420,6 +1422,7 @@ showToken t = case t of
KW_CPlusPlus -> "cplusplus"
KW_DotNet -> "dotnet"
KW_Jvm -> "jvm"
KW_Java -> "java"
KW_Js -> "js"
KW_JavaScript -> "javascript"
KW_CApi -> "capi"
Expand Down
6 changes: 4 additions & 2 deletions src/Language/Haskell/Exts/InternalParser.ly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ FFI
> 'cplusplus' { Loc $$ KW_CPlusPlus }
> 'dotnet' { Loc $$ KW_DotNet }
> 'jvm' { Loc $$ KW_Jvm }
> 'java' { Loc $$ KW_Java }
> 'js' { Loc $$ KW_Js } -- 90
> 'javascript' { Loc $$ KW_JavaScript }
> 'capi' { Loc $$ KW_CApi }
Expand Down Expand Up @@ -845,6 +846,7 @@ so no need to check for extensions.
> | 'cplusplus' { CPlusPlus (nIS $1) }
> | 'dotnet' { DotNet (nIS $1) }
> | 'jvm' { Jvm (nIS $1) }
> | 'java' { Java (nIS $1) }
> | 'js' { Js (nIS $1) }
> | 'javascript' { JavaScript (nIS $1) }
> | 'capi' { CApi (nIS $1) }
Expand All @@ -858,8 +860,8 @@ so no need to check for extensions.
> | {- empty -} { Nothing }

> fspec :: { (Maybe String, Name L, Type L, [S]) }
> : STRING var_no_safety '::' truedtype { let Loc l (StringTok (s,_)) = $1 in (Just s, $2, $4, [l,$3]) }
> | var_no_safety '::' truedtype { (Nothing, $1, $3, [$2]) }
> : STRING var_no_safety '::' truectype { let Loc l (StringTok (s,_)) = $1 in (Just s, $2, $4, [l,$3]) }
> | var_no_safety '::' truectype { (Nothing, $1, $3, [$2]) }

-----------------------------------------------------------------------------
Pragmas
Expand Down
1 change: 1 addition & 0 deletions src/Language/Haskell/Exts/Pretty.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ instance Pretty (CallConv l) where
pretty CPlusPlus {} = text "cplusplus"
pretty DotNet {} = text "dotnet"
pretty Jvm {} = text "jvm"
pretty Java {} = text "java"
pretty Js {} = text "js"
pretty JavaScript {} = text "javascript"
pretty CApi {} = text "capi"
Expand Down
2 changes: 2 additions & 0 deletions src/Language/Haskell/Exts/Syntax.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ data CallConv l
| CPlusPlus l
| DotNet l
| Jvm l
| Java l
| Js l
| JavaScript l
| CApi l
Expand Down Expand Up @@ -1724,6 +1725,7 @@ instance Annotated CallConv where
ann (CPlusPlus l) = l
ann (DotNet l) = l
ann (Jvm l) = l
ann (Java l) = l
ann (Js l) = l
ann (JavaScript l) = l
ann (CApi l) = l
Expand Down