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

Various cleanup.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@629 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-08-07 21:18:24 +00:00
commit 27eee69dbd
6 changed files with 104 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,8 +467,8 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
i = 0;
int j = 0;
p = Firstitem(l);
for (i = 0; i < pcount; ++i) {
Parm *p = Getitem(l,i);
DataType *pt = Gettype(p);
char *pn = Getname(p);
@ -520,6 +520,7 @@ GUILE::create_function (char *name, char *iname, DataType *d, ParmList *l)
Printv(cleanup, tm, "\n", 0);
mreplace (cleanup, argnum, arg, proc_name);
}
p = Nextitem(l);
}
// Now write code to make the function call

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

@ -538,6 +538,7 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
DOHString *cleanup, *outarg, *body;
char *javaReturnSignature = 0;
DOHString *javaParameterSignature;
Parm *p;
cleanup = NewString("");
outarg = NewString("");
@ -593,8 +594,8 @@ void JAVA::create_function(char *name, char *iname, DataType *t, ParmList *l)
int gencomma = 0;
// Now walk the function parameter list and generate code to get arguments
for (int i = 0; i < pcount ; i++) {
Parm *p = Getitem(l,i); // Get the ith argument
p = Firstitem(l);
for (int i = 0; i < pcount ; i++, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);
char *target_copy = NULL;
@ -1077,8 +1078,8 @@ void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
int pcount = Len(l);
for (int i = 0; i < pcount ; i++) {
Parm *p = Getitem(l,i); // Get the ith argument
Parm *p = Firstitem(l);
for (int i = 0; i < pcount ; i++, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);
@ -1150,8 +1151,8 @@ void JAVA::cpp_static_func(char *name, char *iname, DataType *t, ParmList *l) {
int pcount = Len(l);
int gencomma = 0;
for (int i = 0; i < pcount ; i++) {
Parm *p = Getitem(l,i); // Get the ith argument
Parm *p = Firstitem(l);
for (int i = 0; i < pcount ; i++, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);
@ -1218,8 +1219,8 @@ void JAVA::cpp_constructor(char *name, char *iname, ParmList *l) {
if(pcount == 0) // We must have a default constructor
have_default_constructor = 1;
for (int i = 0; i < pcount ; i++) {
Parm *p = Getitem(l,i); // Get the ith argument
Parm *p = Firstitem(l);
for (int i = 0; i < pcount ; i++, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);

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

@ -281,7 +281,7 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
Wrapper *f;
DOHString *cleanup = 0;
DOHString *proc_name = 0;
Parm *p;
DOHString *outarg = 0;
int argout_set = 0;
@ -321,8 +321,8 @@ MZSCHEME::create_function (char *name, char *iname, DataType *d, ParmList *l)
// Now write code to extract the parameters (this is super ugly)
int i = 0;
for (i = 0; i < pcount; ++i) {
Parm *p = Getitem(l,i);
p = Firstitem(l);
for (i = 0; i < pcount; ++i, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);

28
SWIG/Source/Modules1.1/ruby.cxx
View file

@ -441,8 +441,10 @@ void RUBY::create_function(char *name, char *iname, DataType *t, ParmList *l) {
int numreq = 0;
int numoptreal = 0;
for (i = start; i < Len(l); i++) {
if (!Getignore(Getitem(l,i))) {
Parm *p = Firstitem(l);
for (i = 0; i < start; i++) p = Nextitem(l);
for (i = start; p; i++, p = Nextitem(l)) {
if (!Getignore(p)) {
if (i >= Len(l) - numopt) numoptreal++;
else numreq++;
}
@ -455,8 +457,10 @@ void RUBY::create_function(char *name, char *iname, DataType *t, ParmList *l) {
Printv(f->def, "int argc, VALUE *argv, VALUE self",0);
} else {
Printv(f->def, "VALUE self", 0);
for (i = start; i < Len(l); i++) {
if (!Getignore(Getitem(l,i))) {
p = Firstitem(l);
for (i = 0; i < start; i++) p = Nextitem(l);
for (i = start; p; i++, p = Nextitem(l)) {
if (!Getignore(p)) {
Printf(f->def,", VALUE varg%d", i);
}
}
@ -465,8 +469,10 @@ void RUBY::create_function(char *name, char *iname, DataType *t, ParmList *l) {
// Emit all of the local variables for holding arguments.
if (vararg) {
for (i = start; i < Len(l); i++) {
if (!Getignore(Getitem(l,i))) {
p = Firstitem(l);
for (i = 0; i < start; i++) p = Nextitem(l);
for (i = start; p; i++, p = Nextitem(l)) {
if (!Getignore(p)) {
char s[256];
sprintf(s,"varg%d",i);
Wrapper_add_localv(f,s,"VALUE",s,0);
@ -495,8 +501,10 @@ void RUBY::create_function(char *name, char *iname, DataType *t, ParmList *l) {
// Emit count to check the number of arguments
if (vararg) {
Printf(f->code," rb_scan_args(argc, argv, \"%d%d\"", (numarg-numoptreal), numoptreal);
for (i = start; i < Len(l); i++) {
if (!Getignore(Getitem(l,i))) {
p = Firstitem(l);
for (i = 0; i < start; i++) p = Nextitem(l);
for (i = start; p; i++, p = Nextitem(l)) {
if (!Getignore(p)) {
Printf(f->code,", &varg%d", i);
}
}
@ -507,8 +515,8 @@ void RUBY::create_function(char *name, char *iname, DataType *t, ParmList *l) {
// to get arguments
int j = 0; // Total number of non-optional arguments
for (i = 0; i < pcount ; i++) {
Parm *p = Getitem(l,i);
p = Firstitem(l);
for (i = 0; i < pcount ; i++, p = Nextitem(l)) {
DataType *pt = Gettype(p);
char *pn = Getname(p);