diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2013-09-08 22:10:50 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2013-09-08 22:10:50 -0400 |
| commit | 783ca393d9b262fe0efc6308e71c95a2da0eda1a (patch) | |
| tree | d515913f550abc335500613a02c1311d6e12e341 /compiler/parser/Parser.y.pp | |
| parent | a58ba1856451447350132f20637deb898ebee252 (diff) | |
| parent | 2cec084e45392e0b0d198254017b140accee32f0 (diff) | |
| download | haskell-ghc-parmake-gsoc.tar.gz | |
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsocghc-parmake-gsoc
Diffstat (limited to 'compiler/parser/Parser.y.pp')
| -rw-r--r-- | compiler/parser/Parser.y.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 634d3c76f0..b18d0d35c6 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -251,6 +251,7 @@ incorrect. 'ccall' { L _ ITccallconv } 'capi' { L _ ITcapiconv } 'prim' { L _ ITprimcallconv } + 'javascript' { L _ ITjavascriptcallconv } 'proc' { L _ ITproc } -- for arrow notation extension 'rec' { L _ ITrec } -- for arrow notation extension 'group' { L _ ITgroup } -- for list transform extension @@ -977,6 +978,7 @@ callconv :: { CCallConv } | 'ccall' { CCallConv } | 'capi' { CApiConv } | 'prim' { PrimCallConv} + | 'javascript' { JavaScriptCallConv } safety :: { Safety } : 'unsafe' { PlayRisky } @@ -2047,6 +2049,7 @@ special_id | 'ccall' { L1 (fsLit "ccall") } | 'capi' { L1 (fsLit "capi") } | 'prim' { L1 (fsLit "prim") } + | 'javascript' { L1 (fsLit "javascript") } | 'group' { L1 (fsLit "group") } special_sym :: { Located FastString } |