-/* Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
-#include <stdio.h>
-#include "_scm.h"
-#include "eq.h"
+#include "libguile/_scm.h"
+#include "libguile/eq.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
-#include "vectors.h"
+#include "libguile/validate.h"
+#include "libguile/vectors.h"
+#include "libguile/unif.h"
\f
+#if (SCM_DEBUG_DEPRECATED == 0)
+
+/* The function scm_vector_set_length_x will disappear in the next release of
+ * guile.
+ */
+
/*
* This complicates things too much if allowed on any array.
* C code can safely call it on arrays known to be used in a single
* threaded manner.
*
- * SCM_PROC(s_vector_set_length_x, "vector-set-length!", 2, 0, 0, scm_vector_set_length_x);
+ * SCM_REGISTER_PROC(s_vector_set_length_x, "vector-set-length!", 2, 0, 0, scm_vector_set_length_x);
*/
static char s_vector_set_length_x[] = "vector-set-length!";
SCM
-scm_vector_set_length_x (vect, len)
- SCM vect;
- SCM len;
+scm_vector_set_length_x (SCM vect, SCM len)
{
long l;
scm_sizet siz;
scm_sizet sz;
+ char *base;
l = SCM_INUM (len);
SCM_ASRTGO (SCM_NIMP (vect), badarg1);
l = (l + SCM_LONG_BIT - 1) / SCM_LONG_BIT;
}
sz = scm_uniform_element_size (vect);
- if (sz == 0)
+ if (sz != 0)
+ base = SCM_UVECTOR_BASE (vect);
+ else
#endif
switch (SCM_TYP7 (vect))
{
default:
badarg1: scm_wta (vect, (char *) SCM_ARG1, s_vector_set_length_x);
case scm_tc7_string:
- SCM_ASRTGO (vect != scm_nullstr, badarg1);
+ SCM_ASRTGO (!SCM_EQ_P (vect, scm_nullstr), badarg1);
sz = sizeof (char);
+ base = SCM_STRING_CHARS (vect);
l++;
break;
case scm_tc7_vector:
case scm_tc7_wvect:
- SCM_ASRTGO (vect != scm_nullvect, badarg1);
+ SCM_ASRTGO (!SCM_EQ_P (vect, scm_nullvect), badarg1);
sz = sizeof (SCM);
+ base = (char *) SCM_VECTOR_BASE (vect);
break;
}
SCM_ASSERT (SCM_INUMP (len), len, SCM_ARG2, s_vector_set_length_x);
l = 1L;
siz = l * sz;
if (siz != l * sz)
- scm_wta (SCM_MAKINUM (l * sz), (char *) SCM_NALLOC, s_vector_set_length_x);
+ scm_memory_error (s_vector_set_length_x);
SCM_REDEFER_INTS;
SCM_SETCHARS (vect,
((char *)
- scm_must_realloc (SCM_CHARS (vect),
+ scm_must_realloc (base,
(long) SCM_LENGTH (vect) * sz,
(long) siz,
s_vector_set_length_x)));
SCM_VELTS (vect)[--l] = SCM_UNSPECIFIED;
}
else if (SCM_STRINGP (vect))
- SCM_CHARS (vect)[l - 1] = 0;
+ SCM_STRING_CHARS (vect)[l - 1] = 0;
SCM_SETLENGTH (vect, SCM_INUM (len), SCM_TYP7 (vect));
SCM_REALLOW_INTS;
return vect;
}
-SCM_PROC(s_vector_p, "vector?", 1, 0, 0, scm_vector_p);
+#endif /* (SCM_DEBUG_DEPRECATED == 0) */
-SCM
-scm_vector_p(x)
- SCM x;
+SCM_DEFINE (scm_vector_p, "vector?", 1, 0, 0,
+ (SCM obj),
+ "Return @code{#t} if @var{obj} is a vector, otherwise return\n"
+ "@code{#f}.")
+#define FUNC_NAME s_scm_vector_p
{
- if (SCM_IMP(x)) return SCM_BOOL_F;
- return SCM_VECTORP(x) ? SCM_BOOL_T : SCM_BOOL_F;
+ if (SCM_IMP (obj))
+ return SCM_BOOL_F;
+ return SCM_BOOL (SCM_VECTORP (obj));
}
+#undef FUNC_NAME
-SCM_PROC(s_vector_length, "vector-length", 1, 0, 0, scm_vector_length);
-
+SCM_GPROC (s_vector_length, "vector-length", 1, 0, 0, scm_vector_length, g_vector_length);
+/* Returns the number of elements in @var{vector} as an exact integer. */
SCM
-scm_vector_length(v)
- SCM v;
+scm_vector_length (SCM v)
{
- SCM_ASSERT(SCM_NIMP(v) && SCM_VECTORP(v), v, SCM_ARG1, s_vector_length);
- return SCM_MAKINUM(SCM_LENGTH(v));
+ SCM_GASSERT1 (SCM_VECTORP(v),
+ g_vector_length, v, SCM_ARG1, s_vector_length);
+ return SCM_MAKINUM (SCM_VECTOR_LENGTH (v));
}
-SCM_PROC(s_list_to_vector, "list->vector", 1, 0, 0, scm_vector);
-SCM_PROC(s_vector, "vector", 0, 0, 1, scm_vector);
-
-SCM
-scm_vector(l)
- SCM l;
+SCM_REGISTER_PROC (s_list_to_vector, "list->vector", 1, 0, 0, scm_vector);
+/*
+ "Return a newly created vector initialized to the elements of"
+ "the list @var{list}.\n\n"
+ "@lisp\n"
+ "(vector->list '#(dah dah didah)) @result{} (dah dah didah)\n"
+ "(list->vector '(dididit dah)) @result{} #(dididit dah)\n"
+ "@end lisp")
+*/
+SCM_DEFINE (scm_vector, "vector", 0, 0, 1,
+ (SCM l),
+ "@deffnx primitive list->vector l\n"
+ "Return a newly allocated vector whose elements contain the\n"
+ "given arguments. Analogous to @code{list}.\n"
+ "\n"
+ "@lisp\n"
+ "(vector 'a 'b 'c) @result{} #(a b c)\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_vector
{
SCM res;
- register SCM *data;
- long i = scm_ilength(l);
- SCM_ASSERT(i >= 0, l, SCM_ARG1, s_vector);
- res = scm_make_vector (SCM_MAKINUM(i), SCM_UNSPECIFIED);
- data = SCM_VELTS(res);
- for(;i && SCM_NIMP(l);--i, l = SCM_CDR(l))
- *data++ = SCM_CAR(l);
+ SCM *data;
+ long i;
+
+ /* Dirk:FIXME:: In case of multiple threads, the list might get corrupted
+ while the vector is being created. */
+ SCM_VALIDATE_LIST_COPYLEN (1, l, i);
+ res = scm_c_make_vector (i, SCM_UNSPECIFIED);
+ data = SCM_VELTS (res);
+ while (!SCM_NULLP (l))
+ {
+ *data++ = SCM_CAR (l);
+ l = SCM_CDR (l);
+ }
+
return res;
}
-
-SCM_PROC(s_vector_ref, "vector-ref", 2, 0, 0, scm_vector_ref);
+#undef FUNC_NAME
+
+SCM_GPROC (s_vector_ref, "vector-ref", 2, 0, 0, scm_vector_ref, g_vector_ref);
+
+/*
+ "@var{k} must be a valid index of @var{vector}.\n"
+ "@samp{Vector-ref} returns the contents of element @var{k} of\n"
+ "@var{vector}.\n\n"
+ "@lisp\n"
+ "(vector-ref '#(1 1 2 3 5 8 13 21) 5) @result{} 8\n"
+ "(vector-ref '#(1 1 2 3 5 8 13 21)\n"
+ " (let ((i (round (* 2 (acos -1)))))\n"
+ " (if (inexact? i)\n"
+ " (inexact->exact i)\n"
+ " i))) @result{} 13\n"
+ "@end lisp"
+*/
SCM
scm_vector_ref (SCM v, SCM k)
+#define FUNC_NAME s_vector_ref
{
- SCM_ASSERT (SCM_NIMP (v) && SCM_VECTORP (v), v, SCM_ARG1, s_vector_ref);
- SCM_ASSERT (SCM_INUMP (k), k, SCM_ARG2, s_vector_ref);
- SCM_ASSERT (SCM_INUM (k) < SCM_LENGTH (v) && SCM_INUM (k) >= 0,
- k, SCM_OUTOFRANGE, s_vector_ref);
+ SCM_GASSERT2 (SCM_VECTORP (v),
+ g_vector_ref, v, k, SCM_ARG1, s_vector_ref);
+ SCM_GASSERT2 (SCM_INUMP (k),
+ g_vector_ref, v, k, SCM_ARG2, s_vector_ref);
+ SCM_ASSERT_RANGE (2, k, SCM_INUM (k) < SCM_VECTOR_LENGTH (v) && SCM_INUM (k) >= 0);
return SCM_VELTS (v)[(long) SCM_INUM (k)];
}
+#undef FUNC_NAME
+
+SCM_GPROC (s_vector_set_x, "vector-set!", 3, 0, 0, scm_vector_set_x, g_vector_set_x);
-SCM_PROC(s_vector_set_x, "vector-set!", 3, 0, 0, scm_vector_set_x);
+/* "@var{k} must be a valid index of @var{vector}.\n"
+ "@code{Vector-set!} stores @var{obj} in element @var{k} of @var{vector}.\n"
+ "The value returned by @samp{vector-set!} is unspecified.\n"
+ "@lisp\n"
+ "(let ((vec (vector 0 '(2 2 2 2) "Anna")))\n"
+ " (vector-set! vec 1 '("Sue" "Sue"))\n"
+ " vec) @result{} #(0 ("Sue" "Sue") "Anna")\n"
+ "(vector-set! '#(0 1 2) 1 "doe") @result{} @emph{error} ; constant vector\n"
+ "@end lisp"
+*/
SCM
-scm_vector_set_x(v, k, obj)
- SCM v;
- SCM k;
- SCM obj;
+scm_vector_set_x (SCM v, SCM k, SCM obj)
+#define FUNC_NAME s_vector_set_x
{
- SCM_ASSERT(SCM_NIMP(v) && SCM_VECTORP(v), v, SCM_ARG1, s_vector_set_x);
- SCM_ASSERT(SCM_INUMP(k), k, SCM_ARG2, s_vector_set_x);
- SCM_ASSERT((SCM_INUM(k) < SCM_LENGTH(v)) && (SCM_INUM(k) >= 0), k, SCM_OUTOFRANGE, s_vector_set_x);
- SCM_VELTS(v)[((long) SCM_INUM(k))] = obj;
- return obj;
+ SCM_GASSERTn (SCM_VECTORP (v),
+ g_vector_set_x, SCM_LIST3 (v, k, obj),
+ SCM_ARG1, s_vector_set_x);
+ SCM_GASSERTn (SCM_INUMP (k),
+ g_vector_set_x, SCM_LIST3 (v, k, obj),
+ SCM_ARG2, s_vector_set_x);
+ SCM_ASSERT_RANGE (2, k, SCM_INUM (k) < SCM_VECTOR_LENGTH (v) && SCM_INUM (k) >= 0);
+ SCM_VELTS(v)[(long) SCM_INUM(k)] = obj;
+ return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
-SCM_PROC (s_make_vector, "make-vector", 1, 1, 0, scm_make_vector);
+SCM_DEFINE (scm_make_vector, "make-vector", 1, 1, 0,
+ (SCM k, SCM fill),
+ "Return a newly allocated vector of @var{k} elements. If a\n"
+ "second argument is given, then each element is initialized to\n"
+ "@var{fill}. Otherwise the initial contents of each element is\n"
+ "unspecified.")
+#define FUNC_NAME s_scm_make_vector
+{
+ if (SCM_UNBNDP (fill))
+ fill = SCM_UNSPECIFIED;
+
+ if (SCM_INUMP (k))
+ {
+ SCM_ASSERT_RANGE (1, k, SCM_INUM (k) >= 0);
+ return scm_c_make_vector (SCM_INUM (k), fill);
+ }
+ else if (SCM_BIGP (k))
+ SCM_OUT_OF_RANGE (1, k);
+ else
+ SCM_WRONG_TYPE_ARG (1, k);
+}
+#undef FUNC_NAME
+
SCM
-scm_make_vector (k, fill)
- SCM k;
- SCM fill;
+scm_c_make_vector (unsigned long int k, SCM fill)
+#define FUNC_NAME s_scm_make_vector
{
SCM v;
- register long i;
- register long j;
- register SCM *velts;
+ scm_bits_t *base;
- SCM_ASSERT(SCM_INUMP(k) && (0 <= SCM_INUM (k)), k, SCM_ARG1, s_make_vector);
- if (SCM_UNBNDP(fill))
- fill = SCM_UNSPECIFIED;
- i = SCM_INUM(k);
- SCM_NEWCELL(v);
- SCM_DEFER_INTS;
- SCM_SETCHARS(v, scm_must_malloc(i?(long)(i*sizeof(SCM)):1L, s_vector));
- SCM_SETLENGTH(v, i, scm_tc7_vector);
- velts = SCM_VELTS(v);
- j = 0;
- while(--i >= j) (velts)[i] = fill;
- SCM_ALLOW_INTS;
- return v;
-}
+ if (k > 0)
+ {
+ unsigned long int j;
+ SCM_ASSERT_RANGE (1, scm_ulong2num (k), k <= SCM_VECTOR_MAX_LENGTH);
-SCM_PROC(s_vector_to_list, "vector->list", 1, 0, 0, scm_vector_to_list);
+ base = scm_must_malloc (k * sizeof (scm_bits_t), FUNC_NAME);
+ for (j = 0; j != k; ++j)
+ base[j] = SCM_UNPACK (fill);
+ }
+ else
+ base = NULL;
-SCM
-scm_vector_to_list(v)
- SCM v;
+ SCM_NEWCELL (v);
+ SCM_SET_VECTOR_BASE (v, base);
+ SCM_SET_VECTOR_LENGTH (v, k, scm_tc7_vector);
+ scm_remember_upto_here_1 (fill);
+
+ return v;
+}
+#undef FUNC_NAME
+
+
+SCM_DEFINE (scm_vector_to_list, "vector->list", 1, 0, 0,
+ (SCM v),
+ "Return a newly allocated list of the objects contained in the\n"
+ "elements of @var{vector}.\n"
+ "\n"
+ "@lisp\n"
+ "(vector->list '#(dah dah didah)) @result{} (dah dah didah)\n"
+ "(list->vector '(dididit dah)) @result{} #(dididit dah)\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_vector_to_list
{
SCM res = SCM_EOL;
long i;
SCM *data;
- SCM_ASSERT(SCM_NIMP(v) && SCM_VECTORP(v), v, SCM_ARG1, s_vector_to_list);
+ SCM_VALIDATE_VECTOR (1,v);
data = SCM_VELTS(v);
- for(i = SCM_LENGTH(v)-1;i >= 0;i--) res = scm_cons(data[i], res);
+ for(i = SCM_VECTOR_LENGTH(v)-1;i >= 0;i--) res = scm_cons(data[i], res);
return res;
}
+#undef FUNC_NAME
-SCM_PROC (s_vector_fill_x, "vector-fill!", 2, 0, 0, scm_vector_fill_x);
-
-SCM
-scm_vector_fill_x (v, fill_x)
- SCM v;
- SCM fill_x;
+SCM_DEFINE (scm_vector_fill_x, "vector-fill!", 2, 0, 0,
+ (SCM v, SCM fill),
+ "Store @var{fill} in every element of @var{vector}. The value\n"
+ "returned by @code{vector-fill!} is unspecified.")
+#define FUNC_NAME s_scm_vector_fill_x
{
register long i;
register SCM *data;
- SCM_ASSERT(SCM_NIMP(v) && SCM_VECTORP(v), v, SCM_ARG1, s_vector_fill_x);
+ SCM_VALIDATE_VECTOR (1,v);
data = SCM_VELTS(v);
- for(i = SCM_LENGTH(v) - 1; i >= 0; i--)
- data[i] = fill_x;
+ for(i = SCM_VECTOR_LENGTH(v) - 1; i >= 0; i--)
+ data[i] = fill;
return SCM_UNSPECIFIED;
}
-
+#undef FUNC_NAME
SCM
-scm_vector_equal_p(x, y)
- SCM x;
- SCM y;
+scm_vector_equal_p(SCM x, SCM y)
{
long i;
- for(i = SCM_LENGTH(x)-1;i >= 0;i--)
+ for(i = SCM_VECTOR_LENGTH(x)-1;i >= 0;i--)
if (SCM_FALSEP(scm_equal_p(SCM_VELTS(x)[i], SCM_VELTS(y)[i])))
return SCM_BOOL_F;
return SCM_BOOL_T;
}
-SCM_PROC (s_vector_move_left_x, "vector-move-left!", 5, 0, 0, scm_vector_move_left_x);
-
-SCM
-scm_vector_move_left_x (vec1, start1, end1, vec2, start2)
- SCM vec1;
- SCM start1;
- SCM end1;
- SCM vec2;
- SCM start2;
+SCM_DEFINE (scm_vector_move_left_x, "vector-move-left!", 5, 0, 0,
+ (SCM vec1, SCM start1, SCM end1, SCM vec2, SCM start2),
+ "Vector version of @code{substring-move-left!}.")
+#define FUNC_NAME s_scm_vector_move_left_x
{
long i;
long j;
long e;
- SCM_ASSERT (SCM_NIMP (vec1) && SCM_VECTORP (vec1), vec1, SCM_ARG1, s_vector_move_left_x);
- SCM_ASSERT (SCM_INUMP (start1), start1, SCM_ARG2, s_vector_move_left_x);
- SCM_ASSERT (SCM_INUMP (end1), end1, SCM_ARG3, s_vector_move_left_x);
- SCM_ASSERT (SCM_NIMP (vec2) && SCM_VECTORP (vec2), vec2, SCM_ARG4, s_vector_move_left_x);
- SCM_ASSERT (SCM_INUMP (start2), start2, SCM_ARG5, s_vector_move_left_x);
- i = SCM_INUM (start1);
- j = SCM_INUM (start2);
- e = SCM_INUM (end1);
- SCM_ASSERT (i <= SCM_LENGTH (vec1) && i >= 0, start1, SCM_OUTOFRANGE, s_vector_move_left_x);
- SCM_ASSERT (j <= SCM_LENGTH (vec2) && j >= 0, start2, SCM_OUTOFRANGE, s_vector_move_left_x);
- SCM_ASSERT (e <= SCM_LENGTH (vec1) && e >= 0, end1, SCM_OUTOFRANGE, s_vector_move_left_x);
- SCM_ASSERT (e-i+j <= SCM_LENGTH (vec2), start2, SCM_OUTOFRANGE, s_vector_move_left_x);
+ SCM_VALIDATE_VECTOR (1,vec1);
+ SCM_VALIDATE_INUM_COPY (2,start1,i);
+ SCM_VALIDATE_INUM_COPY (3,end1,e);
+ SCM_VALIDATE_VECTOR (4,vec2);
+ SCM_VALIDATE_INUM_COPY (5,start2,j);
+ SCM_ASSERT_RANGE (2, start1, i <= SCM_VECTOR_LENGTH (vec1) && i >= 0);
+ SCM_ASSERT_RANGE (5, start2, j <= SCM_VECTOR_LENGTH (vec2) && j >= 0);
+ SCM_ASSERT_RANGE (3, end1, e <= SCM_VECTOR_LENGTH (vec1) && e >= 0);
+ SCM_ASSERT_RANGE (5, start2, e-i+j <= SCM_VECTOR_LENGTH (vec2));
while (i<e) SCM_VELTS (vec2)[j++] = SCM_VELTS (vec1)[i++];
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
-SCM_PROC (s_vector_move_right_x, "vector-move-right!", 5, 0, 0, scm_vector_move_right_x);
-
-SCM
-scm_vector_move_right_x (vec1, start1, end1, vec2, start2)
- SCM vec1;
- SCM start1;
- SCM end1;
- SCM vec2;
- SCM start2;
+SCM_DEFINE (scm_vector_move_right_x, "vector-move-right!", 5, 0, 0,
+ (SCM vec1, SCM start1, SCM end1, SCM vec2, SCM start2),
+ "Vector version of @code{substring-move-right!}.")
+#define FUNC_NAME s_scm_vector_move_right_x
{
long i;
long j;
long e;
- SCM_ASSERT (SCM_NIMP (vec1) && SCM_VECTORP (vec1),
- vec1, SCM_ARG1, s_vector_move_right_x);
- SCM_ASSERT (SCM_INUMP (start1), start1, SCM_ARG2, s_vector_move_right_x);
- SCM_ASSERT (SCM_INUMP (end1), end1, SCM_ARG3, s_vector_move_right_x);
- SCM_ASSERT (SCM_NIMP (vec2) && SCM_VECTORP (vec2),
- vec2, SCM_ARG4, s_vector_move_right_x);
- SCM_ASSERT (SCM_INUMP (start2), start2, SCM_ARG5, s_vector_move_right_x);
- i = SCM_INUM (start1);
- j = SCM_INUM (start2);
- e = SCM_INUM (end1);
- SCM_ASSERT (i <= SCM_LENGTH (vec1) && i >= 0,
- start1, SCM_OUTOFRANGE, s_vector_move_right_x);
- SCM_ASSERT (j <= SCM_LENGTH (vec2) && j >= 0,
- start2, SCM_OUTOFRANGE, s_vector_move_right_x);
- SCM_ASSERT (e <= SCM_LENGTH (vec1) && e >= 0,
- end1, SCM_OUTOFRANGE, s_vector_move_right_x);
+ SCM_VALIDATE_VECTOR (1,vec1);
+ SCM_VALIDATE_INUM_COPY (2,start1,i);
+ SCM_VALIDATE_INUM_COPY (3,end1,e);
+ SCM_VALIDATE_VECTOR (4,vec2);
+ SCM_VALIDATE_INUM_COPY (5,start2,j);
+ SCM_ASSERT_RANGE (2, start1, i <= SCM_VECTOR_LENGTH (vec1) && i >= 0);
+ SCM_ASSERT_RANGE (5, start2, j <= SCM_VECTOR_LENGTH (vec2) && j >= 0);
+ SCM_ASSERT_RANGE (3, end1, e <= SCM_VECTOR_LENGTH (vec1) && e >= 0);
j = e - i + j;
- SCM_ASSERT (j <= SCM_LENGTH (vec2),
- start2, SCM_OUTOFRANGE, s_vector_move_right_x);
+ SCM_ASSERT_RANGE (5, start2, j <= SCM_VECTOR_LENGTH (vec2));
while (i < e)
SCM_VELTS (vec2)[--j] = SCM_VELTS (vec1)[--e];
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
void
scm_init_vectors ()
{
-#include "vectors.x"
- /*
- scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/vectors.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff