[PATCH] D50697: [clang-format] fix PR38557 - comments between "default" and ':' causes the case label to be treated as an identifier

[Jonas Toth via Phabricator via cfe-commits]

JonasToth created this revision.
JonasToth added reviewers: hokein, krasimir, djasper, klimek.

The Bug was reported and fixed by Owen Pan.


Repository:
  rC Clang

https://reviews.llvm.org/D50697

Files:
  UnwrappedLineParser.cpp


Index: UnwrappedLineParser.cpp
===================================================================
--- UnwrappedLineParser.cpp
+++ UnwrappedLineParser.cpp
@@ -350,7 +350,10 @@
       break;
     case tok::kw_default: {
       unsigned StoredPosition = Tokens->getPosition();
-      FormatToken *Next = Tokens->getNextToken();
+      FormatToken *Next;
+      do {
+        Next = Tokens->getNextToken();
+      } while (Next && Next->is(tok::comment));
       FormatTok = Tokens->setPosition(StoredPosition);
       if (Next && Next->isNot(tok::colon)) {
         // default not followed by ':' is not a case label; treat it like



Index: UnwrappedLineParser.cpp
===================================================================
--- UnwrappedLineParser.cpp
+++ UnwrappedLineParser.cpp
@@ -350,7 +350,10 @@
       break;
     case tok::kw_default: {
       unsigned StoredPosition = Tokens->getPosition();
-      FormatToken *Next = Tokens->getNextToken();
+      FormatToken *Next;
+      do {
+        Next = Tokens->getNextToken();
+      } while (Next && Next->is(tok::comment));
       FormatTok = Tokens->setPosition(StoredPosition);
       if (Next && Next->isNot(tok::colon)) {
         // default not followed by ':' is not a case label; treat it like

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits