ext/swig_wrap.cin in ruby-vpi-16.0.0 vs ext/swig_wrap.cin in ruby-vpi-16.0.1

- old
+ new

@@ -1,22 +1,20 @@ /* ---------------------------------------------------------------------------- * 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 * changes to this file unless you know what you are doing--modify the SWIG * interface file instead. * ----------------------------------------------------------------------------- */ #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 # if defined(__SUNPRO_CC) # if (__SUNPRO_CC <= 0x560) @@ -69,20 +67,30 @@ /* internal inline SWIG method */ #ifndef SWIGINTERNINLINE # 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) # define SWIGEXPORT # else # 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 /* calling conventions for Windows */ #ifndef SWIGSTDCALL @@ -91,16 +99,19 @@ # else # define SWIGSTDCALL # 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 # if defined(__SUNPRO_CC) # if (__SUNPRO_CC <= 0x560) @@ -153,20 +164,30 @@ /* internal inline SWIG method */ #ifndef SWIGINTERNINLINE # 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) # define SWIGEXPORT # else # 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 /* calling conventions for Windows */ #ifndef SWIGSTDCALL @@ -175,21 +196,25 @@ # else # define SWIGSTDCALL # 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 # define SWIG_QUOTE_STRING(x) #x # define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) @@ -406,11 +431,11 @@ SWIG_TypeNameComp(const char *f1, const char *l1, const char *f2, const char *l2) { 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); } /* @@ -784,10 +809,25 @@ #else #define NUM2ULL(x) NUM2ULONG(x) #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. * * VALUEFUNC(f) is a macro used to typecast a C function that implements @@ -827,14 +867,14 @@ #endif #ifndef StringValue #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 {\ StringValue(v);\ rb_check_safe_str(v);\ @@ -936,20 +976,22 @@ } -/*********************************************************************** +/* ----------------------------------------------------------------------------- + * 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" { #endif @@ -1098,18 +1140,20 @@ #ifdef __cplusplus } #endif -/*********************************************************************** +/* ----------------------------------------------------------------------------- + * 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. + * * rubyrun.swg * - * This file contains the runtime support for Ruby modules - * and includes code for managing global variables and pointer - * type checking. - * - ************************************************************************/ + * 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 /* for raw pointers */ @@ -1249,12 +1293,21 @@ sklass = (swig_class *) type->clientdata; /* 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; + } } } /* Create a new Ruby object */ obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr); @@ -1502,11 +1555,12 @@ #define SWIG_init Init_vpi #define SWIG_name "Vpi" static VALUE mVpi; -#define SWIGVERSION 0x010328 +#define SWIGVERSION 0x010331 +#define SWIG_VERSION SWIGVERSION #define SWIG_as_voidptr(a) (void *)((const void *)(a)) #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) @@ -1691,11 +1745,11 @@ } s_vpi_value_value; SWIGINTERN swig_type_info* -SWIG_pchar_descriptor() +SWIG_pchar_descriptor(void) { static int init = 0; static swig_type_info* info = 0; if (!init) { info = SWIG_TypeQuery("_p_char"); @@ -1707,12 +1761,16 @@ 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) { *cptr = (char *)memcpy((char *)malloc((size)*sizeof(char)), cstr, sizeof(char)*(size)); } else { @@ -1724,14 +1782,14 @@ if (psize) *psize = size; return SWIG_OK; } 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; } } } @@ -1815,11 +1873,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "type" "', argument " "1"" of type '" "s_vpi_time *""'"); } arg1 = (s_vpi_time *)(argp1); result = (PLI_INT32) ((arg1)->type); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -1870,11 +1927,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "high" "', argument " "1"" of type '" "s_vpi_time *""'"); } arg1 = (s_vpi_time *)(argp1); result = (PLI_UINT32) ((arg1)->high); - vresult = SWIG_From_unsigned_SS_int((unsigned int)(result)); return vresult; fail: return Qnil; } @@ -1925,11 +1981,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "low" "', argument " "1"" of type '" "s_vpi_time *""'"); } arg1 = (s_vpi_time *)(argp1); result = (PLI_UINT32) ((arg1)->low); - vresult = SWIG_From_unsigned_SS_int((unsigned int)(result)); return vresult; fail: return Qnil; } @@ -1980,11 +2035,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "real" "', argument " "1"" of type '" "s_vpi_time *""'"); } arg1 = (s_vpi_time *)(argp1); result = (double) ((arg1)->real); - vresult = SWIG_From_double((double)(result)); return vresult; fail: return Qnil; } @@ -2012,12 +2066,11 @@ s_vpi_time *result = 0 ; 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: return Qnil; } @@ -2075,11 +2128,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "da" "', argument " "1"" of type '" "s_vpi_delay *""'"); } 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: return Qnil; } @@ -2130,11 +2182,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "no_of_delays" "', argument " "1"" of type '" "s_vpi_delay *""'"); } arg1 = (s_vpi_delay *)(argp1); result = (PLI_INT32) ((arg1)->no_of_delays); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2185,11 +2236,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "time_type" "', argument " "1"" of type '" "s_vpi_delay *""'"); } arg1 = (s_vpi_delay *)(argp1); result = (PLI_INT32) ((arg1)->time_type); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2240,11 +2290,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "mtm_flag" "', argument " "1"" of type '" "s_vpi_delay *""'"); } arg1 = (s_vpi_delay *)(argp1); result = (PLI_INT32) ((arg1)->mtm_flag); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2295,11 +2344,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "append_flag" "', argument " "1"" of type '" "s_vpi_delay *""'"); } arg1 = (s_vpi_delay *)(argp1); result = (PLI_INT32) ((arg1)->append_flag); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2350,11 +2398,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "pulsere_flag" "', argument " "1"" of type '" "s_vpi_delay *""'"); } arg1 = (s_vpi_delay *)(argp1); result = (PLI_INT32) ((arg1)->pulsere_flag); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2382,12 +2429,11 @@ s_vpi_delay *result = 0 ; 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: return Qnil; } @@ -2445,11 +2491,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "aval" "', argument " "1"" of type '" "s_vpi_vecval *""'"); } arg1 = (s_vpi_vecval *)(argp1); result = (PLI_INT32) ((arg1)->aval); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2500,11 +2545,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "bval" "', argument " "1"" of type '" "s_vpi_vecval *""'"); } arg1 = (s_vpi_vecval *)(argp1); result = (PLI_INT32) ((arg1)->bval); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2532,12 +2576,11 @@ s_vpi_vecval *result = 0 ; 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: return Qnil; } @@ -2595,11 +2638,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "logic" "', argument " "1"" of type '" "s_vpi_strengthval *""'"); } arg1 = (s_vpi_strengthval *)(argp1); result = (PLI_INT32) ((arg1)->logic); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2650,11 +2692,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "s0" "', argument " "1"" of type '" "s_vpi_strengthval *""'"); } arg1 = (s_vpi_strengthval *)(argp1); result = (PLI_INT32) ((arg1)->s0); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2705,11 +2746,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "s1" "', argument " "1"" of type '" "s_vpi_strengthval *""'"); } arg1 = (s_vpi_strengthval *)(argp1); result = (PLI_INT32) ((arg1)->s1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2737,12 +2777,11 @@ s_vpi_strengthval *result = 0 ; 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: return Qnil; } @@ -2800,11 +2839,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "format" "', argument " "1"" of type '" "s_vpi_value *""'"); } arg1 = (s_vpi_value *)(argp1); result = (PLI_INT32) ((arg1)->format); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -2825,11 +2863,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "value" "', argument " "1"" of type '" "s_vpi_value *""'"); } 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: return Qnil; } @@ -2857,12 +2894,11 @@ s_vpi_value *result = 0 ; 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: return Qnil; } @@ -2895,15 +2931,15 @@ arg1 = (s_vpi_value_value *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -2928,12 +2964,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "str" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } 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; } @@ -2983,11 +3018,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "scalar" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } arg1 = (s_vpi_value_value *)(argp1); result = (PLI_INT32) ((arg1)->scalar); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -3038,11 +3072,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integer" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } arg1 = (s_vpi_value_value *)(argp1); result = (PLI_INT32) ((arg1)->integer); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -3093,11 +3126,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "real" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } arg1 = (s_vpi_value_value *)(argp1); result = (double) ((arg1)->real); - vresult = SWIG_From_double((double)(result)); return vresult; fail: return Qnil; } @@ -3148,11 +3180,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "time" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } 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: return Qnil; } @@ -3203,11 +3234,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } 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: return Qnil; } @@ -3258,11 +3288,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "strength" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } 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: return Qnil; } @@ -3288,15 +3317,15 @@ arg1 = (s_vpi_value_value *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -3321,12 +3350,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "misc" "', argument " "1"" of type '" "s_vpi_value_value *""'"); } 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; } @@ -3353,12 +3381,11 @@ s_vpi_value_value *result = 0 ; 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: return Qnil; } @@ -3416,11 +3443,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "type" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } arg1 = (s_vpi_systf_data *)(argp1); result = (PLI_INT32) ((arg1)->type); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -3471,11 +3497,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sysfunctype" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } arg1 = (s_vpi_systf_data *)(argp1); result = (PLI_INT32) ((arg1)->sysfunctype); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -3501,15 +3526,15 @@ arg1 = (s_vpi_systf_data *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -3534,12 +3559,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "tfname" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } 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; } @@ -3588,11 +3612,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "calltf" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } 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: return Qnil; } @@ -3642,11 +3665,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "compiletf" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } 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: return Qnil; } @@ -3696,11 +3718,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "sizetf" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } 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: return Qnil; } @@ -3726,15 +3747,15 @@ arg1 = (s_vpi_systf_data *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -3759,12 +3780,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "user_data" "', argument " "1"" of type '" "s_vpi_systf_data *""'"); } 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; } @@ -3791,12 +3811,11 @@ s_vpi_systf_data *result = 0 ; 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: return Qnil; } @@ -3854,11 +3873,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "argc" "', argument " "1"" of type '" "s_vpi_vlog_info *""'"); } arg1 = (s_vpi_vlog_info *)(argp1); result = (PLI_INT32) ((arg1)->argc); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -3909,11 +3927,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "argv" "', argument " "1"" of type '" "s_vpi_vlog_info *""'"); } 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: return Qnil; } @@ -3939,15 +3956,15 @@ arg1 = (s_vpi_vlog_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -3972,12 +3989,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "product" "', argument " "1"" of type '" "s_vpi_vlog_info *""'"); } 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; } @@ -4002,15 +4018,15 @@ arg1 = (s_vpi_vlog_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4035,12 +4051,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "version" "', argument " "1"" of type '" "s_vpi_vlog_info *""'"); } 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; } @@ -4067,12 +4082,11 @@ s_vpi_vlog_info *result = 0 ; 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: return Qnil; } @@ -4130,11 +4144,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "state" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } arg1 = (s_vpi_error_info *)(argp1); result = (PLI_INT32) ((arg1)->state); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -4185,11 +4198,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "level" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } arg1 = (s_vpi_error_info *)(argp1); result = (PLI_INT32) ((arg1)->level); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -4215,15 +4227,15 @@ arg1 = (s_vpi_error_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4248,12 +4260,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "message" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } 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; } @@ -4278,15 +4289,15 @@ arg1 = (s_vpi_error_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4311,12 +4322,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "product" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } 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; } @@ -4341,15 +4351,15 @@ arg1 = (s_vpi_error_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4374,12 +4384,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "code" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } 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; } @@ -4404,15 +4413,15 @@ arg1 = (s_vpi_error_info *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4437,12 +4446,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "file" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } 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; } @@ -4492,11 +4500,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "line" "', argument " "1"" of type '" "s_vpi_error_info *""'"); } arg1 = (s_vpi_error_info *)(argp1); result = (PLI_INT32) ((arg1)->line); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -4524,12 +4531,11 @@ s_vpi_error_info *result = 0 ; 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: return Qnil; } @@ -4587,11 +4593,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "reason" "', argument " "1"" of type '" "s_cb_data *""'"); } arg1 = (s_cb_data *)(argp1); result = (PLI_INT32) ((arg1)->reason); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -4641,11 +4646,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "cb_rtn" "', argument " "1"" of type '" "s_cb_data *""'"); } 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: return Qnil; } @@ -4696,11 +4700,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "obj" "', argument " "1"" of type '" "s_cb_data *""'"); } 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: return Qnil; } @@ -4751,11 +4754,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "time" "', argument " "1"" of type '" "s_cb_data *""'"); } 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: return Qnil; } @@ -4806,11 +4808,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "value" "', argument " "1"" of type '" "s_cb_data *""'"); } 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: return Qnil; } @@ -4861,11 +4862,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "index" "', argument " "1"" of type '" "s_cb_data *""'"); } arg1 = (s_cb_data *)(argp1); result = (PLI_INT32) ((arg1)->index); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -4891,15 +4891,15 @@ arg1 = (s_cb_data *)(argp1); res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2); 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; } if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); return Qnil; @@ -4924,12 +4924,11 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "user_data" "', argument " "1"" of type '" "s_cb_data *""'"); } 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; } @@ -4956,12 +4955,11 @@ s_cb_data *result = 0 ; 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: return Qnil; } @@ -4987,11 +4985,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_register_cb" "', argument " "1"" of type '" "p_cb_data""'"); } 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: return Qnil; } @@ -5012,11 +5009,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_remove_cb" "', argument " "1"" of type '" "vpiHandle""'"); } arg1 = (vpiHandle)(argp1); result = (PLI_INT32)vpi_remove_cb(arg1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5043,11 +5039,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_cb_info" "', argument " "2"" of type '" "p_cb_data""'"); } arg2 = (p_cb_data)(argp2); vpi_get_cb_info(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5067,11 +5062,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_register_systf" "', argument " "1"" of type '" "p_vpi_systf_data""'"); } 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: return Qnil; } @@ -5098,11 +5092,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_systf_info" "', argument " "2"" of type '" "p_vpi_systf_data""'"); } arg2 = (p_vpi_systf_data)(argp2); vpi_get_systf_info(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5124,18 +5117,17 @@ } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); 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; fail: if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); @@ -5166,11 +5158,10 @@ if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vpi_handle_by_index" "', argument " "2"" of type '" "PLI_INT32""'"); } 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: return Qnil; } @@ -5199,11 +5190,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_handle" "', argument " "2"" of type '" "vpiHandle""'"); } 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: return Qnil; } @@ -5241,11 +5231,10 @@ if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vpi_handle_multi" "', argument " "3"" of type '" "vpiHandle""'"); } 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: return Qnil; } @@ -5274,11 +5263,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_iterate" "', argument " "2"" of type '" "vpiHandle""'"); } 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: return Qnil; } @@ -5299,11 +5287,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_scan" "', argument " "1"" of type '" "vpiHandle""'"); } arg1 = (vpiHandle)(argp1); result = (vpiHandle)vpi_scan(arg1); - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 | 0 ); return vresult; fail: return Qnil; } @@ -5332,11 +5319,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get" "', argument " "2"" of type '" "vpiHandle""'"); } arg2 = (vpiHandle)(argp2); result = (PLI_INT32)vpi_get(arg1,arg2); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5365,12 +5351,11 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_str" "', argument " "2"" of type '" "vpiHandle""'"); } 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; } @@ -5396,11 +5381,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_delays" "', argument " "2"" of type '" "p_vpi_delay""'"); } arg2 = (p_vpi_delay)(argp2); vpi_get_delays(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5426,11 +5410,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_put_delays" "', argument " "2"" of type '" "p_vpi_delay""'"); } arg2 = (p_vpi_delay)(argp2); vpi_put_delays(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5456,11 +5439,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_value" "', argument " "2"" of type '" "p_vpi_value""'"); } arg2 = (p_vpi_value)(argp2); vpi_get_value(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5504,11 +5486,10 @@ if (!SWIG_IsOK(ecode4)) { SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vpi_put_value" "', argument " "4"" of type '" "PLI_INT32""'"); } 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: return Qnil; } @@ -5535,11 +5516,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_get_time" "', argument " "2"" of type '" "p_vpi_time""'"); } arg2 = (p_vpi_time)(argp2); vpi_get_time(arg1,arg2); - return Qnil; fail: return Qnil; } @@ -5558,13 +5538,12 @@ } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); 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; fail: if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); @@ -5587,11 +5566,10 @@ if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "vpi_mcd_close" "', argument " "1"" of type '" "PLI_UINT32""'"); } arg1 = (PLI_UINT32)(val1); result = (PLI_UINT32)vpi_mcd_close(arg1); - vresult = SWIG_From_unsigned_SS_int((unsigned int)(result)); return vresult; fail: return Qnil; } @@ -5612,12 +5590,11 @@ if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "vpi_mcd_name" "', argument " "1"" of type '" "PLI_UINT32""'"); } 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; } @@ -5645,13 +5622,12 @@ arg1 = (PLI_UINT32)(val1); res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); 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; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); @@ -5674,13 +5650,12 @@ } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); 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; fail: if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); @@ -5711,11 +5686,10 @@ if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_compare_objects" "', argument " "2"" of type '" "vpiHandle""'"); } arg2 = (vpiHandle)(argp2); result = (PLI_INT32)vpi_compare_objects(arg1,arg2); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5736,11 +5710,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_chk_error" "', argument " "1"" of type '" "p_vpi_error_info""'"); } arg1 = (p_vpi_error_info)(argp1); result = (PLI_INT32)vpi_chk_error(arg1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5761,11 +5734,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_free_object" "', argument " "1"" of type '" "vpiHandle""'"); } arg1 = (vpiHandle)(argp1); result = (PLI_INT32)vpi_free_object(arg1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5786,11 +5758,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_get_vlog_info" "', argument " "1"" of type '" "p_vpi_vlog_info""'"); } arg1 = (p_vpi_vlog_info)(argp1); result = (PLI_INT32)vpi_get_vlog_info(arg1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -5821,18 +5792,17 @@ arg1 = (PLI_INT32)(val1); res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); 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; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); @@ -5865,18 +5835,17 @@ arg1 = (PLI_INT32)(val1); res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); 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; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); @@ -5899,11 +5868,10 @@ if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_get_userdata" "', argument " "1"" of type '" "vpiHandle""'"); } arg1 = (vpiHandle)(argp1); result = (void *)vpi_get_userdata(arg1); - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); return vresult; fail: return Qnil; } @@ -5930,11 +5898,10 @@ res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0); if (!SWIG_IsOK(res2)) { 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: return Qnil; } @@ -5957,18 +5924,17 @@ } res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1); 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; fail: if (alloc1 == SWIG_NEWOBJ) free((char*)buf1); @@ -6001,18 +5967,17 @@ arg1 = (PLI_UINT32)(val1); res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2); 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; fail: if (alloc2 == SWIG_NEWOBJ) free((char*)buf2); @@ -6027,11 +5992,10 @@ if ((argc < 0) || (argc > 0)) { 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: return Qnil; } @@ -6052,11 +6016,10 @@ if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "vpi_mcd_flush" "', argument " "1"" of type '" "PLI_UINT32""'"); } arg1 = (PLI_UINT32)(val1); result = (PLI_INT32)vpi_mcd_flush(arg1); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -6078,11 +6041,10 @@ if (!SWIG_IsOK(ecode1)) { SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "vpi_control" "', argument " "1"" of type '" "PLI_INT32""'"); } arg1 = (PLI_INT32)(val1); result = (PLI_INT32)vpi_control(arg1,arg2); - vresult = SWIG_From_int((int)(result)); return vresult; fail: return Qnil; } @@ -6119,11 +6081,10 @@ if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vpi_handle_by_multi_index" "', argument " "3"" of type '" "PLI_INT32 *""'"); } 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: return Qnil; } @@ -6243,11 +6204,11 @@ }; /* -------- 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 * swig_cast_info structures and swig_cast_info structures store pointers back * to swig_type_info structures, we need some lookup code at initialization. @@ -6255,13 +6216,13 @@ * The runtime then collects these partially filled structures. * The SWIG_InitializeModule function takes these initial arrays out of * 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 * two-dimensional array. Each row corresponds to a type (there are the same * number of rows as there are in the swig_type_initial array). Each entry in @@ -6269,11 +6230,11 @@ * The cast_initial array is actually an array of arrays, because each row has * a variable number of columns. So to actually build the cast linked list, * 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 * casting info to has not been loaded (it is in this module), THEN we * replace the cast->type pointer with the type pointer that has already @@ -6282,11 +6243,11 @@ * cast->type) are loaded, THEN the cast info has already been loaded by * the previous module so we just ignore it. * 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" { #if 0 } /* c-mode */ @@ -6295,35 +6256,52 @@ #if 0 #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; + /* 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; + } - /* Initialize the swig_module */ - swig_module.type_initial = swig_type_initial; - swig_module.cast_initial = swig_cast_initial; - /* 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); #endif for (i = 0; i < swig_module.size; ++i) {