[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 82/86: Rationalize include order in C files
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] 82/86: Rationalize include order in C files |
|
Date: |
Wed, 20 Jun 2018 14:09:45 -0400 (EDT) |
wingo pushed a commit to branch master
in repository guile.
commit b8d757732fae7c396d58327185f94e5d90846445
Author: Andy Wingo <address@hidden>
Date: Wed Jun 20 18:31:24 2018 +0200
Rationalize include order in C files
Include config.h first, then system includes, then libguile includes, in
alphabetical order, then the include for the file in question.
---
libguile/alist.c | 7 ++++--
libguile/array-handle.c | 3 ++-
libguile/array-map.c | 21 ++++++++--------
libguile/arrays.c | 35 +++++++++++++-------------
libguile/async.c | 24 +++++++++---------
libguile/atomic.c | 10 +++++---
libguile/atomics-internal.h | 4 +--
libguile/backtrace.c | 16 ++++++------
libguile/bitvectors.c | 14 ++++++-----
libguile/boolean.c | 5 ++--
libguile/bytevectors.c | 12 +++++----
libguile/chars.c | 9 ++++---
libguile/chooks.c | 2 ++
libguile/continuations.c | 16 ++++++------
libguile/control.c | 9 ++++---
libguile/debug-malloc.c | 3 ++-
libguile/debug.c | 34 ++++++++++++-------------
libguile/deprecated.c | 1 +
libguile/deprecation.c | 9 +++----
libguile/dynl.c | 44 +++++++++++---------------------
libguile/dynstack.c | 3 ++-
libguile/dynwind.c | 2 +-
libguile/eq.c | 11 ++++----
libguile/error.c | 21 ++++++++--------
libguile/eval.c | 11 ++++----
libguile/expand.c | 9 ++++---
libguile/extensions.c | 6 +++--
libguile/fdes-finalizers.c | 8 +++---
libguile/feature.c | 6 ++---
libguile/filesys.c | 14 ++++++-----
libguile/finalizers.c | 9 ++++---
libguile/fluids.c | 10 +++++---
libguile/foreign-object.c | 4 ++-
libguile/foreign.c | 20 ++++++++-------
libguile/fports.c | 16 ++++++------
libguile/frames.c | 9 ++++---
libguile/gc-malloc.c | 23 ++++++++---------
libguile/gc.c | 38 +++++++++++++---------------
libguile/generalized-arrays.c | 11 ++++----
libguile/generalized-vectors.c | 2 +-
libguile/gettext.c | 11 ++++----
libguile/goops.c | 5 ++--
libguile/gsubr.c | 7 ++++--
libguile/guardians.c | 14 +++++------
libguile/guile.c | 1 -
libguile/hash.c | 7 ++++--
libguile/hashtab.c | 11 ++++----
libguile/hooks.c | 8 +++---
libguile/i18n.c | 31 +++++++++++------------
libguile/init.c | 57 +++++++++++++++++++-----------------------
libguile/inline.c | 5 ++--
libguile/instructions.c | 9 +++----
libguile/intrinsics.c | 8 +++---
libguile/ioext.c | 20 ++++++++-------
libguile/keywords.c | 10 ++++----
libguile/list.c | 12 +++++----
libguile/load.c | 37 +++++++++++++--------------
libguile/loader.c | 26 +++++++++----------
libguile/macros.c | 6 ++---
libguile/mallocs.c | 3 +--
libguile/memoize.c | 13 +++++-----
libguile/modules.c | 18 ++++++-------
libguile/net_db.c | 10 ++++----
libguile/null-threads.c | 2 +-
libguile/numbers.c | 25 ++++++++----------
libguile/objprop.c | 11 +++++---
libguile/options.c | 4 ++-
libguile/pairs.c | 5 ++--
libguile/poll.c | 1 +
libguile/ports.c | 57 ++++++++++++++++++++----------------------
libguile/posix-w32.c | 3 ++-
libguile/posix.c | 51 +++++++++++++++++--------------------
libguile/print.c | 38 ++++++++++++++--------------
libguile/procprop.c | 16 ++++++------
libguile/procs.c | 19 +++++++-------
libguile/programs.c | 13 ++++++----
libguile/promises.c | 4 +--
libguile/r6rs-ports.c | 12 ++++-----
libguile/random.c | 21 ++++++++--------
libguile/rdelim.c | 15 +++++------
libguile/read.c | 42 +++++++++++++++----------------
libguile/regex-posix.c | 18 ++++++-------
libguile/rw.c | 21 +++++++++-------
libguile/scmsigs.c | 13 +++++-----
libguile/script.c | 24 ++++++++----------
libguile/simpos.c | 2 +-
libguile/smob.c | 13 +++++-----
libguile/socket.c | 14 +++++------
libguile/sort.c | 12 ++++-----
libguile/srcprop.c | 16 ++++++------
libguile/srfi-1.c | 20 ++++++++-------
libguile/srfi-13.c | 10 +++++---
libguile/srfi-14.c | 11 ++++----
libguile/srfi-4.c | 11 ++++----
libguile/srfi-60.c | 5 ++--
libguile/stackchk.c | 5 +++-
libguile/stacks.c | 15 +++++------
libguile/stime.c | 31 +++++++++++------------
libguile/strings.c | 21 ++++++++--------
libguile/strorder.c | 8 ++++--
libguile/strports.c | 17 ++++++-------
libguile/struct.c | 20 ++++++---------
libguile/symbols.c | 26 ++++++++-----------
libguile/syntax.c | 7 ++++--
libguile/threads.c | 29 ++++++++++-----------
libguile/throw.c | 27 ++++++++++----------
libguile/trees.c | 12 ++++-----
libguile/unicode.c | 6 +++--
libguile/values.c | 5 ++--
libguile/variable.c | 7 ++++--
libguile/vectors.c | 12 ++++-----
libguile/version.c | 6 ++++-
libguile/vm.c | 39 +++++++++++++++--------------
libguile/vports.c | 18 ++++++-------
libguile/weak-set.c | 9 ++++---
libguile/weak-table.c | 14 ++++++-----
libguile/weak-vector.c | 3 ++-
117 files changed, 879 insertions(+), 827 deletions(-)
diff --git a/libguile/alist.c b/libguile/alist.c
index 0a8861d..f19ad23 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -19,18 +19,21 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "gsubr.h"
#include "boolean.h"
#include "eq.h"
+#include "gsubr.h"
#include "list.h"
-#include "pairs.h"
#include "numbers.h"
+#include "pairs.h"
+
#include "alist.h"
+
SCM_DEFINE (scm_acons, "acons", 3, 0, 0,
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index d8e8ff1..d3f7213 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -26,15 +26,16 @@
#include <string.h>
+#include "arrays.h"
#include "bitvectors.h"
#include "bytevectors.h"
#include "list.h"
-#include "arrays.h"
#include "numbers.h"
#include "pairs.h"
#include "strings.h"
#include "symbols.h"
#include "vectors.h"
+
#include "array-handle.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index 6205be0..bb36e29 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -26,29 +26,30 @@
# include <config.h>
#endif
+#include <assert.h>
#include <string.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
-#include "strings.h"
#include "arrays.h"
-#include "smob.h"
+#include "bitvectors.h"
+#include "boolean.h"
#include "chars.h"
#include "eq.h"
#include "eval.h"
#include "feature.h"
-#include "vectors.h"
+#include "generalized-arrays.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
-#include "bitvectors.h"
+#include "pairs.h"
+#include "procs.h"
+#include "smob.h"
#include "srfi-4.h"
+#include "strings.h"
#include "symbols.h"
-#include "procs.h"
-#include "generalized-arrays.h"
+#include "vectors.h"
#include "array-map.h"
-#include <assert.h>
+
/* The WHAT argument for `scm_gc_malloc ()' et al. */
static const char vi_gc_hint[] = "array-indices";
diff --git a/libguile/arrays.c b/libguile/arrays.c
index fee0bd0..24b7743 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -28,34 +28,33 @@
#include <errno.h>
#include <string.h>
-#include "verify.h"
-
-#include "gsubr.h"
-#include "pairs.h"
+#include "array-map.h"
+#include "bitvectors.h"
#include "boolean.h"
-#include "eq.h"
+#include "bytevectors.h"
#include "chars.h"
+#include "dynwind.h"
+#include "eq.h"
#include "eval.h"
-#include "fports.h"
#include "feature.h"
+#include "fports.h"
+#include "generalized-arrays.h"
+#include "generalized-vectors.h"
+#include "gsubr.h"
+#include "list.h"
#include "modules.h"
-#include "strings.h"
-#include "srfi-13.h"
-#include "srfi-4.h"
-#include "vectors.h"
#include "numbers.h"
-#include "bitvectors.h"
+#include "pairs.h"
#include "procs.h"
-#include "bytevectors.h"
-#include "list.h"
-#include "dynwind.h"
#include "read.h"
+#include "srfi-13.h"
+#include "srfi-4.h"
+#include "strings.h"
+#include "uniform.h"
+#include "vectors.h"
+#include "verify.h"
#include "arrays.h"
-#include "array-map.h"
-#include "generalized-vectors.h"
-#include "generalized-arrays.h"
-#include "uniform.h"
size_t
diff --git a/libguile/async.c b/libguile/async.c
index ee00dac..387531b 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -19,30 +19,30 @@
+
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
+#include <full-write.h>
+#include <string.h>
+#include <unistd.h>
+
#include "atomics-internal.h"
+#include "deprecation.h"
+#include "dynwind.h"
#include "eval.h"
-#include "throw.h"
+#include "gsubr.h"
#include "list.h"
+#include "pairs.h"
#include "smob.h"
-#include "dynwind.h"
-#include "deprecation.h"
+#include "throw.h"
#include "async.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#include <unistd.h>
-
-#include <full-write.h>
+
/* {Asynchronous Events}
*
* Asyncs are used to run arbitrary code at the next safe point in a
diff --git a/libguile/atomic.c b/libguile/atomic.c
index 2f1afd1..c243645 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 2016,2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -18,18 +18,22 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "atomics-internal.h"
#include "boolean.h"
-#include "gsubr.h"
#include "extensions.h"
+#include "gsubr.h"
#include "ports.h"
-#include "atomics-internal.h"
+
#include "atomic.h"
+
+
SCM_DEFINE (scm_make_atomic_box, "make-atomic-box", 1, 0, 0,
(SCM init),
"Return an atomic box initialized to value @var{init}.")
diff --git a/libguile/atomics-internal.h b/libguile/atomics-internal.h
index 3c4f0cb..247cb3e 100644
--- a/libguile/atomics-internal.h
+++ b/libguile/atomics-internal.h
@@ -1,7 +1,7 @@
#ifndef SCM_ATOMICS_INTERNAL_H
#define SCM_ATOMICS_INTERNAL_H
-/* Copyright (C) 2016
+/* Copyright (C) 2016, 2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
-#include <stdint.h>
+#include "scm.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index b5c9ce0..943d8b6 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -1,6 +1,6 @@
/* Printing of backtraces and error messages
- * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009,
- * 2010, 2011, 2014, 2018 Free Software Foundation
+ * Copyright (C) 1996-2001,2003-2004,2006,2009-2011,2014,2018
+ * Free Software Foundation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,24 +24,22 @@
#include <stdio.h>
#include <ctype.h>
-
-#include "gsubr.h"
-#include "boolean.h"
-
#include <unistd.h>
+
#ifdef HAVE_IO_H
#include <io.h>
#endif
-#include "backtrace.h"
+#include "boolean.h"
#include "deprecation.h"
#include "dynwind.h"
#include "eval.h"
#include "filesys.h"
#include "fluids.h"
#include "frames.h"
-#include "list.h"
+#include "gsubr.h"
#include "keywords.h"
+#include "list.h"
#include "modules.h"
#include "numbers.h"
#include "ports.h"
@@ -56,6 +54,8 @@
#include "throw.h"
#include "variable.h"
+#include "backtrace.h"
+
/* {Error reporting and backtraces}
*
* Note that these functions shouldn't generate errors themselves.
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index c2e7ae3..b5caece 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -25,18 +25,20 @@
#include <string.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "array-handle.h"
-#include "bitvectors.h"
+#include "arrays.h"
+#include "boolean.h"
#include "generalized-vectors.h"
-#include "numbers.h"
+#include "gsubr.h"
#include "list.h"
-#include "arrays.h"
+#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "srfi-4.h"
+#include "bitvectors.h"
+
+
/* Bit vectors. Would be nice if they were implemented on top of bytevectors,
* but alack, all we have is this crufty C.
*/
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 4521c86..06b5918 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -19,16 +19,17 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "error.h"
#include "gsubr.h"
+#include "verify.h"
#include "boolean.h"
-#include "error.h"
-#include "verify.h"
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index c2a9597..0e708d5 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -36,22 +36,24 @@
#include <gmp.h>
+#include "array-handle.h"
+#include "arrays.h"
#include "boolean.h"
-#include "gsubr.h"
#include "dynwind.h"
#include "extensions.h"
-#include "bytevectors.h"
#include "generalized-vectors.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
#include "pairs.h"
#include "ports.h"
+#include "srfi-4.h"
#include "strings.h"
#include "symbols.h"
-#include "arrays.h"
-#include "array-handle.h"
#include "uniform.h"
-#include "srfi-4.h"
+
+#include "bytevectors.h"
+
/* Utilities. */
diff --git a/libguile/chars.c b/libguile/chars.c
index 6d36957..aa3607d 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -19,6 +19,7 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -29,13 +30,15 @@
#include <unicase.h>
#include <unictype.h>
-#include "gsubr.h"
#include "boolean.h"
-#include "chars.h"
+#include "gsubr.h"
#include "numbers.h"
#include "pairs.h"
-#include "symbols.h"
#include "srfi-14.h"
+#include "symbols.h"
+
+#include "chars.h"
+
diff --git a/libguile/chooks.c b/libguile/chooks.c
index 9ec469e..0ccef5c 100644
--- a/libguile/chooks.c
+++ b/libguile/chooks.c
@@ -26,8 +26,10 @@
#include <stdio.h>
#include "gc.h"
+
#include "chooks.h"
+
/* C level hooks
*
diff --git a/libguile/continuations.c b/libguile/continuations.c
index a5459c0..eb63102 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -18,6 +18,7 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -30,27 +31,28 @@
#include <ucontext.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "async.h"
#include "backtrace.h"
+#include "boolean.h"
#include "debug.h"
+#include "dynstack.h"
+#include "eval.h"
+#include "gsubr.h"
#include "init.h"
+#include "instructions.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
#include "smob.h"
#include "stackchk.h"
#include "stacks.h"
-#include "ports.h"
-#include "dynstack.h"
-#include "eval.h"
#include "symbols.h"
#include "vm.h"
-#include "instructions.h"
#include "continuations.h"
+
static scm_t_bits tc16_continuation;
diff --git a/libguile/control.c b/libguile/control.c
index f954aef..e0eb444 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -23,16 +23,17 @@
#include <alloca.h>
#include "dynstack.h"
-#include "gsubr.h"
-#include "pairs.h"
-#include "control.h"
#include "extensions.h"
+#include "gsubr.h"
+#include "instructions.h"
#include "list.h"
+#include "pairs.h"
#include "programs.h"
#include "threads.h"
-#include "instructions.h"
#include "vm.h"
+#include "control.h"
+
#define PROMPT_ESCAPE_P(p) \
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index 5e224da..409d85a 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -23,13 +23,14 @@
#include <string.h>
#include <stdio.h>
-#include "gsubr.h"
#include "alist.h"
+#include "gsubr.h"
#include "numbers.h"
#include "strings.h"
#include "debug-malloc.h"
+
/*
* The following code is a hack which I wrote quickly in order to
* solve a memory leak problem. Since I wanted to have the
diff --git a/libguile/debug.c b/libguile/debug.c
index 3146a7f..d29394b 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -35,37 +35,37 @@
# include <windows.h>
#endif
-#include "gsubr.h"
+#include "alist.h"
#include "async.h"
+#include "continuations.h"
+#include "dynwind.h"
#include "eval.h"
+#include "feature.h"
+#include "fluids.h"
+#include "gsubr.h"
#include "list.h"
-#include "stackchk.h"
-#include "throw.h"
#include "macros.h"
-#include "smob.h"
-#include "struct.h"
+#include "memoize.h"
+#include "modules.h"
#include "pairs.h"
+#include "ports.h"
+#include "private-options.h"
#include "procprop.h"
+#include "programs.h"
+#include "read.h"
+#include "smob.h"
#include "srcprop.h"
-#include "alist.h"
-#include "continuations.h"
+#include "stackchk.h"
#include "strports.h"
-#include "read.h"
-#include "feature.h"
-#include "dynwind.h"
-#include "modules.h"
-#include "ports.h"
-#include "fluids.h"
-#include "programs.h"
-#include "memoize.h"
+#include "struct.h"
+#include "throw.h"
#include "variable.h"
#include "vm.h"
#include "debug.h"
-#include "private-options.h"
-
+
/*
* Debugging options.
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index f9cbdf0..a145923 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -23,6 +23,7 @@
#define SCM_BUILDING_DEPRECATED_CODE
#include "deprecation.h"
+
#include "deprecated.h"
#if (SCM_ENABLE_DEPRECATED == 1)
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index d2116eb..f3b4bd7 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -28,15 +28,14 @@
#include <stdarg.h>
#include "gsubr.h"
-#include "pairs.h"
-
-#include "deprecation.h"
#include "list.h"
-#include "strings.h"
+#include "pairs.h"
#include "ports.h"
+#include "private-options.h"
+#include "strings.h"
#include "threads.h"
-#include "private-options.h"
+#include "deprecation.h"
diff --git a/libguile/dynl.c b/libguile/dynl.c
index d2cf78b..5f7b2e2 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -19,52 +19,36 @@
*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <alloca.h>
-#include <string.h>
-
/* "dynl.c" dynamically link&load object files.
Author: Aubrey Jaffer
Modified for libguile by Marius Vollmer */
-#if 0 /* Disabled until we know for sure that it isn't needed */
-/* XXX - This is only here to drag in a definition of __eprintf. This
- is needed for proper operation of dynamic linking. The real
- solution would probably be a shared libgcc. */
-
-#undef NDEBUG
-#include <assert.h>
-
-static void
-maybe_drag_in_eprintf ()
-{
- assert (!maybe_drag_in_eprintf);
-}
+#ifdef HAVE_CONFIG_H
+# include <config.h>
#endif
-#include <stdlib.h>
+#include <alloca.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <ltdl.h>
+
+#include "deprecation.h"
+#include "dynwind.h"
+#include "foreign.h"
+#include "gc.h"
#include "gsubr.h"
-#include "libpath.h"
-#include "dynl.h"
-#include "smob.h"
#include "keywords.h"
+#include "libpath.h"
#include "list.h"
#include "ports.h"
+#include "smob.h"
#include "strings.h"
-#include "deprecation.h"
-#include "dynwind.h"
-#include "foreign.h"
#include "threads.h"
-#include "gc.h"
-#include <ltdl.h>
+#include "dynl.h"
+
/* From the libtool manual: "Note that libltdl is not threadsafe,
i.e. a multithreaded application has to use a mutex for libltdl.".
diff --git a/libguile/dynstack.c b/libguile/dynstack.c
index 31c8ff0..706529b 100644
--- a/libguile/dynstack.c
+++ b/libguile/dynstack.c
@@ -29,9 +29,10 @@
#include "control.h"
#include "eval.h"
#include "fluids.h"
-#include "dynstack.h"
#include "variable.h"
+#include "dynstack.h"
+
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 153d24c..1eb5b0d 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -29,9 +29,9 @@
#include "boolean.h"
#include "dynstack.h"
#include "eval.h"
-#include "threads.h"
#include "pairs.h"
#include "ports.h"
+#include "threads.h"
#include "variable.h"
#include "dynwind.h"
diff --git a/libguile/eq.c b/libguile/eq.c
index 3241f01..4848b26 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -22,22 +22,18 @@
#endif
#include <math.h>
-
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
-#include "gsubr.h"
-#include "boolean.h"
#include "array-map.h"
#include "async.h"
#include "bitvectors.h"
+#include "boolean.h"
#include "bytevectors.h"
-#include "eq.h"
#include "eval.h"
#include "foreign.h"
#include "generalized-arrays.h"
#include "goops.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "pairs.h"
#include "private-options.h"
@@ -48,6 +44,9 @@
#include "syntax.h"
#include "vectors.h"
+#include "eq.h"
+
+
static SCM scm_i_eq_p (SCM x, SCM y, SCM rest);
diff --git a/libguile/error.c b/libguile/error.c
index 83b17e5..cc75b50 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -24,13 +24,20 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* For Windows... */
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
-#include "gsubr.h"
#include "async.h"
#include "dynwind.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
@@ -41,15 +48,7 @@
#include "error.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#include <unistd.h>
-/* For Windows... */
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
/* {Errors and Exceptional Conditions}
diff --git a/libguile/eval.c b/libguile/eval.c
index 0d45ef9..c0b6cb4 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -26,22 +26,20 @@
#include <alloca.h>
#include <stdarg.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "alist.h"
#include "async.h"
+#include "boolean.h"
#include "continuations.h"
#include "control.h"
#include "debug.h"
#include "deprecation.h"
#include "dynwind.h"
#include "eq.h"
-#include "eval.h"
#include "expand.h"
#include "feature.h"
#include "fluids.h"
#include "goops.h"
+#include "gsubr.h"
#include "hash.h"
#include "hashtab.h"
#include "keywords.h"
@@ -50,6 +48,7 @@
#include "memoize.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "print.h"
#include "private-options.h"
@@ -67,9 +66,11 @@
#include "vectors.h"
#include "vm.h"
-
+#include "eval.h"
+
+
/* We have three levels of EVAL here:
- eval (exp, env)
diff --git a/libguile/expand.c b/libguile/expand.c
index 2a63d33..40531c8 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -23,18 +23,17 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "alist.h"
+#include "boolean.h"
#include "continuations.h"
#include "eq.h"
-#include "expand.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "keywords.h"
#include "list.h"
#include "macros.h"
#include "modules.h"
+#include "pairs.h"
#include "ports.h"
#include "print.h"
#include "srcprop.h"
@@ -44,6 +43,8 @@
#include "variable.h"
#include "vectors.h"
+#include "expand.h"
+
diff --git a/libguile/extensions.c b/libguile/extensions.c
index 58d5c22..43ac3aa 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -25,14 +25,16 @@
#include <string.h>
-#include "gsubr.h"
#include "dynl.h"
#include "dynwind.h"
-#include "extensions.h"
#include "gc.h"
+#include "gsubr.h"
#include "strings.h"
#include "threads.h"
+#include "extensions.h"
+
+
typedef struct extension_t
{
struct extension_t *next;
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index d202c9f..a932ab3 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -21,17 +21,19 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
#include "boolean.h"
-#include "extensions.h"
#include "eval.h"
+#include "extensions.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "threads.h"
+
#include "fdes-finalizers.h"
+
/* Table of fdes finalizers and associated lock. */
diff --git a/libguile/feature.c b/libguile/feature.c
index 30ce5bf..00046c9 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -19,24 +19,24 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
+#include "fluids.h"
#include "gsubr.h"
#include "modules.h"
#include "pairs.h"
#include "strings.h"
-#include "fluids.h"
#include "symbols.h"
#include "variable.h"
#include "feature.h"
+
SCM scm_program_arguments_fluid;
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 5f12977..a219417 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2006,
- * 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2018 Free Software
Foundation, Inc.
+/* Copyright (C) 1996-2002,2004,2006,2009-2014,2016-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -79,20 +79,19 @@
# include <sys/sendfile.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "async.h"
+#include "boolean.h"
#include "dynwind.h"
#include "fdes-finalizers.h"
#include "feature.h"
-#include "filesys.h"
#include "fports.h"
+#include "gsubr.h"
#include "iselect.h"
#include "list.h"
#include "load.h" /* for scm_i_mirror_backslashes */
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports-internal.h"
#include "ports.h"
#include "posix.h"
@@ -103,6 +102,9 @@
#include "syscalls.h"
#include "vectors.h"
+#include "filesys.h"
+
+
#define NAMLEN(dirent) strlen ((dirent)->d_name)
diff --git a/libguile/finalizers.c b/libguile/finalizers.c
index 46c66ef..1833bfb 100644
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@ -24,20 +24,21 @@
#endif
#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
#include <fcntl.h>
-
#include <full-write.h>
+#include <stdio.h>
+#include <unistd.h>
#include "async.h"
#include "bdw-gc.h"
-#include "finalizers.h"
#include "gc.h"
#include "gsubr.h"
#include "init.h"
#include "threads.h"
+#include "finalizers.h"
+
+
static int automatic_finalization_p = 1;
diff --git a/libguile/fluids.c b/libguile/fluids.c
index e10289d..1f853b4 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -24,8 +24,6 @@
#include <stdio.h>
#include <string.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "alist.h"
#include "atomics-internal.h"
#include "bdw-gc.h"
@@ -33,13 +31,17 @@
#include "deprecation.h"
#include "dynwind.h"
#include "eval.h"
-#include "fluids.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "list.h"
+#include "pairs.h"
#include "ports.h"
#include "print.h"
-#include "weak-table.h"
#include "variable.h"
+#include "weak-table.h"
+
+#include "fluids.h"
+
/* A dynamic state associates fluids with values. There are two
representations of a dynamic state in Guile: the active
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index d5224f4..7d7d0be 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -18,6 +18,7 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -25,7 +26,6 @@
#include "eval.h"
#include "extensions.h"
#include "finalizers.h"
-#include "foreign-object.h"
#include "goops.h"
#include "gsubr.h"
#include "list.h"
@@ -35,6 +35,8 @@
#include "threads.h"
#include "variable.h"
+#include "foreign-object.h"
+
diff --git a/libguile/foreign.c b/libguile/foreign.c
index ec10337..3fa735e 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2010-2016, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2016,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -20,15 +21,14 @@
# include <config.h>
#endif
-#include <ffi.h>
-
-#include <alloca.h>
#include <alignof.h>
-#include <string.h>
+#include <alloca.h>
#include <assert.h>
#include <errno.h>
+#include <string.h>
+
+#include <ffi.h>
-#include "gsubr.h"
#include "boolean.h"
#include "bytevectors.h"
#include "dynwind.h"
@@ -36,12 +36,12 @@
#include "eval.h"
#include "extensions.h"
#include "finalizers.h"
-#include "foreign.h"
+#include "gsubr.h"
+#include "instructions.h"
#include "keywords.h"
-#include "numbers.h"
#include "list.h"
-#include "instructions.h"
#include "modules.h"
+#include "numbers.h"
#include "pairs.h"
#include "ports.h"
#include "stacks.h"
@@ -49,6 +49,8 @@
#include "threads.h"
#include "weak-table.h"
+#include "foreign.h"
+
/* Return the first integer greater than or equal to LEN such that
diff --git a/libguile/fports.c b/libguile/fports.c
index e90732c..878d164 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-2004, 2006-2015, 2017-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2004,2006-2015,2017-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -43,24 +44,22 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/select.h>
-
#include <full-write.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "async.h"
+#include "boolean.h"
#include "dynwind.h"
#include "extensions.h"
#include "fdes-finalizers.h"
-#include "fluids.h"
#include "filesys.h"
-#include "fports.h"
+#include "fluids.h"
#include "gc.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "keywords.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports-internal.h"
#include "posix.h"
#include "read.h"
@@ -69,6 +68,9 @@
#include "syscalls.h"
#include "variable.h"
+#include "fports.h"
+
+
#if SIZEOF_OFF_T == SIZEOF_INT
#define OFF_T_MAX INT_MAX
#define OFF_T_MIN INT_MIN
diff --git a/libguile/frames.c b/libguile/frames.c
index d15c809..d73a73b 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -17,24 +17,27 @@
*/
#if HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
#include <stdlib.h>
#include <string.h>
-#include "gsubr.h"
+
#include "boolean.h"
#include "eval.h"
#include "extensions.h"
+#include "gsubr.h"
#include "modules.h"
#include "numbers.h"
-#include "frames.h"
#include "ports.h"
#include "symbols.h"
#include "threads.h"
#include "variable.h"
#include "vm.h"
+#include "frames.h"
+
+
SCM
scm_c_make_frame (enum scm_vm_frame_kind kind, const struct scm_frame *frame)
{
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index e778080..6bfd6a1 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -27,27 +27,26 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
-#include "eval.h"
-#include "stime.h"
-#include "stackchk.h"
-#include "struct.h"
-#include "smob.h"
#include "arrays.h"
#include "async.h"
+#ifdef GUILE_DEBUG_MALLOC
+#include "debug-malloc.h"
+#endif
+#include "deprecation.h"
+#include "eval.h"
+#include "hashtab.h"
#include "ports.h"
+#include "smob.h"
+#include "stackchk.h"
+#include "stime.h"
#include "strings.h"
+#include "struct.h"
#include "vectors.h"
-#include "hashtab.h"
-#include "deprecation.h"
#include "gc.h"
-#ifdef GUILE_DEBUG_MALLOC
-#include "debug-malloc.h"
-#endif
-
-#include <unistd.h>
/*
INIT_MALLOC_LIMIT is the initial amount of malloc usage which will
diff --git a/libguile/gc.c b/libguile/gc.c
index fb74750..1bfda9a 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -23,48 +23,46 @@
# include <config.h>
#endif
-#include "gen-scmconfig.h"
-#include "pairs.h"
-
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#include <unistd.h>
-#include "gsubr.h"
-#include "eval.h"
-#include "stime.h"
-#include "stackchk.h"
-#include "struct.h"
-#include "smob.h"
#include "arrays.h"
#include "async.h"
-#include "ports.h"
+#include "bdw-gc.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eval.h"
+#include "gen-scmconfig.h"
+#include "gsubr.h"
+#include "hashtab.h"
#include "hooks.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
#include "simpos.h"
+#include "smob.h"
+#include "stackchk.h"
+#include "stime.h"
#include "strings.h"
+#include "struct.h"
#include "symbols.h"
#include "vectors.h"
-#include "hashtab.h"
-#include "deprecation.h"
-#include "gc.h"
-#include "dynwind.h"
+#ifdef GUILE_DEBUG_MALLOC
+#include "debug-malloc.h"
+#endif
-#include "bdw-gc.h"
+#include "gc.h"
/* For GC_set_start_callback. */
#include <gc/gc_mark.h>
-#ifdef GUILE_DEBUG_MALLOC
-#include "debug-malloc.h"
-#endif
-
-#include <unistd.h>
/* Size in bytes of the initial heap. This should be about the size of
result of 'guile -c "(display (assq-ref (gc-stats)
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index 7eab6c2..d7f1ad3 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -20,19 +20,20 @@
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
#include <string.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "array-handle.h"
-#include "generalized-arrays.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
+
+#include "generalized-arrays.h"
SCM_INTERNAL SCM scm_i_array_ref (SCM v,
diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c
index b9faa0c..f3084bb 100644
--- a/libguile/generalized-vectors.c
+++ b/libguile/generalized-vectors.c
@@ -24,8 +24,8 @@
# include <config.h>
#endif
-#include "gsubr.h"
#include "error.h"
+#include "gsubr.h"
#include "generalized-vectors.h"
diff --git a/libguile/gettext.c b/libguile/gettext.c
index c72f017..9227438 100644
--- a/libguile/gettext.c
+++ b/libguile/gettext.c
@@ -21,15 +21,16 @@
# include <config.h>
#endif
-#include "gsubr.h"
+#include <locale.h>
+
+#include "dynwind.h"
#include "feature.h"
-#include "strings.h"
+#include "gsubr.h"
+#include "libgettext.h"
#include "numbers.h"
-#include "dynwind.h"
+#include "strings.h"
#include "gettext.h"
-#include "libgettext.h"
-#include <locale.h>
int
diff --git a/libguile/goops.c b/libguile/goops.c
index e5d6244..d179e01 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -28,8 +28,8 @@
# include <config.h>
#endif
-#include "boolean.h"
#include "async.h"
+#include "boolean.h"
#include "chars.h"
#include "dynwind.h"
#include "eval.h"
@@ -42,8 +42,8 @@
#include "modules.h"
#include "numbers.h"
#include "pairs.h"
-#include "ports.h"
#include "ports-internal.h"
+#include "ports.h"
#include "procprop.h"
#include "programs.h"
#include "smob.h"
@@ -56,6 +56,7 @@
#include "goops.h"
+
/* Objects have identity, so references to classes and instances are by
value, not by reference. Redefinition of a class or modification of
an instance causes in-place update; you can think of GOOPS as
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 42d356d..13756dc 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2001, 2006, 2008-2011, 2013, 2015, 2018
+/* Copyright (C) 1995-2001,2006,2008-2011,2013,2015,2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -27,7 +28,6 @@
#include "foreign.h"
#include "frames.h"
-#include "gsubr.h"
#include "instructions.h"
#include "modules.h"
#include "numbers.h"
@@ -36,6 +36,9 @@
#include "srfi-4.h"
#include "symbols.h"
+#include "gsubr.h"
+
+
/*
* gsubr.c
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 08b8aa1..9bbdc0a 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1998,1999,2000,2001, 2006, 2008, 2009, 2011,
- * 2012, 2013, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2001,2006,2008-2009,2011-2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -49,23 +49,23 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
-
#include "bdw-gc.h"
+#include "boolean.h"
#include "deprecation.h"
#include "eval.h"
-#include "guardians.h"
+#include "gsubr.h"
#include "hashtab.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "print.h"
#include "smob.h"
#include "threads.h"
#include "weak-vector.h"
+#include "guardians.h"
+
static scm_t_bits tc16_guardian;
diff --git a/libguile/guile.c b/libguile/guile.c
index 2ab3103..a056383 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -18,7 +18,6 @@
*/
/* This is the 'main' function for the `guile' executable. It is not
- included in libguile.a.
Eventually, we hope this file will be automatically generated,
based on the list of installed, statically linked libraries on the
diff --git a/libguile/hash.c b/libguile/hash.c
index e9540b2..6391f32 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -19,6 +19,7 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -31,12 +32,12 @@
#include <string.h>
#include <unistr.h>
-#include "gsubr.h"
#include "chars.h"
#include "foreign.h"
+#include "gsubr.h"
+#include "numbers.h"
#include "pairs.h"
#include "ports.h"
-#include "numbers.h"
#include "strings.h"
#include "struct.h"
#include "symbols.h"
@@ -44,6 +45,8 @@
#include "vectors.h"
#include "hash.h"
+
+
#ifndef floor
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index c5510e0..b80cac4 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -24,25 +24,26 @@
#endif
#include <alloca.h>
-#include <stdio.h>
#include <assert.h>
+#include <stdio.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "alist.h"
-#include "boolean.h"
#include "bdw-gc.h"
+#include "boolean.h"
#include "eq.h"
#include "eval.h"
+#include "gsubr.h"
#include "hash.h"
-#include "hashtab.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "procs.h"
#include "vectors.h"
#include "weak-table.h"
+#include "hashtab.h"
+
diff --git a/libguile/hooks.c b/libguile/hooks.c
index c8963b9..2c94b51 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -19,18 +19,19 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
+#include "boolean.h"
#include "eval.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "procprop.h"
#include "smob.h"
@@ -38,6 +39,7 @@
#include "hooks.h"
+
/* Scheme level hooks
*
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 3095452..c68a779 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -21,32 +21,33 @@
#endif
#include <alloca.h>
+#include <locale.h>
+#include <string.h> /* `strcoll ()' */
+#include <ctype.h> /* `toupper ()' et al. */
+#include <errno.h>
+#include <unicase.h>
+#include <unistr.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "boolean.h"
+#include "chars.h"
+#include "dynwind.h"
#include "extensions.h"
#include "feature.h"
-#include "i18n.h"
+#include "gsubr.h"
#include "list.h"
-#include "strings.h"
-#include "chars.h"
#include "modules.h"
#include "numbers.h"
-#include "dynwind.h"
-#include "syscalls.h"
+#include "pairs.h"
+#include "posix.h" /* for `scm_i_locale_mutex' */
#include "smob.h"
+#include "strings.h"
#include "symbols.h"
+#include "syscalls.h"
+#include "threads.h"
#include "values.h"
#include "variable.h"
-#include "threads.h"
-#include <locale.h>
-#include <string.h> /* `strcoll ()' */
-#include <ctype.h> /* `toupper ()' et al. */
-#include <errno.h>
-#include <unicase.h>
-#include <unistr.h>
+#include "i18n.h"
#if defined HAVE_NEWLOCALE && defined HAVE_STRCOLL_L && defined HAVE_USELOCALE
/* The GNU thread-aware locale API is documented in ``Thread-Aware Locale
@@ -65,8 +66,6 @@
# define USE_GNU_LOCALE_API
#endif
-#include "posix.h" /* for `scm_i_locale_mutex' */
-
/* Use Gnulib's header, which also provides `nl_item' & co. */
#include <langinfo.h>
diff --git a/libguile/init.c b/libguile/init.c
index 6a4f216..a898440 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -18,22 +18,24 @@
-/* Include the headers for just about everything.
- We call all their initialization functions. */
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
-#include <stdlib.h>
+#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
-#include <fcntl.h>
-#include <gmp.h>
+#include <unistd.h>
+#include <gmp.h>
/* Everybody has an init function. */
#include "alist.h"
+#include "array-map.h"
+#include "arrays.h"
#include "async.h"
#include "atomic.h"
#include "backtrace.h"
@@ -41,12 +43,13 @@
#include "boolean.h"
#include "bytevectors.h"
#include "chars.h"
-#include "control.h"
#include "continuations.h"
+#include "control.h"
#include "debug.h"
#ifdef GUILE_DEBUG_MALLOC
#include "debug-malloc.h"
#endif
+#include "deprecated.h"
#include "deprecation.h"
#include "dynl.h"
#include "dynwind.h"
@@ -55,23 +58,26 @@
#include "eval.h"
#include "evalext.h"
#include "expand.h"
+#include "extensions.h"
#include "fdes-finalizers.h"
#include "feature.h"
#include "filesys.h"
#include "finalizers.h"
#include "fluids.h"
+#include "foreign-object.h"
#include "foreign.h"
#include "fports.h"
#include "frames.h"
#include "gc.h"
#include "generalized-arrays.h"
#include "generalized-vectors.h"
+#include "gettext.h"
#include "goops.h"
#include "gsubr.h"
+#include "guardians.h"
#include "hash.h"
#include "hashtab.h"
#include "hooks.h"
-#include "gettext.h"
#include "i18n.h"
#include "instructions.h"
#include "intrinsics.h"
@@ -79,28 +85,29 @@
#include "keywords.h"
#include "list.h"
#include "load.h"
+#include "loader.h"
#include "macros.h"
#include "mallocs.h"
#include "memoize.h"
#include "modules.h"
#include "net_db.h"
#include "numbers.h"
-#include "loader.h"
#include "objprop.h"
#include "options.h"
#include "pairs.h"
#include "poll.h"
#include "ports.h"
#include "posix.h"
-#ifdef ENABLE_REGEX
-#include "regex-posix.h"
-#endif
#include "print.h"
+#include "private-options.h"
#include "procprop.h"
#include "procs.h"
#include "programs.h"
#include "promises.h"
-#include "array-map.h"
+#ifdef ENABLE_REGEX
+#include "regex-posix.h"
+#endif
+#include "r6rs-ports.h"
#include "random.h"
#include "rdelim.h"
#include "read.h"
@@ -112,47 +119,35 @@
#include "socket.h"
#include "sort.h"
#include "srcprop.h"
-#include "stackchk.h"
-#include "stacks.h"
-#include "stime.h"
-#include "strings.h"
#include "srfi-1.h"
-#include "srfi-4.h"
#include "srfi-13.h"
#include "srfi-14.h"
+#include "srfi-4.h"
#include "srfi-60.h"
+#include "stackchk.h"
+#include "stacks.h"
+#include "stime.h"
+#include "strings.h"
#include "strorder.h"
#include "strports.h"
#include "struct.h"
#include "symbols.h"
#include "syntax.h"
#include "throw.h"
-#include "arrays.h"
#include "trees.h"
#include "unicode.h"
+#include "uniform.h"
#include "values.h"
#include "variable.h"
#include "vectors.h"
#include "version.h"
#include "vm.h"
#include "vports.h"
-#include "guardians.h"
-#include "extensions.h"
-#include "uniform.h"
-#include "deprecated.h"
#include "weak-set.h"
#include "weak-table.h"
#include "weak-vector.h"
-#include "foreign-object.h"
-#include "r6rs-ports.h"
#include "init.h"
-#include "private-options.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#include <unistd.h>
diff --git a/libguile/inline.c b/libguile/inline.c
index f926813..8c5db65 100644
--- a/libguile/inline.c
+++ b/libguile/inline.c
@@ -23,9 +23,10 @@
#define SCM_IMPLEMENT_INLINES 1
#define SCM_INLINE_C_IMPLEMENTING_INLINES 1
-#include "gc.h"
+
#include "array-handle.h"
-#include "smob.h"
+#include "gc.h"
#include "pairs.h"
#include "ports.h"
+#include "smob.h"
#include "strings.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 0b00fff..33d2cd4 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009-2013, 2017-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2009-2013,2017-2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -20,16 +20,15 @@
# include <config.h>
#endif
-#include <string.h>
-
+#include "extensions.h"
#include "gsubr.h"
-#include "threads.h"
#include "list.h"
#include "numbers.h"
#include "pairs.h"
#include "symbols.h"
+#include "threads.h"
+
#include "instructions.h"
-#include "extensions.h"
SCM_SYMBOL (sym_left_arrow, "<-");
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index d910b6f..37e0d9a 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 Free Software Foundation, Inc.
+/* Copyright (C) 2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -20,17 +21,18 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "boolean.h"
#include "alist.h"
+#include "boolean.h"
#include "cache-internal.h"
#include "extensions.h"
#include "fluids.h"
#include "goops.h"
+#include "gsubr.h"
#include "keywords.h"
#include "modules.h"
#include "numbers.h"
#include "symbols.h"
+
#include "intrinsics.h"
diff --git a/libguile/ioext.c b/libguile/ioext.c
index de69655..b16337a 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -24,32 +24,34 @@
# include <config.h>
#endif
-#include <stdio.h>
#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
-#include "gsubr.h"
-#include "pairs.h"
#include "async.h"
#include "dynwind.h"
#include "extensions.h"
#include "fdes-finalizers.h"
#include "feature.h"
#include "fports.h"
+#include "gsubr.h"
#include "hashtab.h"
-#include "ioext.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports-internal.h"
#include "ports.h"
#include "strings.h"
#include "syscalls.h"
#include "weak-set.h"
-#include <fcntl.h>
+#include "ioext.h"
+
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-#include <unistd.h>
SCM_DEFINE (scm_ftell, "ftell", 1, 0, 0,
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 0762d28..94b19cf 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004,
- * 2006, 2008, 2009, 2011, 2013, 2015, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2001,2003-2004,2006,2008-2009,2011,2013,2015,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -26,14 +26,14 @@
#include <string.h>
#include <stdarg.h>
-#include "gsubr.h"
#include "async.h"
+#include "dynwind.h"
+#include "gsubr.h"
+#include "hashtab.h"
#include "list.h"
#include "pairs.h"
#include "ports.h"
#include "smob.h"
-#include "dynwind.h"
-#include "hashtab.h"
#include "strings.h"
#include "symbols.h"
diff --git a/libguile/list.c b/libguile/list.c
index 6975f5c..ebad7b6 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -23,19 +23,21 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
+#include <stdarg.h>
+
#include "boolean.h"
+#include "eq.h"
+#include "eval.h"
+#include "gsubr.h"
#include "numbers.h"
+#include "pairs.h"
#include "procs.h"
-#include "eq.h"
#include "list.h"
-#include "eval.h"
-#include <stdarg.h>
+
/* creating lists */
#define SCM_I_CONS(cell, x, y) \
diff --git a/libguile/load.c b/libguile/load.c
index fb247d8..50e1881 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2004, 2006, 2008,
- * 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Free Software Foundation,
Inc.
+/* Copyright (C) 1995-1996,1998-2001,2004,2006,2008-2014,2017-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,21 +24,29 @@
# include <config.h>
#endif
+#include <stat-time.h>
#include <string.h>
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif /* HAVE_PWD_H */
-#include "gsubr.h"
-#include "boolean.h"
#include "alist.h"
+#include "backtrace.h"
+#include "boolean.h"
#include "chars.h"
#include "dynwind.h"
#include "eq.h"
-#include "strports.h"
-#include "backtrace.h"
-#include "keywords.h"
#include "eval.h"
#include "filesys.h"
+#include "fluids.h"
#include "fports.h"
+#include "gsubr.h"
+#include "keywords.h"
#include "libpath.h"
#include "list.h"
#include "loader.h"
@@ -47,29 +55,18 @@
#include "read.h"
#include "srfi-13.h"
#include "strings.h"
+#include "strports.h"
#include "symbols.h"
#include "throw.h"
#include "variable.h"
-
-#include "load.h"
-#include "fluids.h"
-
#include "vm.h" /* for load-compiled/vm */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif /* HAVE_PWD_H */
+#include "load.h"
#ifndef R_OK
#define R_OK 4
#endif
-#include <stat-time.h>
-
/* Loading a file, given an absolute filename. */
diff --git a/libguile/loader.c b/libguile/loader.c
index e537ea8..92e4f8f 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -21,36 +21,36 @@
# include <config.h>
#endif
-#include <string.h>
+#include <alignof.h>
+#include <assert.h>
+#include <byteswap.h>
+#include <errno.h>
#include <fcntl.h>
+#include <full-read.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
+#include <verify.h>
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <alignof.h>
-#include <byteswap.h>
-#include <errno.h>
-#include <verify.h>
-
-#include <full-read.h>
-
-#include "gsubr.h"
-#include "bytevectors.h"
#include "boolean.h"
+#include "bytevectors.h"
#include "elf.h"
#include "eval.h"
#include "extensions.h"
+#include "gsubr.h"
#include "pairs.h"
#include "programs.h"
#include "strings.h"
#include "threads.h"
+
#include "loader.h"
+
/* This file contains the loader for Guile's on-disk format: ELF with
some custom tags in the dynamic segment. */
diff --git a/libguile/macros.c b/libguile/macros.c
index 21915cc..003e01f 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -22,19 +22,19 @@
# include <config.h>
#endif
-#include "gsubr.h"
#include "boolean.h"
+#include "gsubr.h"
#include "modules.h"
#include "ports.h"
#include "print.h"
+#include "private-options.h"
#include "procs.h"
#include "random.h"
#include "smob.h"
#include "symbols.h"
-#include "macros.h"
#include "variable.h"
-#include "private-options.h"
+#include "macros.h"
static scm_t_bits scm_tc16_macro;
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 8ab46df..4b90965 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -25,14 +25,13 @@
#endif
#include <stdlib.h>
+#include <unistd.h>
#include "ports.h"
#include "smob.h"
#include "mallocs.h"
-#include <unistd.h>
-
scm_t_bits scm_tc16_malloc;
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 56ac6e7..e62530e 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -27,29 +27,30 @@
#include <string.h>
#include <stdio.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
#include "alist.h"
+#include "boolean.h"
#include "continuations.h"
#include "dynstack.h"
#include "eq.h"
#include "expand.h"
+#include "gsubr.h"
#include "list.h"
#include "macros.h"
-#include "memoize.h"
#include "modules.h"
#include "numbers.h"
-#include "srcprop.h"
+#include "pairs.h"
#include "ports.h"
#include "print.h"
+#include "srcprop.h"
#include "strings.h"
#include "symbols.h"
-#include "throw.h"
#include "threads.h"
+#include "throw.h"
#include "variable.h"
#include "vectors.h"
+#include "memoize.h"
+
diff --git a/libguile/modules.c b/libguile/modules.c
index 4077929..a751c2e 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -24,25 +24,25 @@
#include <stdarg.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "boolean.h"
-
+#include "deprecation.h"
#include "eval.h"
+#include "fluids.h"
+#include "gsubr.h"
+#include "hashtab.h"
+#include "keywords.h"
#include "list.h"
-#include "smob.h"
+#include "pairs.h"
#include "procprop.h"
-#include "vectors.h"
-#include "keywords.h"
-#include "hashtab.h"
+#include "smob.h"
#include "struct.h"
#include "symbols.h"
#include "variable.h"
-#include "fluids.h"
-#include "deprecation.h"
+#include "vectors.h"
#include "modules.h"
+
int scm_module_system_booted_p = 0;
scm_t_bits scm_module_tag;
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 2e357a2..d28ece5 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -45,21 +45,21 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "boolean.h"
+#include "dynwind.h"
#include "feature.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "socket.h"
#include "strings.h"
-#include "vectors.h"
-#include "dynwind.h"
#include "symbols.h"
#include "throw.h"
+#include "vectors.h"
#include "net_db.h"
-#include "socket.h"
#if defined (HAVE_H_ERRNO)
diff --git a/libguile/null-threads.c b/libguile/null-threads.c
index 0b2c0fe..4f72b44 100644
--- a/libguile/null-threads.c
+++ b/libguile/null-threads.c
@@ -22,8 +22,8 @@
#include <stdlib.h>
-#if SCM_USE_NULL_THREADS
+#if SCM_USE_NULL_THREADS
#include "null-threads.h"
static scm_i_pthread_key_t *all_keys = NULL;
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 3f5490c..9fe8115 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2016, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016,2018 Free Software Foundation, Inc.
*
* Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
* and Bellcore. See scm_divide.
@@ -42,40 +42,37 @@
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
-#include <verify.h>
#include <assert.h>
-
#include <math.h>
+#include <stdarg.h>
#include <string.h>
#include <unicase.h>
#include <unictype.h>
+#include <verify.h>
#if HAVE_COMPLEX_H
#include <complex.h>
#endif
-#include <stdarg.h>
-
-#include "gsubr.h"
+#include "bdw-gc.h"
#include "boolean.h"
+#include "deprecation.h"
+#include "eq.h"
#include "feature.h"
+#include "finalizers.h"
+#include "goops.h"
+#include "gsubr.h"
+#include "modules.h"
#include "pairs.h"
#include "ports.h"
-#include "finalizers.h"
#include "smob.h"
#include "strings.h"
-#include "modules.h"
-#include "bdw-gc.h"
-#include "goops.h"
#include "values.h"
#include "numbers.h"
-#include "deprecation.h"
-
-#include "eq.h"
/* values per glibc, if not already defined */
#ifndef M_LOG10E
diff --git a/libguile/objprop.c b/libguile/objprop.c
index e93624b..2e5a620 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008, 2009, 2010,
2011, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000-2001,2003,2006,2008-2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -18,17 +19,21 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "gsubr.h"
#include "alist.h"
#include "async.h"
+#include "gsubr.h"
#include "hashtab.h"
-#include "objprop.h"
#include "pairs.h"
#include "weak-table.h"
+
+#include "objprop.h"
+
+
/* {Object Properties}
diff --git a/libguile/options.c b/libguile/options.c
index 8906b42..6a4dd71 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -22,15 +22,17 @@
# include <config.h>
#endif
-#include "pairs.h"
#include "boolean.h"
#include "list.h"
#include "mallocs.h"
#include "numbers.h"
+#include "pairs.h"
#include "strings.h"
#include "symbols.h"
#include "options.h"
+
+
/* {Run-time options}
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 76afd06..1d68304 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -23,11 +23,12 @@
# include <config.h>
#endif
+#include <verify.h>
+
#include "boolean.h"
#include "gsubr.h"
-#include "pairs.h"
-#include "verify.h"
+#include "pairs.h"
diff --git a/libguile/poll.c b/libguile/poll.c
index cdda329..1e7924d 100644
--- a/libguile/poll.c
+++ b/libguile/poll.c
@@ -41,6 +41,7 @@
#include "poll.h"
+
/* {Poll}
diff --git a/libguile/ports.c b/libguile/ports.c
index ada6136..8f0aedd 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -19,7 +19,6 @@
-/* Headers. */
#define _LARGEFILE64_SOURCE /* ask for stat64 etc */
@@ -28,62 +27,60 @@
#endif
#include <assert.h>
-#include <stdio.h>
+#include <assert.h>
#include <errno.h>
#include <fcntl.h> /* for chsize on mingw */
-#include <assert.h>
#include <iconv.h>
#include <poll.h>
+#include <stdio.h>
+#include <striconveh.h>
+#include <string.h>
#include <uniconv.h>
+#include <unistd.h>
#include <unistr.h>
-#include <striconveh.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#include "alist.h"
#include "async.h"
#include "atomics-internal.h"
-#include "deprecation.h"
-#include "eval.h"
-#include "fports.h" /* direct access for seek and truncate */
-#include "goops.h"
-#include "smob.h"
+#include "boolean.h"
#include "chars.h"
+#include "deprecation.h"
#include "dynwind.h"
+#include "eq.h"
+#include "eval.h"
#include "extensions.h"
#include "finalizers.h"
-#include "keywords.h"
+#include "fluids.h"
+#include "fports.h" /* direct access for seek and truncate */
+#include "goops.h"
+#include "gsubr.h"
#include "hashtab.h"
-#include "strings.h"
+#include "keywords.h"
#include "mallocs.h"
#include "modules.h"
#include "numbers.h"
-#include "ports.h"
+#include "pairs.h"
#include "ports-internal.h"
#include "private-options.h"
#include "procs.h"
+#include "smob.h"
+#include "strings.h"
#include "symbols.h"
#include "syscalls.h"
#include "variable.h"
#include "vectors.h"
#include "weak-set.h"
-#include "fluids.h"
-#include "eq.h"
-#include "alist.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
-
-#include <unistd.h>
+#include "ports.h"
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
/* Mingw (version 3.4.5, circa 2006) has ftruncate as an alias for chsize
already, but have this code here in case that wasn't so in past versions,
diff --git a/libguile/posix-w32.c b/libguile/posix-w32.c
index 438d2c2..d9e0b56 100644
--- a/libguile/posix-w32.c
+++ b/libguile/posix-w32.c
@@ -32,10 +32,11 @@
#include <io.h>
#include <fcntl.h>
-#include "posix-w32.h"
#include "gc.h" /* for scm_*alloc, scm_strdup */
#include "threads.h" /* for scm_i_scm_pthread_mutex_lock */
+#include "posix-w32.h"
+
/*
* Get name and information about current kernel.
*/
diff --git a/libguile/posix.c b/libguile/posix.c
index 2c48451..e416fb9 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -22,18 +22,20 @@
# include <config.h>
#endif
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <uniconv.h>
+#include <unistd.h>
#ifdef HAVE_SCHED_H
# include <sched.h>
#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@ -45,52 +47,45 @@
# endif
#endif
-#include <unistd.h>
-
#ifdef LIBC_H_WITH_UNISTD_H
-#include <libc.h>
+# include <libc.h>
#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
#ifdef HAVE_PWD_H
-#include <pwd.h>
+# include <pwd.h>
#endif
#ifdef HAVE_IO_H
-#include <io.h>
+# include <io.h>
+#endif
+
+#ifdef __MINGW32__
+# include "posix-w32.h"
#endif
-#include "gsubr.h"
-#include "pairs.h"
#include "async.h"
+#include "bitvectors.h"
#include "dynwind.h"
#include "extensions.h"
+#include "feature.h"
#include "finalizers.h"
#include "fports.h"
+#include "gettext.h"
+#include "gsubr.h"
#include "list.h"
-#include "bitvectors.h"
-#include "scmsigs.h"
-#include "feature.h"
#include "modules.h"
#include "numbers.h"
-#include "strings.h"
+#include "pairs.h"
+#include "scmsigs.h"
#include "srfi-13.h"
#include "srfi-14.h"
+#include "strings.h"
#include "symbols.h"
#include "syscalls.h"
-#include "vectors.h"
+#include "threads.h"
#include "values.h"
+#include "vectors.h"
#include "posix.h"
-#include "gettext.h"
-#include "threads.h"
-
-
-#ifdef __MINGW32__
-# include "posix-w32.h"
-#endif
#if HAVE_SYS_WAIT_H
# include <sys/wait.h>
diff --git a/libguile/print.c b/libguile/print.c
index 5e08fc1..1200312 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995-1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008,
- * 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018 Free Software
Foundation, Inc.
+/* Copyright (C) 1995-2004,2006,2008,2009-2015,2017-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -30,45 +30,45 @@
#include <uniconv.h>
#include <unictype.h>
-#include "gsubr.h"
-#include "pairs.h"
+#include "alist.h"
+#include "arrays.h"
+#include "atomic.h"
+#include "bitvectors.h"
#include "boolean.h"
#include "chars.h"
#include "continuations.h"
-#include "smob.h"
#include "control.h"
#include "eval.h"
+#include "fluids.h"
#include "foreign.h"
#include "goops.h"
+#include "gsubr.h"
#include "hashtab.h"
-#include "weak-set.h"
-#include "weak-table.h"
-#include "fluids.h"
#include "keywords.h"
-#include "atomic.h"
-#include "bitvectors.h"
-#include "arrays.h"
-#include "weak-vector.h"
#include "macros.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports-internal.h"
+#include "ports.h"
+#include "private-options.h"
#include "procprop.h"
-#include "read.h"
#include "programs.h"
-#include "alist.h"
-#include "struct.h"
-#include "ports.h"
-#include "ports-internal.h"
+#include "read.h"
+#include "smob.h"
#include "strings.h"
#include "strports.h"
+#include "struct.h"
#include "symbols.h"
#include "syntax.h"
#include "variable.h"
#include "vectors.h"
-#include "numbers.h"
#include "vm.h"
+#include "weak-set.h"
+#include "weak-table.h"
+#include "weak-vector.h"
#include "print.h"
-#include "private-options.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index b154072..2eea844 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -19,28 +19,30 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "pairs.h"
-#include "boolean.h"
-
#include "alist.h"
+#include "boolean.h"
#include "eval.h"
-#include "list.h"
-#include "procs.h"
#include "gsubr.h"
+#include "list.h"
#include "numbers.h"
+#include "pairs.h"
+#include "procs.h"
+#include "programs.h"
#include "smob.h"
#include "symbols.h"
#include "threads.h"
#include "vectors.h"
-#include "weak-table.h"
-#include "programs.h"
#include "vm-builtins.h"
+#include "weak-table.h"
#include "procprop.h"
+
+
SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
diff --git a/libguile/procs.c b/libguile/procs.c
index ca16a4b..4324a78 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1997, 1999-2001, 2006, 2008-2013, 2017-2018
+/* Copyright (C) 1995-1997,1999-2001,2006,2008-2013,2017-2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -23,23 +23,22 @@
# include <config.h>
#endif
-#include "gsubr.h"
-
+#include "deprecation.h"
#include "goops.h"
-#include "strings.h"
-#include "vectors.h"
+#include "gsubr.h"
+#include "loader.h"
+#include "procprop.h"
+#include "programs.h"
#include "smob.h"
+#include "strings.h"
#include "struct.h"
-#include "deprecation.h"
-#include "procprop.h"
#include "symbols.h"
-#include "loader.h"
-#include "programs.h"
+#include "vectors.h"
#include "procs.h"
-
+
/* {Procedures}
*/
diff --git a/libguile/programs.c b/libguile/programs.c
index 1f23aa9..bc32286 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2009-2014, 2017-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2009-2014,2017-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,21 +22,23 @@
#endif
#include <string.h>
-#include "gsubr.h"
-#include "boolean.h"
-#include "instructions.h"
+
#include "alist.h"
+#include "boolean.h"
#include "eval.h"
#include "extensions.h"
+#include "gsubr.h"
+#include "instructions.h"
#include "modules.h"
#include "numbers.h"
#include "pairs.h"
#include "ports.h"
-#include "programs.h"
#include "procprop.h" /* scm_sym_name */
#include "variable.h"
#include "vm.h"
+#include "programs.h"
+
static SCM write_program = SCM_BOOL_F;
diff --git a/libguile/promises.c b/libguile/promises.c
index 38b6932..a843cc6 100644
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -25,7 +25,6 @@
#include <alloca.h>
-#include "gsubr.h"
#include "alist.h"
#include "async.h"
#include "continuations.h"
@@ -37,6 +36,7 @@
#include "feature.h"
#include "fluids.h"
#include "goops.h"
+#include "gsubr.h"
#include "hash.h"
#include "hashtab.h"
#include "list.h"
@@ -55,12 +55,12 @@
#include "threads.h"
#include "throw.h"
#include "values.h"
+
#include "promises.h"
-
scm_t_bits scm_tc16_promise;
SCM_DEFINE (scm_make_promise, "make-promise", 1, 0, 0,
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 26db9fe..b98355c 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -25,22 +25,22 @@
#include <string.h>
#include <stdio.h>
#include <assert.h>
-
-#include "gsubr.h"
#include "boolean.h"
#include "bytevectors.h"
#include "chars.h"
#include "eval.h"
#include "extensions.h"
-#include "procs.h"
+#include "gsubr.h"
#include "numbers.h"
-#include "r6rs-ports.h"
-#include "strings.h"
+#include "ports-internal.h"
+#include "procs.h"
#include "smob.h"
+#include "strings.h"
#include "symbols.h"
#include "values.h"
#include "vectors.h"
-#include "ports-internal.h"
+
+#include "r6rs-ports.h"
diff --git a/libguile/random.c b/libguile/random.c
index 30364c1..1d52133 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -18,40 +18,41 @@
*/
-
/* Original Author: Mikael Djurfeldt <address@hidden> */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <gmp.h>
-#include <stdio.h>
#include <math.h>
+#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
-#include "gsubr.h"
-#include "smob.h"
+#include <gmp.h>
+
+#include "arrays.h"
+#include "feature.h"
#include "generalized-arrays.h"
+#include "generalized-vectors.h"
+#include "gsubr.h"
#include "list.h"
-#include "numbers.h"
-#include "feature.h"
#include "modules.h"
#include "numbers.h"
+#include "numbers.h"
#include "pairs.h"
+#include "smob.h"
+#include "srfi-4.h"
#include "stime.h"
#include "strings.h"
#include "symbols.h"
-#include "arrays.h"
-#include "srfi-4.h"
#include "variable.h"
#include "vectors.h"
-#include "generalized-vectors.h"
#include "random.h"
+
/*
* A plugin interface for RNGs
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index ee62280..b917c5d 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -20,26 +20,23 @@
# include <config.h>
#endif
-#include "boolean.h"
-#include "gsubr.h"
-#include "pairs.h"
-
#include <stdio.h>
-
-#ifdef HAVE_STRING_H
#include <string.h>
-#endif
+#include "boolean.h"
#include "chars.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
-#include "rdelim.h"
-#include "strings.h"
#include "srfi-13.h"
+#include "strings.h"
#include "strports.h"
+#include "rdelim.h"
+
SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
(SCM delims, SCM str, SCM gobble, SCM port, SCM start, SCM end),
"Read characters from @var{port} into @var{str} until one of the\n"
diff --git a/libguile/read.c b/libguile/read.c
index 72151c4..302c3bc 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1997, 1999-2001, 2003-2004, 2006-2012, 2014-2015, 2018
+/* Copyright (C) 1995-1997,1999-2001,2003-2004,2006-2012,2014-2015,2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -24,45 +24,45 @@
# include <config.h>
#endif
+#include <alloca.h>
+#include <c-ctype.h>
+#include <c-strcase.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
#include <unicase.h>
#include <unictype.h>
-#include <c-strcase.h>
-#include <c-ctype.h>
-#include <alloca.h>
+#include <unistd.h>
-#include "gsubr.h"
-#include "pairs.h"
+#include "alist.h"
+#include "arrays.h"
+#include "bitvectors.h"
#include "boolean.h"
#include "bytevectors.h"
#include "chars.h"
-#include "eval.h"
-#include "arrays.h"
-#include "bitvectors.h"
-#include "keywords.h"
-#include "alist.h"
-#include "srcprop.h"
-#include "hashtab.h"
-#include "hash.h"
#include "eq.h"
+#include "eval.h"
#include "fluids.h"
+#include "fports.h"
+#include "gsubr.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "keywords.h"
#include "modules.h"
#include "numbers.h"
-#include "ports.h"
+#include "pairs.h"
#include "ports-internal.h"
-#include "fports.h"
+#include "ports.h"
+#include "private-options.h"
+#include "srcprop.h"
+#include "srfi-13.h"
+#include "srfi-4.h"
#include "strings.h"
#include "strports.h"
+#include "symbols.h"
#include "variable.h"
#include "vectors.h"
-#include "srfi-4.h"
-#include "srfi-13.h"
-#include "symbols.h"
#include "read.h"
-#include "private-options.h"
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 1776877..37f836a 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2001,2004,2006-2007,2010-2012,2018
+/* Copyright (C) 1997-2001,2004,2006-2007,2010-2012,2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -32,29 +32,27 @@
# include <config.h>
#endif
+#include <regex.h>
#include <string.h>
#include <sys/types.h>
-#include "gsubr.h"
-#include "pairs.h"
-
-#include <regex.h>
-
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
#include "async.h"
+#include "feature.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
#include "smob.h"
+#include "strings.h"
+#include "strports.h"
#include "symbols.h"
#include "vectors.h"
-#include "strports.h"
-#include "ports.h"
-#include "feature.h"
-#include "strings.h"
#include "regex-posix.h"
diff --git a/libguile/rw.c b/libguile/rw.c
index d8c0c2d..6666e8f 100644
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2006, 2009, 2011, 2014, 2018 Free Software Foundation,
Inc.
+/* Copyright (C) 2001,2006,2009,2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -26,23 +27,25 @@
#include <errno.h>
#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
-#include "gsubr.h"
#include "async.h"
#include "fports.h"
+#include "gsubr.h"
+#include "modules.h"
#include "numbers.h"
+#include "ports-internal.h"
#include "ports.h"
-#include "rw.h"
#include "strings.h"
-#include "modules.h"
#include "strports.h"
#include "syscalls.h"
-#include "ports-internal.h"
-#include <unistd.h>
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
+#include "rw.h"
+
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 3fef0c7..af2f2dd 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -41,22 +41,21 @@
#include <full-write.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
-
#include "async.h"
+#include "boolean.h"
#include "dynwind.h"
-#include "feature.h"
#include "eval.h"
+#include "feature.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "procs.h"
-#include "variable.h"
-#include "vectors.h"
#include "syscalls.h"
#include "threads.h"
+#include "variable.h"
+#include "vectors.h"
#include "scmsigs.h"
diff --git a/libguile/script.c b/libguile/script.c
index 08f2aa0..9f014ed 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -23,35 +23,33 @@
# include <config.h>
#endif
+#include <ctype.h>
+#include <errno.h>
#include <localcharset.h>
-#include <stdlib.h>
#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
#include <uniconv.h>
+#include <unistd.h> /* for X_OK define */
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
-#include "pairs.h"
#include "eval.h"
#include "feature.h"
#include "fluids.h"
#include "load.h"
#include "modules.h"
+#include "pairs.h"
#include "read.h"
-#include "script.h"
#include "strings.h"
#include "strports.h"
#include "version.h"
#include "vm.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <unistd.h> /* for X_OK define */
+#include "script.h"
-#ifdef HAVE_IO_H
-#include <io.h>
-#endif
/* Concatentate str2 onto str1 at position n and return concatenated
string if file exists; 0 otherwise. */
diff --git a/libguile/simpos.c b/libguile/simpos.c
index fb52949..85bd2c0 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -29,9 +29,9 @@
#include "boolean.h"
#include "gsubr.h"
-
#include "numbers.h"
#include "strings.h"
+
#include "simpos.h"
diff --git a/libguile/smob.c b/libguile/smob.c
index 653bd2e..38d5f84 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2006,
- * 2009, 2010, 2011, 2012, 2013, 2015, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2001,2003-2004,2006,2009-2013,2015,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -19,18 +19,20 @@
+
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
#include "async.h"
+#include "bdw-gc.h"
+#include "finalizers.h"
#include "goops.h"
#include "gsubr.h"
-#include "finalizers.h"
#include "instructions.h"
#include "numbers.h"
#include "ports.h"
@@ -38,7 +40,6 @@
#include "smob.h"
-#include "bdw-gc.h"
#include <gc/gc_mark.h>
diff --git a/libguile/socket.c b/libguile/socket.c
index 0803b16..7db7e40 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -34,8 +34,8 @@
#include <string.h>
#endif
#include <unistd.h>
-#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/types.h>
#ifdef HAVE_UNIX_DOMAIN_SOCKETS
#include <sys/un.h>
#endif
@@ -46,22 +46,22 @@
#include <gmp.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "async.h"
#include "arrays.h"
+#include "async.h"
#include "bytevectors.h"
+#include "dynwind.h"
#include "feature.h"
#include "fports.h"
+#include "gsubr.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "srfi-13.h"
#include "strings.h"
#include "symbols.h"
-#include "vectors.h"
-#include "dynwind.h"
-#include "srfi-13.h"
#include "syscalls.h"
+#include "vectors.h"
#include "socket.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index 9122dcf..1e8dfc9 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -39,18 +39,18 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
+#include "array-map.h"
+#include "arrays.h"
+#include "async.h"
#include "boolean.h"
+#include "dynwind.h"
#include "eval.h"
-#include "arrays.h"
-#include "array-map.h"
#include "feature.h"
#include "generalized-arrays.h"
+#include "gsubr.h"
#include "list.h"
+#include "pairs.h"
#include "vectors.h"
-#include "async.h"
-#include "dynwind.h"
#include "sort.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index b1dd4f9..00ec1b1 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -18,31 +18,33 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <errno.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "async.h"
-#include "smob.h"
#include "alist.h"
+#include "async.h"
#include "debug.h"
-#include "hashtab.h"
+#include "gc.h"
+#include "gsubr.h"
#include "hash.h"
+#include "hashtab.h"
#include "keywords.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
-#include "gc.h"
+#include "private-options.h"
+#include "smob.h"
#include "symbols.h"
#include "weak-table.h"
#include "srcprop.h"
-#include "private-options.h"
+
/* {Source Properties}
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 2377f7b..6d17601 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -1,7 +1,7 @@
/* srfi-1.c --- SRFI-1 procedures for Guile
*
- * Copyright (C) 1995-1997, 2000-2003, 2005, 2006, 2008-2011, 2013
- * 2014, 2018 Free Software Foundation, Inc.
+ * Copyright (C) 1995-1997,2000-2003,2005-2006,2008-2011,2013-2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -19,25 +19,27 @@
* 02110-1301 USA
*/
+
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
+#include <stdarg.h>
+
#include "boolean.h"
#include "eq.h"
-
-#include "list.h"
#include "eval.h"
+#include "extensions.h"
+#include "gsubr.h"
+#include "list.h"
+#include "pairs.h"
#include "procs.h"
-#include "srfi-1.h"
#include "values.h"
#include "vectors.h"
-#include "extensions.h"
-#include <stdarg.h>
+#include "srfi-1.h"
/* The intent of this file was to gradually replace those Scheme
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index 38d5f0e..9dd420a 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -28,19 +28,21 @@
#include <unicase.h>
#include <unictype.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "deprecation.h"
-#include "eval.h"
#include "error.h"
+#include "eval.h"
+#include "gsubr.h"
#include "hash.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "procs.h"
-#include "srfi-13.h"
#include "srfi-14.h"
#include "symbols.h"
+#include "srfi-13.h"
+
+
#define MY_VALIDATE_SUBSTRING_SPEC(pos_str, str, \
pos_start, start, c_start, \
pos_end, end, c_end) \
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 681fa1b..d5de15f 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -23,27 +23,28 @@
# include <config.h>
#endif
-
#include <stdio.h>
#include <string.h>
#include <unictype.h>
-#include "gsubr.h"
-#include "pairs.h"
#include "boolean.h"
#include "chars.h"
#include "eval.h"
+#include "gsubr.h"
#include "list.h"
-#include "ports.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
#include "procs.h"
#include "smob.h"
-#include "srfi-14.h"
#include "strings.h"
#include "symbols.h"
#include "values.h"
+#include "srfi-14.h"
+
+
/* Include the pre-computed standard charset data. */
#include "srfi-14.i.c"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index 59d8b8a..7bcf96a 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -1,6 +1,6 @@
/* srfi-4.c --- Uniform numeric vector datatypes.
- *
- * Copyright (C) 2001, 2004, 2006, 2009, 2010, 2011, 2014, 2018 Free
Software Foundation, Inc.
+ * Copyright (C) 2001,2004,2006,2009-2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,20 +24,21 @@
#include <string.h>
-#include "gsubr.h"
-#include "boolean.h"
#include "bdw-gc.h"
-#include "srfi-4.h"
+#include "boolean.h"
#include "bytevectors.h"
#include "error.h"
#include "eval.h"
#include "extensions.h"
#include "generalized-vectors.h"
+#include "gsubr.h"
#include "modules.h"
#include "numbers.h"
#include "uniform.h"
#include "variable.h"
+#include "srfi-4.h"
+
#define DEFINE_SCHEME_PROXY100(cname, modname, scmname) \
SCM cname (SCM arg1) \
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 2974a2c..ca561ed 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -25,13 +25,12 @@
#endif
#include "boolean.h"
-#include "gsubr.h"
-#include "pairs.h"
#include "eq.h"
-
#include "extensions.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "srfi-60.h"
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index cb55ef4..e10e773 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -19,17 +19,20 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "dynwind.h"
#include "gsubr.h"
#include "numbers.h"
#include "ports.h"
#include "threads.h"
-#include "dynwind.h"
#include "stackchk.h"
+
+
/* {Stack Checking}
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 690de57..498edd6 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -19,31 +19,32 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "gsubr.h"
#include "boolean.h"
+#include "continuations.h"
#include "control.h"
-#include "eval.h"
#include "debug.h"
-#include "continuations.h"
+#include "eval.h"
#include "fluids.h"
+#include "frames.h" /* vm frames */
+#include "gsubr.h"
#include "list.h"
-#include "struct.h"
#include "macros.h"
+#include "modules.h"
#include "numbers.h"
#include "pairs.h"
+#include "private-options.h"
#include "procprop.h"
-#include "modules.h"
#include "strings.h"
+#include "struct.h"
#include "symbols.h"
#include "vm.h" /* to capture vm stacks */
-#include "frames.h" /* vm frames */
#include "stacks.h"
-#include "private-options.h"
static SCM scm_sys_stacks;
diff --git a/libguile/stime.c b/libguile/stime.c
index 99cc3e8..8ff73a1 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -44,35 +44,34 @@
# include <config.h>
#endif
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
#include <strftime.h>
+#include <string.h>
+#include <sys/times.h>
+#include <sys/types.h>
+#include <time.h> /* Gnulib-provided */
+#include <unistd.h>
#include <unistr.h>
-#include "gsubr.h"
-#include "pairs.h"
-#include "boolean.h"
+#ifdef HAVE_SYS_TIMEB_H
+# include <sys/timeb.h>
+#endif
+
#include "async.h"
+#include "boolean.h"
+#include "dynwind.h"
#include "feature.h"
+#include "gsubr.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "strings.h"
-#include "vectors.h"
-#include "dynwind.h"
#include "strings.h"
+#include "vectors.h"
#include "stime.h"
-#include <unistd.h>
-#include <time.h> /* Gnulib-provided */
-
-#include <sys/types.h>
-#include <string.h>
-#include <sys/times.h>
-
-#ifdef HAVE_SYS_TIMEB_H
-# include <sys/timeb.h>
-#endif
#if ! HAVE_DECL_STRPTIME
extern char *strptime ();
diff --git a/libguile/strings.c b/libguile/strings.c
index 851dd50..d838f13 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -33,21 +33,22 @@
#include <uniconv.h>
#include <c-strcase.h>
-#include "striconveh.h"
-
-#include "gsubr.h"
-#include "pairs.h"
#include "chars.h"
-#include "strings.h"
-#include "numbers.h"
-#include "ports.h"
-#include "ports-internal.h"
+#include "deprecation.h"
#include "error.h"
#include "generalized-vectors.h"
-#include "deprecation.h"
+#include "gsubr.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports-internal.h"
+#include "ports.h"
+#include "private-options.h"
+#include "striconveh.h"
#include "symbols.h"
#include "threads.h"
-#include "private-options.h"
+
+#include "strings.h"
+
diff --git a/libguile/strorder.c b/libguile/strorder.c
index 18e2b40..2610130 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -18,21 +18,25 @@
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "gsubr.h"
#include "boolean.h"
#include "chars.h"
+#include "gsubr.h"
#include "pairs.h"
+#include "srfi-13.h"
#include "strings.h"
#include "symbols.h"
#include "strorder.h"
-#include "srfi-13.h"
+
+
+
SCM_C_INLINE_KEYWORD static SCM
srfi13_cmp (SCM s1, SCM s2, SCM (*cmp) (SCM, SCM, SCM, SCM, SCM, SCM))
{
diff --git a/libguile/strports.c b/libguile/strports.c
index 5a0526c..fc6b7fd 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1998-2003, 2005-2006,
- * 2009-2014, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998-2003,2005-2006,2009-2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,31 +24,28 @@
# include <config.h>
#endif
-#include "gsubr.h"
-
#include <stdio.h>
+#include <string.h>
#include <unistd.h>
#include "bytevectors.h"
+#include "deprecation.h"
#include "eval.h"
+#include "gsubr.h"
#include "keywords.h"
+#include "modules.h"
#include "ports.h"
#include "procs.h"
#include "read.h"
+#include "srfi-4.h"
#include "strings.h"
#include "symbols.h"
#include "syscalls.h"
-#include "modules.h"
-#include "deprecation.h"
-#include "srfi-4.h"
#include "threads.h"
#include "variable.h"
#include "strports.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
diff --git a/libguile/struct.c b/libguile/struct.c
index 18ca966..9214ff1 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -25,36 +25,32 @@
#include <alloca.h>
#include <assert.h>
#include <stdarg.h>
+#include <string.h>
#define SCM_BUILDING_DEPRECATED_CODE
-#include "gsubr.h"
-#include "boolean.h"
+#include "alist.h"
#include "async.h"
+#include "bdw-gc.h"
+#include "boolean.h"
#include "chars.h"
#include "deprecation.h"
+#include "eq.h"
#include "eval.h"
#include "finalizers.h"
#include "goops.h"
+#include "gsubr.h"
+#include "hashtab.h"
#include "modules.h"
#include "numbers.h"
-#include "alist.h"
-#include "hashtab.h"
#include "pairs.h"
#include "ports.h"
-#include "strings.h"
#include "srfi-13.h"
+#include "strings.h"
#include "symbols.h"
#include "struct.h"
-#include "eq.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "bdw-gc.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 55951bc..6fc98b8 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -23,36 +23,32 @@
# include <config.h>
#endif
+#include <string.h>
#include <unistr.h>
-#include "gsubr.h"
-#include "pairs.h"
+#include "alist.h"
#include "boolean.h"
#include "chars.h"
#include "eval.h"
+#include "fluids.h"
+#include "gsubr.h"
#include "hash.h"
#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "private-options.h"
+#include "read.h"
#include "smob.h"
+#include "srfi-13.h"
+#include "strings.h"
#include "strorder.h"
#include "variable.h"
-#include "alist.h"
-#include "fluids.h"
-#include "numbers.h"
-#include "strings.h"
#include "vectors.h"
#include "weak-set.h"
-#include "modules.h"
-#include "read.h"
-#include "srfi-13.h"
#include "symbols.h"
-#include "private-options.h"
-
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
diff --git a/libguile/syntax.c b/libguile/syntax.c
index c577b3b..82e5c69 100644
--- a/libguile/syntax.c
+++ b/libguile/syntax.c
@@ -18,19 +18,22 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "eval.h"
#include "gsubr.h"
#include "keywords.h"
-#include "eval.h"
#include "modules.h"
#include "ports.h"
-#include "syntax.h"
#include "threads.h"
#include "variable.h"
+#include "syntax.h"
+
+
static int
diff --git a/libguile/threads.c b/libguile/threads.c
index cec6a4c..bd92a6f 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -37,35 +37,36 @@
# include <pthread_np.h>
#endif
+#include "async.h"
#include "bdw-gc.h"
-#include "pairs.h"
-#include <gc/gc_mark.h>
-
-#include "gsubr.h"
#include "boolean.h"
+#include "continuations.h"
#include "deprecation.h"
+#include "dynwind.h"
+#include "eval.h"
#include "extensions.h"
+#include "fluids.h"
+#include "gc-inline.h"
+#include "gc.h"
+#include "gsubr.h"
#include "hashtab.h"
-#include "eval.h"
+#include "init.h"
+#include "iselect.h"
#include "list.h"
-#include "async.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
-#include "threads.h"
-#include "dynwind.h"
-#include "iselect.h"
-#include "fluids.h"
-#include "continuations.h"
-#include "gc.h"
-#include "gc-inline.h"
-#include "init.h"
#include "scmsigs.h"
#include "strings.h"
#include "symbols.h"
#include "variable.h"
#include "vm.h"
+#include "threads.h"
+
+#include <gc/gc_mark.h>
+
diff --git a/libguile/throw.c b/libguile/throw.c
index c0f4297..2f434d2 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -26,31 +26,32 @@
#include <alloca.h>
#include <stdio.h>
#include <unistdio.h>
-#include "pairs.h"
+
+#include "backtrace.h"
#include "boolean.h"
-#include "smob.h"
-#include "eval.h"
-#include "eq.h"
-#include "gsubr.h"
#include "control.h"
-#include "deprecation.h"
-#include "backtrace.h"
#include "debug.h"
+#include "deprecation.h"
+#include "eq.h"
+#include "eval.h"
+#include "fluids.h"
+#include "gsubr.h"
+#include "init.h"
#include "list.h"
#include "modules.h"
#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
+#include "private-options.h"
+#include "smob.h"
#include "stackchk.h"
#include "stacks.h"
-#include "fluids.h"
-#include "ports.h"
-#include "vm.h"
-#include "throw.h"
-#include "init.h"
#include "strings.h"
#include "symbols.h"
#include "variable.h"
+#include "vm.h"
-#include "private-options.h"
+#include "throw.h"
/* Pleasantly enough, the guts of catch are defined in Scheme, in terms
diff --git a/libguile/trees.c b/libguile/trees.c
index a6ca53d..645b89d 100644
--- a/libguile/trees.c
+++ b/libguile/trees.c
@@ -23,16 +23,16 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
-#include "eq.h"
+#include <stdarg.h>
+#include "eq.h"
+#include "gsubr.h"
#include "list.h"
-#include "vectors.h"
+#include "pairs.h"
#include "srcprop.h"
-#include "trees.h"
+#include "vectors.h"
-#include <stdarg.h>
+#include "trees.h"
/* scm_copy_tree creates deep copies of pairs and vectors, but not of any other
diff --git a/libguile/unicode.c b/libguile/unicode.c
index d71fee5..7a10cbd 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 2014,2018 Free Software Foundation, Inc.
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -16,6 +16,7 @@
*/
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -28,12 +29,13 @@
#include <uniname.h>
#include "chars.h"
-#include "gsubr.h"
#include "extensions.h"
+#include "gsubr.h"
#include "strings.h"
#include "unicode.h"
+
SCM_DEFINE (scm_char_to_formal_name, "char->formal-name", 1, 0, 0,
diff --git a/libguile/values.c b/libguile/values.c
index 07a12fe..9eb150d 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -21,19 +21,20 @@
# include <config.h>
#endif
-#include "gsubr.h"
-#include "pairs.h"
#include "eval.h"
#include "feature.h"
#include "gc.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "strings.h"
#include "struct.h"
#include "values.h"
+
SCM scm_values_vtable;
/* OBJ must be a values object containing exactly two values.
diff --git a/libguile/variable.c b/libguile/variable.c
index 5eb2b02..bb3e0ba 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -19,19 +19,22 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "boolean.h"
-#include "gsubr.h"
+#include "deprecation.h"
#include "eq.h"
+#include "gsubr.h"
#include "list.h"
#include "ports.h"
#include "smob.h"
-#include "deprecation.h"
#include "variable.h"
+
+
void
diff --git a/libguile/vectors.c b/libguile/vectors.c
index c0f5b9c..6efa207 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -19,22 +19,22 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "array-handle.h"
+#include "bdw-gc.h"
#include "boolean.h"
-#include "gsubr.h"
-#include "pairs.h"
#include "eq.h"
+#include "gsubr.h"
#include "list.h"
#include "numbers.h"
-
+#include "pairs.h"
#include "vectors.h"
-#include "array-handle.h"
-#include "generalized-vectors.h"
-#include "bdw-gc.h"
+#include "generalized-vectors.h"
diff --git a/libguile/version.c b/libguile/version.c
index 364afd9..fb1c5c8 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -18,16 +18,20 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <stdio.h>
+
#include "gsubr.h"
-#include "strings.h"
#include "numbers.h"
+#include "strings.h"
#include "version.h"
+
+
#define SCM_TMP_MACRO_MKSTR(x) #x
diff --git a/libguile/vm.c b/libguile/vm.c
index 66ae223..29eca9b 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009-2015, 2017-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2009-2015,2017-2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -34,43 +34,44 @@
#include <sys/mman.h>
#endif
-#include "bdw-gc.h"
-#include "pairs.h"
-#include <gc/gc_mark.h>
-
-#include "gsubr.h"
+#include "alist.h"
+#include "async.h"
#include "atomic.h"
#include "atomics-internal.h"
+#include "bdw-gc.h"
#include "cache-internal.h"
#include "control.h"
-#include "eval.h"
-#include "values.h"
-#include "async.h"
-#include "keywords.h"
#include "dynwind.h"
+#include "eval.h"
#include "extensions.h"
#include "foreign.h"
-#include "alist.h"
-#include "modules.h"
-#include "numbers.h"
-#include "procprop.h"
-#include "list.h"
-#include "stackchk.h"
-#include "hooks.h"
-#include "smob.h"
#include "frames.h"
#include "gc-inline.h"
+#include "gsubr.h"
+#include "hooks.h"
#include "instructions.h"
#include "intrinsics.h"
+#include "keywords.h"
+#include "list.h"
#include "loader.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
+#include "procprop.h"
#include "programs.h"
#include "simpos.h"
+#include "smob.h"
+#include "stackchk.h"
#include "symbols.h"
+#include "values.h"
#include "vectors.h"
-#include "vm.h"
#include "vm-builtins.h"
+#include "vm.h"
+
+#include <gc/gc_mark.h>
+
#if (defined __GNUC__)
# define SCM_NOINLINE __attribute__ ((__noinline__))
#else
diff --git a/libguile/vports.c b/libguile/vports.c
index c7a7464..5d21f1f 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -19,30 +19,29 @@
+
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <config.h>
#endif
#include <assert.h>
-#include <stdio.h>
#include <errno.h>
+#include <stdio.h>
+#include <string.h>
-#include "gsubr.h"
#include "boolean.h"
-#include "eval.h"
#include "chars.h"
-#include "ports.h"
-#include "ports-internal.h"
+#include "eval.h"
#include "fports.h"
+#include "gsubr.h"
#include "numbers.h"
+#include "ports-internal.h"
+#include "ports.h"
#include "strings.h"
#include "vectors.h"
#include "vports.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
@@ -50,7 +49,6 @@
*
*/
-
static scm_t_port_type *scm_soft_port_type;
#define ENCODE_BUF_SIZE 10
diff --git a/libguile/weak-set.c b/libguile/weak-set.c
index ec9fb9c..11e9201 100644
--- a/libguile/weak-set.c
+++ b/libguile/weak-set.c
@@ -18,6 +18,7 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -25,16 +26,16 @@
#include <assert.h>
#include <string.h>
-#include "pairs.h"
+#include "bdw-gc.h"
+#include "eval.h"
#include "finalizers.h"
#include "hash.h"
-#include "eval.h"
+#include "pairs.h"
#include "ports.h"
#include "threads.h"
-#include "bdw-gc.h"
+#include "weak-set.h"
#include "weak-list.h"
-#include "weak-set.h"
/* Weak Sets
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index 97e32a7..83ae264 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -18,28 +18,30 @@
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <assert.h>
-#include "bdw-gc.h"
-#include "pairs.h"
-#include <gc/gc_typed.h>
-
-#include "gsubr.h"
#include "alist.h"
+#include "bdw-gc.h"
+#include "eval.h"
#include "finalizers.h"
+#include "gsubr.h"
#include "hash.h"
-#include "eval.h"
#include "numbers.h"
+#include "pairs.h"
#include "ports.h"
#include "procs.h"
#include "threads.h"
#include "weak-list.h"
+
#include "weak-table.h"
+#include <gc/gc_typed.h>
+
/* Weak Tables
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index c613f5e..4c7fb32 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -27,11 +27,12 @@
#include <string.h>
#include "boolean.h"
-#include "gsubr.h"
#include "extensions.h"
+#include "gsubr.h"
#include "list.h"
#include "pairs.h"
#include "vectors.h"
+
#include "weak-vector.h"
- [Guile-commits] 71/86: Use stdint.h limit macros, (continued)
- [Guile-commits] 71/86: Use stdint.h limit macros, Andy Wingo, 2018/06/20
- [Guile-commits] 77/86: Minor __scm.h reformatting, Andy Wingo, 2018/06/20
- [Guile-commits] 85/86: libguile header files have uniform format for copyright declarations, Andy Wingo, 2018/06/20
- [Guile-commits] 47/86: Move subr snarfing macros to gsubr.h., Andy Wingo, 2018/06/20
- [Guile-commits] 83/86: Make .c copyright headers uniform, Andy Wingo, 2018/06/20
- [Guile-commits] 65/86: Remove _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 66/86: Remove useless "classes: h_files" from Guile headers., Andy Wingo, 2018/06/20
- [Guile-commits] 79/86: Rename __scm.h to scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 78/86: Inline tags.h into __scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 67/86: Remove Emacs local variables comments in Guile source, Andy Wingo, 2018/06/20
- [Guile-commits] 82/86: Rationalize include order in C files,
Andy Wingo <=
- [Guile-commits] 81/86: Make libguile header inclusion consistent within libguile c files, Andy Wingo, 2018/06/20
- [Guile-commits] 84/86: Remove (C) from copyright statements, Andy Wingo, 2018/06/20
- [Guile-commits] 86/86: Update license notices in all C files, Andy Wingo, 2018/06/20