Reviewers: Michael Starzinger, Jakob,
Message:
Random cleanup I saw while poking at for-of.
Description:
Remove unneeded argument from Parser::GetSymbol
Parser::GetSymbol can't actually fail, so no need for the bool* ok
argument or the CHECK_OK in callers.
BUG=
Please review this at https://codereview.chromium.org/15421007/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/parser.h
M src/parser.cc
Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index
86a486fcf9233d16ab3c8f87bec1e6d6d3ea1f1d..5eec342168a820c898b6978367c6830ae06140f3
100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -794,7 +794,7 @@ FunctionLiteral*
Parser::ParseLazy(Utf16CharacterStream* source,
}
-Handle<String> Parser::GetSymbol(bool* ok) {
+Handle<String> Parser::GetSymbol() {
int symbol_id = -1;
if (pre_parse_data() != NULL) {
symbol_id = pre_parse_data()->GetSymbolIdentifier();
@@ -1341,7 +1341,7 @@ Module* Parser::ParseModuleUrl(bool* ok) {
// String
Expect(Token::STRING, CHECK_OK);
- Handle<String> symbol = GetSymbol(CHECK_OK);
+ Handle<String> symbol = GetSymbol();
// TODO(ES6): Request JS resource from environment...
@@ -3692,7 +3692,7 @@ Expression* Parser::ParsePrimaryExpression(bool* ok) {
case Token::STRING: {
Consume(Token::STRING);
- Handle<String> symbol = GetSymbol(CHECK_OK);
+ Handle<String> symbol = GetSymbol();
result = factory()->NewLiteral(symbol);
if (fni_ != NULL) fni_->PushLiteralName(symbol);
break;
@@ -4047,7 +4047,7 @@ ObjectLiteral::Property*
Parser::ParseObjectLiteralGetSet(bool is_getter,
if (is_keyword) {
name =
isolate_->factory()->InternalizeUtf8String(Token::String(next));
} else {
- name = GetSymbol(CHECK_OK);
+ name = GetSymbol();
}
FunctionLiteral* value =
ParseFunctionLiteral(name,
@@ -4128,7 +4128,7 @@ Expression* Parser::ParseObjectLiteral(bool* ok) {
}
case Token::STRING: {
Consume(Token::STRING);
- Handle<String> string = GetSymbol(CHECK_OK);
+ Handle<String> string = GetSymbol();
if (fni_ != NULL) fni_->PushLiteralName(string);
uint32_t index;
if (!string.is_null() && string->AsArrayIndex(&index)) {
@@ -4150,7 +4150,7 @@ Expression* Parser::ParseObjectLiteral(bool* ok) {
default:
if (Token::IsKeyword(next)) {
Consume(next);
- Handle<String> string = GetSymbol(CHECK_OK);
+ Handle<String> string = GetSymbol();
key = factory()->NewLiteral(string);
} else {
// Unexpected token.
@@ -4823,7 +4823,7 @@ void Parser::ExpectSemicolon(bool* ok) {
void Parser::ExpectContextualKeyword(const char* keyword, bool* ok) {
Expect(Token::IDENTIFIER, ok);
if (!*ok) return;
- Handle<String> symbol = GetSymbol(ok);
+ Handle<String> symbol = GetSymbol();
if (!*ok) return;
if (!symbol->IsUtf8EqualTo(CStrVector(keyword))) {
*ok = false;
@@ -4850,7 +4850,7 @@ Handle<String> Parser::ParseIdentifier(bool* ok) {
(top_scope_->is_classic_mode() &&
(next == Token::FUTURE_STRICT_RESERVED_WORD ||
(next == Token::YIELD && !is_generator())))) {
- return GetSymbol(ok);
+ return GetSymbol();
} else {
ReportUnexpectedToken(next);
*ok = false;
@@ -4874,7 +4874,7 @@ Handle<String>
Parser::ParseIdentifierOrStrictReservedWord(
*ok = false;
return Handle<String>();
}
- return GetSymbol(ok);
+ return GetSymbol();
}
@@ -4888,7 +4888,7 @@ Handle<String> Parser::ParseIdentifierName(bool* ok) {
*ok = false;
return Handle<String>();
}
- return GetSymbol(ok);
+ return GetSymbol();
}
Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index
1defbf27427adff426b5b7a46152794c70df15d0..8a3ae92906625ee45f19a6838b9e303752961f81
100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -767,7 +767,7 @@ class Parser BASE_EMBEDDED {
}
}
- Handle<String> GetSymbol(bool* ok);
+ Handle<String> GetSymbol();
// Get odd-ball literals.
Literal* GetLiteralUndefined();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
