summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-07-17 01:08:35 +0200
committerAndy Wingo <wingo@pobox.com>2009-07-19 14:53:03 +0200
commit2fa901a51f62da8a01112aefbf687530f4bff160 (patch)
tree98f0e185e3eb91ba3d7b0f07a29f75fc388a3397
parentcf396142405d9076cc20eca9bf53376e80359a56 (diff)
downloadguile-2fa901a51f62da8a01112aefbf687530f4bff160.tar.gz
rename unif.[ch] to arrays.[ch]
* libguile/Makefile.am: * libguile/unif.c: * libguile/unif.h: * libguile/arrays.c: * libguile/arrays.h: Rename unif.[ch] to arrays.[ch]. * libguile.h: * libguile/array-handle.c: * libguile/array-map.c: * libguile/bitvectors.c: * libguile/bytevectors.c: * libguile/eq.c: * libguile/gc-card.c: * libguile/gc-malloc.c: * libguile/gc-mark.c: * libguile/gc.c: * libguile/init.c: * libguile/inline.h: * libguile/print.c: * libguile/random.c: * libguile/read.c: * libguile/socket.c: * libguile/sort.c: * libguile/srfi-4.c: * libguile/srfi-4.h: * libguile/strports.c: * libguile/vectors.c: * libguile/vectors.h: Update includers.
-rw-r--r--libguile.h4
-rw-r--r--libguile/Makefile.am8
-rw-r--r--libguile/array-handle.c2
-rw-r--r--libguile/array-map.c2
-rw-r--r--libguile/arrays.c (renamed from libguile/unif.c)6
-rw-r--r--libguile/arrays.h (renamed from libguile/unif.h)2
-rw-r--r--libguile/bitvectors.c2
-rw-r--r--libguile/bytevectors.c2
-rw-r--r--libguile/eq.c2
-rw-r--r--libguile/gc-card.c2
-rw-r--r--libguile/gc-malloc.c4
-rw-r--r--libguile/gc-mark.c2
-rw-r--r--libguile/gc.c4
-rw-r--r--libguile/init.c4
-rw-r--r--libguile/inline.h4
-rw-r--r--libguile/print.c2
-rw-r--r--libguile/random.c4
-rw-r--r--libguile/read.c2
-rw-r--r--libguile/socket.c4
-rw-r--r--libguile/sort.c2
-rw-r--r--libguile/srfi-4.c2
-rw-r--r--libguile/srfi-4.h2
-rw-r--r--libguile/strports.c2
-rw-r--r--libguile/vectors.c2
-rw-r--r--libguile/vectors.h2
25 files changed, 38 insertions, 36 deletions
diff --git a/libguile.h b/libguile.h
index 704f001a6..2018a0be1 100644
--- a/libguile.h
+++ b/libguile.h
@@ -31,9 +31,12 @@ extern "C" {
#include "libguile/__scm.h"
#include "libguile/alist.h"
#include "libguile/arbiters.h"
+#include "libguile/array-handle.h"
#include "libguile/array-map.h"
+#include "libguile/arrays.h"
#include "libguile/async.h"
#include "libguile/boolean.h"
+#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
#include "libguile/chars.h"
#include "libguile/continuations.h"
@@ -101,7 +104,6 @@ extern "C" {
#include "libguile/symbols.h"
#include "libguile/tags.h"
#include "libguile/throw.h"
-#include "libguile/unif.h"
#include "libguile/validate.h"
#include "libguile/values.h"
#include "libguile/variable.h"
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 9a59d4404..bc1ec2ba9 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -110,6 +110,7 @@ libguile_la_SOURCES = \
arbiters.c \
array-handle.c \
array-map.c \
+ arrays.c \
async.c \
backtrace.c \
boolean.c \
@@ -197,7 +198,6 @@ libguile_la_SOURCES = \
symbols.c \
threads.c \
throw.c \
- unif.c \
values.c \
variable.c \
vectors.c \
@@ -220,6 +220,7 @@ DOT_X_FILES = \
arbiters.x \
array-handle.x \
array-map.x \
+ arrays.x \
async.x \
backtrace.x \
boolean.x \
@@ -300,7 +301,6 @@ DOT_X_FILES = \
symbols.x \
threads.x \
throw.x \
- unif.x \
values.x \
variable.x \
vectors.x \
@@ -318,6 +318,7 @@ DOT_DOC_FILES = \
arbiters.doc \
array-handle.doc \
array-map.doc \
+ arrays.doc \
async.doc \
backtrace.doc \
boolean.doc \
@@ -398,7 +399,6 @@ DOT_DOC_FILES = \
symbols.doc \
threads.doc \
throw.doc \
- unif.doc \
values.doc \
variable.doc \
vectors.doc \
@@ -460,6 +460,7 @@ modinclude_HEADERS = \
arbiters.h \
array-handle.h \
array-map.h \
+ arrays.h \
async.h \
backtrace.h \
boolean.h \
@@ -553,7 +554,6 @@ modinclude_HEADERS = \
tags.h \
threads.h \
throw.h \
- unif.h \
validate.h \
values.h \
variable.h \
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index 345e9930d..35fc1fc2f 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -27,7 +27,7 @@
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/srfi-4.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index d636e4359..3b60f45e7 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -27,7 +27,7 @@
#include "libguile/_scm.h"
#include "libguile/strings.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/smob.h"
#include "libguile/chars.h"
#include "libguile/eq.h"
diff --git a/libguile/unif.c b/libguile/arrays.c
index 748eed94b..c70d24772 100644
--- a/libguile/unif.c
+++ b/libguile/arrays.c
@@ -53,7 +53,7 @@
#include "libguile/dynwind.h"
#include "libguile/validate.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/array-map.h"
#include "libguile/print.h"
#include "libguile/read.h"
@@ -1605,7 +1605,7 @@ array_free (SCM ptr)
}
void
-scm_init_unif ()
+scm_init_arrays ()
{
scm_i_tc16_array = scm_make_smob_type ("array", 0);
scm_set_smob_mark (scm_i_tc16_array, array_mark);
@@ -1623,7 +1623,7 @@ scm_init_unif ()
init_type_creator_table ();
-#include "libguile/unif.x"
+#include "libguile/arrays.x"
}
diff --git a/libguile/unif.h b/libguile/arrays.h
index 983ce444f..4ca39d00b 100644
--- a/libguile/unif.h
+++ b/libguile/arrays.h
@@ -99,7 +99,7 @@ SCM_INTERNAL SCM scm_i_make_array (int ndim, int enclosed);
SCM_INTERNAL SCM scm_i_cvref (SCM v, size_t p, int enclosed);
SCM_INTERNAL SCM scm_i_read_array (SCM port, int c);
-SCM_INTERNAL void scm_init_unif (void);
+SCM_INTERNAL void scm_init_arrays (void);
#endif /* SCM_UNIF_H */
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 2acb20ba5..a5da47c42 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -31,7 +31,7 @@
#include "libguile/strings.h"
#include "libguile/array-handle.h"
#include "libguile/bitvectors.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/vectors.h"
#include "libguile/srfi-4.h"
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 24afd2414..f50102d30 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -31,7 +31,7 @@
#include "libguile/strings.h"
#include "libguile/validate.h"
#include "libguile/ieee-754.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/srfi-4.h"
#include <byteswap.h>
diff --git a/libguile/eq.c b/libguile/eq.c
index cfe99303a..11dee2793 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -28,7 +28,7 @@
#include "libguile/async.h"
#include "libguile/root.h"
#include "libguile/smob.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/vectors.h"
#include "libguile/struct.h"
diff --git a/libguile/gc-card.c b/libguile/gc-card.c
index 85520f8e4..ef2734d13 100644
--- a/libguile/gc-card.c
+++ b/libguile/gc-card.c
@@ -43,7 +43,7 @@
#include "libguile/strings.h"
#include "libguile/struct.h"
#include "libguile/tags.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/validate.h"
#include "libguile/vectors.h"
#include "libguile/weaks.h"
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index d6973d3ac..f0e78de4f 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009 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
@@ -37,7 +37,7 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
#include "libguile/stackchk.h"
#include "libguile/struct.h"
#include "libguile/smob.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/async.h"
#include "libguile/ports.h"
#include "libguile/root.h"
diff --git a/libguile/gc-mark.c b/libguile/gc-mark.c
index 84714507b..ff3dcd246 100644
--- a/libguile/gc-mark.c
+++ b/libguile/gc-mark.c
@@ -38,7 +38,7 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
#include "libguile/stackchk.h"
#include "libguile/struct.h"
#include "libguile/smob.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/async.h"
#include "libguile/ports.h"
#include "libguile/root.h"
diff --git a/libguile/gc.c b/libguile/gc.c
index b7a3bf091..01f5efff0 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009 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
@@ -33,7 +33,7 @@
#include "libguile/stackchk.h"
#include "libguile/struct.h"
#include "libguile/smob.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/async.h"
#include "libguile/ports.h"
#include "libguile/root.h"
diff --git a/libguile/init.c b/libguile/init.c
index eb230b6e0..1d9827029 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -116,7 +116,7 @@
#include "libguile/struct.h"
#include "libguile/symbols.h"
#include "libguile/throw.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/values.h"
#include "libguile/variable.h"
#include "libguile/vectors.h"
@@ -544,7 +544,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
scm_init_array_handle ();
scm_init_bitvectors ();
scm_init_array_map ();
- scm_init_unif ();
+ scm_init_arrays ();
scm_init_simpos ();
scm_init_load_path ();
scm_init_standard_ports (); /* Requires fports */
diff --git a/libguile/inline.h b/libguile/inline.h
index cb908581d..0adc92caf 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -3,7 +3,7 @@
#ifndef SCM_INLINE_H
#define SCM_INLINE_H
-/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009 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,7 +34,7 @@
#include "libguile/pairs.h"
#include "libguile/gc.h"
#include "libguile/threads.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/ports.h"
#include "libguile/error.h"
diff --git a/libguile/print.c b/libguile/print.c
index 6c44d59db..a2fba6465 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -33,7 +33,7 @@
#include "libguile/procprop.h"
#include "libguile/read.h"
#include "libguile/weaks.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/alist.h"
#include "libguile/struct.h"
#include "libguile/objects.h"
diff --git a/libguile/random.c b/libguile/random.c
index d7a1ffb11..dfda4d082 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001, 2003, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001, 2003, 2005, 2006, 2009 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 published by the Free Software Foundation; either version 3 of
@@ -33,7 +33,7 @@
#include "libguile/numbers.h"
#include "libguile/feature.h"
#include "libguile/strings.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/srfi-4.h"
#include "libguile/vectors.h"
diff --git a/libguile/read.c b/libguile/read.c
index 92db68742..77a839957 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -32,7 +32,7 @@
#include "libguile/bytevectors.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/bitvectors.h"
#include "libguile/keywords.h"
#include "libguile/alist.h"
diff --git a/libguile/socket.c b/libguile/socket.c
index 553a1a185..95995f218 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 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
@@ -27,7 +27,7 @@
#include <gmp.h>
#include "libguile/_scm.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/feature.h"
#include "libguile/fports.h"
#include "libguile/strings.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index 4725e0503..a9e4dda8c 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -39,7 +39,7 @@
#include "libguile/_scm.h"
#include "libguile/eval.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/array-map.h"
#include "libguile/feature.h"
#include "libguile/vectors.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index d02536fde..14ce84069 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -36,7 +36,7 @@
#include "libguile/ports.h"
#include "libguile/chars.h"
#include "libguile/vectors.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/strings.h"
#include "libguile/strports.h"
#include "libguile/dynwind.h"
diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h
index a1a9bafc0..039fa2e8d 100644
--- a/libguile/srfi-4.h
+++ b/libguile/srfi-4.h
@@ -22,7 +22,7 @@
#include "libguile/__scm.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
/* Generic procedures.
*/
diff --git a/libguile/strports.c b/libguile/strports.c
index 5c67bf9a8..619d9d750 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#endif
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/eval.h"
#include "libguile/ports.h"
#include "libguile/read.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index ad8b41934..93f110a21 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -30,7 +30,7 @@
#include "libguile/validate.h"
#include "libguile/vectors.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
#include "libguile/array-map.h"
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 902e15a63..eb0c9436e 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -24,7 +24,7 @@
#include "libguile/__scm.h"
-#include "libguile/unif.h"
+#include "libguile/arrays.h"