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

Removed the last of the Workshop 5.0 warnings.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@477 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-06-16 00:36:04 +00:00
commit 42ce2054f9
5 changed files with 237 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

46
SWIG/Source/Modules1.1/guile.cxx
View file

@ -26,7 +26,7 @@ static char cvsroot[] = "$Header$";
#include "mod11.h"
#include "guile.h"
static char *guile_usage = "\
static char *guile_usage = (char*)"\
Guile Options (available with -guile)\n\
-module name - Set base name of module\n\
-prefix name - Use NAME as prefix [default \"gswig_\"]\n\
@ -53,11 +53,11 @@ GUILE::GUILE ()
{
// Set global vars
typemap_lang = "guile";
typemap_lang = (char*)"guile";
// Set class vars
prefix = "gswig_";
prefix = (char*)"gswig_";
module = NULL;
package = NULL;
linkage = GUILE_LSTYLE_SIMPLE;
@ -477,10 +477,10 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
int numopt = 0;
if (!with_smobs) {
f.add_local ("int", "_len");
f.add_local ("char *", "_tempc");
f.add_local ((char*)"int", (char*)"_len");
f.add_local ((char*)"char *", (char*)"_tempc");
}
f.add_local ("SCM", "gswig_result");
f.add_local ((char*)"SCM", (char*)"gswig_result");
// Now write code to extract the parameters (this is super ugly)
@ -506,7 +506,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
f.code << "/* " << p.name << " ignored... */\n";
else {
++numargs;
if ((tm = typemap_lookup ("in", typemap_lang,
if ((tm = typemap_lookup ((char*)"in", typemap_lang,
p.t, p.name, source, target, &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
@ -521,7 +521,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Check if there are any constraints.
if ((tm = typemap_lookup ("check", typemap_lang,
if ((tm = typemap_lookup ((char*)"check", typemap_lang,
p.t, p.name, source, target, &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
@ -529,7 +529,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Pass output arguments back to the caller.
if ((tm = typemap_lookup ("argout", typemap_lang,
if ((tm = typemap_lookup ((char*)"argout", typemap_lang,
p.t, p.name, source, target, &f))) {
outarg << tm << "\n";
mreplace (outarg, argnum, arg, proc_name);
@ -537,7 +537,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Free up any memory allocated for the arguments.
if ((tm = typemap_lookup ("freearg", typemap_lang,
if ((tm = typemap_lookup ((char*)"freearg", typemap_lang,
p.t, p.name, source, target, &f))) {
cleanup << tm << "\n";
mreplace (cleanup, argnum, arg, proc_name);
@ -554,8 +554,8 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
if (d->type == T_VOID)
f.code << tab4 << "gswig_result = GH_UNSPECIFIED;\n";
else if ((tm = typemap_lookup ("out", typemap_lang,
d, name, "_result", "gswig_result", &f))) {
else if ((tm = typemap_lookup ((char*)"out", typemap_lang,
d, name, (char*)"_result", (char*)"gswig_result", &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
}
@ -571,7 +571,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
<< ");\n";
}
else {
f.add_local ("char", "_ptemp[128]");
f.add_local ((char*)"char", (char*)"_ptemp[128]");
f.code << tab4
<< "SWIG_MakePtr (_ptemp, _result,\""
<< d->print_mangle()
@ -593,8 +593,8 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Look for any remaining cleanup
if (NewObject) {
if ((tm = typemap_lookup ("newfree", typemap_lang,
d, iname, "_result", "", &f))) {
if ((tm = typemap_lookup ((char*)"newfree", typemap_lang,
d, iname, (char*)"_result", (char*)"", &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
}
@ -602,8 +602,8 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Free any memory allocated by the function being wrapped..
if ((tm = typemap_lookup ("ret", typemap_lang,
d, name, "_result", "", &f))) {
if ((tm = typemap_lookup ((char*)"ret", typemap_lang,
d, name, (char*)"_result", (char*)"", &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
}
@ -642,7 +642,7 @@ GUILE::link_variable (char *name, char *iname, DataType *t)
String proc_name;
char var_name[256];
char *tm;
char *tm2 = typemap_lookup ("varout", "guile", t, name, name, "scmresult");
char *tm2 = typemap_lookup ((char*)"varout", (char*)"guile", t, name, name, (char*)"scmresult");
// evaluation function names
@ -683,8 +683,8 @@ GUILE::link_variable (char *name, char *iname, DataType *t)
"\"Unable to set %s. Variable is read only.\", SCM_EOL);\n",
proc_name.get(), proc_name.get());
}
else if ((tm = typemap_lookup ("varin", typemap_lang,
t, name, "s_0", name))) {
else if ((tm = typemap_lookup ((char*)"varin", typemap_lang,
t, name, (char*)"s_0", name))) {
fprintf (f_wrappers, "%s\n", tm);
}
else if (t->is_pointer) {
@ -725,8 +725,8 @@ GUILE::link_variable (char *name, char *iname, DataType *t)
// Now return the value of the variable (regardless
// of evaluating or setting)
if ((tm = typemap_lookup ("varout", typemap_lang,
t, name, name, "gswig_result"))) {
if ((tm = typemap_lookup ((char*)"varout", typemap_lang,
t, name, name, (char*)"gswig_result"))) {
fprintf (f_wrappers, "%s\n", tm);
}
else if (t->is_pointer) {
@ -809,7 +809,7 @@ GUILE::declare_const (char *name, char *, DataType *type, char *value)
rvalue << "'";
"'" >> rvalue;
}
if ((tm = typemap_lookup ("const", typemap_lang, type, name,
if ((tm = typemap_lookup ((char*)"const", typemap_lang, type, name,
rvalue.get(), name))) {
fprintf (f_init, "%s\n", tm);
} else {

288
SWIG/Source/Modules1.1/java.cxx
View file

@ -28,7 +28,7 @@
char bigbuf[1024];
static char *usage = "\
static char *usage = (char*)"\
Java Options\n\
-jnic - use c syntax for jni calls\n\
-jnicpp - use c++ syntax for jni calls\n\
@ -41,41 +41,41 @@ Java Options\n\
char *JAVA::SwigTcToJniType(DataType *t, int ret) {
if(t->is_pointer == 1) {
switch(t->type) {
case T_INT: return "jintArray";
case T_SHORT: return "jshortArray";
case T_LONG: return "jlongArray";
case T_CHAR: return "jstring";
case T_FLOAT: return "jfloatArray";
case T_DOUBLE: return "jdoubleArray";
case T_UINT: return "jintArray";
case T_USHORT: return "jshortArray";
case T_ULONG: return "jlongArray";
case T_UCHAR: return "jbyteArray";
case T_SCHAR: return "jbyteArray";
case T_BOOL: return "jbooleanArray";
case T_INT: return (char*)"jintArray";
case T_SHORT: return (char*)"jshortArray";
case T_LONG: return (char*)"jlongArray";
case T_CHAR: return (char*)"jstring";
case T_FLOAT: return (char*)"jfloatArray";
case T_DOUBLE: return (char*)"jdoubleArray";
case T_UINT: return (char*)"jintArray";
case T_USHORT: return (char*)"jshortArray";
case T_ULONG: return (char*)"jlongArray";
case T_UCHAR: return (char*)"jbyteArray";
case T_SCHAR: return (char*)"jbyteArray";
case T_BOOL: return (char*)"jbooleanArray";
case T_VOID:
case T_USER: return "jlong";
case T_USER: return (char*)"jlong";
}
} else if(t->is_pointer > 1) {
if(ret)
return "jlong";
else return "jlongArray";
return (char*)"jlong";
else return (char*)"jlongArray";
} else {
switch(t->type) {
case T_INT: return "jint";
case T_SHORT: return "jshort";
case T_LONG: return "jlong";
case T_CHAR: return "jbyte";
case T_FLOAT: return "jfloat";
case T_DOUBLE: return "jdouble";
case T_UINT: return "jint";
case T_USHORT: return "jshort";
case T_ULONG: return "jlong";
case T_UCHAR: return "jbyte";
case T_SCHAR: return "jbyte";
case T_BOOL: return "jboolean";
case T_VOID: return "void";
case T_USER: return "jlong";
case T_INT: return (char*)"jint";
case T_SHORT: return (char*)"jshort";
case T_LONG: return (char*)"jlong";
case T_CHAR: return (char*)"jbyte";
case T_FLOAT: return (char*)"jfloat";
case T_DOUBLE: return (char*)"jdouble";
case T_UINT: return (char*)"jint";
case T_USHORT: return (char*)"jshort";
case T_ULONG: return (char*)"jlong";
case T_UCHAR: return (char*)"jbyte";
case T_SCHAR: return (char*)"jbyte";
case T_BOOL: return (char*)"jboolean";
case T_VOID: return (char*)"void";
case T_USER: return (char*)"jlong";
}
}
fprintf(stderr, "SwigTcToJniType: unhandled SWIG type %d, %s\n", t->type, (char *) t->name);
@ -85,43 +85,43 @@ char *JAVA::SwigTcToJniType(DataType *t, int ret) {
char *JAVA::SwigTcToJavaType(DataType *t, int ret, int inShadow) {
if(t->is_pointer == 1) {
switch(t->type) {
case T_INT: return "int []";
case T_SHORT: return "short []";
case T_LONG: return "long []";
case T_CHAR: return "String";
case T_FLOAT: return "float []";
case T_DOUBLE: return "double []";
case T_UINT: return "int []";
case T_USHORT: return "short []";
case T_ULONG: return "long []";
case T_UCHAR: return "byte []";
case T_SCHAR: return "byte []";
case T_BOOL: return "boolean []";
case T_INT: return (char*)"int []";
case T_SHORT: return (char*)"short []";
case T_LONG: return (char*)"long []";
case T_CHAR: return (char*)"String";
case T_FLOAT: return (char*)"float []";
case T_DOUBLE: return (char*)"double []";
case T_UINT: return (char*)"int []";
case T_USHORT: return (char*)"short []";
case T_ULONG: return (char*)"long []";
case T_UCHAR: return (char*)"byte []";
case T_SCHAR: return (char*)"byte []";
case T_BOOL: return (char*)"boolean []";
case T_VOID:
case T_USER: if(inShadow && Getattr(shadow_classes,t->name))
return GetChar(shadow_classes,t->name);
else return "long";
else return (char*)"long";
}
} else if(t->is_pointer > 1) {
if(ret)
return "long";
else return "long []";
return (char*)"long";
else return (char*)"long []";
} else {
switch(t->type) {
case T_INT: return "int";
case T_SHORT: return "short";
case T_LONG: return "long";
case T_CHAR: return "byte";
case T_FLOAT: return "float";
case T_DOUBLE: return "double";
case T_UINT: return "int";
case T_USHORT: return "short";
case T_ULONG: return "long";
case T_UCHAR: return "byte";
case T_SCHAR: return "byte";
case T_BOOL: return "boolean";
case T_VOID: return "void";
case T_USER: return "long";
case T_INT: return (char*)"int";
case T_SHORT: return (char*)"short";
case T_LONG: return (char*)"long";
case T_CHAR: return (char*)"byte";
case T_FLOAT: return (char*)"float";
case T_DOUBLE: return (char*)"double";
case T_UINT: return (char*)"int";
case T_USHORT: return (char*)"short";
case T_ULONG: return (char*)"long";
case T_UCHAR: return (char*)"byte";
case T_SCHAR: return (char*)"byte";
case T_BOOL: return (char*)"boolean";
case T_VOID: return (char*)"void";
case T_USER: return (char*)"long";
}
}
fprintf(stderr, "SwigTcToJavaType: unhandled SWIG type %d, %s\n", t->type, (char *) t->name);
@ -131,23 +131,23 @@ char *JAVA::SwigTcToJavaType(DataType *t, int ret, int inShadow) {
char *JAVA::SwigTcToJniScalarType(DataType *t) {
if(t->is_pointer == 1) {
switch(t->type) {
case T_INT: return "Int";
case T_SHORT: return "Short";
case T_LONG: return "Long";
case T_CHAR: return "Byte";
case T_FLOAT: return "Float";
case T_DOUBLE: return "Double";
case T_UINT: return "Int";
case T_USHORT: return "Short";
case T_ULONG: return "Long";
case T_UCHAR: return "Byte";
case T_SCHAR: return "Byte";
case T_BOOL: return "Boolean";
case T_INT: return (char*)"Int";
case T_SHORT: return (char*)"Short";
case T_LONG: return (char*)"Long";
case T_CHAR: return (char*)"Byte";
case T_FLOAT: return (char*)"Float";
case T_DOUBLE: return (char*)"Double";
case T_UINT: return (char*)"Int";
case T_USHORT: return (char*)"Short";
case T_ULONG: return (char*)"Long";
case T_UCHAR: return (char*)"Byte";
case T_SCHAR: return (char*)"Byte";
case T_BOOL: return (char*)"Boolean";
case T_VOID:
case T_USER: return "Long";
case T_USER: return (char*)"Long";
}
} else {
return "Long";
return (char*)"Long";
}
fprintf(stderr, "SwigTcToJniScalarType: unhandled SWIG type %d, %s\n", t->type, (char *) t->name);
@ -157,42 +157,42 @@ char *JAVA::SwigTcToJniScalarType(DataType *t) {
char *JAVA::JavaMethodSignature(DataType *t, int ret, int inShadow) {
if(t->is_pointer == 1) {
switch(t->type) {
case T_INT: return "[I";
case T_SHORT: return "[S";
case T_LONG: return "[J";
case T_CHAR: return "Ljava/lang/String;";
case T_FLOAT: return "[F";
case T_DOUBLE: return "[D";
case T_UINT: return "[I";
case T_USHORT: return "[S";
case T_ULONG: return "[J";
case T_UCHAR: return "[B";
case T_SCHAR: return "[B";
case T_BOOL: return "[Z";
case T_INT: return (char*)"[I";
case T_SHORT: return (char*)"[S";
case T_LONG: return (char*)"[J";
case T_CHAR: return (char*)"Ljava/lang/String;";
case T_FLOAT: return (char*)"[F";
case T_DOUBLE: return (char*)"[D";
case T_UINT: return (char*)"[I";
case T_USHORT: return (char*)"[S";
case T_ULONG: return (char*)"[J";
case T_UCHAR: return (char*)"[B";
case T_SCHAR: return (char*)"[B";
case T_BOOL: return (char*)"[Z";
case T_VOID:
case T_USER: if(inShadow && Getattr(shadow_classes,t->name))
return GetChar(shadow_classes,t->name);
else return "J";
else return (char*)"J";
}
} else if(t->is_pointer > 1) {
if(ret) return "J";
else return "[J";
if(ret) return (char*)"J";
else return (char*)"[J";
} else {
switch(t->type) {
case T_INT: return "I";
case T_SHORT: return "S";
case T_LONG: return "J";
case T_CHAR: return "B";
case T_FLOAT: return "F";
case T_DOUBLE: return "D";
case T_UINT: return "I";
case T_USHORT: return "S";
case T_ULONG: return "J";
case T_UCHAR: return "B";
case T_SCHAR: return "B";
case T_BOOL: return "Z";
case T_VOID: return "V";
case T_USER: return "J";
case T_INT: return (char*)"I";
case T_SHORT: return (char*)"S";
case T_LONG: return (char*)"J";
case T_CHAR: return (char*)"B";
case T_FLOAT: return (char*)"F";
case T_DOUBLE: return (char*)"D";
case T_UINT: return (char*)"I";
case T_USHORT: return (char*)"S";
case T_ULONG: return (char*)"J";
case T_UCHAR: return (char*)"B";
case T_SCHAR: return (char*)"B";
case T_BOOL: return (char*)"Z";
case T_VOID: return (char*)"V";
case T_USER: return (char*)"J";
}
}
fprintf(stderr, "JavaMethodSignature: unhandled SWIG type %d, %s\n", t->type, (char *) t->name);
@ -202,7 +202,7 @@ char *JAVA::JavaMethodSignature(DataType *t, int ret, int inShadow) {
char *JAVA::JavaTypeFromTypemap(char *op, char *lang, DataType *t, char *pname) {
char *tm;
char *c = bigbuf;
if(!(tm = typemap_lookup(op, lang, t, pname, "", ""))) return NULL;
if(!(tm = typemap_lookup(op, lang, t, pname, (char*)"", (char*)""))) return NULL;
while(*tm && (isspace(*tm) || *tm == '{')) tm++;
while(*tm && *tm != '}') *c++ = *tm++;
*c='\0';
@ -260,22 +260,22 @@ void JAVA::writeRegisterNatives()
String registerFunction;
registerFunction << "jint registerNatives(JNIEnv *jenv) {" << endl
<< tab4 << "jclass nativeClass = " << JNICALL("FindClass")
<< tab4 << "jclass nativeClass = " << JNICALL((char*)"FindClass")
<< "\"" << jni_pkgstr << module << "\");" <<endl;
registerFunction << tab4 << "if (nativeClass == 0)" << endl << tab8 << "return -1;" << endl;
registerFunction << tab4 << "return " << JNICALL("RegisterNatives") << "nativeClass, nativeMethods, " << "numberOfNativeMethods);" << endl;
registerFunction << tab4 << "return " << JNICALL((char*)"RegisterNatives") << "nativeClass, nativeMethods, " << "numberOfNativeMethods);" << endl;
registerFunction << "}" << endl << endl;
// The unregisterNatives function
registerFunction << "jint unregisterNatives(JNIEnv *jenv) {" << endl
<< tab4 << "jclass nativeClass = " << JNICALL("FindClass")
<< tab4 << "jclass nativeClass = " << JNICALL((char*)"FindClass")
<< "\"" << jni_pkgstr << module << "\");" <<endl;
registerFunction << tab4 << "if (nativeClass == 0)" << endl << tab8 << "return -1;" << endl;
registerFunction << tab4 << "// Sun documentation suggests that this method should not be invoked in "
<< "\"normal native code\"." << endl;
registerFunction << tab4 << "// return " << JNICALL("UnregisterNatives") << "nativeClass);" << endl;
registerFunction << tab4 << "// return " << JNICALL((char*)"UnregisterNatives") << "nativeClass);" << endl;
registerFunction << tab4 << "return 0;" << endl;
registerFunction << "}" << endl;
@ -349,7 +349,7 @@ void JAVA::parse_args(int argc, char *argv[]) {
Preprocessor_define((void *) "SWIGJAVA 1",0);
// Add typemap definitions
typemap_lang = "java";
typemap_lang = (char*)"java";
}
// ---------------------------------------------------------------------
@ -435,16 +435,16 @@ void JAVA::initialize()
s2 << "/";
jni_pkgstr = copy_string(s2.get());
} else {
package = c_pkgstr = jni_pkgstr = "";
package = c_pkgstr = jni_pkgstr = (char*)"";
}
sprintf(bigbuf, "Java_%s%s", c_pkgstr, module);
c_pkgstr = copy_string(bigbuf);
sprintf(bigbuf, "%s_%%f", c_pkgstr);
name_register("wrapper", copy_string(bigbuf));
name_register("set", "set_%v");
name_register("get", "get_%v");
name_register("member", "%c_%f");
name_register((char*)"wrapper", copy_string(bigbuf));
name_register((char*)"set", (char*)"set_%v");
name_register((char*)"get", (char*)"get_%v");
name_register((char*)"member", (char*)"%c_%f");
// Generate the java class
sprintf(bigbuf, "%s.java", module);
@ -527,9 +527,9 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
char *wname = name_wrapper(jniname,package);
free(jniname);
char *jnirettype = JavaTypeFromTypemap("jni", typemap_lang, t, iname);
char *jnirettype = JavaTypeFromTypemap((char*)"jni", typemap_lang, t, iname);
if(!jnirettype) jnirettype = SwigTcToJniType(t, 1);
char *javarettype = JavaTypeFromTypemap("jtype", typemap_lang, t, iname);
char *javarettype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, t, iname);
if(!javarettype) javarettype = SwigTcToJavaType(t, 1, 0);
// If dumping the registerNative outputs, store the method return type
@ -539,7 +539,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
}
if(t->type != T_VOID || t->is_pointer) {
f.add_local(jnirettype, "_jresult", "0");
f.add_local(jnirettype, (char*)"_jresult", (char*)"0");
}
fprintf(f_java, " %s ", method_modifiers);
@ -576,9 +576,9 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
source << "jarg" << i;
target << "_arg" << i;
char *jnitype = JavaTypeFromTypemap("jni", typemap_lang, p->t, p->name);
char *jnitype = JavaTypeFromTypemap((char*)"jni", typemap_lang, p->t, p->name);
if(!jnitype) jnitype = SwigTcToJniType(p->t, 0);
char *jtype = JavaTypeFromTypemap("jtype", typemap_lang, p->t, p->name);
char *jtype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, p->t, p->name);
if(!jtype) jtype = SwigTcToJavaType(p->t, 0, 0);
if (useRegisterNatives) {
javaParameterSignature << JavaMethodSignature(p->t, 0, 0);
@ -604,7 +604,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
f.def << ", " << jnitype << " " << source;
// Get typemap for this argument
tm = typemap_lookup("in",typemap_lang,p->t,p->name,source,target,&f);
tm = typemap_lookup((char*)"in",typemap_lang,p->t,p->name,source,target,&f);
if (tm) {
f.code << tm << "\n";
f.code.replace("$arg",source); // Perform a variable replacement
@ -618,7 +618,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
p->t->is_pointer--;
} else {
if(p->t->type == T_CHAR && p->t->is_pointer == 1) {
f.code << tab4 << (char *) target << " = (" << source << ") ? (char *)" << JNICALL("GetStringUTFChars") << source << ", 0) : NULL;\n";
f.code << tab4 << (char *) target << " = (" << source << ") ? (char *)" << JNICALL((char*)"GetStringUTFChars") << source << ", 0) : NULL;\n";
} else {
char *scalarType = SwigTcToJniScalarType(p->t);
char *cptrtype = p->t->print_type();
@ -633,12 +633,12 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
String basic_jniptrtype = basic_jnitype;
basic_jniptrtype << "*";
String source_length = JNICALL("GetArrayLength");
String source_length = JNICALL((char*)"GetArrayLength");
source_length << source << ")";
target_copy = copy_string(f.new_local((char *) basic_jniptrtype, target, NULL));
target_length = copy_string(f.new_local("jsize", target, source_length));
if(local_i == NULL) local_i = copy_string(f.new_local("int", "i", NULL));
target_length = copy_string(f.new_local((char*)"jsize", target, source_length));
if(local_i == NULL) local_i = copy_string(f.new_local((char*)"int", (char*)"i", NULL));
String scalarFunc = "Get";
scalarFunc << scalarType << "ArrayElements";
@ -658,20 +658,20 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
}
// Check to see if there was any sort of a constaint typemap
if ((tm = typemap_lookup("check",typemap_lang,p->t,p->name,source,target))) {
if ((tm = typemap_lookup((char*)"check",typemap_lang,p->t,p->name,source,target))) {
// Yep. Use it instead of the default
f.code << tm << "\n";
f.code.replace("$arg",source);
}
// Check if there was any cleanup code (save it for later)
if ((tm = typemap_lookup("freearg",typemap_lang,p->t,p->name,source,target))) {
if ((tm = typemap_lookup((char*)"freearg",typemap_lang,p->t,p->name,source,target))) {
// Yep. Use it instead of the default
cleanup << tm << "\n";
cleanup.replace("$arg",source);
}
if ((tm = typemap_lookup("argout",typemap_lang,p->t,p->name,source,target))) {
if ((tm = typemap_lookup((char*)"argout",typemap_lang,p->t,p->name,source,target))) {
// Yep. Use it instead of the default
outarg << tm << "\n";
outarg.replace("$arg",source);
@ -679,7 +679,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
// if(p->t->is_pointer && p->t->type != T_USER && p->t->type != T_VOID) {
if(p->t->is_pointer) {
if(p->t->type == T_CHAR && p->t->is_pointer == 1) {
outarg << tab4 << "if(" << target <<") " << JNICALL("ReleaseStringUTFChars") << source << ", " << target << ");\n";
outarg << tab4 << "if(" << target <<") " << JNICALL((char*)"ReleaseStringUTFChars") << source << ", " << target << ");\n";
} else if((p->t->type == T_VOID && p->t->is_pointer == 1) ||
(p->t->type == T_USER && p->t->is_pointer == 1)) {
// nothing to do
@ -730,7 +730,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
// Return value if necessary
if((t->type != T_VOID || t->is_pointer) && !native_func) {
if ((tm = typemap_lookup("out",typemap_lang,t,iname,"_result","_jresult"))) {
if ((tm = typemap_lookup((char*)"out",typemap_lang,t,iname,(char*)"_result",(char*)"_jresult"))) {
f.code << tm << "\n";
} else {
if(t->is_pointer == 0 && t->type == T_USER) { /* return by value */
@ -747,7 +747,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
} else {
if(t->type == T_CHAR && t->is_pointer == 1) {
f.code << tab4 << "if(_result != NULL)\n";
f.code << tab8 << "_jresult = (jstring)" << JNICALL("NewStringUTF") << "_result);\n";
f.code << tab8 << "_jresult = (jstring)" << JNICALL((char*)"NewStringUTF") << "_result);\n";
} else {
fprintf(stderr,"%s : Line %d. Warning: no return typemap for datatype %s\n", input_file,line_number,t->print_type());
t->is_pointer++;
@ -767,13 +767,13 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
// Look for any remaining cleanup
if (NewObject) {
if ((tm = typemap_lookup("newfree",typemap_lang,t,iname,"_result",""))) {
if ((tm = typemap_lookup((char*)"newfree",typemap_lang,t,iname,(char*)"_result",(char*)""))) {
f.code << tm << "\n";
}
}
if((t->type != T_VOID || t->is_pointer) && !native_func) {
if ((tm = typemap_lookup("ret",typemap_lang,t,iname,"_result","_jresult", NULL))) {
if ((tm = typemap_lookup((char*)"ret",typemap_lang,t,iname,(char*)"_result",(char*)"_jresult", NULL))) {
f.code << tm << "\n";
}
}
@ -830,13 +830,13 @@ void JAVA::declare_const(char *name, char *iname, DataType *type, char *value) {
jname = name;
}
if ((tm = typemap_lookup("const",typemap_lang,type,name,name,iname))) {
if ((tm = typemap_lookup((char*)"const",typemap_lang,type,name,name,iname))) {
String str = tm;
str.replace("$value",value);
fprintf(jfile," %s\n\n", (char *) str);
} else {
if((type->is_pointer == 0)) {
char *jtype = typemap_lookup("jtype", typemap_lang, type, name, name, iname);
char *jtype = typemap_lookup((char*)"jtype", typemap_lang, type, name, name, iname);
if(!jtype) jtype = SwigTcToJavaType(type, 0, 0);
if(strcmp(jname, value) == 0 || strstr(value,"::") != NULL) {
fprintf(stderr, "ignoring enum constant: %s\n", jname);
@ -961,7 +961,7 @@ void JAVA::cpp_open_class(char *classname, char *rename, char *ctype, int strip)
shadow_classdef = "";
shadow_classdef << "public class " << shadow_classname << " %BASECLASS% " << "{\n";
shadow_baseclass = "";
shadow_baseclass = (char*) "";
shadow_classdef_emitted = 0;
have_default_constructor = 0;
}
@ -1017,9 +1017,9 @@ void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
if(!shadow) return;
if(!shadow_classdef_emitted) emit_shadow_classdef();
char *javarettype = JavaTypeFromTypemap("jtype", typemap_lang, t, iname);
char *javarettype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, t, iname);
if(!javarettype) javarettype = SwigTcToJavaType(t, 1, 0);
char *shadowrettype = JavaTypeFromTypemap("jstype", typemap_lang, t, iname);
char *shadowrettype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, t, iname);
if(!shadowrettype && t->type == T_USER && t->is_pointer <= 1) {
shadowrettype = GetChar(shadow_classes,t->name);
}
@ -1050,10 +1050,10 @@ void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
nativecall << ", " << arg << "._self";
} else nativecall << ", " << arg;
char *jtype = JavaTypeFromTypemap("jtype", typemap_lang, p->t, p->name);
char *jtype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, p->t, p->name);
if(!jtype) jtype = SwigTcToJavaType(p->t, 0, 0);
char *jstype = JavaTypeFromTypemap("jstype", typemap_lang, p->t, p->name);
char *jstype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, p->t, p->name);
if(!jstype && p->t->type == T_USER && p->t->is_pointer <= 1) {
jstype = GetChar(shadow_classes,p->t->name);
}
@ -1085,9 +1085,9 @@ void JAVA::cpp_static_func(char *name, char *iname, DataType *t, ParmList *l) {
if(!shadow) return;
if(!shadow_classdef_emitted) emit_shadow_classdef();
char *javarettype = JavaTypeFromTypemap("jtype", typemap_lang, t, iname);
char *javarettype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, t, iname);
if(!javarettype) javarettype = SwigTcToJavaType(t, 1, 0);
char *shadowrettype = JavaTypeFromTypemap("jstype", typemap_lang, t, iname);
char *shadowrettype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, t, iname);
if(!shadowrettype && t->type == T_USER && t->is_pointer <= 1) {
shadowrettype = GetChar(shadow_classes,t->name);
}
@ -1123,10 +1123,10 @@ void JAVA::cpp_static_func(char *name, char *iname, DataType *t, ParmList *l) {
gencomma = 1;
char *jtype = JavaTypeFromTypemap("jtype", typemap_lang, p->t, p->name);
char *jtype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, p->t, p->name);
if(!jtype) jtype = SwigTcToJavaType(p->t, 0, 0);
char *jstype = JavaTypeFromTypemap("jstype", typemap_lang, p->t, p->name);
char *jstype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, p->t, p->name);
if(!jstype && p->t->type == T_USER && p->t->is_pointer <= 1) {
jstype = GetChar(shadow_classes, p->t->name);
}
@ -1180,9 +1180,9 @@ void JAVA::cpp_constructor(char *name, char *iname, ParmList *l) {
arg << i;
}
char *jtype = JavaTypeFromTypemap("jtype", typemap_lang, p->t, p->name);
char *jtype = JavaTypeFromTypemap((char*)"jtype", typemap_lang, p->t, p->name);
if(!jtype) jtype = SwigTcToJavaType(p->t, 0, 0);
char *jstype = JavaTypeFromTypemap("jstype", typemap_lang, p->t, p->name);
char *jstype = JavaTypeFromTypemap((char*)"jstype", typemap_lang, p->t, p->name);
if(!jstype) jstype = SwigTcToJavaType(p->t, 0, 1);
if(strcmp(jtype, jstype) == 0) jstype = NULL;

56
SWIG/Source/Modules1.1/mzscheme.cxx
View file

@ -26,7 +26,7 @@ static char cvsroot[] = "$Header$";
#include "mod11.h"
#include "mzscheme.h"
static char *mzscheme_usage = "\
static char *mzscheme_usage = (char*)"\
\n\
Mzscheme Options (available with -mzscheme)\n\
-help - Print this help\n\
@ -44,10 +44,10 @@ MZSCHEME::MZSCHEME ()
{
prefix = NULL;
module = NULL;
package = "";
package = (char*)"";
linkage = 0;
mzscheme_path = "mzscheme";
init_func_def = "";
mzscheme_path = (char*)"mzscheme";
init_func_def = (char*)"";
}
// ---------------------------------------------------------------------
@ -102,7 +102,7 @@ MZSCHEME::parse_args (int argc, char *argv[])
prefix[strlen (prefix)] = '_';
}
} else
prefix = "swig_";
prefix = (char*)"swig_";
// Add a symbol for this module
@ -110,7 +110,7 @@ MZSCHEME::parse_args (int argc, char *argv[])
// Set name of typemaps
typemap_lang = "mzscheme";
typemap_lang = (char*)"mzscheme";
}
// --------------------------------------------------------------------
@ -336,9 +336,9 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
int numopt = 0;
// adds local variables : type name
f.add_local ("char *", "_tempc");
f.add_local ("int", "_len");
f.add_local ("Scheme_Object *", "swig_result");
f.add_local ((char*)"char *", (char*)"_tempc");
f.add_local ((char*)"int", (char*)"_len");
f.add_local ((char*)"Scheme_Object *", (char*)"swig_result");
// Now write code to extract the parameters (this is super ugly)
@ -363,7 +363,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
f.code << "/* " << p.name << " ignored... */\n";
else {
++numargs;
if ((tm = typemap_lookup ("in", typemap_lang,
if ((tm = typemap_lookup ((char*)"in", typemap_lang,
p.t, p.name, source, target, &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
@ -379,7 +379,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Check if there are any constraints.
if ((tm = typemap_lookup ("check", typemap_lang,
if ((tm = typemap_lookup ((char*)"check", typemap_lang,
p.t, p.name, source, target, &f))) {
// Yep. Use it instead of the default
f.code << tm << "\n";
@ -388,7 +388,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Pass output arguments back to the caller.
if ((tm = typemap_lookup ("argout", typemap_lang,
if ((tm = typemap_lookup ((char*)"argout", typemap_lang,
p.t, p.name, source, target, &f))) {
// Yep. Use it instead of the default
outarg << tm << "\n";
@ -397,7 +397,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
}
// Free up any memory allocated for the arguments.
if ((tm = typemap_lookup ("freearg", typemap_lang,
if ((tm = typemap_lookup ((char*)"freearg", typemap_lang,
p.t, p.name, source, target, &f))) {
// Yep. Use it instead of the default
cleanup << tm << "\n";
@ -416,8 +416,8 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
f.code << tab4 << "swig_result = scheme_void;\n";
}
else if ((tm = typemap_lookup ("out", typemap_lang,
d, name, "_result", "swig_result", &f))) {
else if ((tm = typemap_lookup ((char*)"out", typemap_lang,
d, name, (char*)"_result", (char*)"swig_result", &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
}
@ -443,8 +443,8 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Look for any remaining cleanup
if (NewObject) {
if ((tm = typemap_lookup ("newfree", typemap_lang,
d, iname, "_result", "", &f))) {
if ((tm = typemap_lookup ((char*)"newfree", typemap_lang,
d, iname, (char*)"_result", (char*)"", &f))) {
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
}
@ -452,8 +452,8 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Free any memory allocated by the function being wrapped..
if ((tm = typemap_lookup ("ret", typemap_lang,
d, name, "_result", "", &f))) {
if ((tm = typemap_lookup ((char*)"ret", typemap_lang,
d, name, (char*)"_result", (char*)"", &f))) {
// Yep. Use it instead of the default
f.code << tm << "\n";
mreplace (f.code, argnum, arg, proc_name);
@ -462,13 +462,13 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// returning multiple values
if(argout_set) {
if(d->type == T_VOID) {
f.add_local("int", "_lenv", "0");
f.add_local("Scheme_Object *", "_values[MAXVALUES]");
f.add_local((char*)"int", (char*)"_lenv", (char*)"0");
f.add_local((char*)"Scheme_Object *", (char*)"_values[MAXVALUES]");
f.code << tab4 << "swig_result = scheme_values(_lenv, _values);\n";
}
else {
f.add_local("int", "_lenv", "1");
f.add_local("Scheme_Object *", "_values[MAXVALUES]");
f.add_local((char*)"int", (char*)"_lenv", (char*)"1");
f.add_local((char*)"Scheme_Object *",(char*) "_values[MAXVALUES]");
f.code << tab4 << "_values[0] = swig_result;\n";
f.code << tab4 << "swig_result = scheme_values(_lenv, _values);\n";
}
@ -542,8 +542,8 @@ MZSCHEME::link_variable (char *name, char *iname, DataType *t)
fprintf (f_wrappers, "\t\t scheme_signal_error(\"Unable to set %s. "
"Variable is read only.\");\n", iname);
}
else if ((tm = typemap_lookup ("varin", typemap_lang,
t, name, "argv[0]", name))) {
else if ((tm = typemap_lookup ((char*)"varin", typemap_lang,
t, name, (char*)"argv[0]", name))) {
tm2 = tm;
mreplace(tm2, argnum, arg, proc_name);
fprintf (f_wrappers, "%s\n", tm2.get());
@ -570,8 +570,8 @@ MZSCHEME::link_variable (char *name, char *iname, DataType *t)
// Now return the value of the variable (regardless
// of evaluating or setting)
if ((tm = typemap_lookup ("varout", typemap_lang,
t, name, name, "swig_result"))) {
if ((tm = typemap_lookup ((char*)"varout", typemap_lang,
t, name, name, (char*)"swig_result"))) {
fprintf (f_wrappers, "%s\n", tm);
}
else if (t->is_pointer) {
@ -646,7 +646,7 @@ MZSCHEME::declare_const (char *name, char *, DataType *type, char *value)
rvalue << "'";
"'" >> rvalue;
}
if ((tm = typemap_lookup ("const", typemap_lang, type, name,
if ((tm = typemap_lookup ((char*)"const", typemap_lang, type, name,
rvalue.get(), name))) {
// Yep. Use it instead of the default
fprintf (f_init, "%s\n", tm);

8
SWIG/Source/Modules1.1/pycpp.cxx
View file

@ -179,7 +179,7 @@ void PYTHON::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l)
// Check to see if the return type is an object
if ((Getattr(hash,t->name)) && (t->is_pointer <= 1)) {
if (!typemap_check("out",typemap_lang,t,name_member(realname,class_name))) {
if (!typemap_check((char*)"out",typemap_lang,t,name_member(realname,class_name))) {
if (!have_output) {
*pyclass << tab8 << "if val: val = " << GetChar(hash,t->name) << "Ptr(val) ";
if (((Getattr(hash,t->name)) && (t->is_pointer < 1)) ||
@ -248,7 +248,7 @@ void PYTHON::cpp_constructor(char *name, char *iname, ParmList *l) {
else
*construct << tab8 << "self.this = apply(" << module << "." << name_construct(realname) << ",args)\n";
*construct << tab8 << "self.thisown = 1\n";
emitAddPragmas(*construct,"__init__",tab8);
emitAddPragmas(*construct,(char*)"__init__",(char*)tab8);
have_constructor = 1;
} else {
@ -292,7 +292,7 @@ void PYTHON::cpp_destructor(char *name, char *newname) {
}
*pyclass << tab4 << "def __del__(self," << module << "=" << module << "):\n";
emitAddPragmas(*pyclass,"__del__",tab8);
emitAddPragmas(*pyclass,(char*)"__del__",(char*)tab8);
*pyclass << tab8 << "if self.thisown == 1 :\n"
<< tab8 << tab4 << module << "." << name_destroy(realname) << "(self)\n";
@ -354,7 +354,7 @@ void PYTHON::cpp_close_class() {
<< tab8 << "return \"<C " << class_name <<" instance at %s>\" % (self.this,)\n";
classes << repr;
emitAddPragmas(classes,"__class__",tab4);
emitAddPragmas(classes,(char*)"__class__",(char*)tab4);
}
// Now build the real class with a normal constructor

76
SWIG/Source/Modules1.1/python.cxx
View file

@ -39,7 +39,7 @@ Method *head = 0;
static String const_code;
static String shadow_methods;
static char *usage = "\
static char *usage = (char *)"\
Python Options (available with -python)\n\
-globals name - Set name used to access C global variable ('cvar' by default).\n\
-module name - Set module name\n\
@ -102,7 +102,7 @@ void PYTHON::parse_args(int argc, char *argv[]) {
// Set name of typemaps
typemap_lang = "python";
typemap_lang = (char*)"python";
}
@ -518,7 +518,7 @@ void PYTHON::emit_function_header(WrapperFunction &emit_to, char *wname)
char *PYTHON::convert_self(WrapperFunction &)
{
// Default behaviour is no translation
return "";
return (char*)"";
}
// ----------------------------------------------------------------------
@ -528,7 +528,7 @@ char *PYTHON::convert_self(WrapperFunction &)
// ----------------------------------------------------------------------
char *PYTHON::make_funcname_wrapper(char *fnName)
{
return name_wrapper(fnName,"");
return name_wrapper(fnName,(char*)"");
}
// ----------------------------------------------------------------------
@ -542,7 +542,7 @@ void PYTHON::create_command(char *cname, char *iname) {
// Create the name of the wrapper function
char *wname = name_wrapper(cname,"");
char *wname = name_wrapper(cname,(char*)"");
// Now register the function with the interpreter.
@ -598,7 +598,7 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
emit_function_header(f, wname);
f.add_local("PyObject *","_resultobj");
f.add_local((char*)"PyObject *",(char*)"_resultobj");
// Get the function usage string for later use
@ -656,9 +656,9 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
// Look for input typemap
if ((tm = typemap_lookup("in","python",p->t,p->name,source,target,&f))) {
if ((tm = typemap_lookup((char*)"in",(char*)"python",p->t,p->name,source,target,&f))) {
parse_args << "O"; // Grab the argument as a raw PyObject
f.add_local("PyObject *",source,"0");
f.add_local((char*)"PyObject *",source,(char*)"0");
arglist << "&" << source;
if (i >= (pcount-numopt))
get_pointers << tab4 << "if (" << source << ")\n";
@ -710,9 +710,9 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
tempb << "tempbool" << i;
parse_args << "i";
if (!p->defvalue)
f.add_local("int",tempb.get());
f.add_local((char*)"int",tempb.get());
else
f.add_local("int",tempb.get(),tempval.get());
f.add_local((char*)"int",tempb.get(),tempval.get());
get_pointers << tab4 << target << " = " << p->t->print_cast() << " " << tempb << ";\n";
arglist << "&" << tempb;
}
@ -758,32 +758,32 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
sprintf(target,"_arg%d", i);
sprintf(temp,"argument %d",i+1);
f.add_local("PyObject *", source,"0");
f.add_local((char*)"PyObject *", source,(char*)"0");
arglist << "&" << source;
get_pointer(iname, temp, source, target, p->t, get_pointers, "NULL");
get_pointer(iname, temp, source, target, p->t, get_pointers, (char*)"NULL");
}
}
}
j++;
}
// Check if there was any constraint code
if ((tm = typemap_lookup("check","python",p->t,p->name,source,target))) {
if ((tm = typemap_lookup((char*)"check",(char*)"python",p->t,p->name,source,target))) {
check << tm << "\n";
check.replace("$argnum", argnum);
}
// Check if there was any cleanup code
if ((tm = typemap_lookup("freearg","python",p->t,p->name,target,source))) {
if ((tm = typemap_lookup((char*)"freearg",(char*)"python",p->t,p->name,target,source))) {
cleanup << tm << "\n";
cleanup.replace("$argnum", argnum);
cleanup.replace("$arg",source);
}
if ((tm = typemap_lookup("argout","python",p->t,p->name,target,"_resultobj"))) {
if ((tm = typemap_lookup((char*)"argout",(char*)"python",p->t,p->name,target,(char*)"_resultobj"))) {
outarg << tm << "\n";
outarg.replace("$argnum", argnum);
outarg.replace("$arg",source);
have_output++;
}
if ((tm = typemap_lookup("build","python",p->t,p->name,source,target))) {
if ((tm = typemap_lookup((char*)"build",(char*)"python",p->t,p->name,source,target))) {
build << tm << "\n";
have_build = 1;
}
@ -837,7 +837,7 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
// If there was a result, it was saved in _result.
// If the function is a void type, don't do anything.
if ((tm = typemap_lookup("out","python",d,iname,"_result","_resultobj"))) {
if ((tm = typemap_lookup((char*)"out",(char*)"python",d,iname,(char*)"_result",(char*)"_resultobj"))) {
// Yep. Use it instead of the default
f.code << tm << "\n";
} else {
@ -932,14 +932,14 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
// Look to see if there is any newfree cleanup code
if (NewObject) {
if ((tm = typemap_lookup("newfree","python",d,iname,"_result",""))) {
if ((tm = typemap_lookup((char*)"newfree",(char*)"python",d,iname,(char*)"_result",(char*)""))) {
f.code << tm << "\n";
}
}
// See if there is any argument cleanup code
if ((tm = typemap_lookup("ret","python",d,iname,"_result",""))) {
if ((tm = typemap_lookup((char*)"ret",(char*)"python",d,iname,(char*)"_result",(char*)""))) {
// Yep. Use it instead of the default
f.code << tm << "\n";
}
@ -997,7 +997,7 @@ void PYTHON::create_function(char *name, char *iname, DataType *d, ParmList *l)
// If the output of this object has been remapped in any way, we're
// going to return it as a bare object.
if (!typemap_check("out",typemap_lang,d,iname)) {
if (!typemap_check((char*)"out",typemap_lang,d,iname)) {
// If there are output arguments, we are going to return the value
// unchanged. Otherwise, emit some shadow class conversion code.
@ -1053,7 +1053,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
// First make a sanitized version of the function name (in case it's some
// funky C++ thing).
wname = name_wrapper(name,"");
wname = name_wrapper(name,(char*)"");
// ---------------------------------------------------------------------
// Create a function for setting the value of the variable
@ -1061,7 +1061,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
setf.def << "static int " << wname << "_set(PyObject *val) {";
if (!(Status & STAT_READONLY)) {
if ((tm = typemap_lookup("varin","python",t,name,"val",name))) {
if ((tm = typemap_lookup((char*)"varin",(char*)"python",t,name,(char*)"val",name))) {
setf.code << tm << "\n";
setf.code.replace("$name",iname);
} else {
@ -1076,7 +1076,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
case T_SINT: case T_SSHORT: case T_SLONG:
case T_SCHAR: case T_UCHAR: case T_BOOL:
// Get an integer value
setf.add_local(t->print_type(), "tval");
setf.add_local(t->print_type(), (char*)"tval");
setf.code << tab4 << "tval = " << t->print_cast() << "PyInt_AsLong(val);\n"
<< tab4 << "if (PyErr_Occurred()) {\n"
<< tab8 << "PyErr_SetString(PyExc_TypeError,\"C variable '"
@ -1088,7 +1088,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
case T_FLOAT: case T_DOUBLE:
// Get a floating point value
setf.add_local(t->print_type(), "tval");
setf.add_local(t->print_type(), (char*)"tval");
setf.code << tab4 << "tval = " << t->print_cast() << "PyFloat_AsDouble(val);\n"
<< tab4 << "if (PyErr_Occurred()) {\n"
<< tab8 << "PyErr_SetString(PyExc_TypeError,\"C variable '"
@ -1101,7 +1101,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
// A single ascii character
case T_CHAR:
setf.add_local("char *", "tval");
setf.add_local((char*)"char *", (char*)"tval");
setf.code << tab4 << "tval = (char *) PyString_AsString(val);\n"
<< tab4 << "if (PyErr_Occurred()) {\n"
<< tab8 << "PyErr_SetString(PyExc_TypeError,\"C variable '"
@ -1112,8 +1112,8 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
break;
case T_USER:
t->is_pointer++;
setf.add_local(t->print_type(),"temp");
get_pointer(iname,"value","val","temp",t,setf.code,"1");
setf.add_local(t->print_type(),(char*)"temp");
get_pointer(iname,(char*)"value",(char*)"val",(char*)"temp",t,setf.code,(char*)"1");
setf.code << tab4 << name << " = *temp;\n";
t->is_pointer--;
break;
@ -1125,7 +1125,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
// Parse a pointer value
if ((t->type == T_CHAR) && (t->is_pointer == 1)) {
setf.add_local("char *", "tval");
setf.add_local((char*)"char *", (char*)"tval");
setf.code << tab4 << "tval = (char *) PyString_AsString(val);\n"
<< tab4 << "if (PyErr_Occurred()) {\n"
<< tab8 << "PyErr_SetString(PyExc_TypeError,\"C variable '"
@ -1146,8 +1146,8 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
// Is a generic pointer value.
setf.add_local(t->print_type(),"temp");
get_pointer(iname,"value","val","temp",t,setf.code,"1");
setf.add_local(t->print_type(),(char*)"temp");
get_pointer(iname,(char*)"value",(char*)"val",(char*)"temp",t,setf.code,(char*)"1");
setf.code << tab4 << name << " = temp;\n";
}
}
@ -1172,11 +1172,11 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
// ----------------------------------------------------------------
getf.def << "static PyObject *" << wname << "_get() {";
getf.add_local("PyObject *","pyobj");
if ((tm = typemap_lookup("varout","python",t,name,name,"pyobj"))) {
getf.add_local((char*)"PyObject *",(char*)"pyobj");
if ((tm = typemap_lookup((char*)"varout",(char*)"python",t,name,name,(char*)"pyobj"))) {
getf.code << tm << "\n";
getf.code.replace("$name",iname);
} else if ((tm = typemap_lookup("out","python",t,name,name,"pyobj"))) {
} else if ((tm = typemap_lookup((char*)"out",(char*)"python",t,name,name,(char*)"pyobj"))) {
getf.code << tm << "\n";
getf.code.replace("$name",iname);
} else {
@ -1195,7 +1195,7 @@ void PYTHON::link_variable(char *name, char *iname, DataType *t) {
getf.code << tab4 << "pyobj = PyFloat_FromDouble((double) " << name << ");\n";
break;
case T_CHAR:
getf.add_local("char","ptemp[2]");
getf.add_local((char*)"char",(char*)"ptemp[2]");
getf.code << tab4 << "ptemp[0] = " << name << ";\n"
<< tab4 << "ptemp[1] = 0;\n"
<< tab4 << "pyobj = PyString_FromString(ptemp);\n";
@ -1263,7 +1263,7 @@ void PYTHON::declare_const(char *name, char *, DataType *type, char *value) {
// Make a static python object
if ((tm = typemap_lookup("const","python",type,name,value,name))) {
if ((tm = typemap_lookup((char*)"const",(char*)"python",type,name,value,name))) {
const_code << tm << "\n";
} else {
@ -1443,7 +1443,7 @@ void PYTHON::cpp_class_decl(char *name, char *rename, char *type) {
void PYTHON::pragma(char *lang, char *cmd, char *value) {
if (strcmp(lang,"python") == 0) {
if (strcmp(lang,(char*)"python") == 0) {
if (strcmp(cmd,"CODE") == 0) {
if (shadow) {
fprintf(f_shadow,"%s\n",value);
@ -1496,7 +1496,7 @@ void PYTHON::cpp_pragma(Pragma *plist) {
pragmas = 0;
}
while (plist) {
if (strcmp(plist->lang,"python") == 0) {
if (strcmp(plist->lang,(char*)"python") == 0) {
if (strcmp(plist->name,"addtomethod") == 0) {
// parse value, expected to be in the form "methodName:line"
String temp = plist->value;
@ -1518,7 +1518,7 @@ void PYTHON::cpp_pragma(Pragma *plist) {
plist->filename.get(),plist->lineno);
}
} else if (strcmp(plist->name, "addtoclass") == 0) {
pyp1 = new PyPragma("__class__",plist->value);
pyp1 = new PyPragma((char*)"__class__",plist->value);
if (pyp2) {
pyp2->next = pyp1;
pyp2 = pyp1;