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

Fixed SWIG go for cases when SWIG %import-s another package which is located in a subdirectory.

Browse source
This commit is contained in:
Misha Seltzer 2015-02-09 18:34:04 +02:00 • committed by Misha Seltzer
commit 8da4d20308
9 changed files with 135 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/Modules/go.cxx
View file

@ -554,7 +554,7 @@ private:
// Output module initialization code.
Printf(f_go_begin, "\npackage %s\n\n", package);
Printf(f_go_begin, "\npackage %s\n\n", getModuleName(package));
if (gccgo_flag) {
Printf(f_go_runtime, "func SwigCgocall()\n");
@ -2058,7 +2058,7 @@ private:
Printv(f_go_wrappers, "type ", name, " int\n", NULL);
} else {
String *nw = NewString("");
Printv(nw, imported_package, ".", name, NULL);
Printv(nw, getModuleName(imported_package), ".", name, NULL);
Setattr(n, "go:enumname", nw);
}
}
@ -5096,7 +5096,7 @@ private:
Setattr(undefined_types, t, t);
} else {
String *nw = NewString("");
Printv(nw, Getattr(cnmod, "name"), ".", ret, NULL);
Printv(nw, getModuleName(Getattr(cnmod, "name")), ".", ret, NULL);
Delete(ret);
ret = nw;
}
@ -5282,7 +5282,7 @@ private:
Append(ret, ex);
} else {
ret = NewString("");
Printv(ret, Getattr(cnmod, "name"), ".Swigcptr", ex, NULL);
Printv(ret, getModuleName(Getattr(cnmod, "name")), ".Swigcptr", ex, NULL);
}
}
Delete(ty);
@ -5603,6 +5603,21 @@ private:
return ret;
}
/* ----------------------------------------------------------------------
* getModuleName
*
* Return the name of a module. This is different from module path:
* "some/path/to/module" -> "module".
* ---------------------------------------------------------------------- */
String *getModuleName(String *module_path) {
char *suffix = strrchr(Char(module_path), '/');
if (suffix == NULL) {
return module_path;
}
return Str(suffix + 1);
}
}; /* class GO */
/* -----------------------------------------------------------------------------