Update astyle to version 3.0.1

Author: danmar

main.cpp

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
             break;
         case simplecpp::Output::UNHANDLED_CHAR_ERROR:
             std::cerr << "unhandled char error: ";
-			break;
+            break;
         }
         std::cerr << output.msg << std::endl;
     }

runastyle

@@ -6,7 +6,7 @@
 
 # If project management wishes to take a newer astyle version into use
 # just change this string to match the start of astyle version string.
-ASTYLE_VERSION="Artistic Style Version 2.05.1"
+ASTYLE_VERSION="Artistic Style Version 3.0.1"
 ASTYLE="astyle"
 
 DETECTED_VERSION=`$ASTYLE --version 2>&1`
@@ -16,8 +16,8 @@ if [[ "$DETECTED_VERSION" != ${ASTYLE_VERSION}* ]]; then
     exit 1;
 fi
 
-style="--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0"
-options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines"
+style="--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0"
+options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces"
 
 $ASTYLE $style $options *.cpp
 $ASTYLE $style $options *.h

simplecpp.cpp

@@ -715,8 +715,8 @@ void simplecpp::TokenList::constFoldUnaryNotPosNeg(simplecpp::Token *tok)
             tok->setstr(tok->next->str == "0" ? "1" : "0");
             deleteToken(tok->next);
         } else if (tok->op == '~' && tok->next && tok->next->number) {
-           tok->setstr(toString(~stringToLL(tok->next->str)));
-           deleteToken(tok->next);
+            tok->setstr(toString(~stringToLL(tok->next->str)));
+            deleteToken(tok->next);
         } else {
             if (tok->previous && (tok->previous->number || tok->previous->name))
                 continue;
@@ -1747,7 +1747,7 @@ static bool realFileName(const std::string &f, std::string *result)
 
     // Lookup filename or foldername on file system
     WIN32_FIND_DATAA FindFileData;
-	HANDLE hFind = FindFirstFileExA(f.c_str(), FindExInfoBasic, &FindFileData, FindExSearchNameMatch, NULL, 0);
+    HANDLE hFind = FindFirstFileExA(f.c_str(), FindExInfoBasic, &FindFileData, FindExSearchNameMatch, NULL, 0);
 
     if (INVALID_HANDLE_VALUE == hFind)
         return false;
@@ -2022,9 +2022,9 @@ static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const
 
 static std::string getFileName(const std::map<std::string, simplecpp::TokenList *> &filedata, const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader)
 {
-	if (filedata.empty()) {
-		return "";
-	}
+    if (filedata.empty()) {
+        return "";
+    }
     if (isAbsolutePath(header)) {
         return (filedata.find(header) != filedata.end()) ? simplecpp::simplifyPath(header) : "";
     }