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 3404 matching lines @@
   return Function::null();
 }
 
 
 RawObject* Library::LookupLocalObject(const String& name) const {
   intptr_t index;
   return LookupEntry(name, &index);
 }
 
 
 static bool ShouldBePrivate(const String& name) {

[siva, 2013/01/16 23:57:24]

I find the name ShouldBePrivate pretty weird.
It seems to be doing the functionality of
IsPrivate(const String& name);

[srdjan, 2013/01/17 00:31:11]

Reverting this code to original, adding an IsPrivate method that does the same
(used in an ASSERT of Library::PrivateName)

-  return
-      (name.Length() >= 1 &&
-       name.CharAt(0) == '_') ||
-      (name.Length() >= 5 &&
-       (name.CharAt(4) == '_' &&
-        (name.CharAt(0) == 'g' || name.CharAt(0) == 's') &&
-        name.CharAt(1) == 'e' &&
-        name.CharAt(2) == 't' &&
-        name.CharAt(3) == ':'));
+  if (name.Length() <= 1) return false;
+  if (name.CharAt(0) == '_') return true;
+  if (name.StartsWith(Symbols::PrivateGetterPrefix()) ||
+      name.StartsWith(Symbols::PrivateSetterPrefix())) {
+    return true;
+  }
+  // Factory names: List._fromLiteral.
+  // TODO(srdjan): Improve speed by assuming OnebyteStrings.

[siva, 2013/01/16 23:57:24]

assuming OneByteStrings or ExternalOneByteStrings

[srdjan, 2013/01/17 00:31:11]

Done.

+  for (intptr_t i = 1; i < name.Length() - 1; i++) {
+    if (name.CharAt(i) == '.') {
+      if (name.CharAt(i + 1) == '_') {
+        return true;
+      }
+    }
+  }

[siva, 2013/01/16 23:57:24]

As discussed offline, this additional check here probably only makes sense for
Library::PrivateName().

[srdjan, 2013/01/17 00:31:11]

Done.

+  return false;
 }
 
 
 RawField* Library::LookupFieldAllowPrivate(const String& name) const {
   // First check if name is found in the local scope of the library.
   Field& field = Field::Handle(LookupLocalField(name));
   if (!field.IsNull()) {
     return field.raw();
   }
 
@@ skipping 479 matching lines @@
 }
 
 
 RawString* Library::PrivateName(const String& name) const {
   ASSERT(ShouldBePrivate(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();

[siva, 2013/01/16 23:57:24]

I think the function in it's current form will not work for
cases like _xyz.func
I don't think this function was written to accept qualified names.

it is supposed to make it _xyz@123.func but it will make it _xyz.func@123

 }
 
 
 RawLibrary* Library::GetLibrary(intptr_t index) {
   Isolate* isolate = Isolate::Current();
   const GrowableObjectArray& libs =
       GrowableObjectArray::Handle(isolate->object_store()->libraries());
   ASSERT(!libs.IsNull());
   if ((0 <= index) && (index < libs.Length())) {
     Library& lib = Library::Handle();
@@ skipping 6326 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart