[clang-format] Remove unused member variables from BreakableToken

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@295714 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/BreakableToken.cpp b/lib/Format/BreakableToken.cpp
index 42e6a2140af15bd3092b487ffca55b4d0eaa4d83..290df1e15813adf7c3a6b4bfeea78a8c2aa2df16 100644 (file)
--- a/lib/Format/BreakableToken.cpp
+++ b/lib/Format/BreakableToken.cpp
@@ -223,13 +223,11 @@ void BreakableStringLiteral::insertBreak(unsigned LineIndex,
 
 BreakableComment::BreakableComment(const FormatToken &Token,
                                    unsigned StartColumn,
-                                   unsigned OriginalStartColumn,
-                                   bool FirstInLine, bool InPPDirective,
+                                   bool InPPDirective,
                                    encoding::Encoding Encoding,
                                    const FormatStyle &Style)
     : BreakableToken(Token, InPPDirective, Encoding, Style),
-      StartColumn(StartColumn), OriginalStartColumn(OriginalStartColumn),
-      FirstInLine(FirstInLine) {}
+      StartColumn(StartColumn) {}
 
 unsigned BreakableComment::getLineCount() const { return Lines.size(); }
 
@@ -325,8 +323,7 @@ BreakableBlockComment::BreakableBlockComment(
     const FormatToken &Token, unsigned StartColumn,
     unsigned OriginalStartColumn, bool FirstInLine, bool InPPDirective,
     encoding::Encoding Encoding, const FormatStyle &Style)
-    : BreakableComment(Token, StartColumn, OriginalStartColumn, FirstInLine,
-                       InPPDirective, Encoding, Style) {
+    : BreakableComment(Token, StartColumn, InPPDirective, Encoding, Style) {
   assert(Tok.is(TT_BlockComment) &&
          "block comment section must start with a block comment");
 
@@ -664,8 +661,7 @@ BreakableLineCommentSection::BreakableLineCommentSection(
     const FormatToken &Token, unsigned StartColumn,
     unsigned OriginalStartColumn, bool FirstInLine, bool InPPDirective,
     encoding::Encoding Encoding, const FormatStyle &Style)
-    : BreakableComment(Token, StartColumn, OriginalStartColumn, FirstInLine,
-                       InPPDirective, Encoding, Style) {
+    : BreakableComment(Token, StartColumn, InPPDirective, Encoding, Style) {
   assert(Tok.is(TT_LineComment) &&
          "line comment section must start with a line comment");
   FormatToken *LineTok = nullptr;

diff --git a/lib/Format/BreakableToken.h b/lib/Format/BreakableToken.h
index 3f83cfe9013717322ae025af360cfa2bc6bd6842..e30c6171fcd91829a0c82529174c11de839b9635 100644 (file)
--- a/lib/Format/BreakableToken.h
+++ b/lib/Format/BreakableToken.h
@@ -210,12 +210,9 @@ class BreakableComment : public BreakableToken {
 protected:
   /// \brief Creates a breakable token for a comment.
   ///
-  /// \p StartColumn specifies the column in which the comment will start
-  /// after formatting, while \p OriginalStartColumn specifies in which
-  /// column the comment started before formatting.
-  /// If the comment starts a line after formatting, set \p FirstInLine to true.
+  /// \p StartColumn specifies the column in which the comment will start after
+  /// formatting.
   BreakableComment(const FormatToken &Token, unsigned StartColumn,
-                   unsigned OriginalStartColumn, bool FirstInLine,
                    bool InPPDirective, encoding::Encoding Encoding,
                    const FormatStyle &Style);
 
@@ -275,13 +272,6 @@ protected:
   // The intended start column of the first line of text from this section.
   unsigned StartColumn;
 
-  // The original start column of the first line of text from this section.
-  unsigned OriginalStartColumn;
-
-  // Whether the first token of this section is the first token in its unwrapped
-  // line.
-  bool FirstInLine;
-
   // The prefix to use in front a line that has been reflown up.
   // For example, when reflowing the second line after the first here:
   // // comment 1