Revision: 5764
Author: [email protected]
Date: Thu Nov 4 00:19:06 2010
Log: Simplify preparsing of "new"-expressions.
Review URL: http://codereview.chromium.org/4331003
http://code.google.com/p/v8/source/detail?r=5764
Modified:
/branches/bleeding_edge/src/preparser.h
/branches/bleeding_edge/test/cctest/test-parsing.cc
=======================================
--- /branches/bleeding_edge/src/preparser.h Tue Nov 2 00:21:37 2010
+++ /branches/bleeding_edge/src/preparser.h Thu Nov 4 00:19:06 2010
@@ -186,8 +186,7 @@
Expression ParseLeftHandSideExpression(bool* ok);
Expression ParseNewExpression(bool* ok);
Expression ParseMemberExpression(bool* ok);
- Expression ParseNewPrefix(int* new_count, bool* ok);
- Expression ParseMemberWithNewPrefixesExpression(int* new_count, bool*
ok);
+ Expression ParseMemberWithNewPrefixesExpression(unsigned new_count,
bool* ok);
Expression ParsePrimaryExpression(bool* ok);
Expression ParseArrayLiteral(bool* ok);
Expression ParseObjectLiteral(bool* ok);
@@ -963,11 +962,10 @@
}
}
}
-
template <typename Scanner, typename Log>
-Expression PreParser<Scanner, Log>::ParseNewPrefix(int* new_count, bool*
ok) {
+Expression PreParser<Scanner, Log>::ParseNewExpression(bool* ok) {
// NewExpression ::
// ('new')+ MemberExpression
@@ -979,38 +977,25 @@
// many we have parsed. This information is then passed on to the
// member expression parser, which is only allowed to match argument
// lists as long as it has 'new' prefixes left
- Expect(Token::NEW, CHECK_OK);
- *new_count++;
-
- if (peek() == Token::NEW) {
- ParseNewPrefix(new_count, CHECK_OK);
- } else {
- ParseMemberWithNewPrefixesExpression(new_count, CHECK_OK);
- }
-
- if (*new_count > 0) {
- *new_count--;
- }
- return kUnknownExpression;
-}
-
-
-template <typename Scanner, typename Log>
-Expression PreParser<Scanner, Log>::ParseNewExpression(bool* ok) {
- int new_count = 0;
- return ParseNewPrefix(&new_count, ok);
+ unsigned new_count = 0;
+ do {
+ Consume(Token::NEW);
+ new_count++;
+ } while (peek() == Token::NEW);
+
+ return ParseMemberWithNewPrefixesExpression(new_count, ok);
}
template <typename Scanner, typename Log>
Expression PreParser<Scanner, Log>::ParseMemberExpression(bool* ok) {
- return ParseMemberWithNewPrefixesExpression(NULL, ok);
+ return ParseMemberWithNewPrefixesExpression(0, ok);
}
template <typename Scanner, typename Log>
Expression PreParser<Scanner, Log>::ParseMemberWithNewPrefixesExpression(
- int* new_count, bool* ok) {
+ unsigned new_count, bool* ok) {
// MemberExpression ::
// (PrimaryExpression | FunctionLiteral)
// ('[' Expression ']' | '.' Identifier | Arguments)*
@@ -1051,10 +1036,10 @@
break;
}
case Token::LPAREN: {
- if ((new_count == NULL) || *new_count == 0) return result;
+ if (new_count == 0) return result;
// Consume one of the new prefixes (already parsed).
ParseArguments(CHECK_OK);
- *new_count--;
+ new_count--;
result = kUnknownExpression;
break;
}
=======================================
--- /branches/bleeding_edge/test/cctest/test-parsing.cc Tue Nov 2 00:21:37
2010
+++ /branches/bleeding_edge/test/cctest/test-parsing.cc Thu Nov 4 00:19:06
2010
@@ -253,6 +253,7 @@
"var x = 42;",
"function foo(x, y) { return x + y; }",
"native function foo(); return %ArgleBargle(glop);",
+ "var x = new new Function('this.x = 42');",
NULL
};
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
