Improve the stack trace output to be more readable.

vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 59 matching lines @@
   do {                                                                         \
     intptr_t len = (length);                                                   \
     intptr_t max = (max_elements);                                             \
     if (len < 0 || len > max) {                                                \
       return Api::NewError(                                                    \
           "%s expects argument '%s' to be in the range [0..%ld].",             \
           CURRENT_FUNC, #length, max);                                         \
     }                                                                          \
   } while (0)
 
-// Takes a vm internal name and makes it suitable for external user.
-//
-// Examples:
-//
-// Internal getter and setter prefices are removed:
-//
-//   get:foo -> foo
-//   set:foo -> foo
-//
-// Private name mangling is removed, possibly twice:
-//
-//   _ReceivePortImpl@6be832b -> _ReceivePortImpl
-//   _ReceivePortImpl@6be832b._internal@6be832b -> +ReceivePortImpl._internal
-//
-// The trailing . on the default constructor name is dropped:
-//
-//   List. -> List
-//
-// And so forth:
-//
-//   get:foo@6be832b -> foo
-//   _MyClass@6b3832b. -> _MyClass
-//   _MyClass@6b3832b.named -> _MyClass.named
-//
-static RawString* IdentifierPrettyName(Isolate* isolate, const String& name) {
-  intptr_t len = name.Length();
-  intptr_t start = 0;
-  intptr_t at_pos = len;   // Position of '@' in the name.
-  intptr_t dot_pos = len;  // Position of '.' in the name.
-
-  for (int i = 0; i < name.Length(); i++) {
-    if (name.CharAt(i) == ':') {
-      ASSERT(start == 0);
-      start = i + 1;
-    } else if (name.CharAt(i) == '@') {
-      ASSERT(at_pos == len);
-      at_pos = i;
-    } else if (name.CharAt(i) == '.') {
-      dot_pos = i;
-      break;
-    }
-  }
-  intptr_t limit = (at_pos < dot_pos ? at_pos : dot_pos);
-  if (start == 0 && limit == len) {
-    // This name is fine as it is.
-    return name.raw();
-  }
-
-  String& result = String::Handle(isolate);
-  result = String::SubString(name, start, (limit - start));
-
-  // Look for a second '@' now to correctly handle names like
-  // "_ReceivePortImpl@6be832b._internal@6be832b".
-  at_pos = len;
-  for (int i = dot_pos; i < name.Length(); i++) {
-    if (name.CharAt(i) == '@') {
-      ASSERT(at_pos == len);
-      at_pos = i;
-    }
-  }
-
-  intptr_t suffix_len = at_pos - dot_pos;
-  if (suffix_len <= 1) {
-    // The constructor name is of length 0 or 1.  That means that
-    // either this isn't a constructor or that this is an unnamed
-    // constructor.  In either case, we're done.
-    return result.raw();
-  }
-
-  const String& suffix =
-      String::Handle(isolate, String::SubString(name, dot_pos, suffix_len));
-  return String::Concat(result, suffix);
-}
-
 
 // Return error if isolate is in an inconsistent state.
 // Return NULL when no error condition exists.
 //
 // TODO(turnidge): Make this function return an error handle directly
 // rather than returning an error string.  The current behavior can
 // cause compilation errors to appear to be api errors.
 const char* CheckIsolateState(Isolate* isolate, bool generating_snapshot) {
   bool success = true;
   if (!ClassFinalizer::AllClassesFinalized()) {
@@ skipping 2312 matching lines @@
 
 
 DART_EXPORT Dart_Handle Dart_ClassName(Dart_Handle clazz) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Class& cls = Class::Handle(
       isolate, Api::UnwrapClassHandle(isolate, clazz).raw());
   if (cls.IsNull()) {
     RETURN_TYPE_ERROR(isolate, clazz, Class);
   }
-  const String& cls_name = String::Handle(isolate, cls.Name());
-  return Api::NewHandle(isolate, IdentifierPrettyName(isolate, cls_name));
+  return Api::NewHandle(isolate, cls.UserVisibleName());
 }
 
 
 DART_EXPORT Dart_Handle Dart_ClassGetLibrary(Dart_Handle clazz) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Class& cls = Class::Handle(
       isolate, Api::UnwrapClassHandle(isolate, clazz).raw());
   if (cls.IsNull()) {
     RETURN_TYPE_ERROR(isolate, clazz, Class);
@@ skipping 86 matching lines @@
 
 // --- Function and Variable Reflection ---
 
 
 // Outside of the vm, we expose setter names with a trailing '='.
 static bool HasExternalSetterSuffix(const String& name) {
   return name.CharAt(name.Length() - 1) == '=';
 }
 
 
-static RawString* AddExternalSetterSuffix(const String& name) {
-  const String& equals = String::Handle(Symbols::New("="));
-  return String::Concat(name, equals);
-}
-
-
 static RawString* RemoveExternalSetterSuffix(const String& name) {
   ASSERT(HasExternalSetterSuffix(name));
   return String::SubString(name, 0, name.Length() - 1);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetFunctionNames(Dart_Handle target) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(target));
@@ skipping 15 matching lines @@
       for (intptr_t i = 0; i < func_array.Length(); ++i) {
         func ^= func_array.At(i);
 
         // Skip implicit getters and setters.
         if (func.kind() == RawFunction::kImplicitGetter ||
             func.kind() == RawFunction::kImplicitSetter ||
             func.kind() == RawFunction::kConstImplicitGetter) {
           continue;
         }
 
-        name = func.name();
-        bool is_setter = Field::IsSetterName(name);
-        name = IdentifierPrettyName(isolate, name);
-
-        if (is_setter) {
-          name = AddExternalSetterSuffix(name);
-        }
+        name = func.UserVisibleName();
         names.Add(name);
       }
     }
   } else if (obj.IsLibrary()) {
     const Library& lib = Library::Cast(obj);
     DictionaryIterator it(lib);
     Object& obj = Object::Handle();
     while (it.HasNext()) {
       obj = it.GetNext();
       if (obj.IsFunction()) {
         func ^= obj.raw();
-        name = func.name();
-        bool is_setter = Field::IsSetterName(name);
-        name = IdentifierPrettyName(isolate, name);
-        if (is_setter) {
-          name = AddExternalSetterSuffix(name);
-        }
+        name = func.UserVisibleName();
         names.Add(name);
       }
     }
   } else {
     return Api::NewError(
         "%s expects argument 'target' to be a class or library.",
         CURRENT_FUNC);
   }
   return Api::NewHandle(isolate, Array::MakeArray(names));
 }
@@ skipping 87 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionName(Dart_Handle function) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Function& func = Api::UnwrapFunctionHandle(isolate, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function, Function);
   }
-  String& func_name = String::Handle(isolate);
-  func_name = func.name();
-  bool is_setter = Field::IsSetterName(func_name);
-  func_name = IdentifierPrettyName(isolate, func_name);
-  if (is_setter) {
-    func_name = AddExternalSetterSuffix(func_name);
-  }
-  return Api::NewHandle(isolate, func_name.raw());
+  return Api::NewHandle(isolate, func.UserVisibleName());
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionOwner(Dart_Handle function) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Function& func = Api::UnwrapFunctionHandle(isolate, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function, Function);
   }
@@ skipping 148 matching lines @@
     const Array& field_array = Array::Handle(cls.fields());
 
     // Some special types like 'Dynamic' have a null fields list.
     //
     // TODO(turnidge): Fix 'Dynamic' so that it does not have a null
     // fields list.  This will have to wait until the empty array is
     // allocated in the vm isolate.
     if (!field_array.IsNull()) {
       for (intptr_t i = 0; i < field_array.Length(); ++i) {
         field ^= field_array.At(i);
-        name = field.name();
-        name = IdentifierPrettyName(isolate, name);
+        name = field.UserVisibleName();
         names.Add(name);
       }
     }
   } else if (obj.IsLibrary()) {
     const Library& lib = Library::Cast(obj);
     DictionaryIterator it(lib);
     Object& obj = Object::Handle(isolate);
     while (it.HasNext()) {
       obj = it.GetNext();
       if (obj.IsField()) {
         field ^= obj.raw();
-        name = field.name();
-        name = IdentifierPrettyName(isolate, name);
+        name = field.UserVisibleName();
         names.Add(name);
       }
     }
   } else {
     return Api::NewError(
         "%s expects argument 'target' to be a class or library.",
         CURRENT_FUNC);
   }
   return Api::NewHandle(isolate, Array::MakeArray(names));
 }
@@ skipping 30 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_VariableName(Dart_Handle variable) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Field& var = Api::UnwrapFieldHandle(isolate, variable);
   if (var.IsNull()) {
     RETURN_TYPE_ERROR(isolate, variable, Field);
   }
-  const String& var_name = String::Handle(var.name());
-  return Api::NewHandle(isolate, IdentifierPrettyName(isolate, var_name));
+  return Api::NewHandle(isolate, var.UserVisibleName());
 }
 
 
 DART_EXPORT Dart_Handle Dart_VariableIsStatic(Dart_Handle variable,
                                               bool* is_static) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (is_static == NULL) {
     RETURN_NULL_ERROR(is_static);
   }
@@ skipping 992 matching lines @@
   ClassDictionaryIterator it(lib);
   Class& cls = Class::Handle();
   String& name = String::Handle();
   while (it.HasNext()) {
     cls = it.GetNextClass();
     // For now we suppress the signature classes of closures.
     //
     // TODO(turnidge): Add this to the unit test.
     const Function& signature_func = Function::Handle(cls.signature_function());
     if (signature_func.IsNull()) {
-      name = cls.Name();
-      name = IdentifierPrettyName(isolate, name);
+      name = cls.UserVisibleName();
       names.Add(name);
     }
   }
   return Api::NewHandle(isolate, Array::MakeArray(names));
 }
 
 
 DART_EXPORT Dart_Handle Dart_LookupLibrary(Dart_Handle url) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
@@ skipping 151 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart