- Fix the external_test.dart as it was relying on outdated

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 207 matching lines @@
   if (name.Equals(Symbols::TopLevel())) {
     // Name of invisible top-level class.
     return Symbols::Empty().raw();
   }
 
   // First remove all private name mangling.
   String& unmangled_name = String::Handle(Symbols::Empty().raw());
   String& segment = String::Handle();
   intptr_t start_pos = 0;
   for (intptr_t i = 0; i < name.Length(); i++) {
-    if (name.CharAt(i) == '@') {
+    if (name.CharAt(i) == '@' &&
+        (i+1) < name.Length() &&
+        (name.CharAt(i+1) >= '0') &&
+        (name.CharAt(i+1) <= '9')) {
       // Append the current segment to the unmangled name.
       segment = String::SubString(name, start_pos, (i - start_pos));
       unmangled_name = String::Concat(unmangled_name, segment);
 
-      // Advance until past the name mangling.
+      // Advance until past the name mangling. The private keys are only
+      // numbers so we skip until the first non-number.
       i++;  // Skip the '@'.
       while ((i < name.Length()) &&
-             (name.CharAt(i) != '&') &&
-             (name.CharAt(i) != '.')) {
+             (name.CharAt(i) >= '0') &&
+             (name.CharAt(i) <= '9')) {
         i++;
       }
       start_pos = i;
       i--;  // Account for for-loop increment.
     }
   }
   if (start_pos == 0) {
     // No name unmangling needed, reuse the name that was passed in.
     unmangled_name = name.raw();
   } else if (name.Length() != start_pos) {
@@ skipping 9052 matching lines @@
 
 
 void Library::AllocatePrivateKey() const {
   const String& url = String::Handle(this->url());
   intptr_t key_value = url.Hash();
   while (Library::IsKeyUsed(key_value)) {
     key_value++;
   }
   char private_key[32];
   OS::SNPrint(private_key, sizeof(private_key),
-              "%c%#" Px "", kPrivateKeySeparator, key_value);
+              "%c%" Pd "", kPrivateKeySeparator, key_value);
   StorePointer(&raw_ptr()->private_key_, String::New(private_key, Heap::kOld));
 }
 
 
 const String& Library::PrivateCoreLibName(const String& member) {
   const Library& core_lib = Library::Handle(Library::CoreLibrary());
   const String& private_name = String::ZoneHandle(core_lib.PrivateName(member));
   return private_name;
 }
 
@@ skipping 9687 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart