Split StringLiteral from Literal.

src/ast.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ast.h"
 
 #include <cmath>  // For isfinite.
 #include "builtins.h"
 #include "code-stubs.h"
 #include "contexts.h"
@@ skipping 16 matching lines @@
   void type::Accept(AstVisitor* v) { v->Visit##type(this); }
 AST_NODE_LIST(DECL_ACCEPT)
 #undef DECL_ACCEPT
 
 
 // ----------------------------------------------------------------------------
 // Implementation of other node functionality.
 
 
 bool Expression::IsSmiLiteral() const {
-  return AsLiteral() != NULL && AsLiteral()->value()->IsSmi();
-}
-
-
-bool Expression::IsStringLiteral() const {
-  return AsLiteral() != NULL && AsLiteral()->value()->IsString();
+  return AsNumberLiteral() != NULL && AsNumberLiteral()->value()->IsSmi();
 }
 
 
 bool Expression::IsNullLiteral() const {
   return AsLiteral() != NULL && AsLiteral()->value()->IsNull();
 }
 
 
+Literal* Expression::AsAnyLiteral() {
+  if (IsStringLiteral()) {
+    return AsStringLiteral();
+  }
+  if (IsNumberLiteral()) {
+    return AsNumberLiteral();
+  }
+  return AsLiteral();
+}
+
+
 bool Expression::IsUndefinedLiteral(Isolate* isolate) const {
   const VariableProxy* var_proxy = AsVariableProxy();
   if (var_proxy == NULL) return false;
   Variable* var = var_proxy->var();
   // The global identifier "undefined" is immutable. Everything
   // else could be reassigned.
   return var != NULL && var->location() == Variable::UNALLOCATED &&
          String::Equals(var_proxy->name(),
                         isolate->factory()->undefined_string());
 }
@@ skipping 124 matching lines @@
   emit_store_ = true;
   key_ = key;
   value_ = value;
   Handle<Object> k = key->value();
   if (k->IsInternalizedString() &&
       String::Equals(Handle<String>::cast(k),
                      zone->isolate()->factory()->proto_string())) {
     kind_ = PROTOTYPE;
   } else if (value_->AsMaterializedLiteral() != NULL) {
     kind_ = MATERIALIZED_LITERAL;
-  } else if (value_->AsLiteral() != NULL) {
+  } else if (value_->AsAnyLiteral() != NULL) {
     kind_ = CONSTANT;
   } else {
     kind_ = COMPUTED;
   }
 }
 
 
 ObjectLiteralProperty::ObjectLiteralProperty(
     Zone* zone, bool is_getter, FunctionLiteral* value) {
   emit_store_ = true;
@@ skipping 177 matching lines @@
   literals->set(1, *element_values);
 
   constant_elements_ = literals;
   set_is_simple(is_simple);
   set_depth(depth_acc);
 }
 
 
 Handle<Object> MaterializedLiteral::GetBoilerplateValue(Expression* expression,
                                                         Isolate* isolate) {
-  if (expression->AsLiteral() != NULL) {
-    return expression->AsLiteral()->value();
+  if (expression->AsAnyLiteral() != NULL) {
+    return expression->AsAnyLiteral()->value();
   }
   if (CompileTimeValue::IsCompileTimeValue(expression)) {
     return CompileTimeValue::GetValue(isolate, expression);
   }
   return isolate->factory()->uninitialized_value();
 }
 
 
 void MaterializedLiteral::BuildConstants(Isolate* isolate) {
   if (IsArrayLiteral()) {
@@ skipping 69 matching lines @@
 
 
 // Check for the pattern: typeof <expression> equals <string literal>.
 static bool MatchLiteralCompareTypeof(Expression* left,
                                       Token::Value op,
                                       Expression* right,
                                       Expression** expr,
                                       Handle<String>* check) {
   if (IsTypeof(left) && right->IsStringLiteral() && Token::IsEqualityOp(op)) {
     *expr = left->AsUnaryOperation()->expression();
-    *check = Handle<String>::cast(right->AsLiteral()->value());
+    *check = Handle<String>::cast(right->AsStringLiteral()->value());
     return true;
   }
   return false;
 }
 
 
 bool CompareOperation::IsLiteralCompareTypeof(Expression** expr,
                                               Handle<String>* check) {
   return MatchLiteralCompareTypeof(left_, op_, right_, expr, check) ||
       MatchLiteralCompareTypeof(right_, op_, left_, expr, check);
 }
 
 
 static bool IsVoidOfLiteral(Expression* expr) {
   UnaryOperation* maybe_unary = expr->AsUnaryOperation();
-  return maybe_unary != NULL &&
-      maybe_unary->op() == Token::VOID &&
-      maybe_unary->expression()->AsLiteral() != NULL;
+  return maybe_unary != NULL && maybe_unary->op() == Token::VOID &&
+      maybe_unary->expression()->AsAnyLiteral() != NULL;
 }
 
 
 // Check for the pattern: void <literal> equals <expression> or
 // undefined equals <expression>
 static bool MatchLiteralCompareUndefined(Expression* left,
                                          Token::Value op,
                                          Expression* right,
                                          Expression** expr,
                                          Isolate* isolate) {
@@ skipping 551 matching lines @@
 REGULAR_NODE(ExpressionStatement)
 REGULAR_NODE(EmptyStatement)
 REGULAR_NODE(IfStatement)
 REGULAR_NODE(ContinueStatement)
 REGULAR_NODE(BreakStatement)
 REGULAR_NODE(ReturnStatement)
 REGULAR_NODE(SwitchStatement)
 REGULAR_NODE(CaseClause)
 REGULAR_NODE(Conditional)
 REGULAR_NODE(Literal)
+REGULAR_NODE(StringLiteral)
+REGULAR_NODE(NumberLiteral)
 REGULAR_NODE(ArrayLiteral)
 REGULAR_NODE(ObjectLiteral)
 REGULAR_NODE(RegExpLiteral)
 REGULAR_NODE(FunctionLiteral)
 REGULAR_NODE(Assignment)
 REGULAR_NODE(Throw)
 REGULAR_NODE(Property)
 REGULAR_NODE(UnaryOperation)
 REGULAR_NODE(CountOperation)
 REGULAR_NODE(BinaryOperation)
@@ skipping 47 matching lines @@
     add_flag(kDontInline);
   }
 }
 
 #undef REGULAR_NODE
 #undef DONT_OPTIMIZE_NODE
 #undef DONT_SELFOPTIMIZE_NODE
 #undef DONT_CACHE_NODE
 
 
-Handle<String> Literal::ToString() {
-  if (value_->IsString()) return Handle<String>::cast(value_);
+Handle<String> Literal::ToString() const {
+  UNREACHABLE();
+  return Handle<String>();
+}
+
+
+Handle<String> NumberLiteral::ToString() const {
   ASSERT(value_->IsNumber());
   char arr[100];
   Vector<char> buffer(arr, ARRAY_SIZE(arr));
   const char* str;
   if (value_->IsSmi()) {
     // Optimization only, the heap number case would subsume this.
     OS::SNPrintF(buffer, "%d", Smi::cast(*value_)->value());
     str = arr;
   } else {
     str = DoubleToCString(value_->Number(), buffer);
   }
   return isolate_->factory()->NewStringFromAsciiChecked(str);
 }
 
 
 } }  // namespace v8::internal