Author: enrico Date: Tue Sep 15 17:11:20 2015 New Revision: 247727 URL: http://llvm.org/viewvc/llvm-project?rev=247727&view=rev Log: Teach the ObjC data formatters to use the correct language when printing strings
Modified: lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp Modified: lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp?rev=247727&r1=247726&r2=247727&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp (original) +++ lldb/trunk/source/Plugins/Language/ObjC/Cocoa.cpp Tue Sep 15 17:11:20 2015 @@ -876,6 +876,7 @@ lldb_private::formatters::NSStringSummar options.SetNeedsZeroTermination(false); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); options.SetBinaryZeroIsTerminator(false); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::UTF16>(options); } else @@ -889,6 +890,7 @@ lldb_private::formatters::NSStringSummar options.SetNeedsZeroTermination(false); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); options.SetBinaryZeroIsTerminator(false); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::ASCII>(options); } } @@ -904,6 +906,7 @@ lldb_private::formatters::NSStringSummar options.SetQuote('"'); options.SetSourceSize(explicit_length); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::ASCII> (options); } else if (is_unicode) @@ -935,6 +938,7 @@ lldb_private::formatters::NSStringSummar options.SetNeedsZeroTermination(has_explicit_length == false); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); options.SetBinaryZeroIsTerminator(has_explicit_length == false); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::UTF16> (options); } else if (is_path_store) @@ -953,6 +957,7 @@ lldb_private::formatters::NSStringSummar options.SetNeedsZeroTermination(has_explicit_length == false); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); options.SetBinaryZeroIsTerminator(has_explicit_length == false); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::UTF16> (options); } else if (is_inline) @@ -979,6 +984,7 @@ lldb_private::formatters::NSStringSummar options.SetNeedsZeroTermination(!has_explicit_length); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); options.SetBinaryZeroIsTerminator(!has_explicit_length); + options.SetLanguage(summary_options.GetLanguage()); if (has_explicit_length) return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::UTF8>(options); else @@ -999,6 +1005,7 @@ lldb_private::formatters::NSStringSummar options.SetStream(&stream); options.SetSourceSize(explicit_length); options.SetIgnoreMaxLength(summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryUncapped); + options.SetLanguage(summary_options.GetLanguage()); return StringPrinter::ReadStringAndDumpToStream<StringPrinter::StringElementType::ASCII>(options); } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits