wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1066827 - Part13: Fix conflict with Bug 1088328, caused by the change in TokenStream::matchToken on a CLOSED TREE. r=bbouvier

Browse Source
This commit is contained in:
Tooru Fujisawa 2014-10-28 02:45:00 +01:00
parent 76559da488
commit 50596ce740
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/asmjs/AsmJSValidate.cpp
View File

@ -3875,13 +3875,18 @@ CheckModuleProcessingDirectives(ModuleCompiler &m)
{
TokenStream &ts = m.parser().tokenStream;
while (true) {
if (!ts.matchToken(TOK_STRING))
bool matched;
if (!ts.matchToken(&matched, TOK_STRING))
return false;
if (!matched)
return true;
if (!IsIgnoredDirectiveName(m.cx(), ts.currentToken().atom()))
return m.fail(nullptr, "unsupported processing directive");
if (!ts.matchToken(TOK_SEMI))
if (!ts.matchToken(&matched, TOK_SEMI))
return false;
if (!matched)
return m.fail(nullptr, "expected semicolon after string literal");
}
}