[modules] Introduce new VariableLocation for module imports/exports.

src/parsing/parser.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/parsing/parser.h"
 
 #include <memory>
 
 #include "src/api.h"
 #include "src/ast/ast.h"
@@ skipping 1537 matching lines @@
   Scanner::Location module_namespace_binding_loc;
   const ZoneList<const NamedImport*>* named_imports = nullptr;
   if (import_default_binding == nullptr || Check(Token::COMMA)) {
     switch (peek()) {
       case Token::MUL: {
         Consume(Token::MUL);
         ExpectContextualKeyword(CStrVector("as"), CHECK_OK_VOID);
         module_namespace_binding =
             ParseIdentifier(kDontAllowRestrictedIdentifiers, CHECK_OK_VOID);
         module_namespace_binding_loc = scanner()->location();
+        DeclareImport(module_namespace_binding, pos, CHECK_OK_VOID);
         break;
       }
 
       case Token::LBRACE:
         named_imports = ParseNamedImports(pos, CHECK_OK_VOID);
         break;
 
       default:
         *ok = false;
         ReportUnexpectedToken(scanner()->current_token());
         return;
     }
   }
 
   ExpectContextualKeyword(CStrVector("from"), CHECK_OK_VOID);
   const AstRawString* module_specifier = ParseModuleSpecifier(CHECK_OK_VOID);
   ExpectSemicolon(CHECK_OK_VOID);
 
   // Now that we have all the information, we can make the appropriate
   // declarations.
 
-  if (module_namespace_binding != nullptr) {
-    module()->AddStarImport(module_namespace_binding, module_specifier,
-                            module_namespace_binding_loc, zone());
-    // TODO(neis): Create special immutable binding for the namespace object.
-  }
-
   // TODO(neis): Would prefer to call DeclareImport below rather than above and
   // in ParseNamedImports, but then a possible error message would point to the
   // wrong location.  Maybe have a DeclareAt version of Declare that takes a
   // location?
 
+  if (module_namespace_binding != nullptr) {
+    module()->AddStarImport(module_namespace_binding, module_specifier,
+                            module_namespace_binding_loc, zone());
+    // DeclareImport(module_namespace_binding, pos, CHECK_OK_VOID);

[adamk, 2016/08/02 16:34:31]

Leave a TODO here?

[neis, 2016/08/03 09:16:30]

Hmm? This is the same as all the other DeclareImports here, the TODO is above.

[adamk, 2016/08/03 17:51:26]

Oops, didn't look in the right place, I get it.

+  }
+
   if (import_default_binding != nullptr) {
     module()->AddImport(ast_value_factory()->default_string(),
                         import_default_binding, module_specifier,
                         import_default_binding_loc, zone());
     // DeclareImport(import_default_binding, pos, CHECK_OK_VOID);
   }
 
   if (named_imports != nullptr) {
     if (named_imports->length() == 0) {
       module()->AddEmptyImport(module_specifier, scanner()->location(), zone());
@@ skipping 336 matching lines @@
                      ? this->scope()
                      : this->scope()->DeclarationScope();
   return scope->NewUnresolved(factory(), name, Variable::NORMAL,
                               scanner()->location().beg_pos,
                               scanner()->location().end_pos);
 }
 
 
 void Parser::DeclareImport(const AstRawString* local_name, int pos, bool* ok) {
   DCHECK_NOT_NULL(local_name);
-  VariableProxy* proxy = NewUnresolved(local_name, IMPORT);
+  VariableProxy* proxy = NewUnresolved(local_name, CONST);
   Declaration* declaration =
-      factory()->NewVariableDeclaration(proxy, IMPORT, scope(), pos);
+      factory()->NewVariableDeclaration(proxy, CONST, scope(), pos);
   Declare(declaration, DeclarationDescriptor::NORMAL, true, CHECK_OK_VOID);
 }
 
 
 Variable* Parser::Declare(Declaration* declaration,
                           DeclarationDescriptor::Kind declaration_kind,
                           bool resolve, bool* ok, Scope* scope) {
   VariableProxy* proxy = declaration->proxy();
   DCHECK(proxy->raw_name() != NULL);
   const AstRawString* name = proxy->raw_name();
@@ skipping 5163 matching lines @@
   node->Print(Isolate::Current());
 }
 #endif  // DEBUG
 
 #undef CHECK_OK
 #undef CHECK_OK_VOID
 #undef CHECK_FAILED
 
 }  // namespace internal
 }  // namespace v8