[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 27/86: Devolve pairs.h
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] 27/86: Devolve pairs.h |
|
Date: |
Wed, 20 Jun 2018 14:09:33 -0400 (EDT) |
wingo pushed a commit to branch master
in repository guile.
commit 730cfd80e2392e3e07365c9c3bc9816ae41998c6
Author: Andy Wingo <address@hidden>
Date: Mon Jun 18 22:03:13 2018 +0200
Devolve pairs.h
* libguile/_scm.h: Remove pairs.h.
* libguile/alist.c:
* libguile/array-handle.c:
* libguile/array-map.c:
* libguile/arrays.c:
* libguile/async.c:
* libguile/bitvectors.c:
* libguile/bytevectors.c:
* libguile/chars.c:
* libguile/continuations.c:
* libguile/control.c:
* libguile/debug.c:
* libguile/deprecation.c:
* libguile/dynwind.c:
* libguile/eq.c:
* libguile/eval.c:
* libguile/evalext.c:
* libguile/expand.c:
* libguile/fdes-finalizers.c:
* libguile/feature.c:
* libguile/filesys.c:
* libguile/fluids.c:
* libguile/foreign.c:
* libguile/fports.c:
* libguile/gc.c:
* libguile/generalized-arrays.c:
* libguile/goops.c:
* libguile/guardians.c:
* libguile/hash.c:
* libguile/hashtab.c:
* libguile/hooks.c:
* libguile/i18n.c:
* libguile/instructions.c:
* libguile/ioext.c:
* libguile/keywords.c:
* libguile/list.c:
* libguile/load.c:
* libguile/loader.c:
* libguile/memoize.c:
* libguile/modules.c:
* libguile/net_db.c:
* libguile/numbers.c:
* libguile/objprop.c:
* libguile/options.c:
* libguile/ports-internal.h:
* libguile/ports.c:
* libguile/posix.c:
* libguile/print.c:
* libguile/print.h:
* libguile/procprop.c:
* libguile/programs.c:
* libguile/random.c:
* libguile/rdelim.c:
* libguile/read.c:
* libguile/regex-posix.c:
* libguile/scmsigs.c:
* libguile/script.c:
* libguile/socket.c:
* libguile/sort.c:
* libguile/srcprop.c:
* libguile/srfi-1.c:
* libguile/srfi-13.c:
* libguile/srfi-14.c:
* libguile/srfi-60.c:
* libguile/stacks.c:
* libguile/stime.c:
* libguile/strings.c:
* libguile/strorder.c:
* libguile/struct.c:
* libguile/symbols.c:
* libguile/threads.c:
* libguile/throw.c:
* libguile/trees.c:
* libguile/values.c:
* libguile/vectors.c:
* libguile/vm.c:
* libguile/weak-list.h:
* libguile/weak-set.c:
* libguile/weak-table.c:
* libguile/weak-vector.c: Add pairs.h.
---
libguile/_scm.h | 1 -
libguile/alist.c | 1 -
libguile/array-handle.c | 1 +
libguile/array-map.c | 1 +
libguile/arrays.c | 1 +
libguile/async.c | 1 +
libguile/bitvectors.c | 1 +
libguile/bytevectors.c | 1 +
libguile/chars.c | 2 +-
libguile/continuations.c | 1 +
libguile/control.c | 1 +
libguile/debug.c | 1 +
libguile/deprecation.c | 1 +
libguile/dynwind.c | 1 +
libguile/eq.c | 1 +
libguile/eval.c | 1 +
libguile/evalext.c | 1 +
libguile/expand.c | 1 +
libguile/fdes-finalizers.c | 1 +
libguile/feature.c | 1 +
libguile/filesys.c | 1 +
libguile/fluids.c | 1 +
libguile/foreign.c | 1 +
libguile/fports.c | 1 +
libguile/gc.c | 1 +
libguile/generalized-arrays.c | 1 +
libguile/goops.c | 1 +
libguile/guardians.c | 1 +
libguile/hash.c | 1 +
libguile/hashtab.c | 1 +
libguile/hooks.c | 1 +
libguile/i18n.c | 1 +
libguile/instructions.c | 1 +
libguile/ioext.c | 1 +
libguile/keywords.c | 1 +
libguile/list.c | 1 +
libguile/load.c | 1 +
libguile/loader.c | 1 +
libguile/memoize.c | 1 +
libguile/modules.c | 1 +
libguile/net_db.c | 1 +
libguile/numbers.c | 1 +
libguile/objprop.c | 1 +
libguile/options.c | 1 +
libguile/ports-internal.h | 1 +
libguile/ports.c | 1 +
libguile/posix.c | 1 +
libguile/print.c | 5 +++--
libguile/print.h | 4 ++--
libguile/procprop.c | 1 +
libguile/programs.c | 1 +
libguile/random.c | 1 +
libguile/rdelim.c | 1 +
libguile/read.c | 1 +
libguile/regex-posix.c | 1 +
libguile/scmsigs.c | 1 +
libguile/script.c | 1 +
libguile/socket.c | 1 +
libguile/sort.c | 1 +
libguile/srcprop.c | 1 +
libguile/srfi-1.c | 1 +
libguile/srfi-13.c | 1 +
libguile/srfi-14.c | 1 +
libguile/srfi-60.c | 1 +
libguile/stacks.c | 1 +
libguile/stime.c | 1 +
libguile/strings.c | 1 +
libguile/strorder.c | 1 +
libguile/struct.c | 1 +
libguile/symbols.c | 1 +
libguile/threads.c | 1 +
libguile/throw.c | 1 +
libguile/trees.c | 1 +
libguile/values.c | 1 +
libguile/vectors.c | 1 +
libguile/vm.c | 1 +
libguile/weak-list.h | 3 ++-
libguile/weak-set.c | 1 +
libguile/weak-table.c | 1 +
libguile/weak-vector.c | 1 +
80 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 35a5879..85c68ec 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -36,7 +36,6 @@
/* Include headers for those files central to the implementation. The
rest should be explicitly #included in the C files themselves. */
-#include "libguile/pairs.h" /* Everyone conses. */
#include "libguile/gc.h" /* Everyone allocates. */
#include "libguile/gsubr.h" /* Everyone defines global functions. */
#include "libguile/procs.h" /* Same. */
diff --git a/libguile/alist.c b/libguile/alist.c
index c254e21..a4e279d 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -27,7 +27,6 @@
#include "libguile/boolean.h"
#include "libguile/eq.h"
#include "libguile/list.h"
-
#include "libguile/pairs.h"
#include "libguile/numbers.h"
#include "libguile/alist.h"
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index 8af6d1d..f895e3f 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -29,6 +29,7 @@
#include "libguile/bitvectors.h"
#include "libguile/list.h"
#include "libguile/arrays.h"
+#include "libguile/pairs.h"
#include "libguile/array-handle.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index 1422efb..ff5283a 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -27,6 +27,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/strings.h"
#include "libguile/arrays.h"
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 945994e..025567e 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -31,6 +31,7 @@
#include "verify.h"
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/__scm.h"
#include "libguile/eq.h"
diff --git a/libguile/async.c b/libguile/async.c
index 0686674..4879048 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/atomics-internal.h"
#include "libguile/eval.h"
#include "libguile/throw.h"
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 1526d2b..61eee73 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -26,6 +26,7 @@
#include <string.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index b97b3bf..cec0249 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -42,6 +42,7 @@
#include "libguile/bytevectors.h"
#include "libguile/generalized-vectors.h"
#include "libguile/list.h"
+#include "libguile/pairs.h"
#include "libguile/strings.h"
#include "libguile/arrays.h"
#include "libguile/array-handle.h"
diff --git a/libguile/chars.c b/libguile/chars.c
index 5c78a51..9091d86 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -30,8 +30,8 @@
#include "libguile/_scm.h"
#include "libguile/boolean.h"
-
#include "libguile/chars.h"
+#include "libguile/pairs.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 482cadc..2707308 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -31,6 +31,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/backtrace.h"
diff --git a/libguile/control.c b/libguile/control.c
index 654d203..6a0a19c 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -23,6 +23,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/control.h"
#include "libguile/extensions.h"
#include "libguile/list.h"
diff --git a/libguile/debug.c b/libguile/debug.c
index 3568824..b0b110a 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -44,6 +44,7 @@
#include "libguile/macros.h"
#include "libguile/smob.h"
#include "libguile/struct.h"
+#include "libguile/pairs.h"
#include "libguile/procprop.h"
#include "libguile/srcprop.h"
#include "libguile/alist.h"
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index 9546a76..187fef9 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -28,6 +28,7 @@
#include <stdarg.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/deprecation.h"
#include "libguile/list.h"
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index b33bebb..7f395af 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -30,6 +30,7 @@
#include "libguile/boolean.h"
#include "libguile/dynstack.h"
#include "libguile/eval.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/dynwind.h"
diff --git a/libguile/eq.c b/libguile/eq.c
index 5d19cfc..e7cbb2f 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -38,6 +38,7 @@
#include "libguile/generalized-arrays.h"
#include "libguile/goops.h"
#include "libguile/hashtab.h"
+#include "libguile/pairs.h"
#include "libguile/private-options.h"
#include "libguile/smob.h"
#include "libguile/stackchk.h"
diff --git a/libguile/eval.c b/libguile/eval.c
index d4648b2..2d22375 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -27,6 +27,7 @@
#include <stdarg.h>
#include "libguile/__scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 3cfa8a6..84b3dde 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -28,6 +28,7 @@
#include "libguile/list.h"
#include "libguile/fluids.h"
#include "libguile/modules.h"
+#include "libguile/pairs.h"
#include "libguile/evalext.h"
diff --git a/libguile/expand.c b/libguile/expand.c
index f2e462c..295e191 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/__scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 6bd5ad7..3195600 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -22,6 +22,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/extensions.h"
#include "libguile/eval.h"
diff --git a/libguile/feature.c b/libguile/feature.c
index 8f10223..5364c1d 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -28,6 +28,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/strings.h"
#include "libguile/fluids.h"
diff --git a/libguile/filesys.c b/libguile/filesys.c
index fbb2a56..de18870 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -80,6 +80,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
diff --git a/libguile/fluids.c b/libguile/fluids.c
index c928cd9..0a9df1a 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -25,6 +25,7 @@
#include <string.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/alist.h"
#include "libguile/atomics-internal.h"
#include "libguile/bdw-gc.h"
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 9cbf0b2..db52032 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -40,6 +40,7 @@
#include "libguile/keywords.h"
#include "libguile/list.h"
#include "libguile/instructions.h"
+#include "libguile/pairs.h"
#include "libguile/stacks.h"
#include "libguile/threads.h"
#include "libguile/weak-table.h"
diff --git a/libguile/fports.c b/libguile/fports.c
index 623f7be..c400be4 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -47,6 +47,7 @@
#include <full-write.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
diff --git a/libguile/gc.c b/libguile/gc.c
index 7580cca..39d4f32 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/gen-scmconfig.h"
+#include "libguile/pairs.h"
#include <stdio.h>
#include <errno.h>
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index 35be23d..6fbdbaf 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -28,6 +28,7 @@
#include <string.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
#include "libguile/generalized-arrays.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index d3c6b73..a08f06f 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -40,6 +40,7 @@
#include "libguile/keywords.h"
#include "libguile/macros.h"
#include "libguile/modules.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
#include "libguile/procprop.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index cb12663..fa5b43b 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -50,6 +50,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/bdw-gc.h"
diff --git a/libguile/hash.c b/libguile/hash.c
index 9c5618d..b9c1c58 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -32,6 +32,7 @@
#include "libguile/_scm.h"
#include "libguile/chars.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/strings.h"
#include "libguile/symbols.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index ee2ff2e..c0fe2db 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -28,6 +28,7 @@
#include <assert.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/alist.h"
#include "libguile/boolean.h"
#include "libguile/bdw-gc.h"
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 20e6b5d..b60c68a 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/eval.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 0dcddb8..aa83141 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -23,6 +23,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/extensions.h"
#include "libguile/feature.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index f6c6a11..6538d56 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -25,6 +25,7 @@
#include "_scm.h"
#include "threads.h"
#include "libguile/list.h"
+#include "libguile/pairs.h"
#include "instructions.h"
#include "extensions.h"
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 53e95dd..e63b853 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -28,6 +28,7 @@
#include <errno.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
#include "libguile/extensions.h"
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 950743e..f987a52 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -29,6 +29,7 @@
#include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/list.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/smob.h"
#include "libguile/dynwind.h"
diff --git a/libguile/list.c b/libguile/list.c
index b314ded..89e6343 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/eq.h"
diff --git a/libguile/load.c b/libguile/load.c
index 61714c0..97a7159 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -43,6 +43,7 @@
#include "libguile/list.h"
#include "libguile/loader.h"
#include "libguile/modules.h"
+#include "libguile/pairs.h"
#include "libguile/read.h"
#include "libguile/srfi-13.h"
#include "libguile/strings.h"
diff --git a/libguile/loader.c b/libguile/loader.c
index b36eb9e..cbb3b69 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -44,6 +44,7 @@
#include "elf.h"
#include "eval.h"
#include "extensions.h"
+#include "pairs.h"
#include "programs.h"
#include "loader.h"
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 6ec9498..01715e5 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/__scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
diff --git a/libguile/modules.c b/libguile/modules.c
index e6a4f3a..9ff1ec7 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -25,6 +25,7 @@
#include <stdarg.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/eval.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 8528b68..34f9756 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -46,6 +46,7 @@
#include <arpa/inet.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/feature.h"
#include "libguile/list.h"
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 2c1f7f6..16b5a66 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -62,6 +62,7 @@
#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/feature.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/finalizers.h"
#include "libguile/smob.h"
diff --git a/libguile/objprop.c b/libguile/objprop.c
index f79f1dd..8f8b7fb 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -27,6 +27,7 @@
#include "libguile/async.h"
#include "libguile/hashtab.h"
#include "libguile/objprop.h"
+#include "libguile/pairs.h"
#include "libguile/weak-table.h"
diff --git a/libguile/options.c b/libguile/options.c
index 4bbee8b..56b6923 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/list.h"
#include "libguile/mallocs.h"
diff --git a/libguile/ports-internal.h b/libguile/ports-internal.h
index cfc5b7e..20d65aa 100644
--- a/libguile/ports-internal.h
+++ b/libguile/ports-internal.h
@@ -27,6 +27,7 @@
#include "libguile/_scm.h"
#include "libguile/list.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
typedef enum scm_t_port_type_flags {
diff --git a/libguile/ports.c b/libguile/ports.c
index 8dad20e..bf1e742 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -39,6 +39,7 @@
#include <striconveh.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/atomics-internal.h"
diff --git a/libguile/posix.c b/libguile/posix.c
index 1104aaf..0fc3aaf 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -63,6 +63,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
#include "libguile/extensions.h"
diff --git a/libguile/print.c b/libguile/print.c
index c7dd54a..b801884 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -31,6 +31,7 @@
#include <unictype.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/continuations.h"
@@ -262,8 +263,8 @@ scm_i_port_with_print_state (SCM port, SCM print_state)
}
else
port = SCM_COERCE_OUTPORT (port);
- SCM_RETURN_NEWSMOB (scm_tc16_port_with_ps,
- SCM_UNPACK (scm_cons (port, print_state)));
+ return scm_new_double_smob (scm_tc16_port_with_ps,
+ SCM_UNPACK (port), SCM_UNPACK (print_state), 0);
}
static void
diff --git a/libguile/print.h b/libguile/print.h
index 9271c92..9bbf167 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -49,8 +49,8 @@ do { \
#define SCM_SET_WRITINGP(pstate, x) { (pstate)->writingp = (x); }
#define SCM_PORT_WITH_PS_P(p) SCM_TYP16_PREDICATE (scm_tc16_port_with_ps, p)
-#define SCM_PORT_WITH_PS_PORT(p) SCM_CAR (SCM_CELL_OBJECT_1 (p))
-#define SCM_PORT_WITH_PS_PS(p) SCM_CDR (SCM_CELL_OBJECT_1 (p))
+#define SCM_PORT_WITH_PS_PORT(p) SCM_CELL_OBJECT_1 (p)
+#define SCM_PORT_WITH_PS_PS(p) SCM_CELL_OBJECT_2 (p)
#define SCM_COERCE_OUTPORT(p) \
(SCM_PORT_WITH_PS_P (p) ? SCM_PORT_WITH_PS_PORT (p) : p)
diff --git a/libguile/procprop.c b/libguile/procprop.c
index a11f20e..d040813 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/alist.h"
diff --git a/libguile/programs.c b/libguile/programs.c
index 7893333..5c96127 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -28,6 +28,7 @@
#include "eval.h"
#include "extensions.h"
#include "modules.h"
+#include "pairs.h"
#include "programs.h"
#include "procprop.h" /* scm_sym_name */
#include "vm.h"
diff --git a/libguile/random.c b/libguile/random.c
index 6409804..7ecb3f2 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -39,6 +39,7 @@
#include "libguile/list.h"
#include "libguile/numbers.h"
#include "libguile/feature.h"
+#include "libguile/pairs.h"
#include "libguile/stime.h"
#include "libguile/strings.h"
#include "libguile/arrays.h"
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index bc3df33..4df3f00 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -21,6 +21,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include <stdio.h>
diff --git a/libguile/read.c b/libguile/read.c
index 6c9466c..497f1d9 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -34,6 +34,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
#include "libguile/chars.h"
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 101db01..1cf4575 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include <regex.h>
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 4b2505b..a0926dc 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -42,6 +42,7 @@
#include <full-write.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
diff --git a/libguile/script.c b/libguile/script.c
index dd31671..0fcfc5f 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -31,6 +31,7 @@
#include <uniconv.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/eval.h"
#include "libguile/feature.h"
#include "libguile/fluids.h"
diff --git a/libguile/socket.c b/libguile/socket.c
index 5a33379..681be42 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -47,6 +47,7 @@
#include <gmp.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/async.h"
#include "libguile/arrays.h"
#include "libguile/feature.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index 249dbb5..17edc7b 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -40,6 +40,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/eval.h"
#include "libguile/arrays.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 037450b..0f68dfb 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/async.h"
#include "libguile/smob.h"
#include "libguile/alist.h"
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 801c1ce..c202603 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/eq.h"
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index b0763fc..ef50c81 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -29,6 +29,7 @@
#include <unictype.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include <libguile/deprecation.h>
#include "libguile/eval.h"
#include "libguile/error.h"
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 74e5909..26cd7c2 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -28,6 +28,7 @@
#include <unictype.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 784b065..c155b8e 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/eq.h"
#include "libguile/extensions.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 71e37c3..d0f5ebc 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -33,6 +33,7 @@
#include "libguile/list.h"
#include "libguile/struct.h"
#include "libguile/macros.h"
+#include "libguile/pairs.h"
#include "libguile/procprop.h"
#include "libguile/modules.h"
#include "libguile/strings.h"
diff --git a/libguile/stime.c b/libguile/stime.c
index 314eee4..b772162 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -50,6 +50,7 @@
#include <unistr.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/feature.h"
diff --git a/libguile/strings.c b/libguile/strings.c
index 2e3afe2..7a22111 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -36,6 +36,7 @@
#include "striconveh.h"
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/chars.h"
#include "libguile/strings.h"
#include "libguile/ports.h"
diff --git a/libguile/strorder.c b/libguile/strorder.c
index 16aa4bc..f884657 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -25,6 +25,7 @@
#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
+#include "libguile/pairs.h"
#include "libguile/strings.h"
#include "libguile/symbols.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index 6dffe43..91d18fd 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -37,6 +37,7 @@
#include "libguile/goops.h"
#include "libguile/alist.h"
#include "libguile/hashtab.h"
+#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/strings.h"
#include "libguile/srfi-13.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index f0633e6..81d1e88 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -26,6 +26,7 @@
#include <unistr.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index 0e04af3..1e0ad56 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -39,6 +39,7 @@
#endif
#include "libguile/bdw-gc.h"
+#include "libguile/pairs.h"
#include <gc/gc_mark.h>
#include "libguile/_scm.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index 1dbdf7b..23163e4 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <unistdio.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/smob.h"
#include "libguile/eval.h"
diff --git a/libguile/trees.c b/libguile/trees.c
index c4cc06f..21bb223 100644
--- a/libguile/trees.c
+++ b/libguile/trees.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/values.c b/libguile/values.c
index 78fb939..28cb93d 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -22,6 +22,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/eval.h"
#include "libguile/feature.h"
#include "libguile/gc.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 7c8e9bc..1db079d 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 04f63f7..c6ea6eb 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -34,6 +34,7 @@
#endif
#include "libguile/bdw-gc.h"
+#include "libguile/pairs.h"
#include <gc/gc_mark.h>
#include "libguile/_scm.h"
diff --git a/libguile/weak-list.h b/libguile/weak-list.h
index 989cb7f..43e0be9 100644
--- a/libguile/weak-list.h
+++ b/libguile/weak-list.h
@@ -3,7 +3,7 @@
#ifndef SCM_WEAK_LIST_H
#define SCM_WEAK_LIST_H
-/* Copyright (C) 2016 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
@@ -24,6 +24,7 @@
#include "libguile/__scm.h"
+#include "libguile/pairs.h"
#include "libguile/weak-vector.h"
diff --git a/libguile/weak-set.c b/libguile/weak-set.c
index 3083089..7a4d8da 100644
--- a/libguile/weak-set.c
+++ b/libguile/weak-set.c
@@ -25,6 +25,7 @@
#include <assert.h>
#include "libguile/_scm.h"
+#include "libguile/pairs.h"
#include "libguile/finalizers.h"
#include "libguile/hash.h"
#include "libguile/eval.h"
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index 7ef2e1b..f2ddf08 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -25,6 +25,7 @@
#include <assert.h>
#include "libguile/bdw-gc.h"
+#include "libguile/pairs.h"
#include <gc/gc_typed.h>
#include "libguile/_scm.h"
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index 66815a0..f2868ea 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -28,6 +28,7 @@
#include "libguile/_scm.h"
#include "libguile/extensions.h"
#include "libguile/list.h"
+#include "libguile/pairs.h"
#include "libguile/weak-vector.h"
- [Guile-commits] 51/86: Devolve variable snarfers, (continued)
- [Guile-commits] 51/86: Devolve variable snarfers, Andy Wingo, 2018/06/20
- [Guile-commits] 50/86: Devolve keyword-snarfing macros, Andy Wingo, 2018/06/20
- [Guile-commits] 49/86: Move string-related snarfers to strings.h, Andy Wingo, 2018/06/20
- [Guile-commits] 25/86: Remove list.h from _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 26/86: Devolve boolean.h include., Andy Wingo, 2018/06/20
- [Guile-commits] 39/86: Remove <stdio.h> from ports.h, Andy Wingo, 2018/06/20
- [Guile-commits] 55/86: Remove snarf.h from _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 52/86: Remove mutex snarfers, Andy Wingo, 2018/06/20
- [Guile-commits] 58/86: Define scm_t_wchar in one place, Andy Wingo, 2018/06/20
- [Guile-commits] 54/86: Simplify SCM_IMMUTABLE_CELL macros, Andy Wingo, 2018/06/20
- [Guile-commits] 27/86: Devolve pairs.h,
Andy Wingo <=
- [Guile-commits] 53/86: Devolve smob snarfers, Andy Wingo, 2018/06/20
- [Guile-commits] 57/86: Shuffle around inline C function implementation, Andy Wingo, 2018/06/20
- [Guile-commits] 62/86: Devolve foreign.h from _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 63/86: Devolve programs.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 22/86: Devolve more validate macros, Andy Wingo, 2018/06/20
- [Guile-commits] 23/86: Remove includes of validate.h., Andy Wingo, 2018/06/20
- [Guile-commits] 56/86: Devolve variable.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 69/86: Move SCM_C_INLINE_KEYWORD definition to inline.h, Andy Wingo, 2018/06/20
- [Guile-commits] 70/86: Fix include in test-ffi-lib, Andy Wingo, 2018/06/20
- [Guile-commits] 68/86: Remove unneeded memmove.c and strerror.c files, Andy Wingo, 2018/06/20