minor improvement on removeFieldDecl

pmatos · Sep 27, 2012 · 17528dd · 17528dd
1 parent 3e9a81d
commit 17528dd
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/clang_delta/RewriteUtils.cpp b/clang_delta/RewriteUtils.cpp
@@ -1328,6 +1328,18 @@ bool RewriteUtils::removeFieldDecl(const FieldDecl *FD)
   SourceRange Range = FD->getSourceRange();
   SourceLocation StartLoc = Range.getBegin();
   SourceLocation EndLoc = getEndLocationUntil(Range, ';');
+  SourceLocation CurlyEndLoc = getEndLocationUntil(Range, '}');
+
+  // handle cases like:
+  // struct {
+  //   int f <- no semicolon here
+  // };
+  const char *SemiPos = SrcManager->getCharacterData(EndLoc);
+  const char *CurlyPos = SrcManager->getCharacterData(CurlyEndLoc);
+  if (SemiPos > CurlyPos) {
+    EndLoc = CurlyEndLoc.getLocWithOffset(-1);
+  }
+
   return !(TheRewriter->RemoveText(SourceRange(StartLoc, EndLoc)));
 }