Eliminate old style import from language tests

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 4055 matching lines @@
                                                url);
     const String& canon_url = String::CheckedHandle(Api::UnwrapHandle(handle));
     CallLibraryTagHandler(kSourceTag, source_pos, canon_url);
   }
 }
 
 
 void Parser::ParseLibraryName() {
   ASSERT(CurrentToken() == Token::kLIBRARY);
   ConsumeToken();
-  // TODO(hausner): Exact syntax of library name still unclear: identifier,
-  // qualified identifier or even multiple dots allowed? For now we just
-  // accept simple identifiers.
-  const String& lib_name = *ExpectIdentifier("library name expected");
+  String& lib_name = *ExpectIdentifier("library name expected");
+  if (CurrentToken() == Token::kPERIOD) {
+    const String& dot = String::Handle(Symbols::Dot());
+    while (CurrentToken() == Token::kPERIOD) {
+      ConsumeToken();
+      lib_name = String::Concat(lib_name, dot);
+      lib_name = String::Concat(lib_name,
+          *ExpectIdentifier("malformed library name"));
+    }
+    lib_name = Symbols::New(lib_name);
+  }
   library_.SetName(lib_name);
   ExpectSemicolon();
 }
 
 
 void Parser::ParseIdentList(GrowableObjectArray* names) {
   if (!IsIdentifier()) {
     ErrorMsg("identifier expected");
   }
   while (IsIdentifier()) {
@@ skipping 17 matching lines @@
     ErrorMsg("library url expected");
   }
   const String& url = *CurrentLiteral();
   if (url.Length() == 0) {
     ErrorMsg("library url expected");
   }
   ConsumeToken();
   String& prefix = String::Handle();
   if (is_import && IsLiteral("as")) {
     ConsumeToken();
-    prefix = ExpectIdentifier("prefix expected")->raw();
+    prefix = ExpectIdentifier("prefix identifier expected")->raw();
   }
 
   Array& show_names = Array::Handle();
   Array& hide_names = Array::Handle();
   if (IsLiteral("show") || IsLiteral("hide")) {
     GrowableObjectArray& show_list =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     GrowableObjectArray& hide_list =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     for (;;) {
@@ skipping 148 matching lines @@
   SkipMetadata();
   // TODO(hausner): Once support for old #source directive is removed
   // from the compiler, add an error message here if we don't find
   // a 'part of' directive.
   if (CurrentToken() == Token::kPART) {
     ConsumeToken();
     if (!IsLiteral("of")) {
       ErrorMsg("'part of' expected");
     }
     ConsumeToken();
-    // TODO(hausner): Exact syntax of library name still unclear: identifier,
-    // qualified identifier or even multiple dots allowed? For now we just
-    // accept simple identifiers.
     // The VM is not required to check that the library name matches the
     // name of the current library, so we ignore it.
     ExpectIdentifier("library name expected");
+    while (CurrentToken() == Token::kPERIOD) {
+      ConsumeToken();
+      ExpectIdentifier("malformed library name");
+    }
     ExpectSemicolon();
   } else {
     SetPosition(metadata_pos);
   }
 }
 
 
 void Parser::ParseTopLevel() {
   TRACE_PARSER("ParseTopLevel");
   // Collect the classes found at the top level in this growable array.
@@ skipping 5396 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart