AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[parser cleanup] Small cleanups to ParsePropertyName

Browse Source 
Remove an unnecessary is_static argument to ParsePropertyName (the caller
already has easy access to that information) and inline
ParseIdentifierNameOrGetOrSet into its only caller.

Review URL: https://codereview.chromium.org/1606193003

Cr-Commit-Position: refs/heads/master@{#33419}
This commit is contained in:
adamk 2016-01-20 13:27:31 -08:00 committed by Commit bot
parent 637cbeeb12
commit e7fdf5eaed
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/parsing/parser-base.h
View File

@ -715,10 +715,6 @@ class ParserBase : public Traits {
} }
IdentifierT ParseIdentifierName(bool* ok); IdentifierT ParseIdentifierName(bool* ok);
// Parses an identifier and determines whether or not it is 'get' or 'set'.
IdentifierT ParseIdentifierNameOrGetOrSet(bool* is_get, bool* is_set,
bool* ok);
ExpressionT ParseRegExpLiteral(bool seen_equal, ExpressionT ParseRegExpLiteral(bool seen_equal,
ExpressionClassifier* classifier, bool* ok); ExpressionClassifier* classifier, bool* ok);
@ -732,7 +728,7 @@ class ParserBase : public Traits {
ExpressionClassifier* classifier, bool* ok); ExpressionClassifier* classifier, bool* ok);
ExpressionT ParseArrayLiteral(ExpressionClassifier* classifier, bool* ok); ExpressionT ParseArrayLiteral(ExpressionClassifier* classifier, bool* ok);
ExpressionT ParsePropertyName(IdentifierT* name, bool* is_get, bool* is_set, ExpressionT ParsePropertyName(IdentifierT* name, bool* is_get, bool* is_set,
bool* is_static, bool* is_computed_name, bool* is_computed_name,
ExpressionClassifier* classifier, bool* ok); ExpressionClassifier* classifier, bool* ok);
ExpressionT ParseObjectLiteral(ExpressionClassifier* classifier, bool* ok); ExpressionT ParseObjectLiteral(ExpressionClassifier* classifier, bool* ok);
ObjectLiteralPropertyT ParsePropertyDefinition( ObjectLiteralPropertyT ParsePropertyDefinition(
@ -1172,18 +1168,6 @@ ParserBase<Traits>::ParseIdentifierName(bool* ok) {
} }
template <class Traits>
typename ParserBase<Traits>::IdentifierT
ParserBase<Traits>::ParseIdentifierNameOrGetOrSet(bool* is_get,
bool* is_set,
bool* ok) {
IdentifierT result = ParseIdentifierName(ok);
if (!*ok) return Traits::EmptyIdentifier();
scanner()->IsGetOrSet(is_get, is_set);
return result;
}
template <class Traits> template <class Traits>
typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParseRegExpLiteral( typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParseRegExpLiteral(
bool seen_equal, ExpressionClassifier* classifier, bool* ok) { bool seen_equal, ExpressionClassifier* classifier, bool* ok) {
@ -1557,8 +1541,8 @@ typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParseArrayLiteral(
template <class Traits> template <class Traits>
typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParsePropertyName( typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParsePropertyName(
IdentifierT* name, bool* is_get, bool* is_set, bool* is_static, IdentifierT* name, bool* is_get, bool* is_set, bool* is_computed_name,
bool* is_computed_name, ExpressionClassifier* classifier, bool* ok) { ExpressionClassifier* classifier, bool* ok) {
Token::Value token = peek(); Token::Value token = peek();
int pos = peek_position(); int pos = peek_position();
@ -1601,12 +1585,9 @@ typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParsePropertyName(
return expression; return expression;
} }
case Token::STATIC:
*is_static = true;
// Fall through.
default: default:
*name = ParseIdentifierNameOrGetOrSet(is_get, is_set, CHECK_OK); *name = ParseIdentifierName(CHECK_OK);
scanner()->IsGetOrSet(is_get, is_set);
break; break;
} }
@ -1627,14 +1608,13 @@ ParserBase<Traits>::ParsePropertyDefinition(
ExpressionT value = this->EmptyExpression(); ExpressionT value = this->EmptyExpression();
bool is_get = false; bool is_get = false;
bool is_set = false; bool is_set = false;
bool name_is_static = false;
bool is_generator = Check(Token::MUL); bool is_generator = Check(Token::MUL);
Token::Value name_token = peek(); Token::Value name_token = peek();
int next_beg_pos = scanner()->peek_location().beg_pos; int next_beg_pos = scanner()->peek_location().beg_pos;
int next_end_pos = scanner()->peek_location().end_pos; int next_end_pos = scanner()->peek_location().end_pos;
ExpressionT name_expression = ParsePropertyName( ExpressionT name_expression =
name, &is_get, &is_set, &name_is_static, is_computed_name, classifier, ParsePropertyName(name, &is_get, &is_set, is_computed_name, classifier,
CHECK_OK_CUSTOM(EmptyObjectLiteralProperty)); CHECK_OK_CUSTOM(EmptyObjectLiteralProperty));
if (fni_ != nullptr && !*is_computed_name) { if (fni_ != nullptr && !*is_computed_name) {
@ -1744,7 +1724,7 @@ ParserBase<Traits>::ParsePropertyDefinition(
is_static, *is_computed_name); is_static, *is_computed_name);
} }
if (in_class && name_is_static && !is_static) { if (in_class && name_token == Token::STATIC && !is_static) {
// ClassElement (static) // ClassElement (static)
// 'static' MethodDefinition // 'static' MethodDefinition
*name = this->EmptyIdentifier(); *name = this->EmptyIdentifier();
@ -1765,7 +1745,7 @@ ParserBase<Traits>::ParsePropertyDefinition(
name_token = peek(); name_token = peek();
name_expression = ParsePropertyName( name_expression = ParsePropertyName(
name, &dont_care, &dont_care, &dont_care, is_computed_name, classifier, name, &dont_care, &dont_care, is_computed_name, classifier,
CHECK_OK_CUSTOM(EmptyObjectLiteralProperty)); CHECK_OK_CUSTOM(EmptyObjectLiteralProperty));
if (!*is_computed_name) { if (!*is_computed_name) {