<div dir="ltr">Thank you!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jan 8, 2014 at 4:59 PM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Wed Jan  8 09:59:42 2014<br>
New Revision: 198770<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=198770&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=198770&view=rev</a><br>
Log:<br>
clang-format: Don't hang forever when encountering a stray "}" in an @implementation block.<br>
<br>
PR18406.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=198770&r1=198769&r2=198770&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=198770&r1=198769&r2=198770&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)<br>
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Wed Jan  8 09:59:42 2014<br>
@@ -1255,6 +1255,10 @@ void UnwrappedLineParser::parseObjCUntil<br>
       parseBlock(/*MustBeDeclaration=*/false);<br>
       // In ObjC interfaces, nothing should be following the "}".<br>
       addUnwrappedLine();<br>
+    } else if (FormatTok->is(tok::r_brace)) {<br>
+      // Ignore stray "}". parseStructuralElement doesn't consume them.<br>
+      nextToken();<br>
+      addUnwrappedLine();<br>
     } else {<br>
       parseStructuralElement();<br>
     }<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198770&r1=198769&r2=198770&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198770&r1=198769&r2=198770&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Jan  8 09:59:42 2014<br>
@@ -5596,6 +5596,10 @@ TEST_F(FormatTest, FormatObjCProtocol) {<br>
                "    int *looooooooooooooooooooooooooooongNumber;\n"<br>
                "@property(nonatomic, assign, readonly)\n"<br>
                "    NSString *looooooooooooooooooooooooooooongName;");<br>
+<br>
+  verifyFormat("@implementation PR18406\n"<br>
+               "}\n"<br>
+               "@end");<br>
 }<br>
<br>
 TEST_F(FormatTest, FormatObjCMethodDeclarations) {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>