Modifications to the module system

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@961 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2000-12-19 04:38:06 +00:00
commit d66f561cfc
20 changed files with 561 additions and 571 deletions

View file

@ -6,9 +6,9 @@ srcdir = @srcdir@
VPATH = @srcdir@
SRCS = map.c wrapfunc.c naming.c tree.c stype.c scanner.c include.c getopt.c misc.c \
parms.c cwrap.c typemap.c module.c
parms.c cwrap.c typemap.c module.c main.c
OBJS = map.o wrapfunc.o naming.o tree.o stype.o scanner.o include.o getopt.o misc.o \
parms.o cwrap.o typemap.o module.o
parms.o cwrap.o typemap.o module.o main.o
prefix = @prefix@
exec_prefix = @exec_prefix@

View file

@ -111,8 +111,6 @@ Swig_arg_error() {
Printf(stderr,"Use 'swig -help' for available options.\n");
exit(1);
}

View file

@ -182,7 +182,7 @@ DOH *Swig_run_modules(DOH *node) {
}
ml = Getattr(LoadedModules,tag);
if ((!ml) || (Len(ml) == 0)) {
Printf(stderr,"No module for object '%s'\n", tag);
Printf(stderr,"Internal error. No module defined for handling '%s'\n", tag);
return 0;
}
newnode = 0;
@ -192,7 +192,7 @@ DOH *Swig_run_modules(DOH *node) {
m = (Module *) Data(Getitem(ml,i));
assert(m);
newnode = (*m->startfunc)(node);
if (!newnode) return 0; /* Done */
if (!newnode) return node; /* Done */
newtag = Getattr(newnode,"tag");
if (!newtag) {
Printf(stderr,"Fatal error. Module '%s' returns untagged object.\n", m->modname);

View file

@ -424,7 +424,8 @@ extern void Swig_except_clear();
#define Getchild(x) Getattr(x,"child")
#define Setchild(x,c) Setattr(x,"child",c)
extern int Swig_main(int argc, char *argv[]);
extern int Swig_main(int argc, char **argv, char **modules);
extern void Swig_exit(int n);
#endif