/* Copyright (C) 1995,1996,1997,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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * 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 2.1 of the License, or (at your option) any later version.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * 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. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
\f
/* data initialization and C<->Scheme data conversion */
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "libguile/gh.h"
#ifdef HAVE_STRING_H
#include <string.h>
SCM
gh_str2scm (const char *s, size_t len)
{
- return scm_makfromstr (s, len, 0);
+ return scm_mem2string (s, len);
}
SCM
gh_str02scm (const char *s)
If START + LEN is off the end of DST, signal an out-of-range
error. */
void
-gh_set_substr (char *src, SCM dst, scm_bits_t start, size_t len)
+gh_set_substr (char *src, SCM dst, long start, size_t len)
{
char *dst_ptr;
size_t dst_len;
- size_t effective_length;
SCM_ASSERT (SCM_STRINGP (dst), dst, SCM_ARG3, "gh_set_substr");
dst_ptr = SCM_STRING_CHARS (dst);
dst_len = SCM_STRING_LENGTH (dst);
- SCM_ASSERT (len >= 0 && len <= dst_len,
- dst, SCM_ARG4, "gh_set_substr");
+ SCM_ASSERT (start + len <= dst_len, dst, SCM_ARG4, "gh_set_substr");
- effective_length = (len < dst_len) ? len : dst_len;
- memmove (dst_ptr + start, src, effective_length);
+ memmove (dst_ptr + start, src, len);
scm_remember_upto_here_1 (dst);
}
}
SCM
-gh_ints2scm (const int *d, scm_bits_t n)
+gh_ints2scm (const int *d, long n)
{
- scm_bits_t i;
+ long i;
SCM v = scm_c_make_vector (n, SCM_UNSPECIFIED);
- SCM *velts = SCM_VELTS(v);
-
for (i = 0; i < n; ++i)
- velts[i] = (SCM_FIXABLE (d[i]) ? SCM_MAKINUM (d[i]) : scm_i_long2big (d[i]));
+ SCM_VECTOR_SET (v, i, (SCM_FIXABLE (d[i]) ? SCM_MAKINUM (d[i]) : scm_i_long2big (d[i])));
return v;
}
SCM
-gh_doubles2scm (const double *d, scm_bits_t n)
+gh_doubles2scm (const double *d, long n)
{
- scm_bits_t i;
+ long i;
SCM v = scm_c_make_vector (n, SCM_UNSPECIFIED);
- SCM *velts = SCM_VELTS(v);
for(i = 0; i < n; i++)
- velts[i] = scm_make_real (d[i]);
+ SCM_VECTOR_SET (v, i, scm_make_real (d[i]));
return v;
}
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
/* Do not use this function for building normal Scheme vectors, unless
you arrange for the elements to be protected from GC while you
initialize the vector. */
static SCM
makvect (char *m, size_t len, int type)
{
- SCM ans;
- SCM_NEWCELL (ans);
- SCM_DEFER_INTS;
- SCM_SET_UVECTOR_BASE (ans, m);
- SCM_SET_UVECTOR_LENGTH (ans, len, type);
- SCM_ALLOW_INTS;
- return ans;
+ return scm_cell (SCM_MAKE_UVECTOR_TAG (len, type), (scm_t_bits) m);
}
SCM
-gh_chars2byvect (const char *d, scm_bits_t n)
+gh_chars2byvect (const char *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (char), "vector");
+ char *m = scm_gc_malloc (n * sizeof (char), "vector");
memcpy (m, d, n * sizeof (char));
return makvect (m, n, scm_tc7_byvect);
}
SCM
-gh_shorts2svect (const short *d, scm_bits_t n)
+gh_shorts2svect (const short *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (short), "vector");
+ char *m = scm_gc_malloc (n * sizeof (short), "vector");
memcpy (m, d, n * sizeof (short));
return makvect (m, n, scm_tc7_svect);
}
SCM
-gh_longs2ivect (const long *d, scm_bits_t n)
+gh_longs2ivect (const long *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (long), "vector");
+ char *m = scm_gc_malloc (n * sizeof (long), "vector");
memcpy (m, d, n * sizeof (long));
return makvect (m, n, scm_tc7_ivect);
}
SCM
-gh_ulongs2uvect (const unsigned long *d, scm_bits_t n)
+gh_ulongs2uvect (const unsigned long *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (unsigned long), "vector");
+ char *m = scm_gc_malloc (n * sizeof (unsigned long), "vector");
memcpy (m, d, n * sizeof (unsigned long));
return makvect (m, n, scm_tc7_uvect);
}
SCM
-gh_floats2fvect (const float *d, scm_bits_t n)
+gh_floats2fvect (const float *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (float), "vector");
+ char *m = scm_gc_malloc (n * sizeof (float), "vector");
memcpy (m, d, n * sizeof (float));
return makvect (m, n, scm_tc7_fvect);
}
SCM
-gh_doubles2dvect (const double *d, scm_bits_t n)
+gh_doubles2dvect (const double *d, long n)
{
- char *m = scm_must_malloc (n * sizeof (double), "vector");
+ char *m = scm_gc_malloc (n * sizeof (double), "vector");
memcpy (m, d, n * sizeof (double));
return makvect (m, n, scm_tc7_dvect);
}
char *
gh_scm2chars (SCM obj, char *m)
{
- scm_bits_t i, n;
- scm_bits_t v;
+ long i, n;
+ long v;
SCM val;
if (SCM_IMP (obj))
scm_wrong_type_arg (0, 0, obj);
for (i = 0; i < n; ++i)
m[i] = SCM_INUM (SCM_VELTS (obj)[i]);
break;
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
case scm_tc7_byvect:
n = SCM_UVECTOR_LENGTH (obj);
if (m == 0)
break;
#endif
case scm_tc7_string:
- case scm_tc7_substring:
n = SCM_STRING_LENGTH (obj);
if (m == 0)
m = (char *) malloc (n * sizeof (char));
short *
gh_scm2shorts (SCM obj, short *m)
{
- scm_bits_t i, n;
- scm_bits_t v;
+ long i, n;
+ long v;
SCM val;
if (SCM_IMP (obj))
scm_wrong_type_arg (0, 0, obj);
for (i = 0; i < n; ++i)
m[i] = SCM_INUM (SCM_VELTS (obj)[i]);
break;
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
case scm_tc7_svect:
n = SCM_UVECTOR_LENGTH (obj);
if (m == 0)
long *
gh_scm2longs (SCM obj, long *m)
{
- scm_bits_t i, n;
+ long i, n;
SCM val;
if (SCM_IMP (obj))
scm_wrong_type_arg (0, 0, obj);
: scm_num2long (val, 0, NULL);
}
break;
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
case scm_tc7_ivect:
case scm_tc7_uvect:
n = SCM_UVECTOR_LENGTH (obj);
float *
gh_scm2floats (SCM obj, float *m)
{
- scm_bits_t i, n;
+ long i, n;
SCM val;
if (SCM_IMP (obj))
scm_wrong_type_arg (0, 0, obj);
m[i] = SCM_REAL_VALUE (val);
}
break;
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
case scm_tc7_fvect:
n = SCM_UVECTOR_LENGTH (obj);
if (m == 0)
double *
gh_scm2doubles (SCM obj, double *m)
{
- scm_bits_t i, n;
+ long i, n;
SCM val;
if (SCM_IMP (obj))
scm_wrong_type_arg (0, 0, obj);
m[i] = SCM_REAL_VALUE (val);
}
break;
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
case scm_tc7_fvect:
n = SCM_UVECTOR_LENGTH (obj);
if (m == 0)
region to fit the string. If truncation occurs, the corresponding
area of DST is left unchanged. */
void
-gh_get_substr (SCM src, char *dst, scm_bits_t start, size_t len)
+gh_get_substr (SCM src, char *dst, long start, size_t len)
{
size_t src_len, effective_length;
SCM_ASSERT (SCM_STRINGP (src), src, SCM_ARG3, "gh_get_substr");
}
/* returns the length of the given vector */
-scm_bits_t
+unsigned long
gh_vector_length (SCM v)
{
- return (size_t) SCM_VECTOR_LENGTH (v);
+ return (unsigned long) SCM_VECTOR_LENGTH (v);
}
-#ifdef HAVE_ARRAYS
+#if SCM_HAVE_ARRAYS
/* uniform vector support */
/* returns the length as a C unsigned long integer */
-scm_ubits_t
+unsigned long
gh_uniform_vector_length (SCM v)
{
- return SCM_UVECTOR_LENGTH (v);
+ return (unsigned long) SCM_UVECTOR_LENGTH (v);
}
/* gets the given element from a uniform vector; ilist is a list (or
SCM_VALIDATE_MODULE (SCM_ARG1, module);
- sym = gh_symbol2scm (sname);
+ sym = scm_str2symbol (sname);
var = scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
if (var != SCM_BOOL_F)
return SCM_VARIABLE_REF (var);
HCoop / bpt / guile.git / blobdiff