Lookup functions by name that contains the private key, except for dart_api which allows ignoring t…

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/bigint_operations.h"
@@ skipping 2173 matching lines @@
 
 RawFunction* Class::LookupDynamicFunction(const String& name) const {
   Function& function = Function::Handle(LookupFunction(name));
   if (function.IsNull() || !function.IsDynamicFunction()) {
     return Function::null();
   }
   return function.raw();
 }
 
 
+RawFunction* Class::LookupDynamicFunctionAllowPrivate(
+    const String& name) const {
+  Function& function = Function::Handle(LookupFunctionAllowPrivate(name));
+  if (function.IsNull() || !function.IsDynamicFunction()) {
+    return Function::null();
+  }
+  return function.raw();
+}
+
+
 RawFunction* Class::LookupStaticFunction(const String& name) const {
   Function& function = Function::Handle(LookupFunction(name));
   if (function.IsNull() || !function.IsStaticFunction()) {
     return Function::null();
   }
   return function.raw();
 }
 
 
+RawFunction* Class::LookupStaticFunctionAllowPrivate(const String& name) const {
+  Function& function = Function::Handle(LookupFunctionAllowPrivate(name));
+  if (function.IsNull() || !function.IsStaticFunction()) {
+    return Function::null();
+  }
+  return function.raw();
+}
+
+
 RawFunction* Class::LookupConstructor(const String& name) const {
   Function& function = Function::Handle(LookupFunction(name));
   if (function.IsNull() || !function.IsConstructor()) {
     return Function::null();
   }
   ASSERT(!function.is_static());
   return function.raw();
 }
 
 
@@ skipping 33 matching lines @@
 
 RawFunction* Class::LookupFunction(const String& name) const {
   Isolate* isolate = Isolate::Current();
   ASSERT(name.IsOneByteString());
   Array& funcs = Array::Handle(isolate, functions());
   if (funcs.IsNull()) {
     // This can occur, e.g., for Null classes.
     return Function::null();
   }
   Function& function = Function::Handle(isolate, Function::null());
+  if (name.IsSymbol()) {
+    // Quick Symbol compare.
+    intptr_t len = funcs.Length();
+    for (intptr_t i = 0; i < len; i++) {
+      function ^= funcs.At(i);
+      if (function.name() == name.raw()) {
+        return function.raw();
+      }
+    }
+  } else {
+    String& function_name = String::Handle(isolate, String::null());
+    intptr_t len = funcs.Length();
+    for (intptr_t i = 0; i < len; i++) {
+      function ^= funcs.At(i);
+      function_name ^= function.name();
+      if (function_name.Equals(name)) {
+        return function.raw();
+      }
+    }
+  }
+  // No function found.
+  return Function::null();
+}
+
+
+RawFunction* Class::LookupFunctionAllowPrivate(const String& name) const {
+  Isolate* isolate = Isolate::Current();
+  ASSERT(name.IsOneByteString());
+  Array& funcs = Array::Handle(isolate, functions());
+  if (funcs.IsNull()) {
+    // This can occur, e.g., for Null classes.
+    return Function::null();
+  }
+  Function& function = Function::Handle(isolate, Function::null());
   String& function_name = String::Handle(isolate, String::null());
   intptr_t len = funcs.Length();
   for (intptr_t i = 0; i < len; i++) {
     function ^= funcs.At(i);
     function_name ^= function.name();
     if (OneByteString::EqualsIgnoringPrivateKey(function_name, name)) {
       return function.raw();
     }
   }
-
   // No function found.
   return Function::null();
 }
 
 
 RawFunction* Class::LookupGetterFunction(const String& name) const {
   return LookupAccessorFunction(kGetterPrefix, kGetterPrefixLength, name);
 }
 
 
@@ skipping 3906 matching lines @@
     lib_url ^= lib.url();
     lib_key = lib_url.Hash();
     if (lib_key == key) {
       return true;
     }
   }
   return false;
 }
 
 
+static bool IsPrivate(const String& name) {
+  if (ShouldBePrivate(name)) return true;
+  // Factory names: List._fromLiteral.
+  for (intptr_t i = 1; i < name.Length() - 1; i++) {
+    if (name.CharAt(i) == '.') {
+      if (name.CharAt(i + 1) == '_') {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+
+// Cannot handle qualified names properly as it only appends private key to
+// the end (e.g. _Alfa.foo -> _Alfa.foo@...).
 RawString* Library::PrivateName(const String& name) const {
-  ASSERT(ShouldBePrivate(name));
+  ASSERT(IsPrivate(name));
   // ASSERT(strchr(name, '@') == NULL);
   String& str = String::Handle();
   str ^= name.raw();
   str = String::Concat(str, String::Handle(this->private_key()));
   str = Symbols::New(str);
   return str.raw();
 }
 
 
 RawLibrary* Library::GetLibrary(intptr_t index) {
@@ skipping 6332 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart