<div dir="ltr"><div class="gmail_extra">Sorry about the breakage and thank you for rolling it back.<br><br><div class="gmail_quote">On Tue, Sep 10, 2013 at 7:03 PM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Rui,<br>
<br>
I reverted this in r190480 as it was turning the bots red.<br>
<br>
Example error output:<br>
<a href="http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8663/steps/check-all/logs/Clang%20Tools%3A%3Amain.cpp" target="_blank">http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8663/steps/check-all/logs/Clang%20Tools%3A%3Amain.cpp</a><br>
<a href="http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8663/steps/check-all/logs/Clang-Unit%3A%3AReplacementsYamlTest.serializesReplacements" target="_blank">http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8663/steps/check-all/logs/Clang-Unit%3A%3AReplacementsYamlTest.serializesReplacements</a><br>
<span class="HOEnZb"><font color="#888888"><br>
- Hans<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
On Tue, Sep 10, 2013 at 5:45 PM, Rui Ueyama <<a href="mailto:ruiu@google.com">ruiu@google.com</a>> wrote:<br>
> Author: ruiu<br>
> Date: Tue Sep 10 19:45:48 2013<br>
> New Revision: 190469<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=190469&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=190469&view=rev</a><br>
> Log:<br>
> YAMLIO: Fix string quoting logic.<br>
><br>
> YAMLIO printed a string as is without quotes unless it contains a newline<br>
> character. That did not suffice. We also need to quote a string if it starts<br>
> with a backquote, quote, double quote or atsign, or it's the empty string.<br>
><br>
> Modified:<br>
> llvm/trunk/lib/Support/YAMLTraits.cpp<br>
> llvm/trunk/unittests/Support/YAMLIOTest.cpp<br>
><br>
> Modified: llvm/trunk/lib/Support/YAMLTraits.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=190469&r1=190468&r2=190469&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=190469&r1=190468&r2=190469&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/lib/Support/YAMLTraits.cpp (original)<br>
> +++ llvm/trunk/lib/Support/YAMLTraits.cpp Tue Sep 10 19:45:48 2013<br>
> @@ -510,8 +510,16 @@ void Output::endBitSetScalar() {<br>
><br>
> void Output::scalarString(StringRef &S) {<br>
> this->newLineCheck();<br>
> - if (S.find('\n') == StringRef::npos) {<br>
> - // No embedded new-line chars, just print string.<br>
> +<br>
> + if (S.empty()) {<br>
> + // Print '' for the empty string because leaving the field empty is not<br>
> + // allowed.<br>
> + this->outputUpToEndOfLine("''");<br>
> + return;<br>
> + }<br>
> + if (!strchr("'`@\"", S.front()) && S.find('\n') == StringRef::npos) {<br>
> + // Plain string cannot start with double quote or single quote. Backquote<br>
> + // and atsign are reserved characters. Newline is not allowed.<br>
> this->outputUpToEndOfLine(S);<br>
> return;<br>
> }<br>
><br>
> Modified: llvm/trunk/unittests/Support/YAMLIOTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/YAMLIOTest.cpp?rev=190469&r1=190468&r2=190469&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/YAMLIOTest.cpp?rev=190469&r1=190468&r2=190469&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/unittests/Support/YAMLIOTest.cpp (original)<br>
> +++ llvm/trunk/unittests/Support/YAMLIOTest.cpp Tue Sep 10 19:45:48 2013<br>
> @@ -273,7 +273,64 @@ TEST(YAMLIO, TestReadWriteBuiltInTypes)<br>
> }<br>
> }<br>
><br>
> +struct StringTypes {<br>
> + llvm::StringRef str1;<br>
> + llvm::StringRef str2;<br>
> + llvm::StringRef str3;<br>
> + llvm::StringRef str4;<br>
> + llvm::StringRef str5;<br>
> +};<br>
><br>
> +namespace llvm {<br>
> +namespace yaml {<br>
> + template <><br>
> + struct MappingTraits<StringTypes> {<br>
> + static void mapping(IO &io, StringTypes& st) {<br>
> + io.mapRequired("str1", st.str1);<br>
> + io.mapRequired("str2", st.str2);<br>
> + io.mapRequired("str3", st.str3);<br>
> + io.mapRequired("str4", st.str4);<br>
> + io.mapRequired("str5", st.str5);<br>
> + }<br>
> + };<br>
> +}<br>
> +}<br>
> +<br>
> +TEST(YAMLIO, TestReadWriteStringTypes) {<br>
> + std::string intermediate;<br>
> + {<br>
> + StringTypes map;<br>
> + map.str1 = "'aaa";<br>
> + map.str2 = "\"bbb";<br>
> + map.str3 = "`ccc";<br>
> + map.str4 = "@ddd";<br>
> + map.str5 = "";<br>
> +<br>
> + llvm::raw_string_ostream ostr(intermediate);<br>
> + Output yout(ostr);<br>
> + yout << map;<br>
> + }<br>
> +<br>
> + llvm::StringRef flowOut(intermediate);<br>
> + EXPECT_NE(llvm::StringRef::npos, flowOut.find("'''aaa"));<br>
> + EXPECT_NE(llvm::StringRef::npos, flowOut.find("'\"bbb'"));<br>
> + EXPECT_NE(llvm::StringRef::npos, flowOut.find("'`ccc'"));<br>
> + EXPECT_NE(llvm::StringRef::npos, flowOut.find("'@ddd'"));<br>
> + EXPECT_NE(llvm::StringRef::npos, flowOut.find("''\n"));<br>
> +<br>
> + {<br>
> + Input yin(intermediate);<br>
> + StringTypes map;<br>
> + yin >> map;<br>
> +<br>
> + EXPECT_FALSE(yin.error());<br>
> + EXPECT_TRUE(map.str1.equals("'aaa"));<br>
> + EXPECT_TRUE(map.str2.equals("\"bbb"));<br>
> + EXPECT_TRUE(map.str3.equals("`ccc"));<br>
> + EXPECT_TRUE(map.str4.equals("@ddd"));<br>
> + EXPECT_TRUE(map.str5.equals(""));<br>
> + }<br>
> +}<br>
><br>
> //===----------------------------------------------------------------------===//<br>
> // Test ScalarEnumerationTraits<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div>