From 54f476b8553936d7f2fc056d66a38fc5e6447da4 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 27 Jan 2019 16:03:44 +0100 Subject: [PATCH] Sort #includes --- src/applications/listfunc.c | 15 ++++---- src/bags.c | 2 +- src/boehm_gc.c | 2 +- src/boehm_gc.h | 2 +- src/collectors.cc | 8 ++-- src/compiled.h | 70 +++++++++++++++++----------------- src/compiler.c | 20 +++++----- src/compstat.c | 2 +- src/core/ariths.c | 4 +- src/core/calls.c | 16 ++++---- src/core/calls.h | 2 +- src/core/gvars.c | 6 +-- src/core/lists.c | 10 ++--- src/core/lists.h | 2 +- src/core/objects.c | 12 +++--- src/core/opers.c | 14 +++---- src/core/opers.h | 2 +- src/core/records.c | 6 +-- src/core/saveload.c | 14 +++---- src/core/set.c | 10 ++--- src/error.c | 14 +++---- src/gap.c | 30 +++++++-------- src/gap_version.c.in | 2 +- src/gasman.c | 4 +- src/general/intfuncs.c | 6 +-- src/general/iostream.c | 16 ++++---- src/general/streams.c | 24 ++++++------ src/hpc/aobjects.c | 14 +++---- src/hpc/region.c | 6 +-- src/hpc/serialize.c | 6 +-- src/hpc/thread.c | 10 ++--- src/hpc/thread.h | 2 +- src/hpc/threadapi.c | 22 +++++------ src/hpc/traverse.c | 6 +-- src/interpreter/code.c | 16 ++++---- src/interpreter/code.h | 2 +- src/interpreter/expressions.c | 16 ++++---- src/interpreter/expressions.h | 2 +- src/interpreter/funcs.c | 14 +++---- src/interpreter/hookintrprtr.c | 6 +-- src/interpreter/interpreter.c | 20 +++++----- src/interpreter/interpreter.h | 2 +- src/interpreter/read.c | 16 ++++---- src/interpreter/scanner.c | 6 +-- src/interpreter/statements.c | 16 ++++---- src/interpreter/vars.c | 18 ++++----- src/interpreter/vars.h | 2 +- src/io.c | 14 +++---- src/julia_gc.c | 10 ++--- src/libgap-api.c | 10 ++--- src/math/collector_ftl.c | 6 +-- src/math/coset_table.c | 6 +-- src/math/dt.c | 4 +- src/math/dteval.c | 6 +-- src/math/freegroup_elms.cc | 6 +-- src/math/listoper.c | 10 ++--- src/math/pcgroup-elms.cc | 2 +- src/math/pcgroup-elms.h | 2 +- src/math/sctable.c | 2 +- src/math/tietze.c | 6 +-- src/math/vec8bit.c | 18 ++++----- src/math/vecffe.c | 8 ++-- src/math/vecgf2.c | 16 ++++---- src/modules-builtin.c | 8 ++-- src/modules.c | 24 ++++++------ src/profile.c | 14 +++---- src/syntaxtree.c | 22 +++++------ src/sysfiles.c | 23 ++++++----- src/system.c | 4 +- src/tnums/blist.c | 10 ++--- src/tnums/blist.h | 2 +- src/tnums/bool.c | 2 +- src/tnums/cyclotom.c | 10 ++--- src/tnums/finfield.c | 8 ++-- src/tnums/finfield.h | 2 +- src/tnums/integer.c | 8 ++-- src/tnums/macfloat.c | 6 +-- src/tnums/objset.c | 12 +++--- src/tnums/permutat.cc | 16 ++++---- src/tnums/plist.c | 16 ++++---- src/tnums/pperm.cc | 14 +++---- src/tnums/precord.c | 10 ++--- src/tnums/range.c | 10 ++--- src/tnums/rational.c | 8 ++-- src/tnums/string.c | 10 ++--- src/tnums/trans.cc | 14 +++---- src/tnums/weakptr.c | 6 +-- src/util/debug.c | 4 +- 88 files changed, 452 insertions(+), 454 deletions(-) diff --git a/src/applications/listfunc.c b/src/applications/listfunc.c index 0b5521b54a..bc331fb6f3 100644 --- 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() . . . . remove duplicates from a plain list diff --git a/src/bags.c b/src/bags.c index 05edf30088..6afb96bc9f 100644 --- 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 index 01bf497709..8c1b4103c5 100644 --- 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 index 226be0082e..3cf6163b58 100644 --- a/src/boehm_gc.h +++ b/src/boehm_gc.h @@ -27,8 +27,8 @@ #ifndef DISABLE_GC #include #include -#include #include +#include #endif diff --git a/src/collectors.cc b/src/collectors.cc index 3b73ae5567..a1756cdbf7 100644 --- 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 index a5596bdbc9..7e95575abf 100644 --- 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 index 77938d066d..dff5fbb88e 100644 --- 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 @@ -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 index 6618e8026d..3a9214db36 100644 --- 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 index 3f2d9f706b..b3239614dd 100644 --- 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 index d22713fd0f..1cb4835971 100644 --- 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 index 714a820b7a..82b1229114 100644 --- 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 index 258e785048..27cefd8f7a 100644 --- 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 index 142bdf6cab..43f12a3d6a 100644 --- 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 index e341dd2d8d..1cf69b3286 100644 --- 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 index 04a1291d00..fd2a02f11c 100644 --- 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 diff --git a/src/core/opers.c b/src/core/opers.c index 5b58a65e3f..ac6d08daa5 100644 --- a/src/core/opers.c +++ b/src/core/opers.c @@ -14,22 +14,22 @@ #include "core/opers.h" #include "core/ariths.h" -#include "tnums/blist.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/lists.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 "sysfiles.h" +#include "tnums/blist.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/range.h" -#include "core/records.h" -#include "core/saveload.h" #include "tnums/string.h" -#include "sysfiles.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/core/opers.h b/src/core/opers.h index 5bf0d9bebd..d0799e0b77 100644 --- a/src/core/opers.h +++ b/src/core/opers.h @@ -14,9 +14,9 @@ #ifndef GAP_OPERS_H #define GAP_OPERS_H -#include "tnums/bool.h" #include "core/calls.h" #include "system.h" +#include "tnums/bool.h" enum { diff --git a/src/core/records.c b/src/core/records.c index d8b31957bc..03a740f27e 100644 --- a/src/core/records.c +++ b/src/core/records.c @@ -15,13 +15,13 @@ #include "core/records.h" -#include "tnums/bool.h" +#include "core/opers.h" #include "error.h" -#include "util/gaputils.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/string.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/thread.h" diff --git a/src/core/saveload.c b/src/core/saveload.c index 81fe484660..5b65c14ad9 100644 --- a/src/core/saveload.c +++ b/src/core/saveload.c @@ -14,19 +14,19 @@ #include "core/saveload.h" -#include "tnums/bool.h" -#include "core/calls.h" #include "compstat.h" -#include "error.h" -#include "tnums/finfield.h" +#include "core/calls.h" #include "core/gvars.h" +#include "error.h" +#include "general/streams.h" +#include "interpreter/read.h" #include "io.h" #include "modules.h" -#include "interpreter/read.h" -#include "general/streams.h" -#include "tnums/string.h" #include "sysfiles.h" #include "sysopt.h" +#include "tnums/bool.h" +#include "tnums/finfield.h" +#include "tnums/string.h" #ifdef USE_GASMAN #include "gasman_intern.h" diff --git a/src/core/set.c b/src/core/set.c index 6fe879a45a..b9542b428c 100644 --- a/src/core/set.c +++ b/src/core/set.c @@ -22,17 +22,17 @@ #include "core/set.h" +#include "applications/listfunc.h" #include "core/ariths.h" -#include "tnums/bool.h" -#include "tnums/cyclotom.h" +#include "core/lists.h" #include "error.h" #include "io.h" -#include "applications/listfunc.h" -#include "core/lists.h" #include "modules.h" -#include "tnums/plist.h" #include "sysfiles.h" #include "sysopt.h" // for SyInitializing +#include "tnums/bool.h" +#include "tnums/cyclotom.h" +#include "tnums/plist.h" #define RequireMutableSet(funcname, op) \ diff --git a/src/error.c b/src/error.c index d731acb302..5859ae36cf 100644 --- a/src/error.c +++ b/src/error.c @@ -14,21 +14,21 @@ #include "error.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/records.h" +#include "gapstate.h" #include "interpreter/code.h" #include "interpreter/expressions.h" #include "interpreter/funcs.h" -#include "gapstate.h" -#include "util/gaputils.h" +#include "interpreter/statements.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" -#include "interpreter/statements.h" #include "tnums/string.h" -#include "interpreter/vars.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/thread.h" diff --git a/src/gap.c b/src/gap.c index 282ee7860c..65d70080a4 100644 --- a/src/gap.c +++ b/src/gap.c @@ -12,37 +12,37 @@ #include "gap.h" +#include "compiler.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "compiler.h" -#include "error.h" -#include "interpreter/funcs.h" -#include "gapstate.h" #include "core/gvars.h" -#include "tnums/integer.h" -#include "io.h" #include "core/lists.h" -#include "modules.h" -#include "tnums/plist.h" -#include "tnums/precord.h" -#include "interpreter/read.h" #include "core/records.h" #include "core/saveload.h" -#include "interpreter/statements.h" // for ClearError +#include "error.h" +#include "gapstate.h" #include "general/streams.h" -#include "tnums/string.h" +#include "interpreter/funcs.h" +#include "interpreter/read.h" +#include "interpreter/statements.h" // for ClearError +#include "interpreter/vars.h" +#include "io.h" +#include "modules.h" #include "sysenv.h" #include "sysfiles.h" #include "sysmem.h" #include "sysopt.h" -#include "interpreter/vars.h" +#include "tnums/bool.h" +#include "tnums/integer.h" +#include "tnums/plist.h" +#include "tnums/precord.h" +#include "tnums/string.h" #ifdef HPCGAP -#include "interpreter/interpreter.h" #include "hpc/misc.h" #include "hpc/thread.h" #include "hpc/threadapi.h" +#include "interpreter/interpreter.h" #endif #include diff --git a/src/gap_version.c.in b/src/gap_version.c.in index 7072a7974e..278c491a48 100644 --- a/src/gap_version.c.in +++ b/src/gap_version.c.in @@ -10,7 +10,7 @@ ** This file contains the GAP build version */ -#include "system.h" +#include "system.h" /**************************************************************************** ** diff --git a/src/gasman.c b/src/gasman.c index 2676532711..71babda517 100644 --- a/src/gasman.c +++ b/src/gasman.c @@ -114,10 +114,10 @@ #include "gasman.h" #include "gasman_intern.h" -#include "util/gaputils.h" #include "io.h" #include "sysfiles.h" #include "sysmem.h" +#include "util/gaputils.h" #ifdef GAP_MEM_CHECK #include @@ -459,8 +459,8 @@ static inline UInt IS_BAG_BODY(void * ptr) #if defined(MEMORY_CANARY) -#include #include +#include // tell valgrind that the masterpointer, bag contents and bag header of Bag // should all be accessible diff --git a/src/general/intfuncs.c b/src/general/intfuncs.c index ab4bcecb2f..d7313a469f 100644 --- a/src/general/intfuncs.c +++ b/src/general/intfuncs.c @@ -13,14 +13,14 @@ #include "general/intfuncs.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "error.h" #include "core/lists.h" +#include "core/records.h" +#include "error.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" #include "tnums/string.h" diff --git a/src/general/iostream.c b/src/general/iostream.c index 98bdb5f7b8..2f21843aad 100644 --- a/src/general/iostream.c +++ b/src/general/iostream.c @@ -24,11 +24,11 @@ #include "general/iostream.h" -#include "tnums/bool.h" +#include "core/lists.h" #include "error.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/string.h" #include "hpc/thread.h" @@ -45,12 +45,12 @@ #ifdef HAVE_OPENPTY #if defined(HAVE_UTIL_H) - #include /* for openpty() on Mac OS X, OpenBSD and NetBSD */ - #elif defined(HAVE_LIBUTIL_H) - #include /* for openpty() on FreeBSD */ - #elif defined(HAVE_PTY_H) - #include /* for openpty() on Cygwin, Interix, OSF/1 4 and 5 */ - #endif +#include /* for openpty() on Mac OS X, OpenBSD and NetBSD */ +#elif defined(HAVE_LIBUTIL_H) +#include /* for openpty() on FreeBSD */ +#elif defined(HAVE_PTY_H) +#include /* for openpty() on Cygwin, Interix, OSF/1 4 and 5 */ +#endif #endif diff --git a/src/general/streams.c b/src/general/streams.c index 934562124f..fb75659e48 100644 --- a/src/general/streams.c +++ b/src/general/streams.c @@ -13,27 +13,27 @@ #include "general/streams.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 "error.h" -#include "interpreter/funcs.h" #include "gap.h" #include "gapstate.h" -#include "core/gvars.h" -#include "tnums/integer.h" +#include "interpreter/funcs.h" +#include "interpreter/read.h" +#include "interpreter/statements.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "sysfiles.h" +#include "sysopt.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "interpreter/read.h" -#include "core/records.h" -#include "interpreter/statements.h" #include "tnums/string.h" -#include "sysfiles.h" -#include "sysopt.h" -#include "interpreter/vars.h" #include #include diff --git a/src/hpc/aobjects.c b/src/hpc/aobjects.c index b1975e003d..e5172f1b43 100644 --- a/src/hpc/aobjects.c +++ b/src/hpc/aobjects.c @@ -17,21 +17,21 @@ #include "hpc/traverse.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/objects.h" +#include "core/records.h" #include "error.h" -#include "util/fibhash.h" #include "gapstate.h" -#include "util/gaputils.h" -#include "core/gvars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/objects.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" #include "tnums/string.h" +#include "util/fibhash.h" +#include "util/gaputils.h" static Obj TYPE_ALIST; diff --git a/src/hpc/region.c b/src/hpc/region.c index 46c454fb2e..234bbcb60d 100644 --- a/src/hpc/region.c +++ b/src/hpc/region.c @@ -13,12 +13,12 @@ #ifdef USE_BOEHM_GC #include "boehm_gc.h" #endif -#include "gasman.h" #include "core/objects.h" +#include "gasman.h" -// #include "hpc/misc.h" +// #include "hpc/misc.h" #include "hpc/thread.h" -// #include "hpc/guards.h" +// #include "hpc/guards.h" #include diff --git a/src/hpc/serialize.c b/src/hpc/serialize.c index 5364ff34da..4e77f3fdfd 100644 --- a/src/hpc/serialize.c +++ b/src/hpc/serialize.c @@ -10,17 +10,17 @@ #include "hpc/serialize.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/records.h" #include "error.h" #include "gapstate.h" -#include "core/gvars.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/objset.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/rational.h" -#include "core/records.h" #include "tnums/string.h" #include "hpc/aobjects.h" diff --git a/src/hpc/thread.c b/src/hpc/thread.c index d118a83988..6f4ddc5ad1 100644 --- a/src/hpc/thread.c +++ b/src/hpc/thread.c @@ -10,16 +10,16 @@ #include "hpc/thread.h" -#include "interpreter/code.h" +#include "core/gvars.h" #include "error.h" -#include "util/fibhash.h" #include "gapstate.h" -#include "core/gvars.h" +#include "interpreter/code.h" +#include "interpreter/statements.h" +#include "interpreter/vars.h" #include "modules.h" #include "tnums/plist.h" -#include "interpreter/statements.h" #include "tnums/string.h" -#include "interpreter/vars.h" +#include "util/fibhash.h" #include "hpc/guards.h" #include "hpc/misc.h" diff --git a/src/hpc/thread.h b/src/hpc/thread.h index fa09f6d7af..b372450eaa 100644 --- a/src/hpc/thread.h +++ b/src/hpc/thread.h @@ -26,8 +26,8 @@ #else -#include "hpc/tlsconfig.h" #include "hpc/region.h" +#include "hpc/tlsconfig.h" /* Maximum number of threads excluding the main thread */ #define MAX_THREADS 1023 diff --git a/src/hpc/threadapi.c b/src/hpc/threadapi.c index 46ac4a4867..ecd39de27e 100644 --- a/src/hpc/threadapi.c +++ b/src/hpc/threadapi.c @@ -12,23 +12,23 @@ #include "hpc/threadapi.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "interpreter/code.h" -#include "error.h" -#include "interpreter/funcs.h" -#include "gapstate.h" #include "core/gvars.h" -#include "interpreter/interpreter.h" -#include "io.h" #include "core/lists.h" -#include "modules.h" #include "core/objects.h" -#include "tnums/plist.h" -#include "interpreter/read.h" #include "core/records.h" #include "core/set.h" +#include "error.h" +#include "gapstate.h" +#include "interpreter/code.h" +#include "interpreter/funcs.h" +#include "interpreter/interpreter.h" +#include "interpreter/read.h" #include "interpreter/statements.h" +#include "io.h" +#include "modules.h" +#include "tnums/bool.h" +#include "tnums/plist.h" #include "tnums/string.h" #include "hpc/guards.h" @@ -38,8 +38,8 @@ #include "hpc/tls.h" #include "hpc/traverse.h" -#include #include +#include #include #include diff --git a/src/hpc/traverse.c b/src/hpc/traverse.c index 104d478787..4ae447e592 100644 --- a/src/hpc/traverse.c +++ b/src/hpc/traverse.c @@ -13,12 +13,12 @@ */ #include "hpc/traverse.h" -#include "tnums/bool.h" #include "error.h" -#include "util/fibhash.h" -#include "util/gaputils.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" +#include "util/fibhash.h" +#include "util/gaputils.h" #include "hpc/guards.h" #include "hpc/thread.h" diff --git a/src/interpreter/code.c b/src/interpreter/code.c index 2327609625..7605bb6ebe 100644 --- a/src/interpreter/code.c +++ b/src/interpreter/code.c @@ -15,22 +15,22 @@ #include "interpreter/code.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "interpreter/funcs.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/records.h" +#include "core/saveload.h" #include "gap.h" #include "gapstate.h" -#include "core/gvars.h" +#include "interpreter/funcs.h" #include "interpreter/hookintrprtr.h" +#include "interpreter/read.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "interpreter/read.h" -#include "core/records.h" -#include "core/saveload.h" #include "tnums/string.h" -#include "interpreter/vars.h" #include "hpc/thread.h" diff --git a/src/interpreter/code.h b/src/interpreter/code.h index 23f30fa8ab..d48fe993bb 100644 --- a/src/interpreter/code.h +++ b/src/interpreter/code.h @@ -16,8 +16,8 @@ #ifndef GAP_CODE_H #define GAP_CODE_H -#include "gapstate.h" #include "core/objects.h" +#include "gapstate.h" /**************************************************************************** ** diff --git a/src/interpreter/expressions.c b/src/interpreter/expressions.c index c5425715e5..65f9ef6fde 100644 --- a/src/interpreter/expressions.c +++ b/src/interpreter/expressions.c @@ -16,25 +16,25 @@ #include "interpreter/expressions.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/opers.h" +#include "core/records.h" #include "error.h" #include "gapstate.h" -#include "core/gvars.h" +#include "interpreter/code.h" #include "interpreter/hookintrprtr.h" -#include "tnums/integer.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/permutat.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/range.h" -#include "core/records.h" #include "tnums/string.h" -#include "interpreter/vars.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/interpreter/expressions.h b/src/interpreter/expressions.h index d577c8d946..200952bb3b 100644 --- a/src/interpreter/expressions.h +++ b/src/interpreter/expressions.h @@ -17,8 +17,8 @@ #define GAP_EXPRS_H #include "interpreter/code.h" -#include "system.h" #include "interpreter/vars.h" +#include "system.h" /**************************************************************************** ** diff --git a/src/interpreter/funcs.c b/src/interpreter/funcs.c index dfbd0a9342..4d5c8b2a60 100644 --- a/src/interpreter/funcs.c +++ b/src/interpreter/funcs.c @@ -19,20 +19,20 @@ #include "interpreter/funcs.h" #include "core/calls.h" -#include "interpreter/code.h" +#include "core/lists.h" +#include "core/opers.h" #include "error.h" -#include "interpreter/expressions.h" #include "gapstate.h" +#include "interpreter/code.h" +#include "interpreter/expressions.h" #include "interpreter/hookintrprtr.h" +#include "interpreter/read.h" +#include "interpreter/statements.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" #include "tnums/plist.h" -#include "interpreter/read.h" -#include "interpreter/statements.h" #include "tnums/string.h" -#include "interpreter/vars.h" #ifdef HPCGAP #include "hpc/guards.h" diff --git a/src/interpreter/hookintrprtr.c b/src/interpreter/hookintrprtr.c index b36b2c60f2..52078df49a 100644 --- a/src/interpreter/hookintrprtr.c +++ b/src/interpreter/hookintrprtr.c @@ -13,12 +13,12 @@ #include "interpreter/hookintrprtr.h" +#include "gapstate.h" #include "interpreter/code.h" #include "interpreter/expressions.h" -#include "gapstate.h" -#include "util/gaputils.h" -#include "modules.h" #include "interpreter/statements.h" +#include "modules.h" +#include "util/gaputils.h" #include "hpc/thread.h" diff --git a/src/interpreter/interpreter.c b/src/interpreter/interpreter.c index eeff34b3a4..76ac7fb5d2 100644 --- a/src/interpreter/interpreter.c +++ b/src/interpreter/interpreter.c @@ -19,27 +19,27 @@ #include "interpreter/interpreter.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/opers.h" +#include "core/records.h" #include "error.h" -#include "interpreter/funcs.h" #include "gapstate.h" -#include "core/gvars.h" +#include "interpreter/code.h" +#include "interpreter/funcs.h" #include "interpreter/hookintrprtr.h" -#include "tnums/integer.h" +#include "interpreter/read.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/permutat.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/range.h" -#include "interpreter/read.h" -#include "core/records.h" #include "tnums/string.h" -#include "interpreter/vars.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/interpreter/interpreter.h b/src/interpreter/interpreter.h index a2b4d01d42..1df48a5aff 100644 --- a/src/interpreter/interpreter.h +++ b/src/interpreter/interpreter.h @@ -19,8 +19,8 @@ #ifndef GAP_INTRPRTR_H #define GAP_INTRPRTR_H -#include "system.h" #include "gap.h" +#include "system.h" /**************************************************************************** ** diff --git a/src/interpreter/read.c b/src/interpreter/read.c index fac28c017b..2dd348c781 100644 --- a/src/interpreter/read.c +++ b/src/interpreter/read.c @@ -12,22 +12,22 @@ #include "interpreter/read.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/records.h" +#include "gapstate.h" #include "interpreter/code.h" #include "interpreter/funcs.h" -#include "gapstate.h" -#include "core/gvars.h" #include "interpreter/interpreter.h" +#include "interpreter/scanner.h" +#include "interpreter/statements.h" +#include "interpreter/vars.h" #include "io.h" #include "modules.h" +#include "sysopt.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "core/records.h" -#include "interpreter/scanner.h" -#include "interpreter/statements.h" #include "tnums/string.h" -#include "sysopt.h" -#include "interpreter/vars.h" #ifdef HPCGAP #include "hpc/thread.h" diff --git a/src/interpreter/scanner.c b/src/interpreter/scanner.c index 7653130b88..dbd24f32cd 100644 --- a/src/interpreter/scanner.c +++ b/src/interpreter/scanner.c @@ -16,15 +16,15 @@ #include "interpreter/scanner.h" +#include "core/lists.h" #include "error.h" #include "gapstate.h" -#include "util/gaputils.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "sysopt.h" #include "tnums/plist.h" #include "tnums/string.h" -#include "sysopt.h" +#include "util/gaputils.h" static UInt NextSymbol(void); diff --git a/src/interpreter/statements.c b/src/interpreter/statements.c index 9603fccbe3..f89eea7a4f 100644 --- a/src/interpreter/statements.c +++ b/src/interpreter/statements.c @@ -16,24 +16,24 @@ #include "interpreter/statements.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 "interpreter/hookintrprtr.h" #include "interpreter/interpreter.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "sysfiles.h" +#include "sysmem.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" #include "tnums/string.h" -#include "sysfiles.h" -#include "sysmem.h" -#include "interpreter/vars.h" #ifdef HPCGAP #include "hpc/thread.h" diff --git a/src/interpreter/vars.c b/src/interpreter/vars.c index 5b78d7dd91..ef444834a4 100644 --- a/src/interpreter/vars.c +++ b/src/interpreter/vars.c @@ -19,24 +19,24 @@ #include "interpreter/vars.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 "core/saveload.h" #include "error.h" -#include "interpreter/expressions.h" #include "gap.h" -#include "util/gaputils.h" -#include "core/gvars.h" +#include "interpreter/code.h" +#include "interpreter/expressions.h" #include "interpreter/hookintrprtr.h" +#include "interpreter/statements.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" -#include "core/saveload.h" -#include "interpreter/statements.h" #include "tnums/string.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/interpreter/vars.h b/src/interpreter/vars.h index c5be23fb39..6740537773 100644 --- a/src/interpreter/vars.h +++ b/src/interpreter/vars.h @@ -21,8 +21,8 @@ #define GAP_VARS_H #include "core/calls.h" -#include "gapstate.h" #include "core/objects.h" +#include "gapstate.h" /**************************************************************************** diff --git a/src/io.c b/src/io.c index 77de239a24..07e7457c5f 100644 --- a/src/io.c +++ b/src/io.c @@ -21,20 +21,20 @@ #include "io.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "error.h" -#include "gapstate.h" -#include "util/gaputils.h" #include "core/gvars.h" #include "core/lists.h" -#include "modules.h" -#include "tnums/plist.h" +#include "error.h" +#include "gapstate.h" #include "interpreter/read.h" #include "interpreter/scanner.h" -#include "tnums/string.h" +#include "modules.h" #include "sysfiles.h" #include "sysopt.h" +#include "tnums/bool.h" +#include "tnums/plist.h" +#include "tnums/string.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/julia_gc.c b/src/julia_gc.c index 77c153e5c1..4cda36cea7 100644 --- a/src/julia_gc.c +++ b/src/julia_gc.c @@ -14,15 +14,15 @@ ** and gasman.c for two other garbage collector implementations. **/ -#include "util/fibhash.h" -#include "interpreter/funcs.h" +#include "core/objects.h" #include "gapstate.h" #include "gasman.h" -#include "core/objects.h" -#include "tnums/plist.h" +#include "interpreter/funcs.h" +#include "interpreter/vars.h" #include "sysmem.h" #include "system.h" -#include "interpreter/vars.h" +#include "tnums/plist.h" +#include "util/fibhash.h" #include #include diff --git a/src/libgap-api.c b/src/libgap-api.c index 3d448f204c..8117bdb0f6 100644 --- a/src/libgap-api.c +++ b/src/libgap-api.c @@ -15,18 +15,18 @@ #include "libgap-api.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/opers.h" #include "gap.h" #include "gapstate.h" #include "gasman.h" -#include "core/gvars.h" +#include "general/streams.h" +#include "tnums/bool.h" #include "tnums/integer.h" -#include "core/lists.h" #include "tnums/macfloat.h" -#include "core/opers.h" #include "tnums/plist.h" -#include "general/streams.h" #include "tnums/string.h" diff --git a/src/math/collector_ftl.c b/src/math/collector_ftl.c index 9f639883ed..3876de8481 100644 --- a/src/math/collector_ftl.c +++ b/src/math/collector_ftl.c @@ -23,12 +23,12 @@ #include "math/collector_ftl.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/gvars.h" #include "error.h" #include "gapstate.h" -#include "core/gvars.h" -#include "tnums/integer.h" #include "modules.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/plist.h" diff --git a/src/math/coset_table.c b/src/math/coset_table.c index 70ed561a7c..a590ca1980 100644 --- a/src/math/coset_table.c +++ b/src/math/coset_table.c @@ -12,12 +12,12 @@ #include "math/coset_table.h" -#include "tnums/bool.h" +#include "core/lists.h" #include "error.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" diff --git a/src/math/dt.c b/src/math/dt.c index 79c46f228e..b5f925b04e 100644 --- a/src/math/dt.c +++ b/src/math/dt.c @@ -55,10 +55,10 @@ #include "math/dt.h" #include "core/calls.h" -#include "error.h" #include "core/gvars.h" -#include "tnums/integer.h" +#include "error.h" #include "modules.h" +#include "tnums/integer.h" #include "tnums/plist.h" static void UnmarkTree(Obj z); diff --git a/src/math/dteval.c b/src/math/dteval.c index 9b6e4a0640..4663256876 100644 --- a/src/math/dteval.c +++ b/src/math/dteval.c @@ -26,13 +26,13 @@ #include "math/dteval.h" +#include "core/records.h" +#include "math/collector_ftl.h" #include "math/dt.h" -#include "tnums/integer.h" #include "modules.h" -#include "math/collector_ftl.h" +#include "tnums/integer.h" #include "tnums/plist.h" #include "tnums/precord.h" -#include "core/records.h" #ifdef HPCGAP #include "hpc/guards.h" diff --git a/src/math/freegroup_elms.cc b/src/math/freegroup_elms.cc index 33e60ac399..ffb3082b35 100644 --- a/src/math/freegroup_elms.cc +++ b/src/math/freegroup_elms.cc @@ -73,12 +73,12 @@ extern "C" { #include "math/freegroup_elms.h" #include "core/ariths.h" -#include "tnums/bool.h" -#include "error.h" #include "core/gvars.h" #include "core/lists.h" -#include "modules.h" #include "core/opers.h" +#include "error.h" +#include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/string.h" diff --git a/src/math/listoper.c b/src/math/listoper.c index 50344ba707..cd960da6b6 100644 --- a/src/math/listoper.c +++ b/src/math/listoper.c @@ -13,16 +13,16 @@ #include "math/listoper.h" +#include "applications/listfunc.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "error.h" #include "core/gvars.h" -#include "io.h" -#include "applications/listfunc.h" #include "core/lists.h" -#include "modules.h" #include "core/opers.h" +#include "error.h" +#include "io.h" +#include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/range.h" diff --git a/src/math/pcgroup-elms.cc b/src/math/pcgroup-elms.cc index cf16d8d610..9526b5c87b 100644 --- a/src/math/pcgroup-elms.cc +++ b/src/math/pcgroup-elms.cc @@ -12,11 +12,11 @@ extern "C" { #include "math/pcgroup-elms.h" -#include "tnums/bool.h" #include "collectors.h" #include "core/gvars.h" #include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" } // extern "C" diff --git a/src/math/pcgroup-elms.h b/src/math/pcgroup-elms.h index 57e472eb9e..31138b7113 100644 --- a/src/math/pcgroup-elms.h +++ b/src/math/pcgroup-elms.h @@ -11,8 +11,8 @@ #ifndef GAP_OBJPCGEL_H #define GAP_OBJPCGEL_H -#include "system.h" #include "math/freegroup_elms.h" +#include "system.h" /**************************************************************************** ** diff --git a/src/math/sctable.c b/src/math/sctable.c index 2aea3430df..16992eec7e 100644 --- a/src/math/sctable.c +++ b/src/math/sctable.c @@ -40,8 +40,8 @@ #include "math/sctable.h" #include "core/ariths.h" -#include "error.h" #include "core/lists.h" +#include "error.h" #include "modules.h" #include "tnums/plist.h" diff --git a/src/math/tietze.c b/src/math/tietze.c index 5d16508407..f43b1c8ed8 100644 --- a/src/math/tietze.c +++ b/src/math/tietze.c @@ -12,12 +12,12 @@ #include "math/tietze.h" -#include "tnums/bool.h" -#include "error.h" #include "core/lists.h" +#include "error.h" +#include "interpreter/statements.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "interpreter/statements.h" #include "tnums/string.h" diff --git a/src/math/vec8bit.c b/src/math/vec8bit.c index 6468fae59d..f803146645 100644 --- a/src/math/vec8bit.c +++ b/src/math/vec8bit.c @@ -11,23 +11,23 @@ #include "math/vec8bit.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "error.h" -#include "tnums/finfield.h" #include "core/gvars.h" -#include "tnums/integer.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/records.h" +#include "error.h" +#include "interpreter/statements.h" #include "io.h" #include "math/listoper.h" -#include "core/lists.h" +#include "math/vecgf2.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/finfield.h" +#include "tnums/integer.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/range.h" -#include "core/records.h" -#include "interpreter/statements.h" -#include "math/vecgf2.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/math/vecffe.c b/src/math/vecffe.c index a51dc7567d..59dbb97980 100644 --- a/src/math/vecffe.c +++ b/src/math/vecffe.c @@ -12,14 +12,14 @@ #include "math/vecffe.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "error.h" -#include "tnums/finfield.h" #include "core/gvars.h" +#include "core/opers.h" +#include "error.h" #include "math/listoper.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/finfield.h" #include "tnums/plist.h" diff --git a/src/math/vecgf2.c b/src/math/vecgf2.c index a3cdac59cd..1e4c439aa2 100644 --- a/src/math/vecgf2.c +++ b/src/math/vecgf2.c @@ -11,21 +11,21 @@ #include "math/vecgf2.h" #include "core/ariths.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/records.h" +#include "error.h" +#include "interpreter/statements.h" +#include "math/vec8bit.h" +#include "modules.h" #include "tnums/blist.h" #include "tnums/bool.h" -#include "error.h" #include "tnums/finfield.h" -#include "core/gvars.h" #include "tnums/integer.h" -#include "core/lists.h" -#include "modules.h" -#include "core/opers.h" #include "tnums/plist.h" #include "tnums/precord.h" #include "tnums/range.h" -#include "core/records.h" -#include "interpreter/statements.h" -#include "math/vec8bit.h" #include diff --git a/src/modules-builtin.c b/src/modules-builtin.c index 49dcbd3a27..d5519627d5 100644 --- a/src/modules-builtin.c +++ b/src/modules-builtin.c @@ -10,16 +10,16 @@ #include "compiled.h" #include "gap.h" -#include "interpreter/hookintrprtr.h" #include "general/intfuncs.h" #include "general/iostream.h" +#include "interpreter/hookintrprtr.h" #include "math/collector.h" -#include "tnums/objset.h" -#include "profile.h" -#include "syntaxtree.h" #include "math/vec8bit.h" #include "math/vecffe.h" #include "math/vecgf2.h" +#include "profile.h" +#include "syntaxtree.h" +#include "tnums/objset.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/modules.c b/src/modules.c index f9c71153bf..3fbc1ad984 100644 --- a/src/modules.c +++ b/src/modules.c @@ -14,26 +14,26 @@ #include "modules.h" -#include "core/ariths.h" -#include "tnums/bool.h" -#include "interpreter/code.h" #include "compstat.h" -#include "error.h" -#include "interpreter/funcs.h" -#include "gap.h" -#include "gapstate.h" +#include "core/ariths.h" #include "core/gvars.h" -#include "tnums/integer.h" -#include "tnums/intobj.h" -#include "io.h" #include "core/lists.h" #include "core/opers.h" -#include "tnums/plist.h" #include "core/saveload.h" +#include "error.h" +#include "gap.h" +#include "gapstate.h" #include "general/streams.h" -#include "tnums/string.h" +#include "interpreter/code.h" +#include "interpreter/funcs.h" +#include "io.h" #include "sysfiles.h" #include "sysopt.h" +#include "tnums/bool.h" +#include "tnums/integer.h" +#include "tnums/intobj.h" +#include "tnums/plist.h" +#include "tnums/string.h" #ifdef HAVE_DLOPEN #include diff --git a/src/profile.c b/src/profile.c index ad8a7c2d35..65b9ad1374 100644 --- a/src/profile.c +++ b/src/profile.c @@ -13,27 +13,27 @@ #include "profile.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "interpreter/code.h" +#include "core/lists.h" #include "error.h" +#include "interpreter/code.h" #include "interpreter/funcs.h" #include "interpreter/hookintrprtr.h" +#include "interpreter/vars.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "sysfiles.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/string.h" -#include "sysfiles.h" -#include "interpreter/vars.h" #include "hpc/thread.h" -#include // for gettimeofday +#include // for gettimeofday #include #include #ifdef HAVE_SYS_RESOURCE_H -#include // definition of 'struct rusage' +#include // definition of 'struct rusage' #endif diff --git a/src/syntaxtree.c b/src/syntaxtree.c index da1d40bdd9..1a92d1e37c 100644 --- a/src/syntaxtree.c +++ b/src/syntaxtree.c @@ -10,26 +10,26 @@ #include "syntaxtree.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "interpreter/code.h" -#include "error.h" -#include "interpreter/expressions.h" #include "core/gvars.h" -#include "tnums/integer.h" #include "core/lists.h" -#include "modules.h" #include "core/opers.h" -#include "tnums/plist.h" -#include "tnums/precord.h" #include "core/records.h" +#include "error.h" +#include "interpreter/code.h" +#include "interpreter/expressions.h" #include "interpreter/statements.h" -#include "tnums/string.h" -#include "system.h" #include "interpreter/vars.h" +#include "modules.h" +#include "system.h" +#include "tnums/bool.h" +#include "tnums/integer.h" +#include "tnums/plist.h" +#include "tnums/precord.h" +#include "tnums/string.h" -#include #include +#include typedef Obj (*CompileFuncT)(Obj node, Expr expr); typedef Obj (*CompileArgT)(Expr expr); diff --git a/src/sysfiles.c b/src/sysfiles.c index 980b0264c9..e384cdc4a5 100644 --- a/src/sysfiles.c +++ b/src/sysfiles.c @@ -16,23 +16,23 @@ #include "sysfiles.h" -#include "tnums/bool.h" -#include "core/calls.h" #include "compstat.h" -#include "error.h" -#include "gapstate.h" -#include "util/gaputils.h" +#include "core/calls.h" #include "core/gvars.h" -#include "io.h" #include "core/lists.h" -#include "modules.h" -#include "tnums/plist.h" -#include "interpreter/read.h" #include "core/records.h" +#include "error.h" +#include "gapstate.h" +#include "interpreter/read.h" #include "interpreter/statements.h" -#include "tnums/string.h" +#include "io.h" +#include "modules.h" #include "sysenv.h" #include "sysopt.h" +#include "tnums/bool.h" +#include "tnums/plist.h" +#include "tnums/string.h" +#include "util/gaputils.h" #include "hpc/thread.h" @@ -47,7 +47,6 @@ #include #include -#include #include #include #ifdef HAVE_SYS_WAIT_H @@ -65,7 +64,7 @@ typedef void sig_handler_t ( int ); #endif #ifdef HAVE_SYS_IOCTL_H -#include /* for TIOCGWINSZ */ +#include /* for TIOCGWINSZ */ #endif #ifdef SYS_IS_CYGWIN32 diff --git a/src/system.c b/src/system.c index 0f95218c9f..e21f1a3be2 100644 --- a/src/system.c +++ b/src/system.c @@ -44,11 +44,11 @@ #include #endif -#include /* definition of 'struct timeval' */ +#include /* definition of 'struct timeval' */ #include #ifdef HAVE_SYS_RESOURCE_H -#include /* definition of 'struct rusage' */ +#include /* definition of 'struct rusage' */ #endif #ifdef SYS_IS_DARWIN diff --git a/src/tnums/blist.c b/src/tnums/blist.c index 06cbf626cf..a308f58931 100644 --- a/src/tnums/blist.c +++ b/src/tnums/blist.c @@ -72,16 +72,16 @@ #include "tnums/blist.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/saveload.h" +#include "core/set.h" #include "error.h" -#include "util/gaputils.h" #include "io.h" -#include "core/lists.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" #include "tnums/range.h" -#include "core/saveload.h" -#include "core/set.h" +#include "util/gaputils.h" #define RequireBlist(funcname, op, argname) \ diff --git a/src/tnums/blist.h b/src/tnums/blist.h index 8c3660b8f4..af1b4380d7 100644 --- a/src/tnums/blist.h +++ b/src/tnums/blist.h @@ -20,8 +20,8 @@ #ifndef GAP_BLISTER_H #define GAP_BLISTER_H -#include "tnums/bool.h" #include "core/objects.h" +#include "tnums/bool.h" /**************************************************************************** ** diff --git a/src/tnums/bool.c b/src/tnums/bool.c index f1eaaa70bf..5656c6b304 100644 --- a/src/tnums/bool.c +++ b/src/tnums/bool.c @@ -19,9 +19,9 @@ #include "core/ariths.h" #include "core/calls.h" #include "core/gvars.h" +#include "core/opers.h" #include "io.h" #include "modules.h" -#include "core/opers.h" /**************************************************************************** diff --git a/src/tnums/cyclotom.c b/src/tnums/cyclotom.c index fa63a54a20..98f47539e2 100644 --- a/src/tnums/cyclotom.c +++ b/src/tnums/cyclotom.c @@ -90,16 +90,16 @@ #include "tnums/cyclotom.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" #include "gapstate.h" -#include "tnums/integer.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/plist.h" -#include "core/saveload.h" /**************************************************************************** diff --git a/src/tnums/finfield.c b/src/tnums/finfield.c index cab701bb34..c5169a923a 100644 --- a/src/tnums/finfield.c +++ b/src/tnums/finfield.c @@ -16,15 +16,15 @@ #include "tnums/finfield.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/opers.h" #include "error.h" #include "finfield_conway.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" #ifdef HPCGAP diff --git a/src/tnums/finfield.h b/src/tnums/finfield.h index 775b09b36c..f8cbdef65b 100644 --- a/src/tnums/finfield.h +++ b/src/tnums/finfield.h @@ -52,8 +52,8 @@ #ifndef GAP_FINFIELD_H #define GAP_FINFIELD_H -#include "tnums/ffdata.h" #include "core/objects.h" +#include "tnums/ffdata.h" /**************************************************************************** diff --git a/src/tnums/integer.c b/src/tnums/integer.c index 64d23e12c4..7b37d8840e 100644 --- a/src/tnums/integer.c +++ b/src/tnums/integer.c @@ -68,15 +68,15 @@ #include "tnums/integer.h" #include "core/ariths.h" -#include "tnums/bool.h" #include "core/calls.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" #include "general/intfuncs.h" +#include "interpreter/statements.h" #include "io.h" #include "modules.h" -#include "core/opers.h" -#include "core/saveload.h" -#include "interpreter/statements.h" +#include "tnums/bool.h" #include "tnums/string.h" diff --git a/src/tnums/macfloat.c b/src/tnums/macfloat.c index b40163689c..a231e5738e 100644 --- a/src/tnums/macfloat.c +++ b/src/tnums/macfloat.c @@ -23,13 +23,13 @@ #include "tnums/macfloat.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/saveload.h" #include "error.h" #include "io.h" -#include "tnums/integer.h" #include "modules.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/plist.h" -#include "core/saveload.h" #include "tnums/string.h" #define RequireMacFloat(funcname, op) \ diff --git a/src/tnums/objset.c b/src/tnums/objset.c index a9f63e6cfe..7f02b2a325 100644 --- a/src/tnums/objset.c +++ b/src/tnums/objset.c @@ -12,16 +12,16 @@ #include "tnums/objset.h" -#include "tnums/bool.h" -#include "error.h" -#include "util/fibhash.h" -#include "util/gaputils.h" #include "core/gvars.h" -#include "io.h" #include "core/lists.h" +#include "core/saveload.h" +#include "error.h" +#include "io.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "core/saveload.h" +#include "util/fibhash.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/traverse.h" diff --git a/src/tnums/permutat.cc b/src/tnums/permutat.cc index 71aac5ebdf..5d3260a7db 100644 --- a/src/tnums/permutat.cc +++ b/src/tnums/permutat.cc @@ -50,22 +50,22 @@ extern "C" { #include "tnums/permutat.h" +#include "applications/listfunc.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/records.h" +#include "core/saveload.h" #include "error.h" #include "gapstate.h" -#include "tnums/integer.h" #include "io.h" -#include "applications/listfunc.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "sysfiles.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 "core/saveload.h" -#include "sysfiles.h" #include "tnums/trans.h" } // extern "C" diff --git a/src/tnums/plist.c b/src/tnums/plist.c index 5e4e6756ae..cfdb62cad5 100644 --- a/src/tnums/plist.c +++ b/src/tnums/plist.c @@ -38,20 +38,20 @@ #include "tnums/plist.h" #include "core/ariths.h" -#include "tnums/blist.h" -#include "tnums/bool.h" #include "core/calls.h" -#include "tnums/cyclotom.h" +#include "core/lists.h" +#include "core/saveload.h" #include "error.h" -#include "tnums/finfield.h" #include "interpreter/funcs.h" -#include "util/gaputils.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "tnums/range.h" -#include "core/saveload.h" #include "sysopt.h" // for SyInitializing +#include "tnums/blist.h" +#include "tnums/bool.h" +#include "tnums/cyclotom.h" +#include "tnums/finfield.h" +#include "tnums/range.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/guards.h" diff --git a/src/tnums/pperm.cc b/src/tnums/pperm.cc index 9f0e055fb8..d9655b0b4e 100644 --- a/src/tnums/pperm.cc +++ b/src/tnums/pperm.cc @@ -24,21 +24,21 @@ extern "C" { #include "tnums/pperm.h" +#include "applications/listfunc.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" #include "gapstate.h" -#include "core/gvars.h" -#include "tnums/integer.h" #include "general/intfuncs.h" #include "io.h" -#include "applications/listfunc.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/permutat.h" #include "tnums/plist.h" -#include "core/saveload.h" } // extern "C" diff --git a/src/tnums/precord.c b/src/tnums/precord.c index 9e9d4708c3..ff1731e0a5 100644 --- a/src/tnums/precord.c +++ b/src/tnums/precord.c @@ -29,17 +29,17 @@ #include "tnums/precord.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/opers.h" +#include "core/records.h" +#include "core/saveload.h" #include "error.h" #include "interpreter/funcs.h" -#include "util/gaputils.h" #include "io.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "core/records.h" -#include "core/saveload.h" #include "tnums/string.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/aobjects.h" diff --git a/src/tnums/range.c b/src/tnums/range.c index 737ae4f425..763896dcec 100644 --- a/src/tnums/range.c +++ b/src/tnums/range.c @@ -52,15 +52,15 @@ #include "tnums/range.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" -#include "util/gaputils.h" #include "io.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "core/saveload.h" +#include "util/gaputils.h" /**************************************************************************** diff --git a/src/tnums/rational.c b/src/tnums/rational.c index 0f5202147b..a6eddac4e0 100644 --- a/src/tnums/rational.c +++ b/src/tnums/rational.c @@ -46,13 +46,13 @@ #include "tnums/rational.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" -#include "tnums/integer.h" #include "io.h" #include "modules.h" -#include "core/opers.h" -#include "core/saveload.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #if defined(DEBUG_RATIONALS) diff --git a/src/tnums/string.c b/src/tnums/string.c index 21e90a0704..76cb15587d 100644 --- a/src/tnums/string.c +++ b/src/tnums/string.c @@ -53,16 +53,16 @@ #include "tnums/string.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" -#include "util/gaputils.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/range.h" -#include "core/saveload.h" +#include "util/gaputils.h" #ifdef HPCGAP #include "hpc/guards.h" diff --git a/src/tnums/trans.cc b/src/tnums/trans.cc index 33fc760f0f..1bcc06d9b2 100644 --- a/src/tnums/trans.cc +++ b/src/tnums/trans.cc @@ -49,20 +49,20 @@ extern "C" { #include "tnums/trans.h" +#include "applications/listfunc.h" #include "core/ariths.h" -#include "tnums/bool.h" +#include "core/gvars.h" +#include "core/lists.h" +#include "core/opers.h" +#include "core/saveload.h" #include "error.h" #include "gapstate.h" -#include "core/gvars.h" -#include "tnums/integer.h" #include "general/intfuncs.h" -#include "applications/listfunc.h" -#include "core/lists.h" #include "modules.h" -#include "core/opers.h" +#include "tnums/bool.h" +#include "tnums/integer.h" #include "tnums/permutat.h" #include "tnums/plist.h" -#include "core/saveload.h" } // extern "C" diff --git a/src/tnums/weakptr.c b/src/tnums/weakptr.c index 4e27bdf994..be8457207f 100644 --- a/src/tnums/weakptr.c +++ b/src/tnums/weakptr.c @@ -15,12 +15,12 @@ #include "tnums/weakptr.h" -#include "tnums/bool.h" -#include "error.h" #include "core/lists.h" +#include "core/saveload.h" +#include "error.h" #include "modules.h" +#include "tnums/bool.h" #include "tnums/plist.h" -#include "core/saveload.h" #ifdef HPCGAP #include "hpc/guards.h" diff --git a/src/util/debug.c b/src/util/debug.c index e607743289..c26a2ef85e 100644 --- a/src/util/debug.c +++ b/src/util/debug.c @@ -16,10 +16,10 @@ #include "system.h" -#include "core/calls.h" #include "compiled.h" -#include "util/fibhash.h" +#include "core/calls.h" #include "interpreter/hookintrprtr.h" +#include "util/fibhash.h" #ifdef HPCGAP #include "hpc/guards.h"