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

avoid importing several times the same module

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7396 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-08-26 08:32:16 +00:00
commit d6363acffe
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
SWIG/Source/Modules/python.cxx
View file

@ -318,7 +318,7 @@ public:
Swig_register_filebyname("python",f_shadow); Swig_register_filebyname("python",f_shadow);
Printv(f_shadow_py, Printv(f_shadow_py,
"# This file was created automatically by SWIG.\n", "# This file was created automatically by SWIG ", PACKAGE_VERSION, ".\n",
"# Don't modify this file, modify the SWIG interface instead.\n", "# Don't modify this file, modify the SWIG interface instead.\n",
NIL); NIL);
@ -477,7 +477,7 @@ public:
String *modname = Getattr(n,"module"); String *modname = Getattr(n,"module");
if (modname) { if (modname) {
Printf(f_shadow_imports,"import "); String *import = NewString("import ");
// Find the module node for this imported module. It should be the // Find the module node for this imported module. It should be the
// first child but search just in case. // first child but search just in case.
@ -491,11 +491,16 @@ public:
Node *options = Getattr(mod, "options"); Node *options = Getattr(mod, "options");
String* pkg = options ? Getattr(options, "package") : 0; String* pkg = options ? Getattr(options, "package") : 0;
if (pkg && (!package || Strcmp(pkg, package) != 0)) { if (pkg && (!package || Strcmp(pkg, package) != 0)) {
Printf(f_shadow_imports, "%s.", pkg); Printf(import, "%s.", pkg);
} }
// finally, output the name of the imported module // finally, output the name of the imported module
Printf(f_shadow_imports, "%s\n", modname); Printf(import, "%s\n", modname);
if (!Strstr(f_shadow_imports, import)) {
Printf(f_shadow_imports, "%s", import);
}
Delete(import);
} }
} }
return Language::importDirective(n); return Language::importDirective(n);