Simplify template literal raw string creation

src/parser.h

 // 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.
 
 #ifndef V8_PARSER_H_
 #define V8_PARSER_H_
 
 #include "src/allocation.h"
 #include "src/ast.h"
 #include "src/compiler.h"  // For CachedDataMode
@@ skipping 575 matching lines @@
                                   Scanner::Location class_name_location,
                                   bool name_is_strict_reserved, int pos,
                                   bool* ok);
 
   V8_INLINE void CheckConflictingVarDeclarations(v8::internal::Scope* scope,
                                                  bool* ok);
 
   class TemplateLiteral : public ZoneObject {
    public:
     TemplateLiteral(Zone* zone, int pos)
-        : cooked_(8, zone),
-          lengths_(8, zone),
-          expressions_(8, zone),
-          pos_(pos) {}
+        : cooked_(8, zone), raw_(8, zone), expressions_(8, zone), pos_(pos) {}
 
     const ZoneList<Expression*>* cooked() const { return &cooked_; }
-    const ZoneList<int>* lengths() const { return &lengths_; }
+    const ZoneList<Expression*>* raw() const { return &raw_; }
     const ZoneList<Expression*>* expressions() const { return &expressions_; }
     int position() const { return pos_; }
 
-    void AddTemplateSpan(Literal* cooked, int end, Zone* zone) {
+    void AddTemplateSpan(Literal* cooked, Literal* raw, int end, Zone* zone) {
       DCHECK_NOT_NULL(cooked);
+      DCHECK_NOT_NULL(raw);
       cooked_.Add(cooked, zone);
-      lengths_.Add(end - cooked->position(), zone);
+      raw_.Add(raw, zone);
     }
 
     void AddExpression(Expression* expression, Zone* zone) {
       DCHECK_NOT_NULL(expression);
       expressions_.Add(expression, zone);
     }
 
    private:
     ZoneList<Expression*> cooked_;
-    ZoneList<int> lengths_;
+    ZoneList<Expression*> raw_;
     ZoneList<Expression*> expressions_;
     int pos_;
   };
 
   typedef TemplateLiteral* TemplateLiteralState;
 
   V8_INLINE TemplateLiteralState OpenTemplateLiteral(int pos);
   V8_INLINE void AddTemplateSpan(TemplateLiteralState* state, bool tail);
   V8_INLINE void AddTemplateExpression(TemplateLiteralState* state,
                                        Expression* expression);
@@ skipping 247 matching lines @@
   void HandleSourceURLComments();
 
   void ThrowPendingError();
 
   TemplateLiteralState OpenTemplateLiteral(int pos);
   void AddTemplateSpan(TemplateLiteralState* state, bool tail);
   void AddTemplateExpression(TemplateLiteralState* state,
                              Expression* expression);
   Expression* CloseTemplateLiteral(TemplateLiteralState* state, int start,
                                    Expression* tag);
-  ZoneList<Expression*>* TemplateRawStrings(const TemplateLiteral* lit,
-                                            uint32_t* hash);
+  uint32_t ComputeTemplateLiteralHash(const TemplateLiteral* lit);
+
   Scanner scanner_;
   PreParser* reusable_preparser_;
   Scope* original_scope_;  // for ES5 function declarations in sloppy eval
   Target* target_stack_;  // for break, continue statements
   ParseData* cached_parse_data_;
 
   CompilationInfo* info_;
 
   // Pending errors.
   bool has_pending_error_;
@@ skipping 99 matching lines @@
 }
 
 
 Expression* ParserTraits::CloseTemplateLiteral(TemplateLiteralState* state,
                                                int start, Expression* tag) {
   return parser_->CloseTemplateLiteral(state, start, tag);
 }
 } }  // namespace v8::internal
 
 #endif  // V8_PARSER_H_