diff options
| author | Greg Clayton <gclayton@apple.com> | 2012-01-26 21:08:30 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2012-01-26 21:08:30 +0000 |
| commit | 6efba4fc97f4509ab1b48076e030e8fdc5434d33 (patch) | |
| tree | 1c3703b758ef31f489dfb71c22ad1607f2630138 /lldb/source/Commands/CommandObjectFrame.cpp | |
| parent | 48fd81b484adde233b524acc94276fe7a69f33aa (diff) | |
| download | llvm-6efba4fc97f4509ab1b48076e030e8fdc5434d33.zip llvm-6efba4fc97f4509ab1b48076e030e8fdc5434d33.tar.gz llvm-6efba4fc97f4509ab1b48076e030e8fdc5434d33.tar.bz2 | |
Fixed formats being able to be applied recursively when using:
target variable -f <format> [args]
frame variable -f <format> [args]
expression -f <format> -- expr
llvm-svn: 149080
Diffstat (limited to 'lldb/source/Commands/CommandObjectFrame.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectFrame.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 9a4665c..bb8313c 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -476,8 +476,8 @@ public: valobj_sp = frame->GetValueObjectForFrameVariable (var_sp, m_varobj_options.use_dynamic); if (valobj_sp) { - if (format != eFormatDefault) - valobj_sp->SetFormat (format); +// if (format != eFormatDefault) +// valobj_sp->SetFormat (format); if (m_option_variable.show_decl && var_sp->GetDeclaration ().GetFile()) { @@ -490,7 +490,8 @@ public: valobj_sp->SetCustomSummaryFormat(summary_format_sp); ValueObject::DumpValueObject (result.GetOutputStream(), valobj_sp.get(), - options); + options, + format); } } } @@ -521,8 +522,8 @@ public: error); if (valobj_sp) { - if (format != eFormatDefault) - valobj_sp->SetFormat (format); +// if (format != eFormatDefault) +// valobj_sp->SetFormat (format); if (m_option_variable.show_decl && var_sp && var_sp->GetDeclaration ().GetFile()) { var_sp->GetDeclaration ().DumpStopContext (&s, false); @@ -535,7 +536,8 @@ public: ValueObject::DumpValueObject (output_stream, valobj_sp.get(), valobj_sp->GetParent() ? name_cstr : NULL, - options); + options, + format); // Process watchpoint if necessary. if (m_option_watchpoint.watch_variable) { @@ -639,8 +641,8 @@ public: m_varobj_options.use_dynamic); if (valobj_sp) { - if (format != eFormatDefault) - valobj_sp->SetFormat (format); +// if (format != eFormatDefault) +// valobj_sp->SetFormat (format); // When dumping all variables, don't print any variables // that are not in scope to avoid extra unneeded output @@ -656,7 +658,8 @@ public: ValueObject::DumpValueObject (result.GetOutputStream(), valobj_sp.get(), name_cstr, - options); + options, + format); } } } |