Author: jingham
Date: Mon Jun 27 20:33:03 2016
New Revision: 273979
URL: http://llvm.org/viewvc/llvm-project?rev=273979&view=rev
Log:
fixits are apparently called fix-its.
<rdar://problem/26998596>
Modified:
lldb/trunk/include/lldb/Expression/UserExpression.h
lldb/trunk/scripts/interface/SBExpressionOptions.i
lldb/trunk/source/Commands/CommandObjectExpression.cpp
lldb/trunk/source/Target/Target.cpp
Modified: lldb/trunk/include/lldb/Expression/UserExpression.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/UserExpression.h?rev=273979&r1=273978&r2=273979&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/UserExpression.h (original)
+++ lldb/trunk/include/lldb/Expression/UserExpression.h Mon Jun 27 20:33:03 2016
@@ -338,7 +338,7 @@ protected:
Address m_address; ///<
The address the process is stopped in.
std::string m_expr_text; ///<
The text of the expression, as typed by the user
std::string m_expr_prefix; ///<
The text of the translation-level definitions, as provided by the user
- std::string m_fixed_text; ///<
The text of the expression with fixits applied - this won't be set if the fixed
text doesn't parse.
+ std::string m_fixed_text; ///<
The text of the expression with fix-its applied - this won't be set if the
fixed text doesn't parse.
lldb::LanguageType m_language; ///<
The language to use when parsing (eLanguageTypeUnknown means use defaults)
ResultType m_desired_type; ///<
The type to coerce the expression's result to. If eResultTypeAny, inferred
from the expression.
EvaluateExpressionOptions m_options; ///<
Additional options provided by the user.
Modified: lldb/trunk/scripts/interface/SBExpressionOptions.i
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/interface/SBExpressionOptions.i?rev=273979&r1=273978&r2=273979&view=diff
==============================================================================
--- lldb/trunk/scripts/interface/SBExpressionOptions.i (original)
+++ lldb/trunk/scripts/interface/SBExpressionOptions.i Mon Jun 27 20:33:03 2016
@@ -119,11 +119,11 @@ public:
void
SetPrefix (const char *prefix);
- %feature("docstring", "Sets whether to auto-apply FixIt hints to the
expression being evaluated.") SetAutoApplyFixIts;
+ %feature("docstring", "Sets whether to auto-apply fix-it hints to the
expression being evaluated.") SetAutoApplyFixIts;
void
SetAutoApplyFixIts(bool b = true);
- %feature("docstring", "Gets whether to auto-apply FixIt hints to an
expression.") GetAutoApplyFixIts;
+ %feature("docstring", "Gets whether to auto-apply fix-it hints to an
expression.") GetAutoApplyFixIts;
bool
GetAutoApplyFixIts();
Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=273979&r1=273978&r2=273979&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Mon Jun 27 20:33:03
2016
@@ -61,7 +61,7 @@ CommandObjectExpression::CommandOptions:
{ LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "unwind-on-error", 'u',
OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeBoolean,
"Clean up program state if the expression causes a crash, or raises a signal.
Note, unlike gdb hitting a breakpoint is controlled by another option (-i)."},
{ LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "debug", 'g',
OptionParser::eNoArgument , nullptr, nullptr, 0, eArgTypeNone, "When
specified, debug the JIT code by setting a breakpoint on the first instruction
and forcing breakpoints to not be ignored (-i0) and no unwinding to happen on
error (-u0)."},
{ LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "language", 'l',
OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeLanguage,
"Specifies the Language to use when parsing the expression. If not set the
target.language setting is used." },
- { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "apply-fixits", 'X',
OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeLanguage, "If
true, simple FixIt hints will be automatically applied to the expression." },
+ { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "apply-fixits", 'X',
OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeLanguage, "If
true, simple fix-it hints will be automatically applied to the expression." },
{ LLDB_OPT_SET_1, false, "description-verbosity", 'v',
OptionParser::eOptionalArgument, nullptr, g_description_verbosity_type, 0,
eArgTypeDescriptionVerbosity, "How verbose should the output of this
expression be, if the object description is asked for."},
{ LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "top-level", 'p',
OptionParser::eNoArgument , NULL, NULL, 0, eArgTypeNone, "Interpret
the expression as top-level definitions rather than code to be immediately
executed."},
{ LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "allow-jit", 'j',
OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeBoolean,
"Controls whether the expression can fall back to being JITted if it's not
supported by the interpreter (defaults to true)."}
@@ -371,7 +371,7 @@ CommandObjectExpression::EvaluateExpress
if (error_stream && !m_fixed_expression.empty() &&
target->GetEnableNotifyAboutFixIts())
{
if (success == eExpressionCompleted)
- error_stream->Printf (" Fixit applied, fixed expression was:
\n %s\n", m_fixed_expression.c_str());
+ error_stream->Printf (" Fix-it applied, fixed expression was:
\n %s\n", m_fixed_expression.c_str());
}
if (result_valobj_sp)
Modified: lldb/trunk/source/Target/Target.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=273979&r1=273978&r2=273979&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Mon Jun 27 20:33:03 2016
@@ -3435,7 +3435,7 @@ g_properties[] =
{ "debug-file-search-paths" , OptionValue::eTypeFileSpecList,
false, 0 , nullptr, nullptr, "List of directories to be
searched when locating debug symbol files." },
{ "clang-module-search-paths" , OptionValue::eTypeFileSpecList,
false, 0 , nullptr, nullptr, "List of directories to be
searched when locating modules for Clang." },
{ "auto-import-clang-modules" , OptionValue::eTypeBoolean ,
false, true , nullptr, nullptr, "Automatically load Clang
modules referred to by the program." },
- { "auto-apply-fixits" , OptionValue::eTypeBoolean ,
false, true , nullptr, nullptr, "Automatically apply fixit
hints to expressions." },
+ { "auto-apply-fixits" , OptionValue::eTypeBoolean ,
false, true , nullptr, nullptr, "Automatically apply
fix-it hints to expressions." },
{ "notify-about-fixits" , OptionValue::eTypeBoolean ,
false, true , nullptr, nullptr, "Print the fixed
expression text." },
{ "max-children-count" , OptionValue::eTypeSInt64 ,
false, 256 , nullptr, nullptr, "Maximum number of
children to expand in any level of depth." },
{ "max-string-summary-length" , OptionValue::eTypeSInt64 ,
false, 1024 , nullptr, nullptr, "Maximum number of
characters to show when using %s in summary strings." },
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
