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/Lexer.x | |
| 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/Lexer.x')
| -rw-r--r-- | compiler/parser/Lexer.x | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x index 95880946bb..12389e7f17 100644 --- a/compiler/parser/Lexer.x +++ b/compiler/parser/Lexer.x @@ -472,6 +472,7 @@ data Token | ITccallconv | ITcapiconv | ITprimcallconv + | ITjavascriptcallconv | ITmdo | ITfamily | ITgroup @@ -668,6 +669,7 @@ reservedWordsFM = listToUFM $ ( "ccall", ITccallconv, bit ffiBit), ( "capi", ITcapiconv, bit cApiFfiBit), ( "prim", ITprimcallconv, bit ffiBit), + ( "javascript", ITjavascriptcallconv, bit ffiBit), ( "rec", ITrec, bit arrowsBit .|. bit recursiveDoBit), |