commit 0eca1a7136ec5a48d8cf97decf157dc04c93512a
author Sean Callanan <scallanan@apple.com> Wed Oct 12 18:00:53 2011 +0000
committer Sean Callanan <scallanan@apple.com> Wed Oct 12 18:00:53 2011 +0000
tree 9a99341ac9d4a6d9c92b6048d92255848f5d5286
parent 30640cce87a2a8ea138334ac55225983a585d77e

Added support to ClagnExpressionDeclMap for finding
data symbols in namespaces.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@141792 91177308-0d34-0410-b5e6-96231b3b80d8

source/Expression/ClangExpressionDeclMap.cpp

diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 4256a18..c28f26d 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -1630,7 +1630,10 @@
     TypeFromUser type(expr_var->GetTypeFromUser());
     
     VariableSP var = FindVariableInScope (*frame, name, &type);
-    Symbol *sym = FindGlobalDataSymbol(*target, name);
+    
+    ModuleSP module;
+    
+    Symbol *sym = FindGlobalDataSymbol(*target, module, name, NULL);
     
     std::auto_ptr<lldb_private::Value> location_value;
     
@@ -1977,14 +1980,22 @@
 ClangExpressionDeclMap::FindGlobalDataSymbol
 (
     Target &target,
-    const ConstString &name
+    ModuleSP &module,
+    const ConstString &name,
+    ClangNamespaceDecl *namespace_decl
 )
 {
     SymbolContextList sc_list;
     
-    target.GetImages().FindSymbolsWithNameAndType(name, 
-                                                  eSymbolTypeData, 
-                                                  sc_list);
+    if (module && namespace_decl)
+        module->FindSymbolsWithNameAndType(name, 
+                                           namespace_decl, 
+                                           eSymbolTypeData, 
+                                           sc_list);
+    else
+        target.GetImages().FindSymbolsWithNameAndType(name, 
+                                                      eSymbolTypeData, 
+                                                      sc_list);
     
     if (sc_list.GetSize())
     {
@@ -2430,7 +2441,17 @@
                 // We couldn't find a variable or function for this.  Now we'll hunt for a generic 
                 // data symbol, and -- if it is found -- treat it as a variable.
                 
-                Symbol *data_symbol = FindGlobalDataSymbol(*target, name);
+                Symbol *data_symbol;
+                
+                if (namespace_decl && module)
+                {
+                    data_symbol = FindGlobalDataSymbol(*target, module, name, &namespace_decl);
+                }
+                else
+                {
+                    ModuleSP module;
+                    data_symbol = FindGlobalDataSymbol(*target, module, name, NULL);
+                }
                 
                 if (data_symbol)
                 {