commit e23003d1f1276f24dca2ec064f6cda0a64dec642
author Chris Lattner <sabre@nondot.org> Sat Jan 09 21:54:33 2010 +0000
committer Chris Lattner <sabre@nondot.org> Sat Jan 09 21:54:33 2010 +0000
tree 426086a49df9f9dfafda88b2a4ad7b884af90cf2
parent b71980f888b47d84cd229857f1910adb7cbf053b

implement -ftabstop=width, patch by Christian Adåker

llvm-svn: 93078

clang/lib/Frontend/TextDiagnosticPrinter.cpp

diff --git a/clang/lib/Frontend/TextDiagnosticPrinter.cpp b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
index 61f8a70..c27d112 100644
--- a/clang/lib/Frontend/TextDiagnosticPrinter.cpp
+++ b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
@@ -378,9 +378,10 @@
     // Replace this tab with at least one space.
     SourceLine[i] = ' ';
 
+    unsigned TabStop = DiagOpts->TabStop > 0 ? DiagOpts->TabStop : 8;
     // Compute the number of spaces we need to insert.
-    unsigned NumSpaces = ((i+8)&~7) - (i+1);
-    assert(NumSpaces < 8 && "Invalid computation of space amt");
+    unsigned NumSpaces = ((i+TabStop)/TabStop * TabStop) - (i+1);
+    assert(NumSpaces < TabStop && "Invalid computation of space amt");
 
     // Insert spaces into the SourceLine.
     SourceLine.insert(i+1, NumSpaces, ' ');