jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix deprecation warnings for test suite under guile 2.0

Browse source
This commit is contained in:
Geert Janssens 2013-04-19 18:57:31 +02:00
commit d689d9a860
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/guile/multimap/example.i
View file

@ -66,7 +66,7 @@ extern int count(char *bytes, int len, char c);
/* Return the mutated string as a new object. */ /* Return the mutated string as a new object. */
%typemap(argout) (char *str, int len) { %typemap(argout) (char *str, int len) {
SWIG_APPEND_VALUE(scm_mem2string($1,$2)); SWIG_APPEND_VALUE(scm_from_locale_stringn($1,$2));
if ($1) scm_must_free($1); if ($1) scm_must_free($1);
} }

2
Lib/cdata.i
View file

@ -17,7 +17,7 @@ typedef struct SWIGCDATA {
#if SWIGGUILE #if SWIGGUILE
%typemap(out) SWIGCDATA { %typemap(out) SWIGCDATA {
$result = scm_mem2string($1.data,$1.len); $result = scm_from_locale_stringn($1.data,$1.len);
} }
%typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH);
#elif SWIGCHICKEN #elif SWIGCHICKEN

2
Lib/exception.i
View file

@ -24,7 +24,7 @@
SWIGINTERN void SWIG_exception_ (int code, const char *msg, SWIGINTERN void SWIG_exception_ (int code, const char *msg,
const char *subr) { const char *subr) {
#define ERROR(scmerr) \ #define ERROR(scmerr) \
scm_error(scm_str2symbol((char *) (scmerr)), \ scm_error(scm_from_locale_string((char *) (scmerr)), \
(char *) subr, (char *) msg, \ (char *) subr, (char *) msg, \
SCM_EOL, SCM_BOOL_F) SCM_EOL, SCM_BOOL_F)
#define MAP(swigerr, scmerr) \ #define MAP(swigerr, scmerr) \

18
Lib/guile/typemaps.i
View file

@ -60,25 +60,25 @@
%typemap(throws) SWIGTYPE { %typemap(throws) SWIGTYPE {
$&ltype temp = new $ltype($1); $&ltype temp = new $ltype($1);
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1), scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1),
SCM_UNDEFINED)); SCM_UNDEFINED));
} }
%typemap(throws) SWIGTYPE & { %typemap(throws) SWIGTYPE & {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1), scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1),
SCM_UNDEFINED)); SCM_UNDEFINED));
} }
%typemap(throws) SWIGTYPE * { %typemap(throws) SWIGTYPE * {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1),
SCM_UNDEFINED)); SCM_UNDEFINED));
} }
%typemap(throws) SWIGTYPE [] { %typemap(throws) SWIGTYPE [] {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1),
SCM_UNDEFINED)); SCM_UNDEFINED));
} }
@ -151,7 +151,7 @@
enums, which cannot be cast to. */ enums, which cannot be cast to. */
%typemap(varin) enum SWIGTYPE { %typemap(varin) enum SWIGTYPE {
if (sizeof(int) != sizeof($1)) { if (sizeof(int) != sizeof($1)) {
scm_error(scm_str2symbol("swig-error"), scm_error(scm_from_locale_symbol("swig-error"),
(char *) FUNC_NAME, (char *) FUNC_NAME,
(char *) "enum variable '$name' cannot be set", (char *) "enum variable '$name' cannot be set",
SCM_EOL, SCM_BOOL_F); SCM_EOL, SCM_BOOL_F);
@ -161,7 +161,7 @@
%typemap(out) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(out) enum SWIGTYPE { $result = scm_from_long($1); }
%typemap(varout) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(varout) enum SWIGTYPE { $result = scm_from_long($1); }
%typemap(throws) enum SWIGTYPE { %typemap(throws) enum SWIGTYPE {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(scm_from_long($1), SCM_UNDEFINED)); scm_listify(scm_from_long($1), SCM_UNDEFINED));
} }
@ -210,7 +210,7 @@
/* Throw typemap */ /* Throw typemap */
%typemap(throws) C_NAME { %typemap(throws) C_NAME {
C_NAME swig_c_value = $1; C_NAME swig_c_value = $1;
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED)); scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED));
} }
%enddef %enddef
@ -254,7 +254,7 @@
} }
/* Throw typemap */ /* Throw typemap */
%typemap(throws) C_NAME { %typemap(throws) C_NAME {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(C_TO_SCM($1), SCM_UNDEFINED)); scm_listify(C_TO_SCM($1), SCM_UNDEFINED));
} }
%enddef %enddef
@ -329,7 +329,7 @@ SIMPLE_MAP(unsigned long long, scm_to_ulong_long, scm_from_ulong_long, integer);
} }
%typemap(throws) char * { %typemap(throws) char * {
scm_throw(scm_str2symbol((char *) "swig-exception"), scm_throw(scm_from_locale_symbol((char *) "swig-exception"),
scm_listify(SWIG_str02scm($1), SCM_UNDEFINED)); scm_listify(SWIG_str02scm($1), SCM_UNDEFINED));
} }