diff options
author | Moonchild <moonchild@palemoon.org> | 2022-05-21 16:38:37 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2022-05-21 16:38:37 +0000 |
commit | 2694995e52a0bd767acac74f2306767d0a3720c9 (patch) | |
tree | d2a1198ccd0b8eab1b0b589b6900845aa3b87d5b /js/src/frontend/TokenStream.cpp | |
parent | f532bbd7af98d2cb543bf86b93b0e0e9fa1e9b2a (diff) | |
parent | 00c51f75fa4845f348708a796d552ca281f8210a (diff) | |
download | uxp-2694995e52a0bd767acac74f2306767d0a3720c9.tar.gz |
Merge branch 'master' into 12101210
Diffstat (limited to 'js/src/frontend/TokenStream.cpp')
-rw-r--r-- | js/src/frontend/TokenStream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index 8f9e206d9f..b464b23048 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -1260,8 +1260,8 @@ enum FirstCharKind { LastCharKind = Other }; -// OneChar: 40, 41, 44, 58, 59, 63, 91, 93, 123, 125, 126: -// '(', ')', ',', ':', ';', '?', '[', ']', '{', '}', '~' +// OneChar: 40, 41, 44, 58, 59, 91, 93, 123, 125, 126: +// '(', ')', ',', ':', ';', '[', ']', '{', '}', '~' // Ident: 36, 65..90, 95, 97..122: '$', 'A'..'Z', '_', 'a'..'z' // Dot: 46: '.' // Equals: 61: '=' @@ -1811,7 +1811,7 @@ TokenStream::getTokenInternal(TokenKind* ttp, Modifier modifier) tp->type = TOK_OPTCHAIN; } } else { - tp->type = TOK_HOOK; + tp->type = matchChar('?') ? TOK_COALESCE : TOK_HOOK; } goto out; |