astyle formatting

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit 227a6100f7a5 · 2011-02-11T19:31:37.000+01:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -644,7 +644,7 @@ void CheckClass::privateFunctions()
             while (ftok->str() != "{")
                 ftok = ftok->next();
             const Token *etok = ftok->link();
-            
+
             for (; ftok != etok; ftok = ftok->next())
             {
                 if (Token::Match(ftok, "%var% ("))
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -208,7 +208,8 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process
         // Preprocessor
         if (!line.empty() && line[0] == '#')
         {
-            enum {
+            enum
+            {
                 ESC_NONE,
                 ESC_SINGLE,
                 ESC_DOUBLE
@@ -221,7 +222,7 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process
 
             // need space.. #if( => #if (
             bool needSpace = true;
-            while(i != line.end())
+            while (i != line.end())
             {
                 // disable esc-mode
                 if (escapeStatus != ESC_NONE)
@@ -234,7 +235,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process
                     {
                         escapeStatus = ESC_NONE;
                     }
-                } else {
+                }
+                else
+                {
                     // enable esc-mode
                     if (escapeStatus == ESC_NONE && *i == '"')
                         escapeStatus = ESC_DOUBLE;
@@ -264,7 +267,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process
                 if (escapeStatus != ESC_NONE && prev == '\\' && *i == '\\')
                 {
                     prev = ' ';
-                } else {
+                }
+                else
+                {
                     prev = *i;
                 }
                 i++;
@@ -273,7 +278,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process
             {
                 // unmatched quotes.. compiler should probably complain about this..
             }
-        } else {
+        }
+        else
+        {
             // Do not mess with regular code..
             code << line;
         }
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -152,7 +152,7 @@ class Preprocessor
     static std::string removeParantheses(const std::string &str);
 
     /**
-     * clean up #-preprocessor lines (only) 
+     * clean up #-preprocessor lines (only)
      * @param processedFile The data to be processed
      */
     std::string preprocessCleanupDirectives(const std::string &processedFile) const;
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
@@ -251,7 +251,7 @@ int main(int argc, char **argv)
     makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
     makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals -Iexternals/tinyxml");
     makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals -Iexternals/tinyxml");
-    
+
     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
     fout << "DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl\n";

Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ void CheckClass::privateFunctions()`
`644`	`644`	`while (ftok->str() != "{")`
`645`	`645`	`ftok = ftok->next();`
`646`	`646`	`const Token *etok = ftok->link();`
`647`		`-`
	`647`	`+`
`648`	`648`	`for (; ftok != etok; ftok = ftok->next())`
`649`	`649`	`{`
`650`	`650`	`if (Token::Match(ftok, "%var% ("))`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,8 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process`
`208`	`208`	`// Preprocessor`
`209`	`209`	`if (!line.empty() && line[0] == '#')`
`210`	`210`	`{`
`211`		`- enum {`
	`211`	`+ enum`
	`212`	`+ {`
`212`	`213`	`ESC_NONE,`
`213`	`214`	`ESC_SINGLE,`
`214`	`215`	`ESC_DOUBLE`
`@@ -221,7 +222,7 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process`
`221`	`222`
`222`	`223`	`// need space.. #if( => #if (`
`223`	`224`	`bool needSpace = true;`
`224`		`- while(i != line.end())`
	`225`	`+ while (i != line.end())`
`225`	`226`	`{`
`226`	`227`	`// disable esc-mode`
`227`	`228`	`if (escapeStatus != ESC_NONE)`
`@@ -234,7 +235,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process`
`234`	`235`	`{`
`235`	`236`	`escapeStatus = ESC_NONE;`
`236`	`237`	`}`
`237`		`- } else {`
	`238`	`+ }`
	`239`	`+ else`
	`240`	`+ {`
`238`	`241`	`// enable esc-mode`
`239`	`242`	`if (escapeStatus == ESC_NONE && *i == '"')`
`240`	`243`	`escapeStatus = ESC_DOUBLE;`
`@@ -264,7 +267,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process`
`264`	`267`	`if (escapeStatus != ESC_NONE && prev == '\\' && *i == '\\')`
`265`	`268`	`{`
`266`	`269`	`prev = ' ';`
`267`		`- } else {`
	`270`	`+ }`
	`271`	`+ else`
	`272`	`+ {`
`268`	`273`	`prev = *i;`
`269`	`274`	`}`
`270`	`275`	`i++;`
`@@ -273,7 +278,9 @@ std::string Preprocessor::preprocessCleanupDirectives(const std::string &process`
`273`	`278`	`{`
`274`	`279`	`// unmatched quotes.. compiler should probably complain about this..`
`275`	`280`	`}`
`276`		`- } else {`
	`281`	`+ }`
	`282`	`+ else`
	`283`	`+ {`
`277`	`284`	`// Do not mess with regular code..`
`278`	`285`	`code << line;`
`279`	`286`	`}`