maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a bug in handling command resolution for non-exact matches. Now we will correctly give help options when there are both aliases & real commands matching the current input string. 

llvm-svn: 106782
This commit is contained in:
Jim Ingham 2010-06-24 20:28:42 +00:00
parent 9b659142a6
commit 490ac55536
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -316,13 +316,13 @@ CommandInterpreter::GetCommandSP (const char *cmd_cstr, bool include_aliases, bo
ret_val = pos->second;
}
if (num_cmd_matches != 1 && include_aliases && HasAliases())
if (include_aliases && HasAliases())
{
num_alias_matches = CommandObject::AddNamesMatchingPartialString (m_alias_dict, cmd_cstr, *matches);
}
if (num_alias_matches == 1)
if (num_alias_matches == 1 && num_cmd_matches == 0)
{
cmd.assign(matches->GetStringAtIndex (num_cmd_matches));
pos = m_alias_dict.find(cmd);
@ -335,12 +335,12 @@ CommandInterpreter::GetCommandSP (const char *cmd_cstr, bool include_aliases, bo
}
}
if (num_cmd_matches != 1 && num_alias_matches != 1 && HasUserCommands())
if (HasUserCommands())
{
num_user_matches = CommandObject::AddNamesMatchingPartialString (m_user_dict, cmd_cstr, *matches);
}
if (num_user_matches == 1)
if (num_user_matches == 1 && num_alias_matches == 0 && num_cmd_matches == 0)
{
cmd.assign (matches->GetStringAtIndex (num_cmd_matches + num_alias_matches));