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

Reserved word checking removed - a #define can be used in interface instead

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4583 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-03-19 23:02:51 +00:00
commit 4d0e36332f
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
SWIG/Source/Modules/csharp.cxx
View file

@ -471,8 +471,7 @@ class CSHARP : public Language {
if(proxy_flag && wrapping_member_flag && !enum_constant_flag) { if(proxy_flag && wrapping_member_flag && !enum_constant_flag) {
// Capitalize the first letter in the variable to create a JavaBean type getter/setter function name // Capitalize the first letter in the variable to create a JavaBean type getter/setter function name
bool getter_flag = Cmp(symname, Swig_name_set(Swig_name_member(shadow_classname, variable_name))) != 0; bool getter_flag = Cmp(symname, Swig_name_set(Swig_name_member(shadow_classname, variable_name))) != 0;
checkReserved(variable_name);
String *getter_setter_name = NewString(""); String *getter_setter_name = NewString("");
if(!getter_flag) if(!getter_flag)
Printf(getter_setter_name,"set"); Printf(getter_setter_name,"set");
@ -1030,7 +1029,7 @@ class CSHARP : public Language {
base = Nextitem(baselist); base = Nextitem(baselist);
if (base) { if (base) {
Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, input_file, line_number, Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, input_file, line_number,
"Warning for %s: Base %s ignored. Multiple inheritance is not supported in Java.\n", shadow_classname, Getattr(base,"name")); "Warning for %s: Base %s ignored. Multiple inheritance is not supported in C#.\n", shadow_classname, Getattr(base,"name"));
} }
} }
@ -1042,7 +1041,7 @@ class CSHARP : public Language {
const String *pure_java_baseclass = javaTypemapLookup("javabase", shadow_classname, WARN_NONE); const String *pure_java_baseclass = javaTypemapLookup("javabase", shadow_classname, WARN_NONE);
if (Len(pure_java_baseclass) > 0 && Len(baseclass) > 0) { if (Len(pure_java_baseclass) > 0 && Len(baseclass) > 0) {
Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, input_file, line_number, Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, input_file, line_number,
"Warning for %s: Base %s ignored. Multiple inheritance is not supported in Java.\n", shadow_classname, pure_java_baseclass); "Warning for %s: Base %s ignored. Multiple inheritance is not supported in C#.\n", shadow_classname, pure_java_baseclass);
} }
// Pure Java interfaces // Pure Java interfaces
@ -1890,8 +1889,6 @@ class CSHARP : public Language {
} }
String *arg = (!pn || (count > 1)) ? NewStringf("arg%d",arg_num) : Copy(Getattr(p,"name")); String *arg = (!pn || (count > 1)) ? NewStringf("arg%d",arg_num) : Copy(Getattr(p,"name"));
checkReserved(arg);
return arg; return arg;
} }
@ -2036,15 +2033,6 @@ class CSHARP : public Language {
} }
} }
void checkReserved(String *name) {
if (name) {
if (Strcmp(name,"string")==0) {
Push(name,"_");
}
}
}
}; /* class CSHARP */ }; /* class CSHARP */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------