Applied Oleg's MzScheme patches
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@496 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
243ef9cfee
commit
7242c6daf7
5 changed files with 30 additions and 25 deletions
|
|
@ -2,7 +2,7 @@
|
|||
/* SWIG version information */
|
||||
|
||||
#ifndef SWIG_VERSION
|
||||
#define SWIG_VERSION "1.3u-20000618-1136"
|
||||
#define SWIG_VERSION "1.3u-20000619-0141"
|
||||
#endif
|
||||
|
||||
#ifndef SWIG_SPIN
|
||||
|
|
|
|||
|
|
@ -250,12 +250,13 @@ MZSCHEME::close (void)
|
|||
// ----------------------------------------------------------------------
|
||||
|
||||
void
|
||||
MZSCHEME::get_pointer (char *iname, int parm, DataType *t,
|
||||
MZSCHEME::get_pointer (String &name, int parm, DataType *t,
|
||||
WrapperFunction &f)
|
||||
{
|
||||
f.code << tab4 << "_arg" << parm << " = (" << t->print_type()
|
||||
<< ") swig_get_c_pointer(argv["
|
||||
<< parm << "], \"" << t->print_mangle() << "\");\n";
|
||||
f.code << tab4 << "if (!swig_get_c_pointer(" << "argv[" << parm << "], \"" << t->print_mangle()
|
||||
<< "\", (void **) &_arg" << parm << "))\n";
|
||||
f.code << tab8 << "scheme_wrong_type(\"" << name.get()
|
||||
<< "\", \"" << t->print_mangle() << "\", " << parm << ", argc, argv);\n";
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
|
@ -371,7 +372,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
|
|||
// no typemap found
|
||||
// assume it's a Scheme_Object containing the C pointer
|
||||
else if (p.t->is_pointer) {
|
||||
get_pointer (iname, i, p.t, f);
|
||||
get_pointer (proc_name, i, p.t, f);
|
||||
}
|
||||
// no typemap found and not a pointer
|
||||
else throw_unhandled_mzscheme_type_error (p.t);
|
||||
|
|
@ -558,8 +559,10 @@ MZSCHEME::link_variable (char *name, char *iname, DataType *t)
|
|||
fprintf (f_wrappers, "\t\t strncpy(%s,_temp,_len);\n", name);
|
||||
} else {
|
||||
// Set the value of a pointer
|
||||
fprintf(f_wrappers, "\t\t%s = swig_get_c_pointer(argv[0], \"%s\");\n",
|
||||
name, t->print_mangle());
|
||||
fprintf(f_wrappers, "\t\tif (!swig_get_c_pointer(argv[0], \"%s\", (void **) &_arg0))\n",
|
||||
t->print_mangle());
|
||||
fprintf(f_wrappers, "\t\t\tscheme_wrong_type(\"%s\", %s, 0, argc, argv", \
|
||||
var_name, t->print_mangle());
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ private:
|
|||
char *module;
|
||||
char *package;
|
||||
int linkage;
|
||||
void get_pointer(char *iname, int parm, DataType *t, WrapperFunction &f);
|
||||
void get_pointer(String &name, int parm, DataType *t, WrapperFunction &f);
|
||||
void usage_var(char *, DataType *, String &usage);
|
||||
void usage_func(char *, DataType *, ParmList *, String &usage);
|
||||
void usage_returns(char *, DataType *, ParmList *, String &usage);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue