浏览代码

Source: Sort includes the way clang-format would

Re-apply the approach from commit e1c77472 (Format include directive
blocks and ordering with clang-format, 2016-04-29) but this time be
more careful about exclusion of parser generator sources:

    $ git ls-files -z -- \
        '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
      egrep -z -v '^Source/cmCommandArgumentLexer\.' |
      egrep -z -v '^Source/cmCommandArgumentParser\.' |
      egrep -z -v '^Source/cmDependsJavaLexer\.' |
      egrep -z -v '^Source/cmDependsJavaParser\.' |
      egrep -z -v '^Source/cmExprLexer\.' |
      egrep -z -v '^Source/cmExprParser\.' |
      egrep -z -v '^Source/cmFortranLexer\.' |
      egrep -z -v '^Source/cmFortranParser\.' |
      egrep -z -v '^Source/cmListFileLexer\.' |
      egrep -z -v '^Source/cm_sha2' |
      egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
      egrep -z -v '^Utilities/(KW|cm).*/' |
      egrep -z -v '^Tests/Module/GenerateExportHeader' |
      egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
      xargs -0 clang-format -i

Also drop use of custom sorting for `sys/types.h`.
Brad King 9 年之前
父节点
当前提交
54f71cd72c

+ 1 - 1
Source/CPack/WiX/cmWIXPatchParser.h

@@ -17,8 +17,8 @@
 
 #include <cmXMLParser.h>
 
-#include <map>
 #include <list>
+#include <map>
 
 struct cmWIXPatchNode
 {

+ 2 - 2
Source/cmCommandArgumentParserHelper.cxx

@@ -11,10 +11,10 @@
 ============================================================================*/
 #include "cmCommandArgumentParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
-#include "cmState.h"
 #include "cmOutputConverter.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
 
 #include "cmCommandArgumentLexer.h"
 

+ 1 - 1
Source/cmDependsJavaParserHelper.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmDependsJavaParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmDependsJavaLexer.h"
+#include "cmSystemTools.h"
 #include <cmsys/FStream.hxx>
 
 int cmDependsJava_yyparse( yyscan_t yyscanner );

+ 1 - 1
Source/cmExprParserHelper.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmExprParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
+#include "cmSystemTools.h"
 
 #include "cmExprLexer.h"