wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

1336783 - Part 3 - Use simpler macro to avoid internal compiler error on SM-tc(H).

Browse source
This commit is contained in:
Gaming4JC 2019-06-09 16:29:42 -04:00 • committed by Roy Tam
commit f2c29cbe59
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/src/frontend/Parser.cpp
View file

@ -63,24 +63,27 @@ using BindingIter = ParseContext::Scope::BindingIter;
using UsedNamePtr = UsedNameTracker::UsedNameMap::Ptr; using UsedNamePtr = UsedNameTracker::UsedNameMap::Ptr;
// Read a token. Report an error and return null() if that token doesn't match // Read a token. Report an error and return null() if that token doesn't match
// to the given func's condition. // to the condition. Do not use MUST_MATCH_TOKEN_INTERNAL directly.
#define MUST_MATCH_TOKEN_FUNC_MOD(func, modifier, errorNumber) \ #define MUST_MATCH_TOKEN_INTERNAL(cond, modifier, errorNumber) \
JS_BEGIN_MACRO \ JS_BEGIN_MACRO \
TokenKind token; \ TokenKind token; \
if (!tokenStream.getToken(&token, modifier)) \ if (!tokenStream.getToken(&token, modifier)) \
return null(); \ return null(); \
if (!(func)(token)) { \ if (!(cond)) { \
error(errorNumber); \ error(errorNumber); \
return null(); \ return null(); \
} \ } \
JS_END_MACRO JS_END_MACRO
#define MUST_MATCH_TOKEN_MOD(tt, modifier, errorNumber) \ #define MUST_MATCH_TOKEN_MOD(tt, modifier, errorNumber) \
MUST_MATCH_TOKEN_FUNC_MOD([](TokenKind tok) { return tok == tt; }, modifier, errorNumber) MUST_MATCH_TOKEN_INTERNAL(token == tt, modifier, errorNumber)
#define MUST_MATCH_TOKEN(tt, errorNumber) \ #define MUST_MATCH_TOKEN(tt, errorNumber) \
MUST_MATCH_TOKEN_MOD(tt, TokenStream::None, errorNumber) MUST_MATCH_TOKEN_MOD(tt, TokenStream::None, errorNumber)
#define MUST_MATCH_TOKEN_FUNC_MOD(func, modifier, errorNumber) \
MUST_MATCH_TOKEN_INTERNAL((func)(token), modifier, errorNumber)
#define MUST_MATCH_TOKEN_FUNC(func, errorNumber) \ #define MUST_MATCH_TOKEN_FUNC(func, errorNumber) \
MUST_MATCH_TOKEN_FUNC_MOD(func, TokenStream::None, errorNumber) MUST_MATCH_TOKEN_FUNC_MOD(func, TokenStream::None, errorNumber)