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

Fix previous commit adding moduleimports option

Browse source
This commit is contained in:
William S Fulton 2016-12-03 15:28:18 +00:00
commit bed5e5c105
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/Modules/python.cxx
View file

@ -44,7 +44,7 @@ static File *f_shadow_py = 0;
static String *f_shadow = 0; static String *f_shadow = 0;
static String *f_shadow_begin = 0; static String *f_shadow_begin = 0;
static Hash *f_shadow_imports = 0; static Hash *f_shadow_imports = 0;
static String *f_shadow_builtin_imports = 0; static String *f_shadow_after_begin = 0;
static String *f_shadow_stubs = 0; static String *f_shadow_stubs = 0;
static Hash *builtin_getset = 0; static Hash *builtin_getset = 0;
static Hash *builtin_closures = 0; static Hash *builtin_closures = 0;
@ -799,7 +799,7 @@ public:
f_shadow = NewString(""); f_shadow = NewString("");
f_shadow_begin = NewString(""); f_shadow_begin = NewString("");
f_shadow_imports = NewHash(); f_shadow_imports = NewHash();
f_shadow_builtin_imports = NewString(""); f_shadow_after_begin = NewString("");
f_shadow_stubs = NewString(""); f_shadow_stubs = NewString("");
Swig_register_filebyname("shadow", f_shadow); Swig_register_filebyname("shadow", f_shadow);
@ -811,13 +811,13 @@ public:
// follow PEP257 rules: https://www.python.org/dev/peps/pep-0257/ // follow PEP257 rules: https://www.python.org/dev/peps/pep-0257/
// reported by pep257: https://github.com/GreenSteam/pep257 // reported by pep257: https://github.com/GreenSteam/pep257
bool multi_line_ds = Strchr(mod_docstring, '\n') != 0; bool multi_line_ds = Strchr(mod_docstring, '\n') != 0;
Printv(f_shadow, triple_double, multi_line_ds ? "\n":"", mod_docstring, multi_line_ds ? "\n":"", triple_double, "\n\n", NIL); Printv(f_shadow_after_begin, triple_double, multi_line_ds ? "\n":"", mod_docstring, multi_line_ds ? "\n":"", triple_double, "\n\n", NIL);
} }
Delete(mod_docstring); Delete(mod_docstring);
mod_docstring = NULL; mod_docstring = NULL;
} }
Printv(default_import_code, "from sys import version_info as _swig_python_version_info\n", NULL); Printv(default_import_code, "\nfrom sys import version_info as _swig_python_version_info\n", NULL);
if (!builtin && fastproxy) { if (!builtin && fastproxy) {
Printv(default_import_code, "if _swig_python_version_info >= (3, 0, 0):\n", NULL); Printv(default_import_code, "if _swig_python_version_info >= (3, 0, 0):\n", NULL);
@ -1053,13 +1053,14 @@ public:
Printv(f_shadow, "# This file is compatible with both classic and new-style classes.\n", NIL); Printv(f_shadow, "# This file is compatible with both classic and new-style classes.\n", NIL);
} }
Printv(f_shadow_py, "\n", f_shadow_begin, "\n", NIL); Printv(f_shadow_py, "\n", f_shadow_begin, "\n", NIL);
Printv(f_shadow_py, "\n", f_shadow_after_begin, "\n", NIL);
if (moduleimport) { if (moduleimport) {
Replaceall(moduleimport, "$module", module); Replaceall(moduleimport, "$module", module);
Printv(f_shadow_py, moduleimport, NIL); Printv(f_shadow_py, "\n", moduleimport, NIL);
} else { } else {
Printv(f_shadow_py, default_import_code, NIL); Printv(f_shadow_py, default_import_code, NIL);
} }
Printv(f_shadow_py, "\n", f_shadow, "\n", NIL); Printv(f_shadow_py, f_shadow, "\n", NIL);
Printv(f_shadow_py, f_shadow_stubs, "\n", NIL); Printv(f_shadow_py, f_shadow_stubs, "\n", NIL);
Delete(f_shadow_py); Delete(f_shadow_py);
} }
@ -1083,6 +1084,8 @@ public:
Wrapper_pretty_print(f_init, f_begin); Wrapper_pretty_print(f_init, f_begin);
Delete(default_import_code); Delete(default_import_code);
Delete(f_shadow_after_begin);
Delete(f_shadow_imports);
Delete(f_shadow_begin); Delete(f_shadow_begin);
Delete(f_shadow); Delete(f_shadow);
Delete(f_header); Delete(f_header);
@ -1393,7 +1396,7 @@ public:
String *_import = import_directive_string(package, pkg, modname, "_"); String *_import = import_directive_string(package, pkg, modname, "_");
if (!GetFlagAttr(f_shadow_imports, _import)) { if (!GetFlagAttr(f_shadow_imports, _import)) {
String *import = import_directive_string(package, pkg, modname); String *import = import_directive_string(package, pkg, modname);
Printf(builtin ? f_shadow_builtin_imports : f_shadow, "%s", import); Printf(builtin ? f_shadow_after_begin : f_shadow, "%s", import);
Delete(import); Delete(import);
SetFlag(f_shadow_imports, _import); SetFlag(f_shadow_imports, _import);
} }