diff options
| author | Enrico Granata <egranata@apple.com> | 2013-03-26 18:04:53 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2013-03-26 18:04:53 +0000 |
| commit | 9fb5ab558b9874ac7065337a9ac274e2d857da16 (patch) | |
| tree | 478ff60a853cc0be2f1d56af562e6822cc7c3aec /lldb/source/Commands/CommandObjectExpression.cpp | |
| parent | cfed3cf33c1a280669cda1015bc86a5c25d2e583 (diff) | |
| download | llvm-9fb5ab558b9874ac7065337a9ac274e2d857da16.zip llvm-9fb5ab558b9874ac7065337a9ac274e2d857da16.tar.gz llvm-9fb5ab558b9874ac7065337a9ac274e2d857da16.tar.bz2 | |
Our commands that end up displaying a ValueObject as part of their workflow use OptionGroupValueObjectDisplay as their currency for deciding the final representation
ValueObjects themselves use DumpValueObjectOptions as the currency for the same purpose
The code to convert between these two units was replicated (to varying degrees of correctness) in several spots in the code
This checkin provides one and only one (and hopefully correct :-) entry point for this conversion
llvm-svn: 178044
Diffstat (limited to 'lldb/source/Commands/CommandObjectExpression.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectExpression.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index ccb2f8e..927dc62 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -386,27 +386,7 @@ CommandObjectExpression::EvaluateExpression if (format != eFormatDefault) result_valobj_sp->SetFormat (format); - ValueObject::DumpValueObjectOptions options; - options.SetMaximumPointerDepth(m_varobj_options.ptr_depth); - if (m_varobj_options.use_objc) - options.SetShowSummary(false); - else - options.SetOmitSummaryDepth(m_varobj_options.no_summary_depth); - options.SetMaximumDepth(m_varobj_options.max_depth) - .SetShowTypes(m_varobj_options.show_types) - .SetShowLocation(m_varobj_options.show_location) - .SetUseObjectiveC(m_varobj_options.use_objc) - .SetUseDynamicType(m_varobj_options.use_dynamic) - .SetUseSyntheticValue(m_varobj_options.use_synth) - .SetFlatOutput(m_varobj_options.flat_output) - .SetIgnoreCap(m_varobj_options.ignore_cap) - .SetFormat(format) - .SetHideRootType(m_varobj_options.use_objc) - .SetHideName(m_varobj_options.use_objc) - .SetHideValue(m_varobj_options.use_objc); - - if (m_varobj_options.be_raw) - options.SetRawDisplay(true); + ValueObject::DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(true,format)); ValueObject::DumpValueObject (*(output_stream), result_valobj_sp.get(), // Variable object to dump |