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

Overloading for non-pointers and NULL - Chicken

Browse source 
Rework this to be consistent with other target languages
This commit is contained in:
William S Fulton 2018-12-30 17:02:58 +00:00
commit cbc1f7f171
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/chicken/chicken.swg
View file

@ -11,8 +11,9 @@
#include <chicken.h> #include <chicken.h>
%} %}
%insert(runtime) "swigrun.swg"; // Common C API type-checking code %insert(runtime) "swigrun.swg" // Common C API type-checking code
%insert(runtime) "chickenrun.swg"; // CHICKEN run-time code %insert(runtime) "swigerrors.swg" // SWIG errors
%insert(runtime) "chickenrun.swg" // CHICKEN run-time code
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* standard typemaps * standard typemaps
@ -617,7 +618,7 @@ $result = C_SCHEME_UNDEFINED;
$1 = C_swig_is_string ($input); $1 = C_swig_is_string ($input);
} }
%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE &&, SWIGTYPE [] { %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE [] {
void *ptr; void *ptr;
$1 = !SWIG_ConvertPtr($input, &ptr, $1_descriptor, 0); $1 = !SWIG_ConvertPtr($input, &ptr, $1_descriptor, 0);
} }
@ -630,33 +631,30 @@ $result = C_SCHEME_UNDEFINED;
%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE & %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE &
{ {
void *ptr = 0; void *ptr = 0;
if (SWIG_ConvertPtr($input, &ptr, $descriptor, 0)) { if (SWIG_ConvertPtr($input, &ptr, $descriptor, SWIG_POINTER_NO_NULL)) {
/* error */
$1 = 0; $1 = 0;
} else { } else {
$1 = (ptr != 0); $1 = 1;
} }
} }
%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE && %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE &&
{ {
void *ptr = 0; void *ptr = 0;
if (SWIG_ConvertPtr($input, &ptr, $descriptor, 0)) { if (SWIG_ConvertPtr($input, &ptr, $descriptor, SWIG_POINTER_NO_NULL)) {
/* error */
$1 = 0; $1 = 0;
} else { } else {
$1 = (ptr != 0); $1 = 1;
} }
} }
%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE
{ {
void *ptr = 0; void *ptr = 0;
if (SWIG_ConvertPtr($input, &ptr, $&descriptor, 0)) { if (SWIG_ConvertPtr($input, &ptr, $&descriptor, SWIG_POINTER_NO_NULL)) {
/* error */
$1 = 0; $1 = 0;
} else { } else {
$1 = (ptr != 0); $1 = 1;
} }
} }

1
Lib/chicken/chickenrun.swg
View file

@ -265,6 +265,7 @@ SWIG_Chicken_ConvertPtr(C_word s, void **result, swig_type_info *type, int flags
if (s == C_SCHEME_FALSE) { if (s == C_SCHEME_FALSE) {
*result = NULL; *result = NULL;
return (flags & SWIG_POINTER_NO_NULL) ? SWIG_NullReferenceError : SWIG_OK;
} else if (C_swig_is_swigpointer(s)) { } else if (C_swig_is_swigpointer(s)) {
/* try and convert type */ /* try and convert type */
from = (swig_type_info *) C_block_item(s, 1); from = (swig_type_info *) C_block_item(s, 1);