commit 1d2aefd474c9893407ef4deacefd08dd2ca2e806
author Caroline Tice <ctice@apple.com> Thu Sep 09 06:25:08 2010 +0000
committer Caroline Tice <ctice@apple.com> Thu Sep 09 06:25:08 2010 +0000
tree ee8e3d77d9bfa552b080316f29ec27985f4e9b40
parent 88866ac481cd5533c18e00233aeced2eb1fce42b

Make all debugger-level user settable variables into instance variables.
Make get/set variable at the debugger level always set the particular debugger's instance variables rather than
the default variables.




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

source/Interpreter/CommandInterpreter.cpp

diff --git a/source/Interpreter/CommandInterpreter.cpp b/source/Interpreter/CommandInterpreter.cpp
index e7b3a1e..0da474b 100644
--- a/source/Interpreter/CommandInterpreter.cpp
+++ b/source/Interpreter/CommandInterpreter.cpp
@@ -64,7 +64,9 @@
     std::string lang_name = ScriptInterpreter::LanguageToString (script_language);
     StreamString var_name;
     var_name.Printf ("[%s].script-lang", dbg_name);
-    debugger.GetSettingsController()->SetVariable (var_name.GetData(), lang_name.c_str(), lldb::eVarSetOperationAssign, false);
+    debugger.GetSettingsController()->SetVariable (var_name.GetData(), lang_name.c_str(), 
+                                                   lldb::eVarSetOperationAssign, false, 
+                                                   m_debugger.GetInstanceName().AsCString());
 }
 
 void
@@ -140,7 +142,8 @@
     const char *dbg_name = GetDebugger().GetInstanceName().AsCString();
     StreamString var_name;
     var_name.Printf ("[%s].script-lang", dbg_name);
-    value = Debugger::GetSettingsController()->GetVariable (var_name.GetData(), var_type);
+    value = Debugger::GetSettingsController()->GetVariable (var_name.GetData(), var_type, 
+                                                            m_debugger.GetInstanceName().AsCString());
     bool success;
     script_language = Args::StringToScriptLanguage (value.GetStringAtIndex(0), lldb::eScriptLanguageDefault, &success);
     
@@ -777,7 +780,7 @@
     const char *instance_name = GetDebugger().GetInstanceName().AsCString();
     StreamString var_name;
     var_name.Printf ("[%s].prompt", instance_name);
-    return Debugger::GetSettingsController()->GetVariable (var_name.GetData(), var_type).GetStringAtIndex(0);
+    return Debugger::GetSettingsController()->GetVariable (var_name.GetData(), var_type, instance_name).GetStringAtIndex(0);
 }
 
 void
@@ -786,7 +789,8 @@
     const char *instance_name = GetDebugger().GetInstanceName().AsCString();
     StreamString name_str;
     name_str.Printf ("[%s].prompt", instance_name);
-    Debugger::GetSettingsController()->SetVariable (name_str.GetData(), new_prompt, lldb::eVarSetOperationAssign, false);
+    Debugger::GetSettingsController()->SetVariable (name_str.GetData(), new_prompt, lldb::eVarSetOperationAssign, 
+                                                    false, m_debugger.GetInstanceName().AsCString());
 }
 
 void
@@ -1037,7 +1041,8 @@
 {
     lldb::SettableVariableType var_type;
     const char *width_value = 
-                            Debugger::GetSettingsController()->GetVariable ("term-width", var_type).GetStringAtIndex(0);
+      Debugger::GetSettingsController()->GetVariable ("term-width", var_type,
+                                                      m_debugger.GetInstanceName().AsCString()).GetStringAtIndex(0);
     int max_columns = atoi (width_value);
     // Sanity check max_columns, to cope with emacs shell mode with TERM=dumb
     // (0 rows; 0 columns;).
@@ -1128,7 +1133,7 @@
           
           complete_command_name.Printf ("%s %s", prefix, command_name);
 
-          if (sub_cmd_obj->HelpTextContainsWord (search_word))
+          if (sub_cmd_obj->HelpTextContainsWord (search_word, *this))
           {
               commands_found.AppendString (complete_command_name.GetData());
               commands_help.AppendString (sub_cmd_obj->GetHelp());
@@ -1152,7 +1157,7 @@
         const char *command_name = pos->first.c_str();
         CommandObject *cmd_obj = pos->second.get();
 
-        if (cmd_obj->HelpTextContainsWord (search_word))
+        if (cmd_obj->HelpTextContainsWord (search_word, *this))
         {
             commands_found.AppendString (command_name);
             commands_help.AppendString (cmd_obj->GetHelp());