Skip to content

Commit 05b6eeb

Browse files
Closure Teamcopybara-github
Closure Team
authored andcommitted
Update Parser method names that are exclusively used for object literals to reflect that
PiperOrigin-RevId: 722824340
1 parent c830ac4 commit 05b6eeb

File tree

1 file changed

+15
-15
lines changed
  • src/com/google/javascript/jscomp/parsing/parser

1 file changed

+15
-15
lines changed

src/com/google/javascript/jscomp/parsing/parser/Parser.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ private ParseTree parseMethodDefinition(
712712
}
713713
}
714714

715-
private ParseTree parseMethodDeclaration() {
715+
private ParseTree parseObjectLiteralMethodDeclaration() {
716716
return parseMethodDeclaration(createObjectLiteralElementInfo());
717717
}
718718

@@ -732,7 +732,7 @@ private ParseTree parseClassMemberDeclaration(ClassOrObjectElementInfo elementIn
732732
}
733733
}
734734

735-
private ParseTree parseAsyncMethod() {
735+
private ParseTree parseObjectLiteralAsyncMethod() {
736736
return parseAsyncMethod(createObjectLiteralElementInfo());
737737
}
738738

@@ -1930,7 +1930,7 @@ private ParseTree parseObjectLiteral() {
19301930
eat(TokenType.OPEN_CURLY);
19311931
Token commaToken = null;
19321932
while (peek(TokenType.ELLIPSIS) || peekPropertyNameOrComputedProp(0) || peek(TokenType.STAR)) {
1933-
result.add(parsePropertyAssignment());
1933+
result.add(parseObjectLiteralPropertyAssignment());
19341934
commaToken = eatOpt(TokenType.COMMA);
19351935
if (commaToken == null) {
19361936
break;
@@ -1974,10 +1974,10 @@ private boolean peekPropertyName(int tokenIndex) {
19741974
}
19751975
}
19761976

1977-
private ParseTree parsePropertyAssignment() {
1977+
private ParseTree parseObjectLiteralPropertyAssignment() {
19781978
TokenType type = peekType();
19791979
if (type == TokenType.STAR) {
1980-
return parsePropertyAssignmentGenerator();
1980+
return parseObjectLiteralPropertyAssignmentGenerator();
19811981
} else if (type == TokenType.ELLIPSIS) {
19821982
recordFeatureUsed(Feature.OBJECT_LITERALS_WITH_SPREAD);
19831983
SourcePosition start = getTreeStartLocation();
@@ -1990,15 +1990,15 @@ private ParseTree parsePropertyAssignment() {
19901990
|| type == TokenType.IDENTIFIER
19911991
|| Keywords.isKeyword(type)) {
19921992
if (peekGetAccessor()) {
1993-
return parseGetAccessor();
1993+
return parseObjectLiteralGetAccessor();
19941994
} else if (peekSetAccessor()) {
1995-
return parseSetAccessor();
1995+
return parseObjectLiteralSetAccessor();
19961996
} else if (peekAsyncMethod()) {
1997-
return parseAsyncMethod();
1997+
return parseObjectLiteralAsyncMethod();
19981998
} else if (peekType(1) == TokenType.OPEN_PAREN) {
1999-
return parseMethodDeclaration();
1999+
return parseObjectLiteralMethodDeclaration();
20002000
} else {
2001-
return parsePropertyNameAssignment();
2001+
return parseObjectLiteralPropertyNameAssignment();
20022002
}
20032003
} else if (type == TokenType.OPEN_SQUARE) {
20042004
SourcePosition start = getTreeStartLocation();
@@ -2020,14 +2020,14 @@ private ParseTree parsePropertyAssignment() {
20202020
}
20212021
}
20222022

2023-
private ParseTree parsePropertyAssignmentGenerator() {
2023+
private ParseTree parseObjectLiteralPropertyAssignmentGenerator() {
20242024
TokenType type = peekType(1);
20252025
if (type == TokenType.STRING
20262026
|| type == TokenType.NUMBER
20272027
|| type == TokenType.IDENTIFIER
20282028
|| Keywords.isKeyword(type)) {
20292029
// parseMethodDeclaration will consume the '*'.
2030-
return parseMethodDeclaration();
2030+
return parseObjectLiteralMethodDeclaration();
20312031
} else {
20322032
SourcePosition start = getTreeStartLocation();
20332033
eat(TokenType.STAR);
@@ -2072,7 +2072,7 @@ private boolean peekPredefinedString(int index, String string) {
20722072
&& ((IdentifierToken) peekToken(index)).value.equals(string);
20732073
}
20742074

2075-
private ParseTree parseGetAccessor() {
2075+
private ParseTree parseObjectLiteralGetAccessor() {
20762076
return parseGetAccessor(createObjectLiteralElementInfo());
20772077
}
20782078

@@ -2106,7 +2106,7 @@ private boolean peekSetAccessor() {
21062106
return peekPredefinedString(PredefinedName.SET) && peekPropertyNameOrComputedProp(1);
21072107
}
21082108

2109-
private ParseTree parseSetAccessor() {
2109+
private ParseTree parseObjectLiteralSetAccessor() {
21102110
return parseSetAccessor(createObjectLiteralElementInfo());
21112111
}
21122112

@@ -2137,7 +2137,7 @@ private ParseTree parseSetAccessor(ClassOrObjectElementInfo elementInfo) {
21372137
}
21382138
}
21392139

2140-
private ParseTree parsePropertyNameAssignment() {
2140+
private ParseTree parseObjectLiteralPropertyNameAssignment() {
21412141
SourcePosition start = getTreeStartLocation();
21422142
Token name = eatObjectLiteralPropertyName();
21432143
Token colon = eatOpt(TokenType.COLON);

0 commit comments

Comments
 (0)