miriad 4.1.0.14 → 4.1.0.16

data/README

@@ -1,6 +1,6 @@
 --
 
-$Id: README 7 2008-04-18 07:21:10Z davidm $
+$Id$
 
 This file includes an RDoc hack so that links can be made to open up into a new
 frame rather then the current frame.

data/Rakefile

@@ -1,4 +1,4 @@
-# $Id: Rakefile 33 2009-03-17 21:30:46Z davidm $
+# $Id$
 
 require 'rubygems'
 require 'rake/gempackagetask'
@@ -14,7 +14,7 @@ run_swig unless test ?e, 'ext/miriad_wrap.c'
 spec = Gem::Specification.new do |s|
   # Basics
   s.name = 'miriad'
-  s.version = '4.1.0.14'
+  s.version = '4.1.0.16'
   s.summary = 'Ruby interface to MIRIAD'
   s.description = <<-EOS
     The MIRIAD-Ruby package...

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-# $Id: extconf.rb 7 2008-04-18 07:21:10Z davidm $
+# $Id$
 #
 # Usage: ruby extconf.rb --with-narray-include=/path/to/narray.h
 

data/ext/miriad.i

@@ -1,4 +1,4 @@
-/* $Id: miriad.i 11 2008-04-21 20:31:15Z davidm $ */
+/* $Id$ */
 
 /* MIRIAD Swig wrapper */
 

data/ext/miriad_ruby.c

@@ -1,5 +1,5 @@
 /*
- * $Id: miriad_ruby.c 23 2008-04-30 21:42:24Z davidm $
+ * $Id$
  *
  * This file is just to document the classes/methods from the SWIG wrappers
  * that we want to document.  It is for rdoc, not gcc.  At least for now.

data/ext/miriad_ruby.i

@@ -1,5 +1,5 @@
 /*
- * $Id: miriad_ruby.i 33 2009-03-17 21:30:46Z davidm $
+ * $Id$
  *
  * Ruby specific typemaps for MIRIAD Swig wrapper 
  */
@@ -45,10 +45,10 @@ VALUE mirlib_eWrappedMirlibError;
     Check_Type($input, T_ARRAY);
     // Get the length of the array
     // TODO Bounds checking somehow?
-    int n = RARRAY($input)->len; 
+    int n = RARRAY_LEN($input); 
     $1 = ALLOCA_N(double, n);
     // Get the first element in array
-    VALUE *ptr = RARRAY($input)->ptr; 
+    VALUE *ptr = RARRAY_PTR($input); 
     for (i=0; i < n; i++) {
       // Convert Ruby Object to double
       $1[i] = NUM2DBL(ptr[i]); 
@@ -62,9 +62,9 @@ VALUE mirlib_eWrappedMirlibError;
     int i;
     // Get the length of the array
     // TODO Bounds checking somehow?
-    int n = RARRAY($input)->len; 
+    int n = RARRAY_LEN($input); 
     // Get the first element in array
-    VALUE *ptr = RARRAY($input)->ptr; 
+    VALUE *ptr = RARRAY_PTR($input); 
     for (i=0; i < n; i++) {
       // Store or convert doubles to Ruby Objects
       if(TYPE(ptr[i]) == T_FLOAT) {
@@ -93,9 +93,9 @@ VALUE mirlib_eWrappedMirlibError;
   } else {
     Check_Type($input, T_ARRAY);
     // Allocate C array on stack
-    ndata = RARRAY($input)->len;
+    ndata = RARRAY_LEN($input);
     $1 = ALLOCA_N(float,ndata);
-    VALUE * ptr = RARRAY($input)->ptr;
+    VALUE * ptr = RARRAY_PTR($input);
     // TODO Use $symname in #if to avoid copying on read?
     for(i=0; i < ndata; i++) {
       $1[i] = NUM2DBL(ptr[i]);
@@ -109,8 +109,8 @@ VALUE mirlib_eWrappedMirlibError;
   int i;
   // If NArray, data are already in place
   if(TYPE($input) == T_ARRAY) {
-    ndata = RARRAY($input)->len;
-    VALUE * ptr = RARRAY($input)->ptr;
+    ndata = RARRAY_LEN($input);
+    VALUE * ptr = RARRAY_PTR($input);
     for(i=0; i < ndata; i++) {
       // Store or convert doubles to Ruby Objects
       if(TYPE(ptr[i]) == T_FLOAT) {
@@ -136,9 +136,9 @@ VALUE mirlib_eWrappedMirlibError;
     nflag = NA_TOTAL($input);
   } else {
     Check_Type($input, T_ARRAY);
-    nflag = RARRAY($input)->len;
+    nflag = RARRAY_LEN($input);
     $1 = ALLOCA_N(int,nflag);
-    VALUE * ptr = RARRAY($input)->ptr;
+    VALUE * ptr = RARRAY_PTR($input);
     for(i=0; i < nflag; i++) {
       $1[i] = FIX2INT(ptr[i]);
     }
@@ -152,8 +152,8 @@ VALUE mirlib_eWrappedMirlibError;
   int i;
   // If NArray, data are already in place
   if(TYPE($input) == T_ARRAY) {
-    nflag = RARRAY($input)->len;
-    VALUE * ptr = RARRAY($input)->ptr;
+    nflag = RARRAY_LEN($input);
+    VALUE * ptr = RARRAY_PTR($input);
     for(i=0; i < nflag; i++) {
       ptr[i] = INT2FIX($1[i]);
     }
@@ -191,10 +191,10 @@ VALUE mirlib_eWrappedMirlibError;
   } else if(TYPE($input) == T_ARRAY) {
     int i;
     // Get the length of the array
-    $2 = RARRAY($input)->len; 
+    $2 = RARRAY_LEN($input); 
     $1 = ALLOCA_N(type, $2);
     // Get the first element in array
-    VALUE *ptr = RARRAY($input)->ptr; 
+    VALUE *ptr = RARRAY_PTR($input); 
     for (i=0; i < $2; i++) {
       // Convert Ruby Object to int
       $1[i]= (type)converter(ptr[i]); 
@@ -233,7 +233,7 @@ PUTVRX_TYPEMAP(NA_DFLOAT,double,NUM2DBL);
   } else {
     VALUE elem0 = $input;
     if(TYPE($input) == T_ARRAY) {
-      $2 = RARRAY($input)->len; 
+      $2 = RARRAY_LEN($input); 
       elem0 = rb_ary_entry($input,0);
     } else {
       // Convert into one element array
@@ -421,9 +421,9 @@ PUTVRX_TYPEMAP(NA_DFLOAT,double,NUM2DBL);
     int i;
     int nflag;
     Check_Type($input, T_ARRAY);
-    nflag = RARRAY($input)->len;
+    nflag = RARRAY_LEN($input);
     $1 = ALLOCA_N(int,nflag);
-    VALUE * ptr = RARRAY($input)->ptr;
+    VALUE * ptr = RARRAY_PTR($input);
     for(i=0; i < nflag; i++) {
       $1[i] = FIX2INT(ptr[i]);
     }
@@ -450,8 +450,8 @@ PUTVRX_TYPEMAP(NA_DFLOAT,double,NUM2DBL);
 
 // Typemaps for hwriteln
 %typemap(in) (char *linein, size_t length) {
-  $1 = StringValue($input)->ptr;
-  $2 = StringValue($input)->len;
+  $1 = StringValuePtr($input);
+  $2 = StringValueLen($input);
 }
 
 // vim: set expandtab ts=2 sw=2 smarttab syntax=c cindent:

data/ext/miriad_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.31
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -16,14 +16,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -106,12 +106,6 @@
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -119,14 +113,14 @@
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -209,12 +203,6 @@
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
@@ -224,7 +212,7 @@
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
+#define SWIG_RUNTIME_VERSION "3"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -259,7 +247,6 @@
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -400,10 +387,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *, int *);
+typedef void *(*swig_converter_func)(void *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store information on one type */
+/* Structure to store inforomation on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -448,7 +435,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (int)((l1 - f1) - (l2 - f2));
+  return (l1 - f1) - (l2 - f2);
 }
 
 /*
@@ -530,8 +517,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
 }
 
 /* 
@@ -804,15 +791,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 #include <ruby.h>
 
-/* Remove global macros defined in Ruby's win32.h */
-#ifdef write
-# undef write
-#endif
-#ifdef read
-# undef read
-#endif
-
-
 /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
 #ifndef NUM2LL
 #define NUM2LL(x) NUM2LONG((x))
@@ -841,44 +819,12 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifndef RSTRING_PTR
 # define RSTRING_PTR(x) RSTRING(x)->ptr
 #endif
-#ifndef RSTRING_END
-# define RSTRING_END(x) (RSTRING_PTR(x) + RSTRING_LEN(x))
-#endif
 #ifndef RARRAY_LEN
 # define RARRAY_LEN(x) RARRAY(x)->len
 #endif
 #ifndef RARRAY_PTR
 # define RARRAY_PTR(x) RARRAY(x)->ptr
 #endif
-#ifndef RFLOAT_VALUE
-# define RFLOAT_VALUE(x) RFLOAT(x)->value
-#endif
-#ifndef DOUBLE2NUM
-# define DOUBLE2NUM(x) rb_float_new(x)
-#endif
-#ifndef RHASH_TBL
-# define RHASH_TBL(x) (RHASH(x)->tbl)
-#endif
-#ifndef RHASH_ITER_LEV
-# define RHASH_ITER_LEV(x) (RHASH(x)->iter_lev)
-#endif
-#ifndef RHASH_IFNONE
-# define RHASH_IFNONE(x) (RHASH(x)->ifnone)
-#endif
-#ifndef RHASH_SIZE
-# define RHASH_SIZE(x) (RHASH(x)->tbl->num_entries)
-#endif
-#ifndef RHASH_EMPTY_P
-# define RHASH_EMPTY_P(x) (RHASH_SIZE(x) == 0)
-#endif
-#ifndef RSTRUCT_LEN
-# define RSTRUCT_LEN(x) RSTRUCT(x)->len
-#endif
-#ifndef RSTRUCT_PTR
-# define RSTRUCT_PTR(x) RSTRUCT(x)->ptr
-#endif
-
-
 
 /*
  * Need to be very careful about how these macros are defined, especially
@@ -940,7 +886,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
 #endif
 
-static VALUE _mSWIG = Qnil;
 
 /* -----------------------------------------------------------------------------
  * error manipulation
@@ -1031,71 +976,7 @@ SWIG_Ruby_ErrorType(int SWIG_code) {
 }
 
 
-/* This function is called when a user inputs a wrong argument to
-   a method.
- */
-SWIGINTERN 
-const char* Ruby_Format_TypeError( const char* msg,
-				   const char* type, 
-				   const char* name, 
-				   const int argn,
-				   VALUE input )
-{
-  char buf[128];
-  VALUE str;
-  VALUE asStr;
-  if ( msg && *msg )
-    {
-      str = rb_str_new2(msg);
-    }
-  else
-    {
-      str = rb_str_new(NULL, 0);
-    }
-
-  str = rb_str_cat2( str, "Expected argument " );
-  sprintf( buf, "%d of type ", argn-1 );
-  str = rb_str_cat2( str, buf );
-  str = rb_str_cat2( str, type );
-  str = rb_str_cat2( str, ", but got " );
-  str = rb_str_cat2( str, rb_obj_classname(input) );
-  str = rb_str_cat2( str, " " );
-  asStr = rb_inspect(input);
-  if ( RSTRING_LEN(asStr) > 30 )
-    {
-      str = rb_str_cat( str, StringValuePtr(asStr), 30 );
-      str = rb_str_cat2( str, "..." );
-    }
-  else
-    {
-      str = rb_str_append( str, asStr );
-    }
-
-  if ( name )
-    {
-      str = rb_str_cat2( str, "\n\tin SWIG method '" );
-      str = rb_str_cat2( str, name );
-      str = rb_str_cat2( str, "'" );
-    }
 
-  return StringValuePtr( str );
-}
-
-/* This function is called when an overloaded method fails */
-SWIGINTERN 
-void Ruby_Format_OverloadedError(
-				 const int argc,
-				 const int maxargs,
-				 const char* method, 
-				 const char* prototypes 
-				 )
-{
-  const char* msg = "Wrong # of arguments";
-  if ( argc <= maxargs ) msg = "Wrong arguments";
-  rb_raise(rb_eArgError,"%s for overloaded method '%s'.\n"  
-	   "Possible C/C++ prototypes are:\n%s",
-	   msg, method, prototypes);
-}
 
 /* -----------------------------------------------------------------------------
  * See the LICENSE file for information on copyright, usage and redistribution
@@ -1113,54 +994,26 @@ void Ruby_Format_OverloadedError(
 extern "C" {
 #endif
 
-/* Ruby 1.8 actually assumes the first case. */
-#if SIZEOF_VOIDP == SIZEOF_LONG
-#  define SWIG2NUM(v) LONG2NUM((unsigned long)v)
-#  define NUM2SWIG(x) (unsigned long)NUM2LONG(x)
-#elif SIZEOF_VOIDP == SIZEOF_LONG_LONG
-#  define SWIG2NUM(v) LL2NUM((unsigned long long)v)
-#  define NUM2SWIG(x) (unsigned long long)NUM2LL(x)
-#else
-#  error sizeof(void*) is not the same as long or long long
-#endif
-
 
 /* Global Ruby hash table to store Trackings from C/C++
-   structs to Ruby Objects. 
-*/
-static VALUE swig_ruby_trackings = Qnil;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete;
+   structs to Ruby Objects. */
+static VALUE swig_ruby_trackings;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   /* Create a ruby hash table to store Trackings from C++ 
-     objects to Ruby objects. */
-
-  /* Try to see if some other .so has already created a 
-     tracking hash table, which we keep hidden in an instance var
-     in the SWIG module.
-     This is done to allow multiple DSOs to share the same
-     tracking table.
-  */
-  ID trackings_id = rb_intern( "@__trackings__" );
-  VALUE verbose = rb_gv_get("VERBOSE");
-  rb_gv_set("VERBOSE", Qfalse);
-  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
-  rb_gv_set("VERBOSE", verbose);
-
-  /* No, it hasn't.  Create one ourselves */ 
-  if ( swig_ruby_trackings == Qnil )
-    {
-      swig_ruby_trackings = rb_hash_new();
-      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
-    }
-
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+     objects to Ruby objects.  Also make sure to tell
+     the garabage collector about the hash table. */
+  swig_ruby_trackings = rb_hash_new();
+  rb_gc_register_address(&swig_ruby_trackings);
+  
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1170,7 +1023,8 @@ SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
      a Ruby number object. */
 
   /* Convert the pointer to a Ruby number */
-  return SWIG2NUM(ptr);
+  unsigned long value = (unsigned long) ptr;
+  return LONG2NUM(value);
 }
 
 /* Get a Ruby number to reference an object */
@@ -1180,7 +1034,8 @@ SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
      a Ruby number object. */
 
   /* Convert the Object to a Ruby number */
-  return SWIG2NUM(object);
+  unsigned long value = (unsigned long) object;
+  return LONG2NUM(value);
 }
 
 /* Get a Ruby object from a previously stored reference */
@@ -1188,8 +1043,9 @@ SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
   /* The provided Ruby number object is a reference
      to the Ruby object we want.*/
 
-  /* Convert the Ruby number to a Ruby object */
-  return NUM2SWIG(reference);
+  /* First convert the Ruby number to a C number */
+  unsigned long value = NUM2LONG(reference);
+  return (VALUE) value;
 }
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
@@ -1281,15 +1137,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
   return target;
 }
 
-/* For ruby1.8.4 and earlier. */
-#ifndef RUBY_INIT_STACK
-   RUBY_EXTERN void Init_stack(VALUE* addr);
-#  define RUBY_INIT_STACK \
-   VALUE variable_in_this_stack_frame; \
-   Init_stack(&variable_in_this_stack_frame);
-#endif
-
-
 #ifdef __cplusplus
 }
 #endif
@@ -1354,7 +1201,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)		  
 #define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)	  
 
-#include "assert.h"
 
 /* -----------------------------------------------------------------------------
  * pointers/data manipulation
@@ -1362,6 +1208,9 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 #ifdef __cplusplus
 extern "C" {
+#if 0
+} /* cc-mode */
+#endif
 #endif
 
 typedef struct {
@@ -1373,44 +1222,10 @@ typedef struct {
 } swig_class;
 
 
-/* Global pointer used to keep some internal SWIG stuff */
+static VALUE _mSWIG = Qnil;
 static VALUE _cSWIG_Pointer = Qnil;
 static VALUE swig_runtime_data_type_pointer = Qnil;
 
-/* Global IDs used to keep some internal SWIG stuff */
-static ID swig_arity_id = 0;
-static ID swig_call_id  = 0;
-
-/*
-  If your swig extension is to be run within an embedded ruby and has
-  director callbacks, you should set -DRUBY_EMBEDDED during compilation.  
-  This will reset ruby's stack frame on each entry point from the main 
-  program the first time a virtual director function is invoked (in a 
-  non-recursive way).
-  If this is not done, you run the risk of Ruby trashing the stack.
-*/
-
-#ifdef RUBY_EMBEDDED
-
-#  define SWIG_INIT_STACK                            \
-      if ( !swig_virtual_calls ) { RUBY_INIT_STACK } \
-      ++swig_virtual_calls;
-#  define SWIG_RELEASE_STACK --swig_virtual_calls;
-#  define Ruby_DirectorTypeMismatchException(x) \
-          rb_raise( rb_eTypeError, x ); return c_result;
-
-      static unsigned int swig_virtual_calls = 0;
-
-#else  /* normal non-embedded extension */
-
-#  define SWIG_INIT_STACK
-#  define SWIG_RELEASE_STACK
-#  define Ruby_DirectorTypeMismatchException(x) \
-          throw Swig::DirectorTypeMismatchException( x );
-
-#endif  /* RUBY_EMBEDDED */
-
-
 SWIGRUNTIME VALUE 
 getExceptionClass(void) {
   static int init = 0;
@@ -1442,8 +1257,6 @@ SWIG_Ruby_InitRuntime(void)
 {
   if (_mSWIG == Qnil) {
     _mSWIG = rb_define_module("SWIG");
-    swig_call_id  = rb_intern("call");
-    swig_arity_id = rb_intern("arity");
   }
 }
 
@@ -1467,7 +1280,7 @@ SWIGRUNTIME VALUE
 SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
 {
   int own =  flags & SWIG_POINTER_OWN; 
-  int track;
+  
   char *klass_name;
   swig_class *sklass;
   VALUE klass;
@@ -1480,15 +1293,14 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     sklass = (swig_class *) type->clientdata;
 		
     /* Are we tracking this class and have we already returned this Ruby object? */
-    track = sklass->trackObjects;
-    if (track) {
+    if (sklass->trackObjects) {
       obj = SWIG_RubyInstanceFor(ptr);
       
       /* Check the object's type and make sure it has the correct type.
         It might not in cases where methods do things like 
         downcast methods. */
       if (obj != Qnil) {
-        VALUE value = rb_iv_get(obj, "@__swigtype__");
+        VALUE value = rb_iv_get(obj, "__swigtype__");
         char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
@@ -1498,13 +1310,10 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     }
 
     /* Create a new Ruby object */
-    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), 
-			   ( own ? VOIDFUNC(sklass->destroy) : 
-			     (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 )
-			     ), ptr);
+    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr);
 
     /* If tracking is on for this class then track this object. */
-    if (track) {
+    if (sklass->trackObjects) {
       SWIG_RubyAddTracking(ptr, obj);
     }
   } else {
@@ -1514,7 +1323,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     free((void *) klass_name);
     obj = Data_Wrap_Struct(klass, 0, 0, ptr);
   }
-  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
+  rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
   
   return obj;
 }
@@ -1526,7 +1335,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
   VALUE obj;
   swig_class *sklass = (swig_class *) type->clientdata;
   obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0);
-  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
+  rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
   return obj;
 }
 
@@ -1534,7 +1343,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
 SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
-  VALUE stype = rb_iv_get(obj, "@__swigtype__");
+  VALUE stype = rb_iv_get(obj, "__swigtype__");
   return StringValuePtr(stype);
 }
 
@@ -1616,11 +1425,8 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) {
       return SWIG_ERROR;
-    } else {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
     }
+    *ptr = SWIG_TypeCast(tc, vptr);
   } else {
     *ptr = vptr;
   }
@@ -1701,42 +1507,10 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
   rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
 }
 
-/* This function can be used to check whether a proc or method or similarly
-   callable function has been passed.  Usually used in a %typecheck, like:
-
-   %typecheck(c_callback_t, precedence=SWIG_TYPECHECK_POINTER) {
-        $result = SWIG_Ruby_isCallable( $input );
-   }
- */
-SWIGINTERN
-int SWIG_Ruby_isCallable( VALUE proc )
-{
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
-    return 1;
-  return 0;
-}
-
-/* This function can be used to check the arity (number of arguments)
-   a proc or method can take.  Usually used in a %typecheck.
-   Valid arities will be that equal to minimal or those < 0
-   which indicate a variable number of parameters at the end.
- */
-SWIGINTERN
-int SWIG_Ruby_arity( VALUE proc, int minimal )
-{
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
-    {
-      VALUE num = rb_funcall( proc, swig_arity_id, 0 );
-      int arity = NUM2INT(num);
-      if ( arity < 0 && (arity+1) < -minimal ) return 1;
-      if ( arity == minimal ) return 1;
-      return 1;
-    }
-  return 0;
-}
-
-
 #ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
 }
 #endif
 
@@ -1771,11 +1545,7 @@ static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
 
 static VALUE mMiriad;
 
-#define SWIG_RUBY_THREAD_BEGIN_BLOCK
-#define SWIG_RUBY_THREAD_END_BLOCK
-
-
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010331 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1870,11 +1640,11 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
-    char *cstr = StringValuePtr(obj); 
-    #else
+    
+
+
     char *cstr = STR2CSTR(obj);
-    #endif
+    
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -1961,12 +1731,14 @@ SWIGINTERN void uvio_probvr(uvio *self,char *var,char *type,int *length,int *upd
     }
 
 #include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
+#ifndef LLONG_MIN
+# define LLONG_MIN	LONG_LONG_MIN
+#endif
+#ifndef LLONG_MAX
+# define LLONG_MAX	LONG_LONG_MAX
+#endif
+#ifndef ULLONG_MAX
+# define ULLONG_MAX	ULONG_LONG_MAX
 #endif
 
 
@@ -1977,7 +1749,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/Users/davidm/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2034,7 +1806,7 @@ SWIGINTERN void uvio_wwrite(uvio *self,float *data,int *flags,int n){
       uvwwrite_c(self->fd, data, flags, n);
     }
 
-/*@SWIG:/Users/davidm/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2184,7 +1956,7 @@ SWIGINTERN void uvio_hdaccess(uvio *self,int ihandle){
     }
   }
 
-/*@SWIG:/Users/davidm/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2298,7 +2070,7 @@ _wrap_new_Uvio(int argc, VALUE *argv, VALUE self) {
   }
   res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","uvio", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "uvio" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   result = (uvio *)new_uvio(arg1,arg2);DATA_PTR(self) = result;
@@ -2336,7 +2108,7 @@ _wrap_Uvio_close(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","close", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "close" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   uvio_close(arg1);
@@ -2357,7 +2129,7 @@ _wrap_Uvio_flush(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","flush", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "flush" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   uvio_flush(arg1);
@@ -2378,7 +2150,7 @@ _wrap_Uvio_uvnext(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","uvnext", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "uvnext" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   uvio_uvnext(arg1);
@@ -2399,7 +2171,7 @@ _wrap_Uvio_rewind(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","rewind", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "rewind" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   uvio_rewind(arg1);
@@ -2436,12 +2208,12 @@ _wrap_Uvio_probvr(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","probvr", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "probvr" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","probvr", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "probvr" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   uvio_probvr(arg1,arg2,arg3,arg4,arg5);
@@ -2482,12 +2254,12 @@ _wrap_Uvio_putvr(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","putvr", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "putvr" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","putvr", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "putvr" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   {
@@ -2510,7 +2282,7 @@ _wrap_Uvio_putvr(int argc, VALUE *argv, VALUE self) {
     } else {
       VALUE elem0 = argv[1];
       if(TYPE(argv[1]) == T_ARRAY) {
-        arg4 = RARRAY(argv[1])->len; 
+        arg4 = RARRAY_LEN(argv[1]); 
         elem0 = rb_ary_entry(argv[1],0);
       } else {
         // Convert into one element array
@@ -2612,12 +2384,12 @@ _wrap_Uvio_scan(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","scan", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "scan" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","scan", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "scan" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   uvio_scan(arg1,arg2);
@@ -2647,7 +2419,7 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","write", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "write" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -2660,10 +2432,10 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
       Check_Type(argv[0], T_ARRAY);
       // Get the length of the array
       // TODO Bounds checking somehow?
-      int n = RARRAY(argv[0])->len; 
+      int n = RARRAY_LEN(argv[0]); 
       arg2 = ALLOCA_N(double, n);
       // Get the first element in array
-      VALUE *ptr = RARRAY(argv[0])->ptr; 
+      VALUE *ptr = RARRAY_PTR(argv[0]); 
       for (i=0; i < n; i++) {
         // Convert Ruby Object to double
         arg2[i] = NUM2DBL(ptr[i]); 
@@ -2683,9 +2455,9 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
     } else {
       Check_Type(argv[1], T_ARRAY);
       // Allocate C array on stack
-      ndata3 = RARRAY(argv[1])->len;
+      ndata3 = RARRAY_LEN(argv[1]);
       arg3 = ALLOCA_N(float,ndata3);
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       // TODO Use write in #if to avoid copying on read?
       for(i=0; i < ndata3; i++) {
         arg3[i] = NUM2DBL(ptr[i]);
@@ -2702,9 +2474,9 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
       nflag4 = NA_TOTAL(argv[2]);
     } else {
       Check_Type(argv[2], T_ARRAY);
-      nflag4 = RARRAY(argv[2])->len;
+      nflag4 = RARRAY_LEN(argv[2]);
       arg4 = ALLOCA_N(int,nflag4);
-      VALUE * ptr = RARRAY(argv[2])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[2]);
       for(i=0; i < nflag4; i++) {
         arg4[i] = FIX2INT(ptr[i]);
       }
@@ -2719,16 +2491,15 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
     }
   }
   uvio_write(arg1,arg2,arg3,arg4,arg5);
-  vresult = rb_ary_new();
   {
     // If NArray, data are already in place
     if(TYPE(argv[0]) == T_ARRAY) {
       int i;
       // Get the length of the array
       // TODO Bounds checking somehow?
-      int n = RARRAY(argv[0])->len; 
+      int n = RARRAY_LEN(argv[0]); 
       // Get the first element in array
-      VALUE *ptr = RARRAY(argv[0])->ptr; 
+      VALUE *ptr = RARRAY_PTR(argv[0]); 
       for (i=0; i < n; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -2746,8 +2517,8 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[1]) == T_ARRAY) {
-      ndata = RARRAY(argv[1])->len;
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      ndata = RARRAY_LEN(argv[1]);
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < ndata; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -2765,8 +2536,8 @@ _wrap_Uvio_write(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[2]) == T_ARRAY) {
-      nflag = RARRAY(argv[2])->len;
-      VALUE * ptr = RARRAY(argv[2])->ptr;
+      nflag = RARRAY_LEN(argv[2]);
+      VALUE * ptr = RARRAY_PTR(argv[2]);
       for(i=0; i < nflag; i++) {
         ptr[i] = INT2FIX(arg4[i]);
       }
@@ -2796,7 +2567,7 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","wwrite", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "wwrite" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -2812,9 +2583,9 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
     } else {
       Check_Type(argv[0], T_ARRAY);
       // Allocate C array on stack
-      ndata2 = RARRAY(argv[0])->len;
+      ndata2 = RARRAY_LEN(argv[0]);
       arg2 = ALLOCA_N(float,ndata2);
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       // TODO Use wwrite in #if to avoid copying on read?
       for(i=0; i < ndata2; i++) {
         arg2[i] = NUM2DBL(ptr[i]);
@@ -2831,9 +2602,9 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
       nflag3 = NA_TOTAL(argv[1]);
     } else {
       Check_Type(argv[1], T_ARRAY);
-      nflag3 = RARRAY(argv[1])->len;
+      nflag3 = RARRAY_LEN(argv[1]);
       arg3 = ALLOCA_N(int,nflag3);
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < nflag3; i++) {
         arg3[i] = FIX2INT(ptr[i]);
       }
@@ -2842,14 +2613,13 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
     arg4 = nflag3;
   }
   uvio_wwrite(arg1,arg2,arg3,arg4);
-  vresult = rb_ary_new();
   {
     int ndata;
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[0]) == T_ARRAY) {
-      ndata = RARRAY(argv[0])->len;
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      ndata = RARRAY_LEN(argv[0]);
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       for(i=0; i < ndata; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -2867,8 +2637,8 @@ _wrap_Uvio_wwrite(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[1]) == T_ARRAY) {
-      nflag = RARRAY(argv[1])->len;
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      nflag = RARRAY_LEN(argv[1]);
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < nflag; i++) {
         ptr[i] = INT2FIX(arg3[i]);
       }
@@ -2912,44 +2682,44 @@ _wrap_Uvio_set(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","set", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","set", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "set" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","set", 3, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "set" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = (char *)(buf3);
   if (argc > 2) {
     ecode4 = SWIG_AsVal_int(argv[2], &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "int","set", 4, argv[2] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "set" "', argument " "4"" of type '" "int""'");
     } 
     arg4 = (int)(val4);
   }
   if (argc > 3) {
     ecode5 = SWIG_AsVal_double(argv[3], &val5);
     if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "double","set", 5, argv[3] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "set" "', argument " "5"" of type '" "double""'");
     } 
     arg5 = (double)(val5);
   }
   if (argc > 4) {
     ecode6 = SWIG_AsVal_double(argv[4], &val6);
     if (!SWIG_IsOK(ecode6)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode6), Ruby_Format_TypeError( "", "double","set", 6, argv[4] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "set" "', argument " "6"" of type '" "double""'");
     } 
     arg6 = (double)(val6);
   }
   if (argc > 5) {
     ecode7 = SWIG_AsVal_double(argv[5], &val7);
     if (!SWIG_IsOK(ecode7)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode7), Ruby_Format_TypeError( "", "double","set", 7, argv[5] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "set" "', argument " "7"" of type '" "double""'");
     } 
     arg7 = (double)(val7);
   }
@@ -2987,7 +2757,7 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","uvread", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "uvread" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3000,10 +2770,10 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
       Check_Type(argv[0], T_ARRAY);
       // Get the length of the array
       // TODO Bounds checking somehow?
-      int n = RARRAY(argv[0])->len; 
+      int n = RARRAY_LEN(argv[0]); 
       arg2 = ALLOCA_N(double, n);
       // Get the first element in array
-      VALUE *ptr = RARRAY(argv[0])->ptr; 
+      VALUE *ptr = RARRAY_PTR(argv[0]); 
       for (i=0; i < n; i++) {
         // Convert Ruby Object to double
         arg2[i] = NUM2DBL(ptr[i]); 
@@ -3023,9 +2793,9 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
     } else {
       Check_Type(argv[1], T_ARRAY);
       // Allocate C array on stack
-      ndata3 = RARRAY(argv[1])->len;
+      ndata3 = RARRAY_LEN(argv[1]);
       arg3 = ALLOCA_N(float,ndata3);
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       // TODO Use uvread in #if to avoid copying on read?
       for(i=0; i < ndata3; i++) {
         arg3[i] = NUM2DBL(ptr[i]);
@@ -3042,9 +2812,9 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
       nflag4 = NA_TOTAL(argv[2]);
     } else {
       Check_Type(argv[2], T_ARRAY);
-      nflag4 = RARRAY(argv[2])->len;
+      nflag4 = RARRAY_LEN(argv[2]);
       arg4 = ALLOCA_N(int,nflag4);
-      VALUE * ptr = RARRAY(argv[2])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[2]);
       for(i=0; i < nflag4; i++) {
         arg4[i] = FIX2INT(ptr[i]);
       }
@@ -3059,16 +2829,15 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
     }
   }
   uvio_uvread(arg1,arg2,arg3,arg4,arg5,arg6);
-  vresult = rb_ary_new();
   {
     // If NArray, data are already in place
     if(TYPE(argv[0]) == T_ARRAY) {
       int i;
       // Get the length of the array
       // TODO Bounds checking somehow?
-      int n = RARRAY(argv[0])->len; 
+      int n = RARRAY_LEN(argv[0]); 
       // Get the first element in array
-      VALUE *ptr = RARRAY(argv[0])->ptr; 
+      VALUE *ptr = RARRAY_PTR(argv[0]); 
       for (i=0; i < n; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -3086,8 +2855,8 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[1]) == T_ARRAY) {
-      ndata = RARRAY(argv[1])->len;
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      ndata = RARRAY_LEN(argv[1]);
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < ndata; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -3105,8 +2874,8 @@ _wrap_Uvio_uvread(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[2]) == T_ARRAY) {
-      nflag = RARRAY(argv[2])->len;
-      VALUE * ptr = RARRAY(argv[2])->ptr;
+      nflag = RARRAY_LEN(argv[2]);
+      VALUE * ptr = RARRAY_PTR(argv[2]);
       for(i=0; i < nflag; i++) {
         ptr[i] = INT2FIX(arg4[i]);
       }
@@ -3144,7 +2913,7 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","uvwread", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "uvwread" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3160,9 +2929,9 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
     } else {
       Check_Type(argv[0], T_ARRAY);
       // Allocate C array on stack
-      ndata2 = RARRAY(argv[0])->len;
+      ndata2 = RARRAY_LEN(argv[0]);
       arg2 = ALLOCA_N(float,ndata2);
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       // TODO Use uvwread in #if to avoid copying on read?
       for(i=0; i < ndata2; i++) {
         arg2[i] = NUM2DBL(ptr[i]);
@@ -3179,9 +2948,9 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
       nflag3 = NA_TOTAL(argv[1]);
     } else {
       Check_Type(argv[1], T_ARRAY);
-      nflag3 = RARRAY(argv[1])->len;
+      nflag3 = RARRAY_LEN(argv[1]);
       arg3 = ALLOCA_N(int,nflag3);
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < nflag3; i++) {
         arg3[i] = FIX2INT(ptr[i]);
       }
@@ -3190,14 +2959,13 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
     arg4 = nflag3;
   }
   uvio_uvwread(arg1,arg2,arg3,arg4,arg5);
-  vresult = rb_ary_new();
   {
     int ndata;
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[0]) == T_ARRAY) {
-      ndata = RARRAY(argv[0])->len;
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      ndata = RARRAY_LEN(argv[0]);
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       for(i=0; i < ndata; i++) {
         // Store or convert doubles to Ruby Objects
         if(TYPE(ptr[i]) == T_FLOAT) {
@@ -3215,8 +2983,8 @@ _wrap_Uvio_uvwread(int argc, VALUE *argv, VALUE self) {
     int i;
     // If NArray, data are already in place
     if(TYPE(argv[1]) == T_ARRAY) {
-      nflag = RARRAY(argv[1])->len;
-      VALUE * ptr = RARRAY(argv[1])->ptr;
+      nflag = RARRAY_LEN(argv[1]);
+      VALUE * ptr = RARRAY_PTR(argv[1]);
       for(i=0; i < nflag; i++) {
         ptr[i] = INT2FIX(arg3[i]);
       }
@@ -3257,7 +3025,7 @@ _wrap_Uvio_getvr(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","getvr", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getvr" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3335,7 +3103,7 @@ _wrap_Uvio_updatedq___(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","updated", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "updated" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   result = (int)uvio_updated(arg1);
@@ -3362,7 +3130,7 @@ _wrap_Uvio_track(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","track", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "track" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3370,7 +3138,7 @@ _wrap_Uvio_track(int argc, VALUE *argv, VALUE self) {
   }
   res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","track", 3, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "track" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = (char *)(buf3);
   uvio_track(arg1,arg2,arg3);
@@ -3402,12 +3170,12 @@ _wrap_Uvio_sela(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","sela", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sela" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","sela", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "sela" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   {
@@ -3421,7 +3189,7 @@ _wrap_Uvio_sela(int argc, VALUE *argv, VALUE self) {
   }
   res4 = SWIG_AsCharPtrAndSize(argv[2], &buf4, NULL, &alloc4);
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char *","sela", 4, argv[2] ));
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "sela" "', argument " "4"" of type '" "char *""'");
   }
   arg4 = (char *)(buf4);
   uvio_sela(arg1,arg2,arg3,arg4);
@@ -3435,15 +3203,6 @@ fail:
 }
 
 
-
-/*
-  Document-method: Miriad::Uvio.select
-
-  call-seq:
-    select(object, datasel, p1=0.0, p2=0.0)
-
-Iterate thru each element in the Uvio and select those that match a condition.  A block must be provided.
-*/
 SWIGINTERN VALUE
 _wrap_Uvio_select(int argc, VALUE *argv, VALUE self) {
   uvio *arg1 = (uvio *) 0 ;
@@ -3466,12 +3225,12 @@ _wrap_Uvio_select(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","select", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "select" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","select", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "select" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   {
@@ -3486,14 +3245,14 @@ _wrap_Uvio_select(int argc, VALUE *argv, VALUE self) {
   if (argc > 2) {
     ecode4 = SWIG_AsVal_double(argv[2], &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "double","select", 4, argv[2] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "select" "', argument " "4"" of type '" "double""'");
     } 
     arg4 = (double)(val4);
   }
   if (argc > 3) {
     ecode5 = SWIG_AsVal_double(argv[3], &val5);
     if (!SWIG_IsOK(ecode5)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "double","select", 5, argv[3] ));
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "select" "', argument " "5"" of type '" "double""'");
     } 
     arg5 = (double)(val5);
   }
@@ -3519,7 +3278,7 @@ _wrap_Uvio_visno(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","visno", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "visno" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   result = (unsigned int)uvio_visno(arg1);
@@ -3542,7 +3301,7 @@ _wrap_Uvio_flagwr(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","flagwr", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "flagwr" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3554,9 +3313,9 @@ _wrap_Uvio_flagwr(int argc, VALUE *argv, VALUE self) {
       int i;
       int nflag;
       Check_Type(argv[0], T_ARRAY);
-      nflag = RARRAY(argv[0])->len;
+      nflag = RARRAY_LEN(argv[0]);
       arg2 = ALLOCA_N(int,nflag);
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       for(i=0; i < nflag; i++) {
         arg2[i] = FIX2INT(ptr[i]);
       }
@@ -3581,7 +3340,7 @@ _wrap_Uvio_wflagwr(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","wflagwr", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "wflagwr" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   {
@@ -3593,9 +3352,9 @@ _wrap_Uvio_wflagwr(int argc, VALUE *argv, VALUE self) {
       int i;
       int nflag;
       Check_Type(argv[0], T_ARRAY);
-      nflag = RARRAY(argv[0])->len;
+      nflag = RARRAY_LEN(argv[0]);
       arg2 = ALLOCA_N(int,nflag);
-      VALUE * ptr = RARRAY(argv[0])->ptr;
+      VALUE * ptr = RARRAY_PTR(argv[0]);
       for(i=0; i < nflag; i++) {
         arg2[i] = FIX2INT(ptr[i]);
       }
@@ -3629,17 +3388,17 @@ _wrap_Uvio_haccess(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","haccess", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "haccess" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","haccess", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "haccess" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","haccess", 3, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "haccess" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = (char *)(buf3);
   result = (int)uvio_haccess(arg1,arg2,arg3);
@@ -3668,12 +3427,12 @@ _wrap_Uvio_hdaccess(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","hdaccess", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "hdaccess" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","hdaccess", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "hdaccess" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
   uvio_hdaccess(arg1,arg2);
@@ -3707,12 +3466,12 @@ _wrap_Uvio_hreadln(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","hreadln", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "hreadln" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","hreadln", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "hreadln" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
   uvio_hreadln(arg1,arg2,arg3,arg4,arg5);
@@ -3753,22 +3512,22 @@ _wrap_Uvio_hwriteln(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","hwriteln", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "hwriteln" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","hwriteln", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "hwriteln" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
   res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","hwriteln", 3, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "hwriteln" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = (char *)(buf3);
   ecode4 = SWIG_AsVal_size_t(argv[2], &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "size_t","hwriteln", 4, argv[2] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "hwriteln" "', argument " "4"" of type '" "size_t""'");
   } 
   arg4 = (size_t)(val4);
   uvio_hwriteln(arg1,arg2,arg3,arg4);
@@ -3795,12 +3554,12 @@ _wrap_Uvio_hiswrite(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","hiswrite", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "hiswrite" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","hiswrite", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "hiswrite" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   uvio_hiswrite(arg1,arg2);
@@ -3831,17 +3590,17 @@ _wrap_Uvio_wrhda(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_uvio, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "uvio *","wrhda", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "wrhda" "', argument " "1"" of type '" "uvio *""'"); 
   }
   arg1 = (uvio *)(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","wrhda", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "wrhda" "', argument " "2"" of type '" "char *""'");
   }
   arg2 = (char *)(buf2);
   res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char *","wrhda", 3, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "wrhda" "', argument " "3"" of type '" "char *""'");
   }
   arg3 = (char *)(buf3);
   uvio_wrhda(arg1,arg2,arg3);
@@ -3950,7 +3709,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
+  int found;
 
   clientdata = clientdata;
 
@@ -3960,9 +3719,6 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
   }
 
   /* Try and load any already created modules */
@@ -3991,12 +3747,6 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
-     a different interpreter, but not yet have a pointer in this interpreter.
-     In this case, we do not want to continue adding types... everything should be
-     set up already */
-  if (init == 0) return;
-
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -4130,9 +3880,7 @@ SWIG_PropagateClientData(void) {
 }
 #endif
 
-/*
 
-*/
 #ifdef __cplusplus
 extern "C"
 #endif