[modules] Basic support of exports

src/ast/modules.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 "src/ast/modules.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 69 matching lines @@
 
 const AstRawString* FromStringOrUndefined(Isolate* isolate,
                                           AstValueFactory* avfactory,
                                           Handle<Object> object) {
   if (object->IsUndefined(isolate)) return nullptr;
   return avfactory->GetString(Handle<String>::cast(object));
 }
 
 }  // namespace
 
-Handle<FixedArray> ModuleDescriptor::Entry::Serialize(Isolate* isolate) const {
-  Handle<FixedArray> result = isolate->factory()->NewFixedArray(4);
-  result->set(0, *ToStringOrUndefined(isolate, export_name));
-  result->set(1, *ToStringOrUndefined(isolate, local_name));
-  result->set(2, *ToStringOrUndefined(isolate, import_name));
-  result->set(3, *ToStringOrUndefined(isolate, module_request));
+Handle<ModuleInfoEntry> ModuleDescriptor::Entry::Serialize(
+    Isolate* isolate) const {
+  return ModuleInfoEntry::New(isolate,
+                              ToStringOrUndefined(isolate, export_name),
+                              ToStringOrUndefined(isolate, local_name),
+                              ToStringOrUndefined(isolate, import_name),
+                              ToStringOrUndefined(isolate, module_request));
+}
+
+ModuleDescriptor::Entry* ModuleDescriptor::Entry::Deserialize(
+    Isolate* isolate, AstValueFactory* avfactory,
+    Handle<ModuleInfoEntry> entry) {
+  Entry* result = new (avfactory->zone()) Entry(Scanner::Location::invalid());
+  result->export_name = FromStringOrUndefined(
+      isolate, avfactory, handle(entry->export_name(), isolate));
+  result->local_name = FromStringOrUndefined(
+      isolate, avfactory, handle(entry->local_name(), isolate));
+  result->import_name = FromStringOrUndefined(
+      isolate, avfactory, handle(entry->import_name(), isolate));
+  result->module_request = FromStringOrUndefined(
+      isolate, avfactory, handle(entry->module_request(), isolate));
   return result;
 }
 
-ModuleDescriptor::Entry* ModuleDescriptor::Entry::Deserialize(
-    Isolate* isolate, AstValueFactory* avfactory, Handle<FixedArray> data) {
-  Entry* entry = new (avfactory->zone()) Entry(Scanner::Location::invalid());
-  entry->export_name =
-      FromStringOrUndefined(isolate, avfactory, handle(data->get(0), isolate));
-  entry->local_name =
-      FromStringOrUndefined(isolate, avfactory, handle(data->get(1), isolate));
-  entry->import_name =
-      FromStringOrUndefined(isolate, avfactory, handle(data->get(2), isolate));
-  entry->module_request =
-      FromStringOrUndefined(isolate, avfactory, handle(data->get(3), isolate));
-  return entry;
-}
-
 void ModuleDescriptor::MakeIndirectExportsExplicit(Zone* zone) {
   for (auto it = regular_exports_.begin(); it != regular_exports_.end();) {
     Entry* entry = it->second;
     DCHECK_NOT_NULL(entry->local_name);
     auto import = regular_imports_.find(entry->local_name);
     if (import != regular_imports_.end()) {
       // Found an indirect export.  Patch export entry and move it from regular
       // to special.
       DCHECK_NULL(entry->import_name);
       DCHECK_NULL(entry->module_request);
@@ skipping 53 matching lines @@
       return false;
     }
   }
 
   MakeIndirectExportsExplicit(zone);
   return true;
 }
 
 }  // namespace internal
 }  // namespace v8