Revert cl 14446

runtime/vm/scanner.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/scanner.h"
 
 #include "platform/assert.h"
 #include "vm/flags.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 379 matching lines @@
   if (!IsLetter(c0_)) {
     ErrorMsg("Unrecognized library tag");
     SkipLine();
     return;
   }
   const String& kLibrary = String::Handle(Symbols::Library());
   const String& kImport = String::Handle(Symbols::Import());
   const String& kSource = String::Handle(Symbols::Source());
   const String& ident = String::Handle(ConsumeIdentChars(false));
   if (ident.Equals(kLibrary)) {
-    current_token_.kind = Token::kLEGACY_LIBRARY;
+    current_token_.kind = Token::kLIBRARY;
     return;
   }
   if (ident.Equals(kImport)) {
-    current_token_.kind = Token::kLEGACY_IMPORT;
+    current_token_.kind = Token::kIMPORT;
     return;
   }
   if (ident.Equals(kSource)) {
-    current_token_.kind = Token::kLEGACY_SOURCE;
+    current_token_.kind = Token::kSOURCE;
     return;
   }
   ErrorMsg("Unrecognized library token");
   SkipLine();
 }
 
 
 void Scanner::ScanLiteralString(bool is_raw) {
   ASSERT(!IsScanningString());
   ASSERT(c0_ == '"' || c0_ == '\'');
@@ skipping 530 matching lines @@
               "%c%#"Px"", kPrivateKeySeparator, key_value);
   const String& result = String::Handle(String::New(private_key, Heap::kOld));
   return result.raw();
 }
 
 
 void Scanner::InitOnce() {
 }
 
 }  // namespace dart