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

(SWIG_Guile_ConvertPtr): Use constants SWIG_OK, SWIG_ERROR.

Browse source 
(SWIG_Guile_MustGetPtr): Use SWIG_IsOK macro.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8621 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Matthias Köppe 2006-01-29 20:35:52 +00:00
commit 66bc80a516
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SWIG/Lib/guile/guile_gh_run.swg
View file

@ -126,24 +126,24 @@ SWIG_Guile_ConvertPtr(swig_module_info *module, SCM s, void **result, swig_type_
swig_type_info *from; swig_type_info *from;
if (SCM_NULLP(s)) { if (SCM_NULLP(s)) {
*result = NULL; *result = NULL;
return 0; return SWIG_OK;
} else if (SCM_NIMP(s)) { } else if (SCM_NIMP(s)) {
from = SWIG_Guile_LookupType(module, s, 1); from = SWIG_Guile_LookupType(module, s, 1);
if (!from) return 1; if (!from) return SWIG_ERROR;
if (type) { if (type) {
cast = SWIG_TypeCheckStruct(from, type); cast = SWIG_TypeCheckStruct(from, type);
if (cast) { if (cast) {
*result = SWIG_TypeCast(cast, (void *) SCM_CDR(s)); *result = SWIG_TypeCast(cast, (void *) SCM_CDR(s));
return 0; return SWIG_OK;
} else { } else {
return 1; return SWIG_ERROR;
} }
} else { } else {
*result = (void *) SCM_CDR(s); *result = (void *) SCM_CDR(s);
return 0; return SWIG_OK;
} }
} }
return 1; return SWIG_ERROR;
} }
static void * static void *
@ -151,7 +151,8 @@ SWIG_Guile_MustGetPtr (swig_module_info *module, SCM s, swig_type_info *type,
int argnum, int flags, const char *func_name) int argnum, int flags, const char *func_name)
{ {
void *result; void *result;
if (SWIG_Guile_ConvertPtr(module, s, &result, type, flags)) { int res = SWIG_Guile_ConvertPtr(module, s, &result, type, flags);
if (!SWIG_IsOK(res)) {
/* type mismatch */ /* type mismatch */
scm_wrong_type_arg((char *) func_name, argnum, s); scm_wrong_type_arg((char *) func_name, argnum, s);
} }

24
SWIG/Lib/guile/guile_scm_run.swg
View file

@ -143,7 +143,6 @@ SWIG_Guile_PointerType(SCM object)
else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object); else scm_wrong_type_arg("SWIG-Guile-PointerType", 1, object);
} }
/* Return 0 if successful. */
static int static int
SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags) SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
{ {
@ -153,25 +152,25 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
if (SCM_NULLP(smob)) { if (SCM_NULLP(smob)) {
*result = NULL; *result = NULL;
return 0; return SWIG_OK;
} else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) { } else if (SCM_SMOB_PREDICATE(swig_tag, smob) || SCM_SMOB_PREDICATE(swig_collectable_tag, smob)) {
/* we do not accept smobs representing destroyed pointers */ /* we do not accept smobs representing destroyed pointers */
from = (swig_type_info *) SCM_CELL_WORD_2(smob); from = (swig_type_info *) SCM_CELL_WORD_2(smob);
if (!from) return 1; if (!from) return SWIG_ERROR;
if (type) { if (type) {
cast = SWIG_TypeCheckStruct(from, type); cast = SWIG_TypeCheckStruct(from, type);
if (cast) { if (cast) {
*result = SWIG_TypeCast(cast, (void *) SCM_CELL_WORD_1(smob)); *result = SWIG_TypeCast(cast, (void *) SCM_CELL_WORD_1(smob));
return 0; return SWIG_OK;
} else { } else {
return 1; return SWIG_ERROR;
} }
} else { } else {
*result = (void *) SCM_CELL_WORD_1(smob); *result = (void *) SCM_CELL_WORD_1(smob);
return 0; return SWIG_OK;
} }
} }
return 1; return SWIG_ERROR;
} }
static SWIGINLINE void * static SWIGINLINE void *
@ -179,7 +178,8 @@ SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
int argnum, int flags, const char *func_name) int argnum, int flags, const char *func_name)
{ {
void *result; void *result;
if (SWIG_Guile_ConvertPtr(s, &result, type, flags)) { int res = SWIG_Guile_ConvertPtr(s, &result, type, flags);
if (!SWIG_IsOK(res)) {
/* type mismatch */ /* type mismatch */
scm_wrong_type_arg((char *) func_name, argnum, s); scm_wrong_type_arg((char *) func_name, argnum, s);
} }
@ -251,15 +251,15 @@ SWIG_Guile_ConvertMember(SCM smob, void *ptr, size_t sz, swig_type_info *type,
if (SCM_SMOB_PREDICATE(swig_member_function_tag, smob)) { if (SCM_SMOB_PREDICATE(swig_member_function_tag, smob)) {
from = (swig_type_info *) SCM_CELL_WORD_2(smob); from = (swig_type_info *) SCM_CELL_WORD_2(smob);
if (!from) return 1; if (!from) return SWIG_ERROR;
if (type) { if (type) {
cast = SWIG_TypeCheckStruct(from, type); cast = SWIG_TypeCheckStruct(from, type);
if (!cast) return 1; if (!cast) return SWIG_ERROR;
} }
memcpy(ptr, (void *) SCM_CELL_WORD_1(smob), sz); memcpy(ptr, (void *) SCM_CELL_WORD_1(smob), sz);
return 0; return SWIG_OK;
} }
return 1; return SWIG_ERROR;
} }