* unif.c: #include <config.h> if HAVE_CONFIG_H. Replace usage of

[bpt/guile.git] / libguile / unif.c

diff --git a/libguile/unif.c b/libguile/unif.c
index b900df5..c550b92 100644 (file)
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -49,6 +49,10 @@
 */
 \f
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -116,7 +120,7 @@ scm_uniform_element_size (SCM obj)
       result = sizeof (short);
       break;
 
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       result = sizeof (long long);
       break;
@@ -146,7 +150,7 @@ scm_uniform_element_size (SCM obj)
 static int
 singp (SCM obj)
 {
-  if (!SCM_SLOPPY_REALP (obj))
+  if (!SCM_REALP (obj))
     return 0;
   else
     {
@@ -205,7 +209,7 @@ scm_make_uve (long k, SCM prot)
          i = sizeof (short) * k;
          type = scm_tc7_svect;
        }
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
       else if (s == 'l')
        {
          i = sizeof (long long) * k;
@@ -269,7 +273,7 @@ SCM_DEFINE (scm_uniform_vector_length, "uniform-vector-length", 1, 0, 0,
     case scm_tc7_dvect:
     case scm_tc7_cvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
       return SCM_MAKINUM (SCM_UVECTOR_LENGTH (v));
@@ -324,7 +328,7 @@ SCM_DEFINE (scm_array_p, "array?", 1, 1, 0,
          protp = SCM_SYMBOLP (prot)
            && (1 == SCM_SYMBOL_LENGTH (prot))
            && ('s' == SCM_SYMBOL_CHARS (prot)[0]);
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
        case scm_tc7_llvect:
          protp = SCM_SYMBOLP (prot)
            && (1 == SCM_SYMBOL_LENGTH (prot))
@@ -370,7 +374,7 @@ SCM_DEFINE (scm_array_rank, "array-rank", 1, 0, 0,
     case scm_tc7_fvect:
     case scm_tc7_cvect:
     case scm_tc7_dvect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
     case scm_tc7_svect:
@@ -413,7 +417,7 @@ SCM_DEFINE (scm_array_dimensions, "array-dimensions", 1, 0, 0,
     case scm_tc7_cvect:
     case scm_tc7_dvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
       return scm_cons (scm_uniform_vector_length (ra), SCM_EOL);
@@ -678,8 +682,8 @@ SCM_DEFINE (scm_make_shared_array, "make-shared-array", 2, 0, 1,
   scm_t_array_dim *s;
 
   SCM_VALIDATE_REST_ARGUMENT (dims);
-  SCM_VALIDATE_ARRAY (1,oldra);
-  SCM_VALIDATE_PROC (2,mapfunc);
+  SCM_VALIDATE_ARRAY (1, oldra);
+  SCM_VALIDATE_PROC (2, mapfunc);
   ra = scm_shap2ra (dims, FUNC_NAME);
   if (SCM_ARRAYP (oldra))
     {
@@ -802,7 +806,8 @@ SCM_DEFINE (scm_transpose_array, "transpose-array", 1, 0, 1,
            "@end lisp")
 #define FUNC_NAME s_scm_transpose_array
 {
-  SCM res, vargs, *ve = &vargs;
+  SCM res, vargs;
+  SCM const *ve = &vargs;
   scm_t_array_dim *s, *r;
   int ndim, i, k;
 
@@ -821,7 +826,7 @@ SCM_DEFINE (scm_transpose_array, "transpose-array", 1, 0, 1,
     case scm_tc7_dvect:
     case scm_tc7_cvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
       if (SCM_NULLP (args) || !SCM_NULLP (SCM_CDR (args)))
@@ -938,7 +943,7 @@ SCM_DEFINE (scm_enclose_array, "enclose-array", 1, 0, 1,
     case scm_tc7_vector:
     case scm_tc7_wvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
       s->lbnd = 0;
@@ -1056,7 +1061,7 @@ tail:
     case scm_tc7_dvect:
     case scm_tc7_cvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
     case scm_tc7_vector:
@@ -1104,7 +1109,7 @@ SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
        }
       else
        {
-          SCM_VALIDATE_INUM (2,args);
+          SCM_VALIDATE_INUM (2, args);
          pos = SCM_INUM (args);
        }
       length = SCM_INUM (scm_uniform_vector_length (v));
@@ -1153,7 +1158,7 @@ SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
 
     case scm_tc7_svect:
       return SCM_MAKINUM (((short *) SCM_CELL_WORD_1 (v))[pos]);
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       return scm_long_long2num (((long long *) SCM_CELL_WORD_1 (v))[pos]);
 #endif
@@ -1184,7 +1189,7 @@ scm_cvref (SCM v, unsigned long pos, SCM last)
     default:
       SCM_WRONG_TYPE_ARG (SCM_ARG1, v);
     case scm_tc7_bvect:
-      if (SCM_BITVEC_REF(v,pos))
+      if (SCM_BITVEC_REF(v, pos))
        return SCM_BOOL_T;
       else
        return SCM_BOOL_F;
@@ -1198,7 +1203,7 @@ scm_cvref (SCM v, unsigned long pos, SCM last)
       return scm_long2num(((signed long *) SCM_VELTS (v))[pos]);
     case scm_tc7_svect:
       return SCM_MAKINUM (((short *) SCM_CELL_WORD_1 (v))[pos]);
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       return scm_long_long2num (((long long *) SCM_CELL_WORD_1 (v))[pos]);
 #endif
@@ -1278,7 +1283,7 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
        }
       else
        {
-          SCM_VALIDATE_INUM_COPY (3,args,pos);
+          SCM_VALIDATE_INUM_COPY (3, args, pos);
        }
       length = SCM_INUM (scm_uniform_vector_length (v));
       SCM_ASRTGO (pos >= 0 && pos < length, outrng);
@@ -1296,9 +1301,9 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
       goto badarg1;
     case scm_tc7_bvect:
       if (SCM_FALSEP (obj))
-       SCM_BITVEC_CLR(v,pos);
+       SCM_BITVEC_CLR(v, pos);
       else if (SCM_EQ_P (obj, SCM_BOOL_T))
-       SCM_BITVEC_SET(v,pos);
+       SCM_BITVEC_SET(v, pos);
       else
        badobj:SCM_WRONG_TYPE_ARG (2, obj);
       break;
@@ -1324,7 +1329,7 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
       SCM_ASRTGO (SCM_INUMP (obj), badobj);
       ((short *) SCM_UVECTOR_BASE (v))[pos] = SCM_INUM (obj);
       break;
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       ((long long *) SCM_UVECTOR_BASE (v))[pos]
        = scm_num2long_long (obj, SCM_ARG2, FUNC_NAME);
@@ -1350,7 +1355,7 @@ SCM_DEFINE (scm_array_set_x, "array-set!", 2, 0, 1,
       break;
     case scm_tc7_vector:
     case scm_tc7_wvect:
-      SCM_VELTS (v)[pos] = obj;
+      SCM_VECTOR_SET (v, pos, obj);
       break;
     }
   return SCM_UNSPECIFIED;
@@ -1392,7 +1397,7 @@ SCM_DEFINE (scm_array_contents, "array-contents", 1, 1, 0,
     case scm_tc7_dvect:
     case scm_tc7_cvect:
     case scm_tc7_svect:
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
 #endif
       return ra;
@@ -1542,7 +1547,7 @@ loop:
       base = (char *) SCM_UVECTOR_BASE (v);
       sz = sizeof (short);
       break;
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       base = (char *) SCM_UVECTOR_BASE (v);
       sz = sizeof (long long);
@@ -1708,7 +1713,7 @@ loop:
       base = (char *) SCM_UVECTOR_BASE (v);
       sz = sizeof (short);
       break;
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       base = (char *) SCM_UVECTOR_BASE (v);
       sz = sizeof (long long);
@@ -1824,7 +1829,7 @@ SCM_DEFINE (scm_bit_position, "bit-position", 3, 0, 0,
 
   SCM_VALIDATE_BOOL (1, item);
   SCM_ASSERT (SCM_BITVECTOR_P (v), v, SCM_ARG2, FUNC_NAME);
-  SCM_VALIDATE_INUM_COPY (3,k,pos);
+  SCM_VALIDATE_INUM_COPY (3, k, pos);
   SCM_ASSERT_RANGE (3, k, (pos <= SCM_BITVECTOR_LENGTH (v)) && (pos >= 0));
 
   if (pos == SCM_BITVECTOR_LENGTH (v))
@@ -1902,7 +1907,7 @@ SCM_DEFINE (scm_bit_set_star_x, "bit-set*!", 3, 0, 0,
            k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
            if (k >= vlen)
              scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
-           SCM_BITVEC_CLR(v,k);
+           SCM_BITVEC_CLR(v, k);
          }
       else if (SCM_EQ_P (obj, SCM_BOOL_T))
        for (i = SCM_UVECTOR_LENGTH (kv); i;)
@@ -1910,7 +1915,7 @@ SCM_DEFINE (scm_bit_set_star_x, "bit-set*!", 3, 0, 0,
            k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
            if (k >= vlen)
              scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
-           SCM_BITVEC_SET(v,k);
+           SCM_BITVEC_SET(v, k);
          }
       else
        badarg3:SCM_WRONG_TYPE_ARG (3, obj);
@@ -1960,7 +1965,7 @@ SCM_DEFINE (scm_bit_count_star, "bit-count*", 3, 0, 0,
            k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
            if (k >= vlen)
              scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
-           if (!SCM_BITVEC_REF(v,k))
+           if (!SCM_BITVEC_REF(v, k))
              count++;
          }
       else if (SCM_EQ_P (obj, SCM_BOOL_T))
@@ -1969,7 +1974,7 @@ SCM_DEFINE (scm_bit_count_star, "bit-count*", 3, 0, 0,
            k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
            if (k >= vlen)
              scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
-           if (SCM_BITVEC_REF (v,k))
+           if (SCM_BITVEC_REF (v, k))
              count++;
          }
       else
@@ -2050,7 +2055,7 @@ scm_istr2bve (char *str, long len)
 
 
 static SCM 
-ra2l (SCM ra,unsigned long base,unsigned long k)
+ra2l (SCM ra, unsigned long base, unsigned long k)
 {
   register SCM res = SCM_EOL;
   register long inc = SCM_ARRAY_DIMS (ra)[k].inc;
@@ -2139,7 +2144,7 @@ SCM_DEFINE (scm_array_to_list, "array->list", 1, 0, 0,
          res = scm_cons(scm_short2num (data[k]), res);
        return res;
       }
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       {
        long long *data = (long long *)SCM_VELTS(v);
@@ -2190,7 +2195,7 @@ SCM_DEFINE (scm_list_to_uniform_array, "list->uniform-array", 3, 0, 0,
   SCM ra;
   unsigned long k;
   long n;
-  SCM_VALIDATE_INUM_COPY (1,ndim,k);
+  SCM_VALIDATE_INUM_COPY (1, ndim, k);
   while (k--)
     {
       n = scm_ilength (row);
@@ -2261,7 +2266,7 @@ l2ra (SCM lst, SCM ra, unsigned long base, unsigned long k)
 
 
 static void 
-rapr1 (SCM ra,unsigned long j,unsigned long k,SCM port,scm_print_state *pstate)
+rapr1 (SCM ra, unsigned long j, unsigned long k, SCM port, scm_print_state *pstate)
 {
   long inc = 1;
   long n = (SCM_TYP7 (ra) == scm_tc7_smob
@@ -2508,7 +2513,7 @@ tail:
     case scm_tc7_svect:
       scm_putc ('h', port);
       break;
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       scm_putc ('l', port);
       break;
@@ -2564,7 +2569,7 @@ loop:
       return SCM_MAKINUM (-1L);
     case scm_tc7_svect:
       return scm_str2symbol ("s");
-#ifdef HAVE_LONG_LONGS
+#if SCM_SIZEOF_LONG_LONG != 0
     case scm_tc7_llvect:
       return scm_str2symbol ("l");
 #endif
@@ -2605,9 +2610,7 @@ scm_init_unif ()
   scm_set_smob_print (scm_tc16_array, scm_raprin1);
   scm_set_smob_equalp (scm_tc16_array, scm_array_equal_p);
   scm_add_feature ("array");
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/unif.x"
-#endif
 }
 
 /*