[modules] Basic support of exports

src/ast/modules.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_AST_MODULES_H_
 #define V8_AST_MODULES_H_
 
+#ifdef DEBUG
+// TODO: Remove before landing.
+#include "src/ast/ast-value-factory.h"
+#endif  // DEBUG
+
 #include "src/parsing/scanner.h"  // Only for Scanner::Location.
 #include "src/pending-compilation-error-handler.h"
 #include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 
 
 class AstRawString;
+class ModuleInfoEntry;
 
 
 class ModuleDescriptor : public ZoneObject {
  public:
   explicit ModuleDescriptor(Zone* zone)
       : special_exports_(1, zone),
         special_imports_(1, zone),
         regular_exports_(zone),
         regular_imports_(zone) {}
 
@@ skipping 46 matching lines @@
   bool Validate(ModuleScope* module_scope,
                 PendingCompilationErrorHandler* error_handler, Zone* zone);
 
   struct Entry : public ZoneObject {
     const Scanner::Location location;
     const AstRawString* export_name;
     const AstRawString* local_name;
     const AstRawString* import_name;
     const AstRawString* module_request;
 
+    // TODO(neis): Remove local_name component?
     explicit Entry(Scanner::Location loc)
         : location(loc),
           export_name(nullptr),
           local_name(nullptr),
           import_name(nullptr),
           module_request(nullptr) {}
 
-    Handle<FixedArray> Serialize(Isolate* isolate) const;
+#ifdef DEBUG
+    // TODO: Remove before landing.
+    void Print() const {
+      PrintF("export name: ");
+      if (export_name != nullptr) {
+        PrintF("%.*s\n", export_name->length(), export_name->raw_data());
+      }
+      PrintF("local name: ");
+      if (local_name != nullptr) {
+        PrintF("%.*s\n", local_name->length(), local_name->raw_data());
+        // local_name->string()->ShortPrint();
+      }
+    }
+#endif  // DEBUG
+
+    // (De-)serialization support.
+    // Note that the location value is not preserved as it's only needed by the
+    // parser.  (A Deserialize'd entry has an invalid location.)
+    Handle<ModuleInfoEntry> Serialize(Isolate* isolate) const;
     static Entry* Deserialize(Isolate* isolate, AstValueFactory* avfactory,
-                              Handle<FixedArray> data);
+                              Handle<ModuleInfoEntry> entry);
   };
 
   // Empty imports and namespace imports.
   const ZoneList<const Entry*>& special_imports() const {
     return special_imports_;
   }
 
   // All the remaining imports, indexed by local name.
   const ZoneMap<const AstRawString*, const Entry*>& regular_imports() const {
     return regular_imports_;
   }
 
   // Star exports and explicitly indirect exports.
   const ZoneList<const Entry*>& special_exports() const {
     return special_exports_;
   }
 
   // All the remaining exports, indexed by local name.
   const ZoneMultimap<const AstRawString*, Entry*>& regular_exports() const {
     return regular_exports_;
   }
 
+#ifdef DEBUG
+  void Print() const;
+#endif  // DEBUG
+
   void AddRegularExport(Entry* entry) {
     DCHECK_NOT_NULL(entry->export_name);
     DCHECK_NOT_NULL(entry->local_name);
     DCHECK_NULL(entry->import_name);
     regular_exports_.insert(std::make_pair(entry->local_name, entry));
   }
 
   void AddSpecialExport(const Entry* entry, Zone* zone) {
     DCHECK_NOT_NULL(entry->module_request);
     special_exports_.Add(entry, zone);
@@ skipping 42 matching lines @@
   // into:
   //   import {a as b} from "X"; export {a as c} from "X";
   // (The import entry is never deleted.)
   void MakeIndirectExportsExplicit(Zone* zone);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_MODULES_H_