rb-gsl 1.16.0.4 → 1.16.0.5

data/ext/{gsl → gsl_native}/blas3.c

@@ -91,11 +91,11 @@ static VALUE rb_gsl_blas_dgemm(int argc, VALUE *argv, VALUE obj)
 static VALUE rb_gsl_blas_zgemm(int argc, VALUE *argv, VALUE obj)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *C = NULL;
-  gsl_complex alpha, beta, *pa = &alpha, *pb = β
+  gsl_complex *pa = NULL, *pb = NULL;
   CBLAS_TRANSPOSE_t TransA, TransB;
   int flag = 0;
-  alpha.dat[0] = 1.0; alpha.dat[1] = 0.0;
-  beta.dat[0] = 0.0; beta.dat[1] = 0.0;
+  (*pa).dat[0] = 1.0; (*pa).dat[1] = 0.0;
+  (*pb).dat[0] = 0.0; (*pb).dat[1] = 0.0;
   switch (argc) {
   case 2:
     CHECK_MATRIX_COMPLEX(argv[0]);
@@ -156,7 +156,7 @@ static VALUE rb_gsl_blas_zgemm(int argc, VALUE *argv, VALUE obj)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 7)", argc);
     break;
   }
-  gsl_blas_zgemm(TransA, TransB, alpha, A, B, beta, C);
+  gsl_blas_zgemm(TransA, TransB, *pa, A, B, *pb, C);
   if (flag == 1) return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, C);
   else return argv[6];
 }
@@ -307,7 +307,7 @@ static VALUE rb_gsl_blas_zsymm(int argc, VALUE *argv, VALUE obj)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 7)", argc);
     break;
   }
-  gsl_blas_zsymm(Side, Uplo, alpha, A, B, beta, C);
+  gsl_blas_zsymm(Side, Uplo, *pa, A, B, *pb, C);
   if (flag == 1) return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, C);
   else return argv[6];
 }
@@ -382,13 +382,13 @@ static VALUE rb_gsl_blas_zhemm(int argc, VALUE *argv, VALUE obj)
     rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 7)", argc);
     break;
   }
-  gsl_blas_zhemm(Side, Uplo, alpha, A, B, beta, C);
+  gsl_blas_zhemm(Side, Uplo, *pa, A, B, *pb, C);
   if (flag == 1) return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, C);
   else return argv[6];
 }
 
-static VALUE rb_gsl_blas_dtrmm(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_dtrmm(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                               VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix *A = NULL, *B = NULL;
   double alpha;
@@ -410,8 +410,8 @@ static VALUE rb_gsl_blas_dtrmm(VALUE obj, VALUE s, VALUE u, VALUE ta,
   return bb;
 }
 
-static VALUE rb_gsl_blas_dtrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_dtrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                                VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix *A = NULL, *B = NULL, *Bnew = NULL;
   double alpha;
@@ -435,11 +435,11 @@ static VALUE rb_gsl_blas_dtrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
   return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, Bnew);
 }
 
-static VALUE rb_gsl_blas_ztrmm(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_ztrmm(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                               VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix_complex *A = NULL, *B = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   CBLAS_SIDE_t Side;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t TransA;
@@ -455,15 +455,15 @@ static VALUE rb_gsl_blas_ztrmm(VALUE obj, VALUE s, VALUE u, VALUE ta,
   Data_Get_Struct(a, gsl_complex, pa);
   Data_Get_Struct(aa, gsl_matrix_complex, A);
   Data_Get_Struct(bb, gsl_matrix_complex, B);
-  gsl_blas_ztrmm(Side, Uplo, TransA, Diag, alpha, A, B);
+  gsl_blas_ztrmm(Side, Uplo, TransA, Diag, *pa, A, B);
   return bb;
 }
 
-static VALUE rb_gsl_blas_ztrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_ztrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                                VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *Bnew = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   CBLAS_SIDE_t Side;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t TransA;
@@ -480,12 +480,12 @@ static VALUE rb_gsl_blas_ztrmm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
   Data_Get_Struct(bb, gsl_matrix_complex, B);
   Bnew = gsl_matrix_complex_alloc(B->size1, B->size2);
   gsl_matrix_complex_memcpy(Bnew, B);
-  gsl_blas_ztrmm(Side, Uplo, TransA, Diag, alpha, A, Bnew);
+  gsl_blas_ztrmm(Side, Uplo, TransA, Diag, *pa, A, Bnew);
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, Bnew);
 }
 
-static VALUE rb_gsl_blas_dtrsm(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_dtrsm(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                               VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix *A = NULL, *B = NULL;
   double alpha;
@@ -507,8 +507,8 @@ static VALUE rb_gsl_blas_dtrsm(VALUE obj, VALUE s, VALUE u, VALUE ta,
   return bb;
 }
 
-static VALUE rb_gsl_blas_dtrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_dtrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                                VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix *A = NULL, *B = NULL, *Bnew = NULL;
   double alpha;
@@ -532,11 +532,11 @@ static VALUE rb_gsl_blas_dtrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
   return Data_Wrap_Struct(cgsl_matrix, 0, gsl_matrix_free, Bnew);
 }
 
-static VALUE rb_gsl_blas_ztrsm(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_ztrsm(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                               VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix_complex *A = NULL, *B = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   CBLAS_SIDE_t Side;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t TransA;
@@ -552,15 +552,15 @@ static VALUE rb_gsl_blas_ztrsm(VALUE obj, VALUE s, VALUE u, VALUE ta,
   Data_Get_Struct(a, gsl_complex, pa);
   Data_Get_Struct(aa, gsl_matrix_complex, A);
   Data_Get_Struct(bb, gsl_matrix_complex, B);
-  gsl_blas_ztrsm(Side, Uplo, TransA, Diag, alpha, A, B);
+  gsl_blas_ztrsm(Side, Uplo, TransA, Diag, *pa, A, B);
   return bb;
 }
 
-static VALUE rb_gsl_blas_ztrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta, 
-			       VALUE d, VALUE a, VALUE aa, VALUE bb)
+static VALUE rb_gsl_blas_ztrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
+                                VALUE d, VALUE a, VALUE aa, VALUE bb)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *Bnew = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   CBLAS_SIDE_t Side;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t TransA;
@@ -578,12 +578,12 @@ static VALUE rb_gsl_blas_ztrsm2(VALUE obj, VALUE s, VALUE u, VALUE ta,
   Data_Get_Struct(bb, gsl_matrix_complex, B);
   Bnew = gsl_matrix_complex_alloc(B->size1, B->size2);
   gsl_matrix_complex_memcpy(Bnew, B);
-  gsl_blas_ztrsm(Side, Uplo, TransA, Diag, alpha, A, Bnew);
+  gsl_blas_ztrsm(Side, Uplo, TransA, Diag, *pa, A, Bnew);
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, Bnew);
 }
 
 static VALUE rb_gsl_blas_dsyrk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                               VALUE b, VALUE cc)
 {
   gsl_matrix *A = NULL, *C = NULL;
   double alpha, beta;
@@ -603,7 +603,7 @@ static VALUE rb_gsl_blas_dsyrk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_dsyrk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                                VALUE b, VALUE cc)
 {
   gsl_matrix *A = NULL, *C = NULL, *Cnew = NULL;
   double alpha, beta;
@@ -625,10 +625,10 @@ static VALUE rb_gsl_blas_dsyrk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_zsyrk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                               VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *C = NULL;
-  gsl_complex alpha, beta, *pa = &alpha, *pb = β
+  gsl_complex *pa = NULL, *pb = NULL;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
   CHECK_FIXNUM(u);  CHECK_FIXNUM(t);
@@ -640,15 +640,15 @@ static VALUE rb_gsl_blas_zsyrk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(b, gsl_complex, pb);
   Data_Get_Struct(aa, gsl_matrix_complex, A);
   Data_Get_Struct(cc, gsl_matrix_complex, C);
-  gsl_blas_zsyrk(Uplo, Trans, alpha, A, beta, C);
+  gsl_blas_zsyrk(Uplo, Trans, *pa, A, *pb, C);
   return cc;
 }
 
 static VALUE rb_gsl_blas_zsyrk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                                VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *C = NULL, *Cnew = NULL;
-  gsl_complex alpha, beta, *pa = &alpha, *pb = β
+  gsl_complex *pa = NULL, *pb = NULL;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
   CHECK_FIXNUM(u);  CHECK_FIXNUM(t);
@@ -662,12 +662,12 @@ static VALUE rb_gsl_blas_zsyrk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(cc, gsl_matrix_complex, C);
   Cnew = gsl_matrix_complex_alloc(C->size1, C->size2);
   gsl_matrix_complex_memcpy(Cnew, C);
-  gsl_blas_zsyrk(Uplo, Trans, alpha, A, beta, Cnew);
+  gsl_blas_zsyrk(Uplo, Trans, *pa, A, *pb, Cnew);
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, Cnew);
 }
 
 static VALUE rb_gsl_blas_zherk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                               VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *C = NULL;
   double alpha, beta;
@@ -688,7 +688,7 @@ static VALUE rb_gsl_blas_zherk(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_zherk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-			       VALUE b, VALUE cc)
+                                VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *C = NULL, *Cnew = NULL;
   double alpha, beta;
@@ -710,7 +710,7 @@ static VALUE rb_gsl_blas_zherk2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_dsyr2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix *A = NULL, *B = NULL, *C = NULL;
   double alpha, beta;
@@ -731,7 +731,7 @@ static VALUE rb_gsl_blas_dsyr2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_dsyr2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                 VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix *A = NULL, *B = NULL, *C = NULL, *Cnew = NULL;
   double alpha, beta;
@@ -754,10 +754,10 @@ static VALUE rb_gsl_blas_dsyr2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
 }
 
 static VALUE rb_gsl_blas_zsyr2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *C = NULL;
-  gsl_complex alpha, beta, *pa = &alpha, *pb = β
+  gsl_complex *pa = NULL, *pb = NULL;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
   CHECK_FIXNUM(u);  CHECK_FIXNUM(t);
@@ -770,15 +770,15 @@ static VALUE rb_gsl_blas_zsyr2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(aa, gsl_matrix_complex, A);
   Data_Get_Struct(bb, gsl_matrix_complex, B);
   Data_Get_Struct(cc, gsl_matrix_complex, C);
-  gsl_blas_zsyr2k(Uplo, Trans, alpha, A, B, beta, C);
+  gsl_blas_zsyr2k(Uplo, Trans, *pa, A, B, *pb, C);
   return cc;
 }
 
 static VALUE rb_gsl_blas_zsyr2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                 VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *C = NULL, *Cnew = NULL;
-  gsl_complex alpha, beta, *pa = &alpha, *pb = β
+  gsl_complex *pa = NULL, *pb = NULL;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
   CHECK_FIXNUM(u);  CHECK_FIXNUM(t);
@@ -793,15 +793,15 @@ static VALUE rb_gsl_blas_zsyr2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(cc, gsl_matrix_complex, C);
   Cnew = gsl_matrix_complex_alloc(C->size1, C->size2);
   gsl_matrix_complex_memcpy(Cnew, C);
-  gsl_blas_zsyr2k(Uplo, Trans, alpha, A, B, beta, Cnew);
+  gsl_blas_zsyr2k(Uplo, Trans, *pa, A, B, *pb, Cnew);
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, Cnew);
 }
 
 static VALUE rb_gsl_blas_zher2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *C = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   double beta;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
@@ -816,15 +816,15 @@ static VALUE rb_gsl_blas_zher2k(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(aa, gsl_matrix_complex, A);
   Data_Get_Struct(bb, gsl_matrix_complex, B);
   Data_Get_Struct(cc, gsl_matrix_complex, C);
-  gsl_blas_zher2k(Uplo, Trans, alpha, A, B, beta, C);
+  gsl_blas_zher2k(Uplo, Trans, *pa, A, B, beta, C);
   return cc;
 }
 
 static VALUE rb_gsl_blas_zher2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
-				VALUE bb, VALUE b, VALUE cc)
+                                 VALUE bb, VALUE b, VALUE cc)
 {
   gsl_matrix_complex *A = NULL, *B = NULL, *C = NULL, *Cnew = NULL;
-  gsl_complex alpha, *pa = α
+  gsl_complex *pa = NULL;
   double beta;
   CBLAS_UPLO_t Uplo;
   CBLAS_TRANSPOSE_t Trans;
@@ -841,7 +841,7 @@ static VALUE rb_gsl_blas_zher2k2(VALUE obj, VALUE u, VALUE t, VALUE a, VALUE aa,
   Data_Get_Struct(cc, gsl_matrix_complex, C);
   Cnew = gsl_matrix_complex_alloc(C->size1, C->size2);
   gsl_matrix_complex_memcpy(Cnew, C);
-  gsl_blas_zher2k(Uplo, Trans, alpha, A, B, beta, Cnew);
+  gsl_blas_zher2k(Uplo, Trans, *pa, A, B, beta, Cnew);
   return Data_Wrap_Struct(cgsl_matrix_complex, 0, gsl_matrix_complex_free, Cnew);
 }
 

data/ext/{gsl → gsl_native}/block.c

@@ -18,26 +18,23 @@
 #include "include/rb_gsl_histogram.h"
 #include "include/rb_gsl_complex.h"
 #include "include/rb_gsl_poly.h"
-
-#ifdef HAVE_NARRAY_H
 #include "include/rb_gsl_with_narray.h"
-#endif
 
 #define BASE_DOUBLE
 #include "include/templates_on.h"
-#include "block_source.c"
+#include "block_source.h"
 #include "include/templates_off.h"
 #undef  BASE_DOUBLE
 
 #define BASE_INT
 #include "include/templates_on.h"
-#include "block_source.c"
+#include "block_source.h"
 #include "include/templates_off.h"
 #undef  BASE_INT
 
 #define BASE_UCHAR
 #include "include/templates_on.h"
-#include "block_source.c"
+#include "block_source.h"
 #include "include/templates_off.h"
 #undef  BASE_UCHAR
 

data/ext/{gsl/block_source.c → gsl_native/block_source.h}

@@ -82,9 +82,9 @@ static VALUE FUNCTION(rb_gsl_block,fprintf)(int argc, VALUE *argv, VALUE obj)
   GSL_TYPE(gsl_block) *h = NULL;
   FILE *fp = NULL;
   int status, flag = 0;
-  if (argc != 1 && argc != 2) 
-    rb_raise(rb_eArgError, 
-	     "wrong number of arguments (%d for 1 or 2)", argc);
+  if (argc != 1 && argc != 2)
+    rb_raise(rb_eArgError,
+             "wrong number of arguments (%d for 1 or 2)", argc);
   Data_Get_Struct(obj, GSL_TYPE(gsl_block), h);
   fp = rb_gsl_open_writefile(argv[0], &flag);
   if (argc == 2) {
@@ -203,28 +203,27 @@ static VALUE FUNCTION(rb_gsl_block,get)(int argc, VALUE *argv, VALUE obj)
       n = RARRAY_LEN(argv[0]);
       bnew = FUNCTION(gsl_block,alloc)(n);
       for (j = 0; j < n; j++) {
-	i = FIX2INT(rb_ary_entry(argv[0], j));
-	if (i < 0) k = b->size + i; else k = i;
-	bnew->data[j] = b->data[k];
+        i = FIX2INT(rb_ary_entry(argv[0], j));
+        if (i < 0) k = b->size + i; else k = i;
+        bnew->data[j] = b->data[k];
       }
       return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free), bnew);
       break;
     default:
       if (PERMUTATION_P(argv[0])) {
-	Data_Get_Struct(argv[0], gsl_index, p);
-	bnew = FUNCTION(gsl_block,alloc)(p->size);
-	for (j = 0; j < p->size; j++) bnew->data[j] = b->data[p->data[j]];
-	return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free), bnew);
+        Data_Get_Struct(argv[0], gsl_index, p);
+        bnew = FUNCTION(gsl_block,alloc)(p->size);
+        for (j = 0; j < p->size; j++) bnew->data[j] = b->data[p->data[j]];
+        return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free), bnew);
       } else if (CLASS_OF(argv[0]) == rb_cRange) {
-	get_range_int_beg_en_n(argv[0], &beg, &en, &n, &step);
-	bnew = FUNCTION(gsl_block,alloc)(n);
-	for (j = 0; j < n; j++) 
-	  bnew->data[j] = b->data[beg+j];
-	return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free),
-				bnew);
+        get_range_int_beg_en_n(argv[0], &beg, &en, &n, &step);
+        bnew = FUNCTION(gsl_block,alloc)(n);
+        for (j = 0; j < n; j++)
+          bnew->data[j] = b->data[beg+j];
+        return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free), bnew);
       } else {
-	rb_raise(rb_eArgError, "wrong argument type %s (Fixnum, Array, or Range expected)", rb_class2name(CLASS_OF(argv[0])));
-	break;
+        rb_raise(rb_eArgError, "wrong argument type %s (Fixnum, Array, or Range expected)", rb_class2name(CLASS_OF(argv[0])));
+        break;
       }
     }
     break;
@@ -237,7 +236,6 @@ static VALUE FUNCTION(rb_gsl_block,get)(int argc, VALUE *argv, VALUE obj)
     }
     return Data_Wrap_Struct(GSL_TYPE(cgsl_block), 0, FUNCTION(gsl_block,free), bnew);
 
-
     break;
   }
   return Qnil;
@@ -257,9 +255,9 @@ static VALUE FUNCTION(rb_gsl_block,set)(VALUE obj, VALUE ii, VALUE xx)
 }
 
 
-static int FUNCTION(gsl_block,eq)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,eq)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -273,9 +271,9 @@ static int FUNCTION(gsl_block,eq)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,ne)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,ne)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -289,9 +287,9 @@ static int FUNCTION(gsl_block,ne)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,gt)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,gt)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -305,9 +303,9 @@ static int FUNCTION(gsl_block,gt)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,ge)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,ge)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -321,9 +319,9 @@ static int FUNCTION(gsl_block,ge)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,lt)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,lt)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -337,9 +335,9 @@ static int FUNCTION(gsl_block,lt)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,le)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,le)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -353,9 +351,9 @@ static int FUNCTION(gsl_block,le)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,and)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,and)(const GSL_TYPE(gsl_block) *a,
+                                   const GSL_TYPE(gsl_block) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -369,9 +367,9 @@ static int FUNCTION(gsl_block,and)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,or)(const GSL_TYPE(gsl_block) *a, 
-				   const GSL_TYPE(gsl_block) *b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,or)(const GSL_TYPE(gsl_block) *a,
+                                  const GSL_TYPE(gsl_block) *b,
+                                  gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -385,9 +383,9 @@ static int FUNCTION(gsl_block,or)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,xor)(const GSL_TYPE(gsl_block) *a, 
-				    const GSL_TYPE(gsl_block) *b,
-				    gsl_block_uchar *c)
+static int FUNCTION(gsl_block,xor)(const GSL_TYPE(gsl_block) *a,
+                                   const GSL_TYPE(gsl_block) *b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -401,8 +399,8 @@ static int FUNCTION(gsl_block,xor)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,eq2)(const GSL_TYPE(gsl_block) *a, 
-				    BASE b, gsl_block_uchar *c)
+static int FUNCTION(gsl_block,eq2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b, gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -415,9 +413,9 @@ static int FUNCTION(gsl_block,eq2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,ne2)(const GSL_TYPE(gsl_block) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,ne2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -430,9 +428,9 @@ static int FUNCTION(gsl_block,ne2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,gt2)(const GSL_TYPE(gsl_block) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,gt2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -445,9 +443,9 @@ static int FUNCTION(gsl_block,gt2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,ge2)(const GSL_TYPE(gsl_block) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,ge2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -460,9 +458,9 @@ static int FUNCTION(gsl_block,ge2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,lt2)(const GSL_TYPE(gsl_block) *a, 
-				   BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,lt2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -475,9 +473,9 @@ static int FUNCTION(gsl_block,lt2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,le2)(const GSL_TYPE(gsl_block) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,le2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -490,9 +488,9 @@ static int FUNCTION(gsl_block,le2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,and2)(const GSL_TYPE(gsl_block) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,and2)(const GSL_TYPE(gsl_block) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -505,9 +503,9 @@ static int FUNCTION(gsl_block,and2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,or2)(const GSL_TYPE(gsl_block) *a, 
-				    BASE b,
-				   gsl_block_uchar *c)
+static int FUNCTION(gsl_block,or2)(const GSL_TYPE(gsl_block) *a,
+                                   BASE b,
+                                   gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -520,9 +518,9 @@ static int FUNCTION(gsl_block,or2)(const GSL_TYPE(gsl_block) *a,
   return 0;
 }
 
-static int FUNCTION(gsl_block,xor2)(const GSL_TYPE(gsl_block) *a, 
-				     BASE b,
-				    gsl_block_uchar *c)
+static int FUNCTION(gsl_block,xor2)(const GSL_TYPE(gsl_block) *a,
+                                    BASE b,
+                                    gsl_block_uchar *c)
 {
   size_t i;
   BASE x, y;
@@ -537,12 +535,12 @@ static int FUNCTION(gsl_block,xor2)(const GSL_TYPE(gsl_block) *a,
 
 
 static VALUE FUNCTION(rb_gsl_block,compare)(VALUE aa, VALUE bb,
-					     int (*cmp)(const GSL_TYPE(gsl_block)*,
-							const GSL_TYPE(gsl_block)*,
-							gsl_block_uchar*),
-					     int (*cmp2)(const GSL_TYPE(gsl_block)*,
-							 BASE,
-							 gsl_block_uchar*))
+                                            int (*cmp)(const GSL_TYPE (gsl_block)*,
+                                                       const GSL_TYPE (gsl_block)*,
+                                                       gsl_block_uchar*),
+                                            int (*cmp2)(const GSL_TYPE (gsl_block)*,
+                                                        BASE,
+                                                        gsl_block_uchar*))
 {
   GSL_TYPE(gsl_block) *a, *b;
   /*  gsl_block_int *c;*/
@@ -553,9 +551,9 @@ static VALUE FUNCTION(rb_gsl_block,compare)(VALUE aa, VALUE bb,
   c = gsl_block_uchar_alloc(a->size);
   if (BL_P(bb)) {
     Data_Get_Struct(bb, GSL_TYPE(gsl_block), b);
-    if (a->size != b->size) 
-      rb_raise(rb_eRuntimeError, "Block size mismatch, %d and %d", (int) a->size, 
-	       (int) b->size);
+    if (a->size != b->size)
+      rb_raise(rb_eRuntimeError, "Block size mismatch, %d and %d", (int) a->size,
+               (int) b->size);
     /*status =*/ (*cmp)(a, b, c);
   } else {
     /*status =*/ (*cmp2)(a, NUMCONV(bb), c);
@@ -566,55 +564,55 @@ static VALUE FUNCTION(rb_gsl_block,compare)(VALUE aa, VALUE bb,
 static VALUE FUNCTION(rb_gsl_block,eq)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,eq),
-					 FUNCTION(gsl_block,eq2));
+                                        FUNCTION(gsl_block,eq2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,ne)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,ne),
-					 FUNCTION(gsl_block,ne2));
+                                        FUNCTION(gsl_block,ne2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,gt)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,gt),
-					 FUNCTION(gsl_block,gt2));
+                                        FUNCTION(gsl_block,gt2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,ge)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,ge),
-					 FUNCTION(gsl_block,ge2));
+                                        FUNCTION(gsl_block,ge2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,lt)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,lt),
-					 FUNCTION(gsl_block,lt2));
+                                        FUNCTION(gsl_block,lt2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,le)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,le),
-					 FUNCTION(gsl_block,le2));
+                                        FUNCTION(gsl_block,le2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,and)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,and),
-					 FUNCTION(gsl_block,and2));
+                                        FUNCTION(gsl_block,and2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,or)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,or),
-					 FUNCTION(gsl_block,or2));
+                                        FUNCTION(gsl_block,or2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,xor)(VALUE aa, VALUE bb)
 {
   return FUNCTION(rb_gsl_block,compare)(aa, bb, FUNCTION(gsl_block,xor),
-					 FUNCTION(gsl_block,xor2));
+                                        FUNCTION(gsl_block,xor2));
 }
 
 static VALUE FUNCTION(rb_gsl_block,not)(VALUE obj)
@@ -669,11 +667,11 @@ static VALUE FUNCTION(rb_gsl_block,all)(VALUE obj)
 
   Data_Get_Struct(obj, GSL_TYPE(gsl_block), v);
   if (rb_block_given_p()) {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (!rb_yield(C_TO_VALUE(v->data[i]))) return Qfalse;
     return Qtrue;
   } else {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (!v->data[i]) return Qfalse;
     return Qtrue;
   }
@@ -686,11 +684,11 @@ static VALUE FUNCTION(rb_gsl_block,none)(VALUE obj)
 
   Data_Get_Struct(obj, GSL_TYPE(gsl_block), v);
   if (rb_block_given_p()) {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (rb_yield(C_TO_VALUE(v->data[i]))) return Qfalse;
     return Qtrue;
   } else {
-    for (i = 0; i < v->size; i++) 
+    for (i = 0; i < v->size; i++)
       if (v->data[i]) return Qfalse;
     return Qtrue;
   }
@@ -708,10 +706,10 @@ static VALUE FUNCTION(rb_gsl_block,where)(VALUE obj)
     btmp = gsl_block_uchar_alloc(v->size);
     for (i = 0; i < v->size; i++) {
       if (rb_yield(C_TO_VALUE(v->data[i]))) {
-	btmp->data[i] = 1;
-	n++;
+        btmp->data[i] = 1;
+        n++;
       } else {
-	btmp->data[i] = 0;
+        btmp->data[i] = 0;
       }
     }  /* for */
   } else { /* block is not given */
@@ -744,10 +742,10 @@ static VALUE FUNCTION(rb_gsl_block,where2)(VALUE obj)
     btmp = gsl_block_uchar_alloc(v->size);
     for (i = 0; i < v->size; i++) {
       if (rb_yield(C_TO_VALUE(v->data[i]))) {
-	btmp->data[i] = 1;
-	n++;
+        btmp->data[i] = 1;
+        n++;
       } else {
-	btmp->data[i] = 0;
+        btmp->data[i] = 0;
       }
     } /* for */
   } else {  /* block is not given */
@@ -758,11 +756,11 @@ static VALUE FUNCTION(rb_gsl_block,where2)(VALUE obj)
     v2 = gsl_permutation_calloc(v->size);  /* calloc() initializes v2 */
     vv1 = Qnil;
     vv2 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v2);
-  } else if (v->size-n == 0) { 
+  } else if (v->size-n == 0) {
     v1 = gsl_permutation_calloc(n);           /* calloc() initializes v1 */
-    vv1 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v1);     
+    vv1 = Data_Wrap_Struct(cgsl_index, 0, gsl_permutation_free, v1);
     vv2 = Qnil;
-  } else { 
+  } else {
     /* same case as 'where' */
     v1 = gsl_permutation_alloc(n);
     v2 = gsl_permutation_alloc(v->size-n);
@@ -830,12 +828,12 @@ static VALUE FUNCTION(rb_gsl_block,collect_bang)(VALUE obj)
 
 void FUNCTION(Init_gsl_block,init)(VALUE module)
 {
-  rb_define_singleton_method(GSL_TYPE(cgsl_block), "new", 
-			     FUNCTION(rb_gsl_block,new), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_block), "alloc", 
-			     FUNCTION(rb_gsl_block,new), 1);
-  rb_define_singleton_method(GSL_TYPE(cgsl_block), "calloc", 
-			     FUNCTION(rb_gsl_block,calloc), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_block), "new",
+                             FUNCTION(rb_gsl_block,new), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_block), "alloc",
+                             FUNCTION(rb_gsl_block,new), 1);
+  rb_define_singleton_method(GSL_TYPE(cgsl_block), "calloc",
+                             FUNCTION(rb_gsl_block,calloc), 1);
 
   rb_define_method(GSL_TYPE(cgsl_block), "size", FUNCTION(rb_gsl_block,size), 0);
   rb_define_alias(GSL_TYPE(cgsl_block), "length", "size");
@@ -871,9 +869,9 @@ void FUNCTION(Init_gsl_block,init)(VALUE module)
   rb_define_method(GSL_TYPE(cgsl_block), "all?", FUNCTION(rb_gsl_block,all), 0);
   rb_define_method(GSL_TYPE(cgsl_block), "none?", FUNCTION(rb_gsl_block,none), 0);
   rb_define_method(GSL_TYPE(cgsl_block), "any",
-		   FUNCTION(rb_gsl_block,any), 0);
+                   FUNCTION(rb_gsl_block,any), 0);
   rb_define_method(GSL_TYPE(cgsl_block), "any?",
-		   FUNCTION(rb_gsl_block,any2), 0);
+                   FUNCTION(rb_gsl_block,any2), 0);
 
   rb_define_method(GSL_TYPE(cgsl_block), "where", FUNCTION(rb_gsl_block,where), 0);
   rb_define_method(GSL_TYPE(cgsl_block), "where2", FUNCTION(rb_gsl_block,where2), 0);