Merge better naming of anonymous namespaces. Close #643.

dxr/plugins/clang/dxr-index.cpp

@@ -300,6 +300,22 @@ class IndexConsumer : public ASTConsumer,
       recordValue("locend", locationToString(afterToken(endLoc)));
   }
 
+  // Given a declaration, get the name of the file containing the corresponding
+  // definition or the name of the file containing the declaration if no
+  // definition can be found.
+  std::string getRealFilenameForDefinition(const NamedDecl &d) {
+    const NamedDecl *decl = &d;
+
+    if (const FunctionDecl *fd = dyn_cast<FunctionDecl>(decl)) {
+      const FunctionDecl *def = 0;
+      if (fd->isDefined(def))
+        decl = def;
+    }
+
+    const std::string &filename = sm.getFilename(decl->getLocation());
+    return getFileInfo(filename)->realname;
+  }
+
   // This is a wrapper around NamedDecl::getQualifiedNameAsString.
   // It produces more qualified output to distinguish several cases
   // which would otherwise be ambiguous.
@@ -376,8 +392,7 @@ class IndexConsumer : public ASTConsumer,
     const std::string anon_ns = "<anonymous namespace>";
 #endif
     if (StringRef(ret).startswith(anon_ns)) {
-      const std::string &filename = ci.getFrontendOpts().Inputs[0].getFile().str();
-      const std::string &realname = getFileInfo(filename)->realname;
+      const std::string &realname = getRealFilenameForDefinition(d);
       ret = "(" + ret.substr(1, anon_ns.size() - 2) + " in " + realname + ")" +
         ret.substr(anon_ns.size());
     }

dxr/plugins/clang/tests/test_anon_ns/code/main.cpp

@@ -1,4 +1,5 @@
 #include "main2.h"
+#include "main3.h"
 
 namespace
 {
@@ -11,5 +12,6 @@ int main()
 {
     foo();  /* calling foo in main */
     bar();
+    baz();
     return 0;
 }

dxr/plugins/clang/tests/test_anon_ns/code/main2.cpp

@@ -1,4 +1,5 @@
 #include "main2.h"
+#include "main3.h"
 
 namespace
 {
@@ -10,4 +11,5 @@ namespace
 void bar()
 {
     foo();  /* calling foo in main2 */
+    baz();
 }

dxr/plugins/clang/tests/test_anon_ns/code/main3.h

@@ -0,0 +1,6 @@
+namespace
+{
+    void baz() /* in main3.h */
+    {
+    }
+}

dxr/plugins/clang/tests/test_anon_ns/test_anon_ns.py

@@ -6,12 +6,20 @@ class AnonymousNamespaceTests(DxrInstanceTestCase):
 
     def test_function(self):
         self.found_line_eq('+function:"(anonymous namespace in main.cpp)::foo()"',
-                           'void <b>foo</b>() /* in main */', 5)
+                           'void <b>foo</b>() /* in main */', 6)
         self.found_line_eq('+function:"(anonymous namespace in main2.cpp)::foo()"',
-                           'void <b>foo</b>() /* in main2 */', 5)
+                           'void <b>foo</b>() /* in main2 */', 6)
 
     def test_function_ref(self):
         self.found_line_eq('+function-ref:"(anonymous namespace in main.cpp)::foo()"',
-                           '<b>foo</b>();  /* calling foo in main */', 12)
+                           '<b>foo</b>();  /* calling foo in main */', 13)
         self.found_line_eq('+function-ref:"(anonymous namespace in main2.cpp)::foo()"',
-                           '<b>foo</b>();  /* calling foo in main2 */', 12)
+                           '<b>foo</b>();  /* calling foo in main2 */', 13)
+
+    def test_anonymous_namespace_in_header(self):
+        self.found_line_eq('+function:"(anonymous namespace in main3.h)::baz()"',
+                           'void <b>baz</b>() /* in main3.h */', 3)
+        self.found_files_eq('+function-ref:"(anonymous namespace in main3.h)::baz()"', [
+            "main.cpp",
+            "main2.cpp"])
+