Index: src/preparser.h |
diff --git a/src/preparser.h b/src/preparser.h |
index 9dee863d591191a40de0a78d7d191347f9bc3966..6ccaca23589d11114ec053a3b2f5dcde269c5c64 100644 |
--- a/src/preparser.h |
+++ b/src/preparser.h |
@@ -149,7 +149,8 @@ class ParserBase : public Traits { |
FunctionState** function_state_stack, |
typename Traits::Type::Scope** scope_stack, |
typename Traits::Type::Scope* scope, |
- typename Traits::Type::Zone* zone = NULL); |
+ typename Traits::Type::Zone* extra_param = NULL, |
+ AstStringTable* string_table = NULL); |
~FunctionState(); |
int NextMaterializedLiteralIndex() { |
@@ -356,7 +357,9 @@ class ParserBase : public Traits { |
void ReportMessageAt(Scanner::Location location, const char* message, |
bool is_reference_error = false) { |
- Traits::ReportMessageAt(location, message, NULL, is_reference_error); |
+ Traits::ReportMessageAt(location, message, |
+ reinterpret_cast<const char*>(NULL), |
+ is_reference_error); |
} |
void ReportUnexpectedToken(Token::Value token); |
@@ -743,7 +746,7 @@ class PreParserScope { |
class PreParserFactory { |
public: |
- explicit PreParserFactory(void* extra_param) {} |
+ explicit PreParserFactory(void* extra_param1, void* extra_param2) {} |
PreParserExpression NewLiteral(PreParserIdentifier identifier, |
int pos) { |
return PreParserExpression::Default(); |
@@ -997,8 +1000,8 @@ class PreParserTraits { |
// Producing data during the recursive descent. |
PreParserIdentifier GetSymbol(Scanner* scanner); |
- static PreParserIdentifier NextLiteralString(Scanner* scanner, |
- PretenureFlag tenured) { |
+ |
+ static PreParserIdentifier GetNextSymbol(Scanner* scanner) { |
return PreParserIdentifier::Default(); |
} |
@@ -1184,7 +1187,8 @@ ParserBase<Traits>::FunctionState::FunctionState( |
FunctionState** function_state_stack, |
typename Traits::Type::Scope** scope_stack, |
typename Traits::Type::Scope* scope, |
- typename Traits::Type::Zone* extra_param) |
+ typename Traits::Type::Zone* extra_param, |
+ AstStringTable* string_table) |
: next_materialized_literal_index_(JSFunction::kLiteralsPrefixSize), |
next_handler_index_(0), |
expected_property_count_(0), |
@@ -1196,7 +1200,7 @@ ParserBase<Traits>::FunctionState::FunctionState( |
outer_scope_(*scope_stack), |
saved_ast_node_id_(0), |
extra_param_(extra_param), |
- factory_(extra_param) { |
+ factory_(extra_param, string_table) { |
*scope_stack_ = scope; |
*function_state_stack = this; |
Traits::SetUpFunctionState(this, extra_param); |
@@ -1323,14 +1327,14 @@ typename ParserBase<Traits>::ExpressionT ParserBase<Traits>::ParseRegExpLiteral( |
int literal_index = function_state_->NextMaterializedLiteralIndex(); |
- IdentifierT js_pattern = this->NextLiteralString(scanner(), TENURED); |
+ IdentifierT js_pattern = this->GetNextSymbol(scanner()); |
if (!scanner()->ScanRegExpFlags()) { |
Next(); |
ReportMessageAt(scanner()->location(), "invalid_regexp_flags"); |
*ok = false; |
return Traits::EmptyExpression(); |
} |
- IdentifierT js_flags = this->NextLiteralString(scanner(), TENURED); |
+ IdentifierT js_flags = this->GetNextSymbol(scanner()); |
Next(); |
return factory()->NewRegExpLiteral(js_pattern, js_flags, literal_index, pos); |
} |