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

Issue #1918 - m-c 1353693: Correct parsing of async generator methods

Browse source
This commit is contained in:
Martok 2022-06-17 21:12:01 +02:00 • committed by roytam1
commit e9cc7313ac
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7085,6 +7085,7 @@ JSOpFromPropertyType(PropertyType propType)
case PropertyType::Method: case PropertyType::Method:
case PropertyType::GeneratorMethod: case PropertyType::GeneratorMethod:
case PropertyType::AsyncMethod: case PropertyType::AsyncMethod:
case PropertyType::AsyncGeneratorMethod:
case PropertyType::Constructor: case PropertyType::Constructor:
case PropertyType::DerivedConstructor: case PropertyType::DerivedConstructor:
return JSOP_INITPROP; return JSOP_INITPROP;
@ -7208,7 +7209,7 @@ Parser<ParseHandler>::classDefinition(YieldHandling yieldHandling,
if (propType != PropertyType::Getter && propType != PropertyType::Setter && if (propType != PropertyType::Getter && propType != PropertyType::Setter &&
propType != PropertyType::Method && propType != PropertyType::GeneratorMethod && propType != PropertyType::Method && propType != PropertyType::GeneratorMethod &&
propType != PropertyType::AsyncMethod && propType != PropertyType::AsyncMethod && propType != PropertyType::AsyncGeneratorMethod &&
propType != PropertyType::Constructor && propType != PropertyType::DerivedConstructor) propType != PropertyType::Constructor && propType != PropertyType::DerivedConstructor)
{ {
errorAt(nameOffset, JSMSG_BAD_METHOD_DEF); errorAt(nameOffset, JSMSG_BAD_METHOD_DEF);
@ -9736,6 +9737,9 @@ Parser<ParseHandler>::propertyName(YieldHandling yieldHandling,
// AsyncMethod[Yield, Await]: // AsyncMethod[Yield, Await]:
// async [no LineTerminator here] PropertyName[?Yield, ?Await] ... // async [no LineTerminator here] PropertyName[?Yield, ?Await] ...
// //
// AsyncGeneratorMethod[Yield, Await]:
// async [no LineTerminator here] * PropertyName[?Yield, ?Await] ...
//
// PropertyName: // PropertyName:
// LiteralPropertyName // LiteralPropertyName
// ComputedPropertyName[?Yield, ?Await] // ComputedPropertyName[?Yield, ?Await]
@ -9751,7 +9755,7 @@ Parser<ParseHandler>::propertyName(YieldHandling yieldHandling,
if (!tokenStream.peekTokenSameLine(&tt)) if (!tokenStream.peekTokenSameLine(&tt))
return null(); return null();
if (tt == TOK_STRING || tt == TOK_NUMBER || tt == TOK_LB || if (tt == TOK_STRING || tt == TOK_NUMBER || tt == TOK_LB ||
TokenKindIsPossibleIdentifierName(tt)) TokenKindIsPossibleIdentifierName(tt) || tt == TOK_MUL)
{ {
isAsync = true; isAsync = true;
tokenStream.consumeKnownToken(tt); tokenStream.consumeKnownToken(tt);
@ -9891,7 +9895,9 @@ Parser<ParseHandler>::propertyName(YieldHandling yieldHandling,
if (tt == TOK_LP) { if (tt == TOK_LP) {
tokenStream.ungetToken(); tokenStream.ungetToken();
if (isGenerator) if (isGenerator && isAsync)
*propType = PropertyType::AsyncGeneratorMethod;
else if (isGenerator)
*propType = PropertyType::GeneratorMethod; *propType = PropertyType::GeneratorMethod;
else if (isAsync) else if (isAsync)
*propType = PropertyType::AsyncMethod; *propType = PropertyType::AsyncMethod;
@ -10169,6 +10175,7 @@ Parser<ParseHandler>::methodDefinition(uint32_t toStringStart, PropertyType prop
case PropertyType::Method: case PropertyType::Method:
case PropertyType::GeneratorMethod: case PropertyType::GeneratorMethod:
case PropertyType::AsyncMethod: case PropertyType::AsyncMethod:
case PropertyType::AsyncGeneratorMethod:
kind = Method; kind = Method;
break; break;
@ -10184,11 +10191,13 @@ Parser<ParseHandler>::methodDefinition(uint32_t toStringStart, PropertyType prop
MOZ_CRASH("Parser: methodDefinition: unexpected property type"); MOZ_CRASH("Parser: methodDefinition: unexpected property type");
} }
GeneratorKind generatorKind = propType == PropertyType::GeneratorMethod GeneratorKind generatorKind = (propType == PropertyType::GeneratorMethod ||
propType == PropertyType::AsyncGeneratorMethod)
? StarGenerator ? StarGenerator
: NotGenerator; : NotGenerator;
FunctionAsyncKind asyncKind = (propType == PropertyType::AsyncMethod) FunctionAsyncKind asyncKind = (propType == PropertyType::AsyncMethod ||
propType == PropertyType::AsyncGeneratorMethod)
? AsyncFunction ? AsyncFunction
: SyncFunction; : SyncFunction;

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

@ -579,6 +579,7 @@ enum class PropertyType {
Method, Method,
GeneratorMethod, GeneratorMethod,
AsyncMethod, AsyncMethod,
AsyncGeneratorMethod,
Constructor, Constructor,
DerivedConstructor DerivedConstructor
}; };