Chromium Code Reviews| Index: src/parsing/parser.cc |
| diff --git a/src/parsing/parser.cc b/src/parsing/parser.cc |
| index 9daee95600d6424a0621c32d727fe89c0f126a88..17e40634187ebd8689175a5c56288e2fb89c4672 100644 |
| --- a/src/parsing/parser.cc |
| +++ b/src/parsing/parser.cc |
| @@ -439,6 +439,14 @@ bool ParserTraits::ShortcutNumericLiteralBinaryExpression( |
| *x = factory->NewNumberLiteral(value, pos, has_dot); |
| return true; |
| } |
| + case Token::EXP: { |
| + double value = std::pow(x_val, y_val); |
| + int int_value = static_cast<int>(value); |
| + *x = factory->NewNumberLiteral( |
| + int_value == value && value != -0.0 ? int_value : value, pos, |
| + has_dot); |
| + return true; |
| + } |
| default: |
| break; |
| } |
| @@ -774,6 +782,8 @@ Parser::Parser(ParseInfo* info) |
| set_allow_harmony_do_expressions(FLAG_harmony_do_expressions); |
| set_allow_harmony_function_name(FLAG_harmony_function_name); |
| set_allow_harmony_function_sent(FLAG_harmony_function_sent); |
| + set_allow_harmony_exponentiation_operator( |
| + FLAG_harmony_exponentiation_operator); |
| for (int feature = 0; feature < v8::Isolate::kUseCounterFeatureCount; |
| ++feature) { |
| use_counts_[feature] = 0; |
| @@ -4829,6 +4839,7 @@ PreParser::PreParseResult Parser::ParseLazyFunctionBodyWithPreParser( |
| SET_ALLOW(harmony_do_expressions); |
| SET_ALLOW(harmony_function_name); |
| SET_ALLOW(harmony_function_sent); |
| + SET_ALLOW(harmony_exponentiation_operator); |
| #undef SET_ALLOW |
| } |
| PreParser::PreParseResult result = reusable_preparser_->PreParseLazyFunction( |
| @@ -5528,6 +5539,11 @@ void ParserTraits::RewriteDestructuringAssignments() { |
| parser_->RewriteDestructuringAssignments(); |
| } |
| +Expression* ParserTraits::RewriteExponentiation(Expression* left, |
| + Expression* right, |
| + Token::Value op, int pos) { |
| + return parser_->RewriteExponentiation(left, right, op, pos); |
| +} |
| void ParserTraits::RewriteNonPattern(Type::ExpressionClassifier* classifier, |
| bool* ok) { |
| @@ -5618,6 +5634,59 @@ void Parser::RewriteDestructuringAssignments() { |
| } |
| } |
| +Expression* Parser::RewriteExponentiation(Expression* left, Expression* right, |
| + Token::Value op, int pos) { |
| + // TODO(bmeurer): remove rewriting craziness and replace with |
| + // backend support for exponent op, some day |
| + if (op == Token::EXP) { |
|
Dan Ehrenberg
2016/02/25 19:17:41
Callers already know whether they are doing EXP or
caitp (gmail)
2016/03/11 15:54:19
Done.
|
| + ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone()); |
| + args->Add(left, zone()); |
| + args->Add(right, zone()); |
| + return factory()->NewCallRuntime(Context::MATH_POW_METHOD_INDEX, args, pos); |
| + } |
| + |
| + DCHECK_EQ(op, Token::ASSIGN_EXP); |
| + ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone()); |
| + if (left->IsVariableProxy()) { |
| + VariableProxy* lhs = left->AsVariableProxy(); |
| + |
| + Expression* result; |
| + DCHECK_NOT_NULL(lhs->raw_name()); |
| + result = |
| + this->ExpressionFromIdentifier(lhs->raw_name(), lhs->position(), |
| + lhs->end_position(), scope_, factory()); |
| + args->Add(left, zone()); |
| + args->Add(right, zone()); |
| + Expression* call = |
| + factory()->NewCallRuntime(Context::MATH_POW_METHOD_INDEX, args, pos); |
| + return factory()->NewAssignment(Token::ASSIGN, result, call, pos); |
| + } else if (left->IsProperty()) { |
| + Property* prop = left->AsProperty(); |
| + auto temp_obj = scope_->NewTemporary(ast_value_factory()->empty_string()); |
| + auto temp_key = scope_->NewTemporary(ast_value_factory()->empty_string()); |
| + Expression* assign_obj = factory()->NewAssignment( |
| + Token::ASSIGN, factory()->NewVariableProxy(temp_obj), prop->obj(), |
| + RelocInfo::kNoPosition); |
| + Expression* assign_key = factory()->NewAssignment( |
| + Token::ASSIGN, factory()->NewVariableProxy(temp_key), prop->key(), |
| + RelocInfo::kNoPosition); |
| + args->Add(factory()->NewProperty(factory()->NewVariableProxy(temp_obj), |
| + factory()->NewVariableProxy(temp_key), |
| + left->position()), |
| + zone()); |
| + args->Add(right, zone()); |
| + Expression* call = |
| + factory()->NewCallRuntime(Context::MATH_POW_METHOD_INDEX, args, pos); |
| + Expression* assign = |
| + factory()->NewAssignment(Token::ASSIGN, left, call, pos); |
| + return factory()->NewBinaryOperation( |
| + Token::COMMA, assign_obj, |
| + factory()->NewBinaryOperation(Token::COMMA, assign_key, assign, pos), |
| + pos); |
| + } else { |
| + return factory()->NewAssignment(Token::ASSIGN_MUL, left, right, pos); |
|
Dan Ehrenberg
2016/02/25 19:17:41
This should be unreachable because of the check pr
caitp (gmail)
2016/03/11 15:54:19
Done.
|
| + } |
| +} |
| Expression* Parser::RewriteSpreads(ArrayLiteral* lit) { |
| // Array literals containing spreads are rewritten using do expressions, e.g. |