Sort #includes

gap-system · Jan 27, 2019 · 54f476b · 54f476b
1 parent 877c7ea
commit 54f476b
Show file tree

Hide file tree

Showing 88 changed files with 452 additions and 454 deletions.
diff --git a/src/applications/listfunc.c b/src/applications/listfunc.c
@@ -13,20 +13,20 @@
 #include "applications/listfunc.h"
 
 #include "core/ariths.h"
-#include "tnums/blist.h"
-#include "tnums/bool.h"
 #include "core/calls.h"
+#include "core/lists.h"
+#include "core/opers.h"
+#include "core/set.h"
 #include "error.h"
 #include "io.h"
-#include "core/lists.h"
 #include "modules.h"
-#include "core/opers.h"
+#include "sysfiles.h"
+#include "tnums/blist.h"
+#include "tnums/bool.h"
 #include "tnums/permutat.h"
 #include "tnums/plist.h"
 #include "tnums/pperm.h"
-#include "core/set.h"
 #include "tnums/string.h"
-#include "sysfiles.h"
 #include "tnums/trans.h"
 
 #ifdef HPCGAP
@@ -688,7 +688,7 @@ static Obj FuncPOSITION_FIRST_COMPONENT_SORTED(Obj self, Obj list, Obj obj)
     RESET_FILT_LIST(shadow, FN_IS_SSORT);
 
 #include "applications/sortbase.h"
-  
+
 #define SORT_FUNC_NAME SortParaDensePlistComp
 #define SORT_FUNC_ARGS Obj list, Obj shadow, Obj func
 #define SORT_ARGS list, shadow, func
@@ -713,7 +713,6 @@ static Obj FuncPOSITION_FIRST_COMPONENT_SORTED(Obj self, Obj list, Obj obj)
 #include "applications/sortbase.h"
 
 
-
 /****************************************************************************
 **
 *F  RemoveDupsDensePlist(<list>)  . . . . remove duplicates from a plain list

diff --git a/src/bags.c b/src/bags.c
@@ -8,9 +8,9 @@
 **  SPDX-License-Identifier: GPL-2.0-or-later
 */
 
+#include "core/objects.h"    // HACK: for FIRST_IMM_MUT_TNUM; remove this later
 #include "error.h"
 #include "gasman.h"
-#include "core/objects.h"    // HACK: for FIRST_IMM_MUT_TNUM; remove this later
 
 /****************************************************************************
 **

diff --git a/src/boehm_gc.c b/src/boehm_gc.c
@@ -15,9 +15,9 @@
 
 #include "boehm_gc.h"
 
+#include "core/objects.h"
 #include "gapstate.h"
 #include "gasman.h"
-#include "core/objects.h"
 #include "sysmem.h"
 
 #ifdef TRACK_CREATOR

diff --git a/src/boehm_gc.h b/src/boehm_gc.h
@@ -27,8 +27,8 @@
 #ifndef DISABLE_GC
 #include <gc/gc.h>
 #include <gc/gc_inline.h>
-#include <gc/gc_typed.h>
 #include <gc/gc_mark.h>
+#include <gc/gc_typed.h>
 #endif
 
 

diff --git a/src/collectors.cc b/src/collectors.cc
@@ -27,14 +27,14 @@ extern "C" {
 
 #include "collectors.h"
 
-#include "tnums/bool.h"
-#include "error.h"
-#include "gapstate.h"
 #include "core/gvars.h"
 #include "core/lists.h"
-#include "modules.h"
+#include "error.h"
+#include "gapstate.h"
 #include "math/collector.h"
 #include "math/freegroup_elms.h"
+#include "modules.h"
+#include "tnums/bool.h"
 #include "tnums/plist.h"
 #include "tnums/string.h"
 

diff --git a/src/compiled.h b/src/compiled.h
@@ -18,61 +18,61 @@
 extern "C" {
 #endif
 
-#include "core/ariths.h"
-#include "tnums/blist.h"
-#include "tnums/bool.h"
-#include "core/calls.h"
-#include "interpreter/code.h"
+#include "applications/listfunc.h"
 #include "collectors.h"
 #include "compiler.h"
 #include "compstat.h"
-#include "math/coset_table.h"
-#include "tnums/cyclotom.h"
-#include "math/dt.h"
-#include "math/dteval.h"
+#include "core/ariths.h"
+#include "core/calls.h"
+#include "core/gvars.h"
+#include "core/lists.h"
+#include "core/objects.h"
+#include "core/opers.h"
+#include "core/records.h"
+#include "core/saveload.h"
+#include "core/set.h"
 #include "error.h"
-#include "interpreter/expressions.h"
-#include "tnums/finfield.h"
-#include "interpreter/funcs.h"
 #include "gap.h"
 #include "gapstate.h"
 #include "gasman.h"
-#include "core/gvars.h"
-#include "tnums/integer.h"
+#include "general/iostream.h"
+#include "general/streams.h"
+#include "interpreter/code.h"
+#include "interpreter/expressions.h"
+#include "interpreter/funcs.h"
 #include "interpreter/interpreter.h"
+#include "interpreter/read.h"
+#include "interpreter/scanner.h"
+#include "interpreter/statements.h"
+#include "interpreter/vars.h"
 #include "io.h"
-#include "general/iostream.h"
-#include "applications/listfunc.h"
-#include "math/listoper.h"
-#include "core/lists.h"
-#include "tnums/macfloat.h"
-#include "modules.h"
 #include "math/collector_ftl.h"
-#include "core/objects.h"
+#include "math/coset_table.h"
+#include "math/dt.h"
+#include "math/dteval.h"
 #include "math/freegroup_elms.h"
+#include "math/listoper.h"
 #include "math/pcgroup-elms.h"
-#include "core/opers.h"
+#include "math/sctable.h"
+#include "math/tietze.h"
+#include "math/vector.h"
+#include "modules.h"
+#include "sysfiles.h"
+#include "system.h"
+#include "tnums/blist.h"
+#include "tnums/bool.h"
+#include "tnums/cyclotom.h"
+#include "tnums/finfield.h"
+#include "tnums/integer.h"
+#include "tnums/macfloat.h"
 #include "tnums/permutat.h"
 #include "tnums/plist.h"
 #include "tnums/pperm.h"
 #include "tnums/precord.h"
 #include "tnums/range.h"
 #include "tnums/rational.h"
-#include "interpreter/read.h"
-#include "core/records.h"
-#include "core/saveload.h"
-#include "interpreter/scanner.h"
-#include "math/sctable.h"
-#include "core/set.h"
-#include "interpreter/statements.h"
-#include "general/streams.h"
 #include "tnums/string.h"
-#include "sysfiles.h"
-#include "system.h"
-#include "math/tietze.h"
 #include "tnums/trans.h"
-#include "interpreter/vars.h"
-#include "math/vector.h"
 #include "tnums/weakptr.h"
 
 #ifdef HPCGAP

diff --git a/src/compiler.c b/src/compiler.c
@@ -13,22 +13,22 @@
 #include "compiler.h"
 
 #include "core/ariths.h"
-#include "tnums/bool.h"
 #include "core/calls.h"
-#include "interpreter/code.h"
+#include "core/gvars.h"
+#include "core/lists.h"
+#include "core/records.h"
 #include "error.h"
+#include "interpreter/code.h"
 #include "interpreter/expressions.h"
-#include "core/gvars.h"
-#include "tnums/integer.h"
+#include "interpreter/statements.h"
+#include "interpreter/vars.h"
 #include "io.h"
-#include "core/lists.h"
 #include "modules.h"
+#include "sysopt.h"
+#include "tnums/bool.h"
+#include "tnums/integer.h"
 #include "tnums/plist.h"
-#include "core/records.h"
-#include "interpreter/statements.h"
 #include "tnums/string.h"
-#include "sysopt.h"
-#include "interpreter/vars.h"
 
 #include <stdarg.h>
 
@@ -5209,7 +5209,7 @@ Int CompileFunc (
 
     /* emit code to include the interface files                            */
     Emit( "/* C file produced by GAC */\n" );
-    Emit( "#include \"compiled.h\"\n" );
+    Emit("#include  \"compiled.h\"\n");
     Emit( "#define FILE_CRC  \"%d\"\n", magic1 );
 
     /* emit code for global variables                                      */

diff --git a/src/compstat.c b/src/compstat.c
@@ -8,8 +8,8 @@
 **  SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "system.h"
 #include "compstat.h"
+#include "system.h"
 
 // #define AVOID_PRECOMPILED
 

diff --git a/src/core/ariths.c b/src/core/ariths.c
@@ -12,10 +12,10 @@
 
 #include "core/ariths.h"
 
-#include "tnums/bool.h"
+#include "core/opers.h"
 #include "error.h"
 #include "modules.h"
-#include "core/opers.h"
+#include "tnums/bool.h"
 
 
 #define RequireValue(funcname, val)                                          \

diff --git a/src/core/calls.c b/src/core/calls.c
@@ -36,20 +36,20 @@
 
 #include "core/calls.h"
 
-#include "tnums/bool.h"
-#include "interpreter/code.h"
-#include "error.h"
 #include "core/gvars.h"
-#include "tnums/integer.h"
-#include "io.h"
 #include "core/lists.h"
-#include "modules.h"
 #include "core/opers.h"
-#include "tnums/plist.h"
 #include "core/saveload.h"
+#include "error.h"
+#include "interpreter/code.h"
 #include "interpreter/statements.h"
-#include "tnums/string.h"
 #include "interpreter/vars.h"
+#include "io.h"
+#include "modules.h"
+#include "tnums/bool.h"
+#include "tnums/integer.h"
+#include "tnums/plist.h"
+#include "tnums/string.h"
 
 #ifdef HPCGAP
 #include "hpc/thread.h"

diff --git a/src/core/calls.h b/src/core/calls.h
@@ -45,9 +45,9 @@
 #ifndef GAP_CALLS_H
 #define GAP_CALLS_H
 
+#include "core/objects.h"
 #include "interpreter/funcs.h"
 #include "util/gaputils.h"
-#include "core/objects.h"
 
 
 typedef Obj (* ObjFunc_0ARGS) (Obj self);

diff --git a/src/core/gvars.c b/src/core/gvars.c
@@ -29,14 +29,14 @@
 
 #include "core/gvars.h"
 
-#include "tnums/bool.h"
 #include "core/calls.h"
+#include "core/lists.h"
 #include "error.h"
 #include "gapstate.h"
-#include "tnums/integer.h"
 #include "io.h"
-#include "core/lists.h"
 #include "modules.h"
+#include "tnums/bool.h"
+#include "tnums/integer.h"
 #include "tnums/plist.h"
 #include "tnums/string.h"
 

diff --git a/src/core/lists.c b/src/core/lists.c
@@ -23,20 +23,20 @@
 #include "core/lists.h"
 
 #include "core/ariths.h"
-#include "tnums/bool.h"
 #include "core/calls.h"
+#include "core/opers.h"
+#include "core/records.h"
 #include "error.h"
 #include "gapstate.h"
-#include "util/gaputils.h"
-#include "tnums/integer.h"
 #include "io.h"
 #include "modules.h"
-#include "core/opers.h"
+#include "tnums/bool.h"
+#include "tnums/integer.h"
 #include "tnums/plist.h"
 #include "tnums/precord.h"
 #include "tnums/range.h"
-#include "core/records.h"
 #include "tnums/string.h"
+#include "util/gaputils.h"
 
 #ifdef HPCGAP
 #include "hpc/aobjects.h"

diff --git a/src/core/lists.h b/src/core/lists.h
@@ -18,9 +18,9 @@
 #ifndef GAP_LISTS_H
 #define GAP_LISTS_H
 
+#include "core/objects.h"
 #include "error.h"
 #include "io.h"
-#include "core/objects.h"
 
 /****************************************************************************
 **

diff --git a/src/core/objects.c b/src/core/objects.c
@@ -12,19 +12,19 @@
 
 #include "core/objects.h"
 
-#include "tnums/bool.h"
 #include "core/calls.h"
+#include "core/gvars.h"
+#include "core/lists.h"
+#include "core/opers.h"
+#include "core/records.h"
+#include "core/saveload.h"
 #include "error.h"
 #include "gapstate.h"
-#include "core/gvars.h"
 #include "io.h"
-#include "core/lists.h"
 #include "modules.h"
-#include "core/opers.h"
+#include "tnums/bool.h"
 #include "tnums/plist.h"
 #include "tnums/precord.h"
-#include "core/records.h"
-#include "core/saveload.h"
 #include "tnums/string.h"
 
 #ifdef HPCGAP