[Guile-commits] 56/86: Devolve variable.h from _scm.h.

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 3c48c8778466ba99acd167686a3793253b2806ef
Author: Andy Wingo <address@hidden>
Date:   Wed Jun 20 11:00:29 2018 +0200

    Devolve variable.h from _scm.h.
    
    * libguile/_scm.h: Remove variable.h.
    * libguile/backtrace.c:
    * libguile/debug.c:
    * libguile/dynstack.c:
    * libguile/dynwind.c:
    * libguile/eval.c:
    * libguile/evalext.c:
    * libguile/expand.c:
    * libguile/feature.c:
    * libguile/fluids.c:
    * libguile/foreign-object.c:
    * libguile/fports.c:
    * libguile/frames.c:
    * libguile/goops.c:
    * libguile/i18n.c:
    * libguile/load.c:
    * libguile/macros.c:
    * libguile/memoize.c:
    * libguile/ports.c:
    * libguile/print.c:
    * libguile/programs.c:
    * libguile/random.c:
    * libguile/read.c:
    * libguile/scmsigs.c:
    * libguile/srfi-4.c:
    * libguile/strports.c:
    * libguile/syntax.c:
    * libguile/threads.c:
    * libguile/throw.c: Add variable.h.
---
 libguile/_scm.h           | 1 -
 libguile/backtrace.c      | 1 +
 libguile/debug.c          | 1 +
 libguile/dynstack.c       | 1 +
 libguile/dynwind.c        | 1 +
 libguile/eval.c           | 1 +
 libguile/evalext.c        | 1 +
 libguile/expand.c         | 1 +
 libguile/feature.c        | 1 +
 libguile/fluids.c         | 1 +
 libguile/foreign-object.c | 1 +
 libguile/fports.c         | 1 +
 libguile/frames.c         | 1 +
 libguile/goops.c          | 1 +
 libguile/i18n.c           | 1 +
 libguile/load.c           | 1 +
 libguile/macros.c         | 1 +
 libguile/memoize.c        | 1 +
 libguile/ports.c          | 1 +
 libguile/print.c          | 1 +
 libguile/programs.c       | 1 +
 libguile/random.c         | 1 +
 libguile/read.c           | 1 +
 libguile/scmsigs.c        | 1 +
 libguile/srfi-4.c         | 1 +
 libguile/strports.c       | 1 +
 libguile/syntax.c         | 1 +
 libguile/threads.c        | 1 +
 libguile/throw.c          | 1 +
 29 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index abdddee..5c910b1 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -40,7 +40,6 @@
 #include "libguile/threads.h"  /* You are not alone. */
 #include "libguile/foreign.h"  /* Snarfing needs the foreign data structures. 
*/
 #include "libguile/programs.h" /* ... and program.h. */
-#include "libguile/variable.h"
 #include "libguile/modules.h"
 #include "libguile/inline.h"
 #include "libguile/strings.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 18ac33c..fb4dd3c 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -53,6 +53,7 @@
 #include "libguile/strports.h"
 #include "libguile/struct.h"
 #include "libguile/throw.h"
+#include "libguile/variable.h"
 
 /* {Error reporting and backtraces}
  *
diff --git a/libguile/debug.c b/libguile/debug.c
index 57fd808..984b864 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -59,6 +59,7 @@
 #include "libguile/fluids.h"
 #include "libguile/programs.h"
 #include "libguile/memoize.h"
+#include "libguile/variable.h"
 #include "libguile/vm.h"
 
 #include "libguile/debug.h"
diff --git a/libguile/dynstack.c b/libguile/dynstack.c
index 56a7b1e..2c84472 100644
--- a/libguile/dynstack.c
+++ b/libguile/dynstack.c
@@ -31,6 +31,7 @@
 #include "libguile/eval.h"
 #include "libguile/fluids.h"
 #include "libguile/dynstack.h"
+#include "libguile/variable.h"
 
 
 
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 7f395af..aa7a835 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -32,6 +32,7 @@
 #include "libguile/eval.h"
 #include "libguile/pairs.h"
 #include "libguile/ports.h"
+#include "libguile/variable.h"
 
 #include "libguile/dynwind.h"
 
diff --git a/libguile/eval.c b/libguile/eval.c
index d02d938..9de80c9 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -64,6 +64,7 @@
 #include "libguile/threads.h"
 #include "libguile/throw.h"
 #include "libguile/values.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/vm.h"
 
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 6f492c7..6e863b2 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -30,6 +30,7 @@
 #include "libguile/fluids.h"
 #include "libguile/modules.h"
 #include "libguile/pairs.h"
+#include "libguile/variable.h"
 
 #include "libguile/evalext.h"
 
diff --git a/libguile/expand.c b/libguile/expand.c
index cc99484..9f6e455 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -42,6 +42,7 @@
 #include "libguile/srcprop.h"
 #include "libguile/strings.h"
 #include "libguile/throw.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 
 
diff --git a/libguile/feature.c b/libguile/feature.c
index ca491f0..521fd57 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -32,6 +32,7 @@
 #include "libguile/pairs.h"
 #include "libguile/strings.h"
 #include "libguile/fluids.h"
+#include "libguile/variable.h"
 
 #include "libguile/feature.h"
 
diff --git a/libguile/fluids.c b/libguile/fluids.c
index 773c318..a746f7a 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -40,6 +40,7 @@
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/weak-table.h"
+#include "libguile/variable.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 7a6a5eb..593069d 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -32,6 +32,7 @@
 #include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/procs.h"
+#include "libguile/variable.h"
 
 
 
diff --git a/libguile/fports.c b/libguile/fports.c
index 24c2ed0..d6b7c02 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -66,6 +66,7 @@
 #include "libguile/read.h"
 #include "libguile/strings.h"
 #include "libguile/syscalls.h"
+#include "libguile/variable.h"
 
 #if SIZEOF_OFF_T == SIZEOF_INT
 #define OFF_T_MAX  INT_MAX
diff --git a/libguile/frames.c b/libguile/frames.c
index c19f511..fbd937a 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -30,6 +30,7 @@
 #include "numbers.h"
 #include "frames.h"
 #include "ports.h"
+#include "libguile/variable.h"
 #include "vm.h"
 
 SCM
diff --git a/libguile/goops.c b/libguile/goops.c
index 5b2b966..3c947f7 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -49,6 +49,7 @@
 #include "libguile/smob.h"
 #include "libguile/strings.h"
 #include "libguile/strports.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-table.h"
 
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 9704e07..7ea5554 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -37,6 +37,7 @@
 #include "libguile/syscalls.h"
 #include "libguile/smob.h"
 #include "libguile/values.h"
+#include "libguile/variable.h"
 #include "libguile/threads.h"
 
 #include <locale.h>
diff --git a/libguile/load.c b/libguile/load.c
index eaaa4ed..3fa1d6a 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -49,6 +49,7 @@
 #include "libguile/srfi-13.h"
 #include "libguile/strings.h"
 #include "libguile/throw.h"
+#include "libguile/variable.h"
 
 #include "libguile/load.h"
 #include "libguile/fluids.h"
diff --git a/libguile/macros.c b/libguile/macros.c
index 1ea8aaf..0015ecf 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -30,6 +30,7 @@
 #include "libguile/random.h"
 #include "libguile/smob.h"
 #include "libguile/macros.h"
+#include "libguile/variable.h"
 
 #include "libguile/private-options.h"
 
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 1c4f05e..4d396c6 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -46,6 +46,7 @@
 #include "libguile/print.h"
 #include "libguile/strings.h"
 #include "libguile/throw.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 
 
diff --git a/libguile/ports.c b/libguile/ports.c
index fd68329..2b2d129 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -63,6 +63,7 @@
 #include "libguile/private-options.h"
 #include "libguile/procs.h"
 #include "libguile/syscalls.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-set.h"
 #include "libguile/fluids.h"
diff --git a/libguile/print.c b/libguile/print.c
index dbca06b..a26a52d 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -60,6 +60,7 @@
 #include "libguile/strings.h"
 #include "libguile/strports.h"
 #include "libguile/syntax.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/numbers.h"
 #include "libguile/vm.h"
diff --git a/libguile/programs.c b/libguile/programs.c
index e502ece..5fad4c9 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -34,6 +34,7 @@
 #include "ports.h"
 #include "programs.h"
 #include "procprop.h" /* scm_sym_name */
+#include "libguile/variable.h"
 #include "vm.h"
 
 
diff --git a/libguile/random.c b/libguile/random.c
index 60279e8..69939b5 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -45,6 +45,7 @@
 #include "libguile/strings.h"
 #include "libguile/arrays.h"
 #include "libguile/srfi-4.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/generalized-vectors.h"
 
diff --git a/libguile/read.c b/libguile/read.c
index d1eba62..5f86a03 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -55,6 +55,7 @@
 #include "libguile/fports.h"
 #include "libguile/strings.h"
 #include "libguile/strports.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/srfi-4.h"
 #include "libguile/srfi-13.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index b502c87..a113822 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -53,6 +53,7 @@
 #include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/procs.h"
+#include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/syscalls.h"
 #include "libguile/threads.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index b0700e0..3361349 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -37,6 +37,7 @@
 #include "libguile/generalized-vectors.h"
 #include "libguile/numbers.h"
 #include "libguile/uniform.h"
+#include "libguile/variable.h"
 
 
 #define DEFINE_SCHEME_PROXY100(cname, modname, scmname)                   \
diff --git a/libguile/strports.c b/libguile/strports.c
index d610fd0..e4bd2fc 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -41,6 +41,7 @@
 #include "libguile/modules.h"
 #include "libguile/deprecation.h"
 #include "libguile/srfi-4.h"
+#include "libguile/variable.h"
 
 #include "libguile/strports.h"
 
diff --git a/libguile/syntax.c b/libguile/syntax.c
index fc84d2f..70686d1 100644
--- a/libguile/syntax.c
+++ b/libguile/syntax.c
@@ -28,6 +28,7 @@
 #include "libguile/eval.h"
 #include "libguile/ports.h"
 #include "libguile/syntax.h"
+#include "libguile/variable.h"
 
 
 
diff --git a/libguile/threads.c b/libguile/threads.c
index c0b955b..3067de2 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -63,6 +63,7 @@
 #include "libguile/init.h"
 #include "libguile/scmsigs.h"
 #include "libguile/strings.h"
+#include "libguile/variable.h"
 #include "libguile/vm.h"
 
 
diff --git a/libguile/throw.c b/libguile/throw.c
index ff6fb36..5848415 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -47,6 +47,7 @@
 #include "libguile/throw.h"
 #include "libguile/init.h"
 #include "libguile/strings.h"
+#include "libguile/variable.h"
 
 #include "libguile/private-options.h"