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

1339963 - Part 3: Check IdentifierName in ExportClause without from.

Browse source
This commit is contained in:
Gaming4JC 2019-06-09 22:35:15 -04:00 • committed by Roy Tam
commit 9b7c6181e6
3 changed files with 77 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5124,6 +5124,31 @@ Parser<ParseHandler>::exportBatch(uint32_t begin)
return exportFrom(begin, kid);
}
template<>
bool
Parser<FullParseHandler>::checkLocalExportNames(ParseNode* node)
{
// ES 2017 draft 15.2.3.1.
for (ParseNode* next = node->pn_head; next; next = next->pn_next) {
ParseNode* name = next->pn_left;
MOZ_ASSERT(name->isKind(PNK_NAME));
RootedPropertyName ident(context, name->pn_atom->asPropertyName());
if (!checkLocalExportName(ident, name->pn_pos.begin))
return false;
}
return true;
}
template<>
bool
Parser<SyntaxParseHandler>::checkLocalExportNames(Node node)
{
MOZ_ALWAYS_FALSE(abortIfSyntaxParser());
return false;
}
template <typename ParseHandler>
typename ParseHandler::Node
Parser<ParseHandler>::exportClause(uint32_t begin)
@ -5211,6 +5236,9 @@ Parser<ParseHandler>::exportClause(uint32_t begin)
if (!matchOrInsertSemicolonAfterNonExpression())
return null();
if (!checkLocalExportNames(kid))
return null();
Node node = handler.newExportDeclaration(kid, TokenPos(begin, pos().end));
if (!node)
return null();

5
js/src/frontend/Parser.h
View file

@ -1202,6 +1202,7 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
Node exportFrom(uint32_t begin, Node specList);
Node exportBatch(uint32_t begin);
bool checkLocalExportNames(Node node);
Node exportClause(uint32_t begin);
Node exportFunctionDeclaration(uint32_t begin);
Node exportVariableStatement(uint32_t begin);
@ -1356,6 +1357,10 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
uint32_t offset,
YieldHandling yieldHandling);
bool checkLocalExportName(HandlePropertyName ident, uint32_t offset) {
return checkLabelOrIdentifierReference(ident, offset, YieldIsName);
}
bool checkBindingIdentifier(HandlePropertyName ident,
uint32_t offset,
YieldHandling yieldHandling);

46
js/src/jit-test/tests/modules/export-declaration.js
View file

@ -403,10 +403,52 @@ assertThrowsInstanceOf(function() {
parseAsModule("export {,} from 'a'");
}, SyntaxError);
parseAsModule("export { true as a } from 'b'");
program([
exportDeclaration(
null,
[
exportSpecifier(
ident("true"),
ident("true")
),
],
lit("b"),
false
)
]).assert(parseAsModule("export { true } from 'b'"));
program([
exportDeclaration(
null,
[
exportSpecifier(
ident("true"),
ident("name")
),
],
lit("b"),
false
)
]).assert(parseAsModule("export { true as name } from 'b'"));
assertThrowsInstanceOf(function() {
parseAsModule("export { true }");
}, SyntaxError);
assertThrowsInstanceOf(function() {
parseAsModule("export { true as name }");
}, SyntaxError);
assertThrowsInstanceOf(function() {
parseAsModule("export { static }");
}, SyntaxError);
assertThrowsInstanceOf(function() {
parseAsModule("export { static as name }");
}, SyntaxError);
assertThrowsInstanceOf(function () {
parseAsModule("export { a } from 'b' f();");
parseAsModule("export { name } from 'b' f();");
}, SyntaxError);
assertThrowsInstanceOf(function () {