ruby-vpi 16.0.0 → 16.0.1

data/doc/memo.html

@@ -18,10 +18,10 @@
 
     <div id="index">
       <h1>Contents</h1>
-      <ul><li><a id="a-606616158" href="#Pending_tasks">Pending tasks</a></li><li><a id="a-606618668" href="#Finished_tasks">Finished tasks</a></li><li><a id="a-606619638" href="#Obsolete_tasks">Obsolete tasks</a></li></ul>
+      <ul><li><a id="a-606759078" href="#Pending_tasks">Pending tasks</a></li><li><a id="a-606760118" href="#Finished_tasks">Finished tasks</a></li><li><a id="a-606761088" href="#Obsolete_tasks">Obsolete tasks</a></li></ul>
 
           </div>
-      <h1><a id="Pending_tasks" href="#a-606616158">1</a> &nbsp; Pending tasks</h1>
+      <h1><a id="Pending_tasks" href="#a-606759078">1</a> &nbsp; Pending tasks</h1>
 
 
 	<ul>
@@ -59,7 +59,7 @@
 	</ul>
 
 
-	<h1><a id="Finished_tasks" href="#a-606618668">2</a> &nbsp; Finished tasks</h1>
+	<h1><a id="Finished_tasks" href="#a-606760118">2</a> &nbsp; Finished tasks</h1>
 
 
 	<ul>
@@ -127,7 +127,7 @@
 	</ul>
 
 
-	<h1><a id="Obsolete_tasks" href="#a-606619638">3</a> &nbsp; Obsolete tasks</h1>
+	<h1><a id="Obsolete_tasks" href="#a-606761088">3</a> &nbsp; Obsolete tasks</h1>
 
 
 	<ul>

data/doc/readme.html

@@ -37,7 +37,7 @@
   }
 </style>
 
-	<h1 style="margin-top: 0;"><a id="Ruby-VPI" href="#a-606773538">1</a> &nbsp; Ruby-VPI</h1>
+	<h1 style="margin-top: 0;"><a id="Ruby-VPI" href="#a-607628178">1</a> &nbsp; Ruby-VPI</h1>
 
 
 	<p><a href="http://www.ruby-lang.org"><img src="images/ruby/logo-reflection.png" alt="Logo of the Ruby programming language" style="margin: 0; margin-left: 2em; float: right"/></a></p>
@@ -59,7 +59,7 @@
 
 <div id="resources">
 
-	<h2><a id="Resources" href="#a-606776378">1.1</a> &nbsp; Resources</h2>
+	<h2><a id="Resources" href="#a-607629158">1.1</a> &nbsp; Resources</h2>
 
 
 	<p class="title">Records</p>
@@ -116,7 +116,7 @@
 
 </div>
 
-	<h2 ><a id="intro.features" href="#a-606777368">1.2</a> &nbsp; Features</h2>
+	<h2 ><a id="intro.features" href="#a-607630098">1.2</a> &nbsp; Features</h2>
 
 
 	<p class="title">Portable</p>
@@ -173,7 +173,7 @@
 	</ul>
 
 
-	<h2 ><a id="intro.reqs" href="#a-606778438">1.3</a> &nbsp; Requirements</h2>
+	<h2 ><a id="intro.reqs" href="#a-607631128">1.3</a> &nbsp; Requirements</h2>
 
 
 	<p>The following software is necessary in order to use Ruby-VPI.</p>
@@ -251,7 +251,7 @@
 	</ul>
 
 
-	<h2 ><a id="intro.applications" href="#a-606779428">1.4</a> &nbsp; Applications</h2>
+	<h2 ><a id="intro.applications" href="#a-607632078">1.4</a> &nbsp; Applications</h2>
 
 
 	<p>Examples of tasks that can be performed with Ruby-VPI are:</p>
@@ -285,7 +285,7 @@
 	</ul>
 
 
-	<h2 ><a id="intro.appetizers" href="#a-606780568">1.5</a> &nbsp; Appetizers</h2>
+	<h2 ><a id="intro.appetizers" href="#a-607633188">1.5</a> &nbsp; Appetizers</h2>
 
 
 	<p>Here is a tiny sampling of code to whet your appetite. See <a href="manual.html#usage.tutorial">the tutorial</a> for more samples.</p>
@@ -331,7 +331,7 @@
 	</blockquote>
 
 
-	<h2 ><a id="intro.license" href="#a-606781628">1.6</a> &nbsp; License</h2>
+	<h2 ><a id="intro.license" href="#a-607634248">1.6</a> &nbsp; License</h2>
 
 
 	<p>Copyright&#169; 2006-2007 Suraj N. Kurapati</p>
@@ -362,7 +362,7 @@ of distribution plus a nominal fee, with information on how to obtain the Code.<
 <span class="caps">THE SOFTWARE</span>.</p>
 
 
-	<h2 ><a id="intro.related-works" href="#a-606782898">1.7</a> &nbsp; Related works</h2>
+	<h2 ><a id="intro.related-works" href="#a-607635258">1.7</a> &nbsp; Related works</h2>
 
 
 	<ul>
@@ -374,7 +374,7 @@ of distribution plus a nominal fee, with information on how to obtain the Code.<
 	</ul>
 
 
-	<h3 ><a id="intro.related-works.pli" href="#a-606785918">1.7.1</a> &nbsp; Ye olde <span class="caps">PLI</span></h3>
+	<h3 ><a id="intro.related-works.pli" href="#a-607636448">1.7.1</a> &nbsp; Ye olde <span class="caps">PLI</span></h3>
 
 
 	<p>The following projects utilize the archaic <strong>tf</strong> and <strong>acc</strong> PLI interfaces, which have been officially deprecated in <span class="caps">IEEE</span> Std 1364-2005.</p>

data/doc/rss.xml

@@ -4,6 +4,31 @@
   <title>Ruby-VPI</title>
   <link>http://ruby-vpi.rubyforge.org</link>
   <description>Ruby-VPI is a Ruby interface to IEEE 1364-2005 Verilog VPI and a platform for unit testing, rapid prototyping, and systems integration of Verilog modules through Ruby. It lets you create complex Verilog test benches easily and wholly in Ruby.</description>
+  <item>
+    <title>Version 16.0.1 released</title>
+    <link>http://ruby-vpi.rubyforge.org/doc/history.html#a16.0.1</link>
+    <guid>http://ruby-vpi.rubyforge.org/doc/history.html#a16.0.1</guid>
+    <description>&lt;h1 id=&quot;16.0.1&quot;&gt;Version 16.0.1 (2007-05-27)&lt;/h1&gt;
+
+	&lt;p&gt;This release restores support for installation on Mac &lt;span class=&quot;caps&quot;&gt;OS X&lt;/span&gt;.&lt;/p&gt;
+
+
+	&lt;h2&gt;Thanks&lt;/h2&gt;
+
+
+	&lt;ul&gt;
+	&lt;li&gt;Mark Thompson &lt;a href=&quot;http://rubyforge.org/tracker/index.php?func=detail&amp;#38;aid=11125&amp;#38;group_id=1339&amp;#38;atid=5281&quot;&gt;reported and solved&lt;/a&gt; the problem.&lt;/li&gt;
+	&lt;/ul&gt;
+
+
+	&lt;h2&gt;Repairs&lt;/h2&gt;
+
+
+	&lt;ul&gt;
+	&lt;li&gt;Shared-object files have a file extension of &lt;tt&gt;.so&lt;/tt&gt; in Linux and &lt;tt&gt;.bundle&lt;/tt&gt; on Mac &lt;span class=&quot;caps&quot;&gt;OS X&lt;/span&gt;.  Previously, only the Linux file extension was supported.&lt;/li&gt;
+	&lt;/ul&gt;</description>
+    <pubDate>Sun, 27 May 2007 00:00:00 PDT</pubDate>
+  </item>
   <item>
     <title>Version 16.0.0 released</title>
     <link>http://ruby-vpi.rubyforge.org/doc/history.html#a16.0.0</link>

data/ext/Rakefile

@@ -23,7 +23,7 @@ file 'Makefile' => [:swig, 'extconf.rb'] do |t|
   ruby t.prerequisites[1], "--with-cflags=#{ENV['CFLAGS']}", "--with-ldflags=#{ENV['LDFLAGS']}"
 end
 
-CLEAN.include 'Makefile', 'mkmf.log', '*.o', '*.so'
+CLEAN.include 'Makefile', 'mkmf.log', '*.o', '*.' + Config::CONFIG['DLEXT']
 
 
 desc 'Generate Ruby wrapper for VPI.'

data/ext/swig_wrap.cin

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.28
+ * 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
@@ -9,12 +9,10 @@
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
-/***********************************************************************
- *
+/* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
- *
- ************************************************************************/
+ * ----------------------------------------------------------------------------- */
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
@@ -71,7 +69,13 @@
 # define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 #endif
 
-/* exporting methods for Windows DLLs */
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
 #ifndef SWIGEXPORT
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(STATIC_LINKED)
@@ -80,7 +84,11 @@
 #     define SWIGEXPORT __declspec(dllexport)
 #   endif
 # else
-#   define SWIGEXPORT
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
 # endif
 #endif
 
@@ -93,12 +101,15 @@
 # endif 
 #endif
 
-/***********************************************************************
- *
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
- *
- ************************************************************************/
+ * ----------------------------------------------------------------------------- */
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
@@ -155,7 +166,13 @@
 # define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 #endif
 
-/* exporting methods for Windows DLLs */
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
 #ifndef SWIGEXPORT
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(STATIC_LINKED)
@@ -164,7 +181,11 @@
 #     define SWIGEXPORT __declspec(dllexport)
 #   endif
 # else
-#   define SWIGEXPORT
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
 # endif
 #endif
 
@@ -177,17 +198,21 @@
 # endif 
 #endif
 
-/***********************************************************************
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- *     This file contains generic CAPI SWIG runtime support for pointer
- *     type checking.
- *
- ************************************************************************/
+ * This file contains generic CAPI SWIG runtime support for pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
 
 /* 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 "2"
+#define SWIG_RUNTIME_VERSION "3"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -408,7 +433,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
   for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
     while ((*f1 == ' ') && (f1 != l1)) ++f1;
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
-    if (*f1 != *f2) return (int)(*f1 - *f2);
+    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
   return (l1 - f1) - (l2 - f2);
 }
@@ -786,6 +811,21 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 #endif
 
+/* RSTRING_LEN, etc are new in Ruby 1.9, but ->ptr and ->len no longer work */
+/* Define these for older versions so we can just write code the new way */
+#ifndef RSTRING_LEN
+# define RSTRING_LEN(x) RSTRING(x)->len
+#endif
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) RSTRING(x)->ptr
+#endif
+#ifndef RARRAY_LEN
+# define RARRAY_LEN(x) RARRAY(x)->len
+#endif
+#ifndef RARRAY_PTR
+# define RARRAY_PTR(x) RARRAY(x)->ptr
+#endif
+
 /*
  * Need to be very careful about how these macros are defined, especially
  * when compiling C++ code or C code with an ANSI C compiler.
@@ -829,10 +869,10 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define StringValue(s) RB_STRING_VALUE(s)
 #endif
 #ifndef StringValuePtr
-#define StringValuePtr(s) RSTRING(RB_STRING_VALUE(s))->ptr
+#define StringValuePtr(s) RSTRING_PTR(RB_STRING_VALUE(s))
 #endif
 #ifndef StringValueLen
-#define StringValueLen(s) RSTRING(RB_STRING_VALUE(s))->len
+#define StringValueLen(s) RSTRING_LEN(RB_STRING_VALUE(s))
 #endif
 #ifndef SafeStringValue
 #define SafeStringValue(v) do {\
@@ -938,15 +978,17 @@ SWIG_Ruby_ErrorType(int SWIG_code) {
 
 
 
-/***********************************************************************
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
  * rubytracking.swg
  *
  * This file contains support for tracking mappings from 
  * Ruby objects to C++ objects.  This functionality is needed
  * to implement mark functions for Ruby's mark and sweep
  * garbage collector.
- ************************************************************************/
-
+ * ----------------------------------------------------------------------------- */
 
 #ifdef __cplusplus
 extern "C" {
@@ -1100,14 +1142,16 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #endif
 
 
-/***********************************************************************
- * rubyrun.swg
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
  *
- *     This file contains the runtime support for Ruby modules
- *     and includes code for managing global variables and pointer
- *     type checking.
+ * rubyrun.swg
  *
- ************************************************************************/
+ * This file contains the runtime support for Ruby modules
+ * and includes code for managing global variables and pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
 
 /* For backward compatibility only */
 #define SWIG_POINTER_EXCEPTION  0
@@ -1251,8 +1295,17 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     /* Are we tracking this class and have we already returned this Ruby object? */
     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) {
-        return obj;
+        VALUE value = rb_iv_get(obj, "__swigtype__");
+        char* type_name = RSTRING_PTR(value);
+				
+        if (strcmp(type->name, type_name) == 0) {
+          return obj;
+        }
       }
     }
 
@@ -1504,7 +1557,8 @@ static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0};
 
 static VALUE mVpi;
 
-#define SWIGVERSION 0x010328 
+#define SWIGVERSION 0x010331 
+#define SWIG_VERSION SWIGVERSION
 
 
 #define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
@@ -1693,7 +1747,7 @@ typedef union {
 
 
 SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor()
+SWIG_pchar_descriptor(void)
 {
   static int init = 0;
   static swig_type_info* info = 0;
@@ -1709,8 +1763,12 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    char *cstr = rb_string_value_ptr(&(obj)); 
-    size_t size = RSTRING(obj)->len + 1;
+    
+
+
+    char *cstr = STR2CSTR(obj);
+    
+    size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
 	if (*alloc == SWIG_NEWOBJ) {
@@ -1726,10 +1784,10 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
   } else {
     swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
     if (pchar_descriptor) {
-      char* vptr = 0;
-      if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_descriptor, 0) == SWIG_OK) {
-	if (cptr) *cptr = vptr;
-	if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0;
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *)vptr;
+	if (psize) *psize = vptr ? (strlen((char*)vptr) + 1) : 0;
 	if (alloc) *alloc = SWIG_OLDOBJ;
 	return SWIG_OK;
       }
@@ -1817,7 +1875,6 @@ _wrap_s_vpi_time_type_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_time *)(argp1);
   result = (PLI_INT32) ((arg1)->type);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -1872,7 +1929,6 @@ _wrap_s_vpi_time_high_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_time *)(argp1);
   result = (PLI_UINT32) ((arg1)->high);
-  
   vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
   return vresult;
 fail:
@@ -1927,7 +1983,6 @@ _wrap_s_vpi_time_low_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_time *)(argp1);
   result = (PLI_UINT32) ((arg1)->low);
-  
   vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
   return vresult;
 fail:
@@ -1982,7 +2037,6 @@ _wrap_s_vpi_time_real_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_time *)(argp1);
   result = (double) ((arg1)->real);
-  
   vresult = SWIG_From_double((double)(result));
   return vresult;
 fail:
@@ -2014,8 +2068,7 @@ _wrap_new_s_vpi_time(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_time *)(s_vpi_time *) calloc(1, sizeof(s_vpi_time));
-  DATA_PTR(self) = result;
+  result = (s_vpi_time *)(s_vpi_time *) calloc(1, sizeof(s_vpi_time));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -2077,7 +2130,6 @@ _wrap_s_vpi_delay_da_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (struct t_vpi_time *) ((arg1)->da);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_time, 0 |  0 );
   return vresult;
 fail:
@@ -2132,7 +2184,6 @@ _wrap_s_vpi_delay_no_of_delays_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (PLI_INT32) ((arg1)->no_of_delays);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2187,7 +2238,6 @@ _wrap_s_vpi_delay_time_type_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (PLI_INT32) ((arg1)->time_type);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2242,7 +2292,6 @@ _wrap_s_vpi_delay_mtm_flag_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (PLI_INT32) ((arg1)->mtm_flag);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2297,7 +2346,6 @@ _wrap_s_vpi_delay_append_flag_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (PLI_INT32) ((arg1)->append_flag);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2352,7 +2400,6 @@ _wrap_s_vpi_delay_pulsere_flag_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_delay *)(argp1);
   result = (PLI_INT32) ((arg1)->pulsere_flag);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2384,8 +2431,7 @@ _wrap_new_s_vpi_delay(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_delay *)(s_vpi_delay *) calloc(1, sizeof(s_vpi_delay));
-  DATA_PTR(self) = result;
+  result = (s_vpi_delay *)(s_vpi_delay *) calloc(1, sizeof(s_vpi_delay));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -2447,7 +2493,6 @@ _wrap_s_vpi_vecval_aval_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vecval *)(argp1);
   result = (PLI_INT32) ((arg1)->aval);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2502,7 +2547,6 @@ _wrap_s_vpi_vecval_bval_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vecval *)(argp1);
   result = (PLI_INT32) ((arg1)->bval);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2534,8 +2578,7 @@ _wrap_new_s_vpi_vecval(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_vecval *)(s_vpi_vecval *) calloc(1, sizeof(s_vpi_vecval));
-  DATA_PTR(self) = result;
+  result = (s_vpi_vecval *)(s_vpi_vecval *) calloc(1, sizeof(s_vpi_vecval));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -2597,7 +2640,6 @@ _wrap_s_vpi_strengthval_logic_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_strengthval *)(argp1);
   result = (PLI_INT32) ((arg1)->logic);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2652,7 +2694,6 @@ _wrap_s_vpi_strengthval_s0_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_strengthval *)(argp1);
   result = (PLI_INT32) ((arg1)->s0);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2707,7 +2748,6 @@ _wrap_s_vpi_strengthval_s1_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_strengthval *)(argp1);
   result = (PLI_INT32) ((arg1)->s1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2739,8 +2779,7 @@ _wrap_new_s_vpi_strengthval(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_strengthval *)(s_vpi_strengthval *) calloc(1, sizeof(s_vpi_strengthval));
-  DATA_PTR(self) = result;
+  result = (s_vpi_strengthval *)(s_vpi_strengthval *) calloc(1, sizeof(s_vpi_strengthval));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -2802,7 +2841,6 @@ _wrap_s_vpi_value_format_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value *)(argp1);
   result = (PLI_INT32) ((arg1)->format);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -2827,7 +2865,6 @@ _wrap_s_vpi_value_value_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value *)(argp1);
   result = (s_vpi_value_value *)& ((arg1)->value);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_s_vpi_value_value, 0 |  0 );
   return vresult;
 fail:
@@ -2859,8 +2896,7 @@ _wrap_new_s_vpi_value(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_value *)(s_vpi_value *) calloc(1, sizeof(s_vpi_value));
-  DATA_PTR(self) = result;
+  result = (s_vpi_value *)(s_vpi_value *) calloc(1, sizeof(s_vpi_value));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -2897,11 +2933,11 @@ _wrap_s_vpi_value_value_str_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "str" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->str) free((char*)arg1->str);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->str = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->str = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->str = 0;
   }
@@ -2930,8 +2966,7 @@ _wrap_s_vpi_value_value_str_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->str);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -2985,7 +3020,6 @@ _wrap_s_vpi_value_value_scalar_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (PLI_INT32) ((arg1)->scalar);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -3040,7 +3074,6 @@ _wrap_s_vpi_value_value_integer_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (PLI_INT32) ((arg1)->integer);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -3095,7 +3128,6 @@ _wrap_s_vpi_value_value_real_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (double) ((arg1)->real);
-  
   vresult = SWIG_From_double((double)(result));
   return vresult;
 fail:
@@ -3150,7 +3182,6 @@ _wrap_s_vpi_value_value_time_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (struct t_vpi_time *) ((arg1)->time);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_time, 0 |  0 );
   return vresult;
 fail:
@@ -3205,7 +3236,6 @@ _wrap_s_vpi_value_value_vector_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (struct t_vpi_vecval *) ((arg1)->vector);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_vecval, 0 |  0 );
   return vresult;
 fail:
@@ -3260,7 +3290,6 @@ _wrap_s_vpi_value_value_strength_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (struct t_vpi_strengthval *) ((arg1)->strength);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_strengthval, 0 |  0 );
   return vresult;
 fail:
@@ -3290,11 +3319,11 @@ _wrap_s_vpi_value_value_misc_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "misc" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->misc) free((char*)arg1->misc);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->misc = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->misc = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->misc = 0;
   }
@@ -3323,8 +3352,7 @@ _wrap_s_vpi_value_value_misc_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_value_value *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->misc);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -3355,8 +3383,7 @@ _wrap_new_s_vpi_value_value(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_value_value *)(s_vpi_value_value *) calloc(1, sizeof(s_vpi_value_value));
-  DATA_PTR(self) = result;
+  result = (s_vpi_value_value *)(s_vpi_value_value *) calloc(1, sizeof(s_vpi_value_value));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -3418,7 +3445,6 @@ _wrap_s_vpi_systf_data_type_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_INT32) ((arg1)->type);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -3473,7 +3499,6 @@ _wrap_s_vpi_systf_data_sysfunctype_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_INT32) ((arg1)->sysfunctype);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -3503,11 +3528,11 @@ _wrap_s_vpi_systf_data_tfname_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "tfname" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->tfname) free((char*)arg1->tfname);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->tfname = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->tfname = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->tfname = 0;
   }
@@ -3536,8 +3561,7 @@ _wrap_s_vpi_systf_data_tfname_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->tfname);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -3590,7 +3614,6 @@ _wrap_s_vpi_systf_data_calltf_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_INT32 (*)(PLI_BYTE8 *)) ((arg1)->calltf);
-  
   vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_char__int);
   return vresult;
 fail:
@@ -3644,7 +3667,6 @@ _wrap_s_vpi_systf_data_compiletf_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_INT32 (*)(PLI_BYTE8 *)) ((arg1)->compiletf);
-  
   vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_char__int);
   return vresult;
 fail:
@@ -3698,7 +3720,6 @@ _wrap_s_vpi_systf_data_sizetf_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_INT32 (*)(PLI_BYTE8 *)) ((arg1)->sizetf);
-  
   vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_char__int);
   return vresult;
 fail:
@@ -3728,11 +3749,11 @@ _wrap_s_vpi_systf_data_user_data_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "user_data" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->user_data) free((char*)arg1->user_data);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->user_data = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->user_data = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->user_data = 0;
   }
@@ -3761,8 +3782,7 @@ _wrap_s_vpi_systf_data_user_data_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_systf_data *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->user_data);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -3793,8 +3813,7 @@ _wrap_new_s_vpi_systf_data(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_systf_data *)(s_vpi_systf_data *) calloc(1, sizeof(s_vpi_systf_data));
-  DATA_PTR(self) = result;
+  result = (s_vpi_systf_data *)(s_vpi_systf_data *) calloc(1, sizeof(s_vpi_systf_data));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -3856,7 +3875,6 @@ _wrap_s_vpi_vlog_info_argc_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vlog_info *)(argp1);
   result = (PLI_INT32) ((arg1)->argc);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -3911,7 +3929,6 @@ _wrap_s_vpi_vlog_info_argv_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vlog_info *)(argp1);
   result = (PLI_BYTE8 **) ((arg1)->argv);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_p_char, 0 |  0 );
   return vresult;
 fail:
@@ -3941,11 +3958,11 @@ _wrap_s_vpi_vlog_info_product_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "product" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->product) free((char*)arg1->product);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->product = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->product = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->product = 0;
   }
@@ -3974,8 +3991,7 @@ _wrap_s_vpi_vlog_info_product_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vlog_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->product);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4004,11 +4020,11 @@ _wrap_s_vpi_vlog_info_version_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "version" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->version) free((char*)arg1->version);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->version = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->version = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->version = 0;
   }
@@ -4037,8 +4053,7 @@ _wrap_s_vpi_vlog_info_version_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_vlog_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->version);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4069,8 +4084,7 @@ _wrap_new_s_vpi_vlog_info(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_vlog_info *)(s_vpi_vlog_info *) calloc(1, sizeof(s_vpi_vlog_info));
-  DATA_PTR(self) = result;
+  result = (s_vpi_vlog_info *)(s_vpi_vlog_info *) calloc(1, sizeof(s_vpi_vlog_info));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -4132,7 +4146,6 @@ _wrap_s_vpi_error_info_state_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_INT32) ((arg1)->state);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4187,7 +4200,6 @@ _wrap_s_vpi_error_info_level_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_INT32) ((arg1)->level);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4217,11 +4229,11 @@ _wrap_s_vpi_error_info_message_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "message" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->message) free((char*)arg1->message);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->message = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->message = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->message = 0;
   }
@@ -4250,8 +4262,7 @@ _wrap_s_vpi_error_info_message_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->message);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4280,11 +4291,11 @@ _wrap_s_vpi_error_info_product_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "product" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->product) free((char*)arg1->product);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->product = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->product = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->product = 0;
   }
@@ -4313,8 +4324,7 @@ _wrap_s_vpi_error_info_product_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->product);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4343,11 +4353,11 @@ _wrap_s_vpi_error_info_code_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "code" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->code) free((char*)arg1->code);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->code = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->code = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->code = 0;
   }
@@ -4376,8 +4386,7 @@ _wrap_s_vpi_error_info_code_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->code);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4406,11 +4415,11 @@ _wrap_s_vpi_error_info_file_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "file" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->file) free((char*)arg1->file);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->file = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->file = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->file = 0;
   }
@@ -4439,8 +4448,7 @@ _wrap_s_vpi_error_info_file_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->file);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4494,7 +4502,6 @@ _wrap_s_vpi_error_info_line_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_vpi_error_info *)(argp1);
   result = (PLI_INT32) ((arg1)->line);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4526,8 +4533,7 @@ _wrap_new_s_vpi_error_info(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_vpi_error_info *)(s_vpi_error_info *) calloc(1, sizeof(s_vpi_error_info));
-  DATA_PTR(self) = result;
+  result = (s_vpi_error_info *)(s_vpi_error_info *) calloc(1, sizeof(s_vpi_error_info));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -4589,7 +4595,6 @@ _wrap_s_cb_data_reason_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (PLI_INT32) ((arg1)->reason);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4643,7 +4648,6 @@ _wrap_s_cb_data_cb_rtn_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (PLI_INT32 (*)(struct t_cb_data *)) ((arg1)->cb_rtn);
-  
   vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_struct_t_cb_data__int);
   return vresult;
 fail:
@@ -4698,7 +4702,6 @@ _wrap_s_cb_data_obj_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (vpiHandle) ((arg1)->obj);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -4753,7 +4756,6 @@ _wrap_s_cb_data_time_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (p_vpi_time) ((arg1)->time);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_time, 0 |  0 );
   return vresult;
 fail:
@@ -4808,7 +4810,6 @@ _wrap_s_cb_data_value_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (p_vpi_value) ((arg1)->value);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_t_vpi_value, 0 |  0 );
   return vresult;
 fail:
@@ -4863,7 +4864,6 @@ _wrap_s_cb_data_index_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (PLI_INT32) ((arg1)->index);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -4893,11 +4893,11 @@ _wrap_s_cb_data_user_data_set(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "user_data" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   if (arg1->user_data) free((char*)arg1->user_data);
   if (arg2) {
-    size_t size = strlen(arg2) + 1;
-    arg1->user_data = (char *)memcpy((char *)malloc((size)*sizeof(char)), arg2, sizeof(char)*(size));
+    size_t size = strlen((const char *)(arg2)) + 1;
+    arg1->user_data = (PLI_BYTE8 *)(char *)memcpy((char *)malloc((size)*sizeof(char)), (const char *)(arg2), sizeof(char)*(size));
   } else {
     arg1->user_data = 0;
   }
@@ -4926,8 +4926,7 @@ _wrap_s_cb_data_user_data_get(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (s_cb_data *)(argp1);
   result = (PLI_BYTE8 *) ((arg1)->user_data);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -4958,8 +4957,7 @@ _wrap_new_s_cb_data(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (s_cb_data *)(s_cb_data *) calloc(1, sizeof(s_cb_data));
-  DATA_PTR(self) = result;
+  result = (s_cb_data *)(s_cb_data *) calloc(1, sizeof(s_cb_data));DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -4989,7 +4987,6 @@ _wrap_vpi_register_cb(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (p_cb_data)(argp1);
   result = (vpiHandle)vpi_register_cb(arg1);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5014,7 +5011,6 @@ _wrap_vpi_remove_cb(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (vpiHandle)(argp1);
   result = (PLI_INT32)vpi_remove_cb(arg1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5045,7 +5041,6 @@ _wrap_vpi_get_cb_info(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_cb_data)(argp2);
   vpi_get_cb_info(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5069,7 +5064,6 @@ _wrap_vpi_register_systf(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (p_vpi_systf_data)(argp1);
   result = (vpiHandle)vpi_register_systf(arg1);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5100,7 +5094,6 @@ _wrap_vpi_get_systf_info(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_vpi_systf_data)(argp2);
   vpi_get_systf_info(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5126,14 +5119,13 @@ _wrap_vpi_handle_by_name(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_handle_by_name" "', argument " "1"" of type '" "PLI_BYTE8 *""'");
   }
-  arg1 = buf1;
+  arg1 = (PLI_BYTE8 *)(buf1);
   res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_unsigned_int, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_handle_by_name" "', argument " "2"" of type '" "vpiHandle""'"); 
   }
   arg2 = (vpiHandle)(argp2);
   result = (vpiHandle)vpi_handle_by_name(arg1,arg2);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
@@ -5168,7 +5160,6 @@ _wrap_vpi_handle_by_index(int argc, VALUE *argv, VALUE self) {
   } 
   arg2 = (PLI_INT32)(val2);
   result = (vpiHandle)vpi_handle_by_index(arg1,arg2);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5201,7 +5192,6 @@ _wrap_vpi_handle(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (vpiHandle)(argp2);
   result = (vpiHandle)vpi_handle(arg1,arg2);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5243,7 +5233,6 @@ _wrap_vpi_handle_multi(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = (vpiHandle)(argp3);
   result = (vpiHandle)vpi_handle_multi(arg1,arg2,arg3,arg4);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5276,7 +5265,6 @@ _wrap_vpi_iterate(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (vpiHandle)(argp2);
   result = (vpiHandle)vpi_iterate(arg1,arg2);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5301,7 +5289,6 @@ _wrap_vpi_scan(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (vpiHandle)(argp1);
   result = (vpiHandle)vpi_scan(arg1);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5334,7 +5321,6 @@ _wrap_vpi_get(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (vpiHandle)(argp2);
   result = (PLI_INT32)vpi_get(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5367,8 +5353,7 @@ _wrap_vpi_get_str(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (vpiHandle)(argp2);
   result = (PLI_BYTE8 *)vpi_get_str(arg1,arg2);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -5398,7 +5383,6 @@ _wrap_vpi_get_delays(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_vpi_delay)(argp2);
   vpi_get_delays(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5428,7 +5412,6 @@ _wrap_vpi_put_delays(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_vpi_delay)(argp2);
   vpi_put_delays(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5458,7 +5441,6 @@ _wrap_vpi_get_value(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_vpi_value)(argp2);
   vpi_get_value(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5506,7 +5488,6 @@ _wrap_vpi_put_value(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (PLI_INT32)(val4);
   result = (vpiHandle)vpi_put_value(arg1,arg2,arg3,arg4);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -5537,7 +5518,6 @@ _wrap_vpi_get_time(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (p_vpi_time)(argp2);
   vpi_get_time(arg1,arg2);
-  
   return Qnil;
 fail:
   return Qnil;
@@ -5560,9 +5540,8 @@ _wrap_vpi_mcd_open(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_mcd_open" "', argument " "1"" of type '" "PLI_BYTE8 *""'");
   }
-  arg1 = buf1;
+  arg1 = (PLI_BYTE8 *)(buf1);
   result = (PLI_UINT32)vpi_mcd_open(arg1);
-  
   vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
@@ -5589,7 +5568,6 @@ _wrap_vpi_mcd_close(int argc, VALUE *argv, VALUE self) {
   } 
   arg1 = (PLI_UINT32)(val1);
   result = (PLI_UINT32)vpi_mcd_close(arg1);
-  
   vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
   return vresult;
 fail:
@@ -5614,8 +5592,7 @@ _wrap_vpi_mcd_name(int argc, VALUE *argv, VALUE self) {
   } 
   arg1 = (PLI_UINT32)(val1);
   result = (PLI_BYTE8 *)vpi_mcd_name(arg1);
-  
-  vresult = SWIG_FromCharPtr(result);
+  vresult = SWIG_FromCharPtr((const char *)result);
   return vresult;
 fail:
   return Qnil;
@@ -5647,9 +5624,8 @@ _wrap_vpi_mcd_printf(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_mcd_printf" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   result = (PLI_INT32)vpi_mcd_printf(arg1,arg2,arg3);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
@@ -5676,9 +5652,8 @@ _wrap_vpi_printf(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_printf" "', argument " "1"" of type '" "PLI_BYTE8 *""'");
   }
-  arg1 = buf1;
+  arg1 = (PLI_BYTE8 *)(buf1);
   result = (PLI_INT32)vpi_printf(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
@@ -5713,7 +5688,6 @@ _wrap_vpi_compare_objects(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (vpiHandle)(argp2);
   result = (PLI_INT32)vpi_compare_objects(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5738,7 +5712,6 @@ _wrap_vpi_chk_error(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (p_vpi_error_info)(argp1);
   result = (PLI_INT32)vpi_chk_error(arg1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5763,7 +5736,6 @@ _wrap_vpi_free_object(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (vpiHandle)(argp1);
   result = (PLI_INT32)vpi_free_object(arg1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5788,7 +5760,6 @@ _wrap_vpi_get_vlog_info(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (p_vpi_vlog_info)(argp1);
   result = (PLI_INT32)vpi_get_vlog_info(arg1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5823,14 +5794,13 @@ _wrap_vpi_get_data(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_data" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   ecode3 = SWIG_AsVal_int(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vpi_get_data" "', argument " "3"" of type '" "PLI_INT32""'");
   } 
   arg3 = (PLI_INT32)(val3);
   result = (PLI_INT32)vpi_get_data(arg1,arg2,arg3);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
@@ -5867,14 +5837,13 @@ _wrap_vpi_put_data(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_put_data" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   ecode3 = SWIG_AsVal_int(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vpi_put_data" "', argument " "3"" of type '" "PLI_INT32""'");
   } 
   arg3 = (PLI_INT32)(val3);
   result = (PLI_INT32)vpi_put_data(arg1,arg2,arg3);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
@@ -5901,7 +5870,6 @@ _wrap_vpi_get_userdata(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (vpiHandle)(argp1);
   result = (void *)vpi_get_userdata(arg1);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
   return vresult;
 fail:
@@ -5932,7 +5900,6 @@ _wrap_vpi_put_userdata(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_put_userdata" "', argument " "2"" of type '" "void *""'"); 
   }
   result = (PLI_INT32)vpi_put_userdata(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -5959,14 +5926,13 @@ _wrap_vpi_vprintf(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_vprintf" "', argument " "1"" of type '" "PLI_BYTE8 *""'");
   }
-  arg1 = buf1;
+  arg1 = (PLI_BYTE8 *)(buf1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vpi_vprintf" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = (int)(val2);
   result = (PLI_INT32)vpi_vprintf(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
@@ -6003,14 +5969,13 @@ _wrap_vpi_mcd_vprintf(int argc, VALUE *argv, VALUE self) {
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_mcd_vprintf" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
   }
-  arg2 = buf2;
+  arg2 = (PLI_BYTE8 *)(buf2);
   ecode3 = SWIG_AsVal_int(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vpi_mcd_vprintf" "', argument " "3"" of type '" "int""'");
   } 
   arg3 = (int)(val3);
   result = (PLI_INT32)vpi_mcd_vprintf(arg1,arg2,arg3);
-  
   vresult = SWIG_From_int((int)(result));
   if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
   return vresult;
@@ -6029,7 +5994,6 @@ _wrap_vpi_flush(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
   result = (PLI_INT32)vpi_flush();
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6054,7 +6018,6 @@ _wrap_vpi_mcd_flush(int argc, VALUE *argv, VALUE self) {
   } 
   arg1 = (PLI_UINT32)(val1);
   result = (PLI_INT32)vpi_mcd_flush(arg1);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6080,7 +6043,6 @@ _wrap_vpi_control(int argc, VALUE *argv, VALUE self) {
   } 
   arg1 = (PLI_INT32)(val1);
   result = (PLI_INT32)vpi_control(arg1,arg2);
-  
   vresult = SWIG_From_int((int)(result));
   return vresult;
 fail:
@@ -6121,7 +6083,6 @@ _wrap_vpi_handle_by_multi_index(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = (PLI_INT32 *)(argp3);
   result = (vpiHandle)vpi_handle_by_multi_index(arg1,arg2,arg3);
-  
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
   return vresult;
 fail:
@@ -6245,7 +6206,7 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
-/*************************************************************************
+/* -----------------------------------------------------------------------------
  * Type initialization:
  * This problem is tough by the requirement that no dynamic 
  * memory is used. Also, since swig_type_info structures store pointers to 
@@ -6257,9 +6218,9 @@ static swig_cast_info *swig_cast_initial[] = {
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
-
+ *
  * The generated swig_type_info structures are assigned staticly to an initial 
- * array. We just loop though that array, and handle each type individually.
+ * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
  * cast linked list. The cast data is initially stored in something like a
@@ -6271,7 +6232,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * we find the array of casts associated with the type, and loop through it 
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
-
+ *
  * First off, we lookup the cast->type name to see if it is already loaded. 
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
@@ -6284,7 +6245,7 @@ static swig_cast_info *swig_cast_initial[] = {
  *  3) Finally, if cast->type has not already been loaded, then we add that
  *     swig_cast_info to the linked list (because the cast->type) pointer will
  *     be correct.
-**/
+ * ----------------------------------------------------------------------------- */
 
 #ifdef __cplusplus
 extern "C" {
@@ -6297,32 +6258,49 @@ extern "C" {
 #define SWIGRUNTIME_DEBUG
 #endif
 
+
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
-  swig_module_info *module_head;
-  static int init_run = 0;
+  swig_module_info *module_head, *iter;
+  int found;
 
   clientdata = clientdata;
 
-  if (init_run) return;
-  init_run = 1;
-
-  /* Initialize the swig_module */
-  swig_module.type_initial = swig_type_initial;
-  swig_module.cast_initial = swig_cast_initial;
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+  }
 
   /* Try and load any already created modules */
   module_head = SWIG_GetModule(clientdata);
-  if (module_head) {
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+    module_head = &swig_module;
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    found=0;
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        found=1;
+        break;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+
+    /* if the is found in the list, then all is done and we may leave */
+    if (found) return;
+    /* otherwise we must add out module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
-  } else {
-    /* This is the first module loaded */
-    swig_module.next = &swig_module;
-    SWIG_SetModule(clientdata, &swig_module);
   }
-		 
+
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);