Skip to content
Snippets Groups Projects
Commit 7124f04d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

print full name of function (including namespace) in comment to make header file easier to search

parent 82013059
No related branches found
No related tags found
No related merge requests found
...@@ -1146,27 +1146,30 @@ class API: ...@@ -1146,27 +1146,30 @@ class API:
return module return module
def write_cpp(self): def write_cpp(self):
def write_module(module, indent): def write_module(module, indent, cpp_mpath):
cpp_mpath += module.name + "::"
f.write(indent + "namespace " + module.name + " { // " + f.write(indent + "namespace " + module.name + " { // " +
capi(module.doc) + "\n\n") capi(module.doc) + "\n\n")
indent += " " indent += " "
for rtype, name, args, doc, special in module.fs: for rtype, name, args, doc, special in module.fs:
rt = rtype.rcpp_type if rtype else "void"
f.write(indent + "// " + cpp_mpath + name + "\n" + indent + "//\n")
f.write(indent + "// " + ("\n" + indent + "// ").join( f.write(indent + "// " + ("\n" + indent + "// ").join(
textwrap.wrap(doc, 80-len(indent))) + "\n") textwrap.wrap(doc, 80-len(indent))) + "\n")
rt = rtype.rcpp_type if rtype else "void"
fnameapi = indent + ns.upper() + "_API " + rt + " " + name + "("; fnameapi = indent + ns.upper() + "_API " + rt + " " + name + "(";
f.write(fnameapi) f.write(fnameapi)
if args: if args:
f.write((",\n" + ' ' * len(fnameapi)).join(a.cpp for a in args)) f.write((",\n" + ' ' * len(fnameapi)).join(a.cpp for a in args))
f.write(");\n\n") f.write(");\n\n")
for m in module.submodules: for m in module.submodules:
write_module(m, indent) write_module(m, indent, cpp_mpath)
f.write(indent[:-2] + "} // namespace " + module.name + "\n\n") f.write(indent[:-2] + "} // namespace " + module.name + "\n\n")
with open(ns + ".h", "w") as f: with open(ns + ".h", "w") as f:
f.write(cpp_header.format(self.copyright, self.issues, ns.upper(), self.code, f.write(cpp_header.format(self.copyright, self.issues, ns.upper(), self.code,
self.version_major, self.version_minor, ns)) self.version_major, self.version_minor, ns))
for m in self.modules: for m in self.modules:
write_module(m, "") write_module(m, "", "")
f.write(cpp_footer) f.write(cpp_footer)
def write_c(self): def write_c(self):
...@@ -1183,7 +1186,8 @@ class API: ...@@ -1183,7 +1186,8 @@ class API:
# *c.h # *c.h
fname = c_namespace + name[0].upper() + name[1:] fname = c_namespace + name[0].upper() + name[1:]
f.write("\n/* " + "\n * ".join(textwrap.wrap(doc, 75)) + " */\n") f.write("\n/* " + "\n * ".join(textwrap.wrap(doc, 75)) + " */\n")
fnameapi = ns.upper() + "_API " + (rtype.rc_type if rtype else "void") + " " + fname + "(" fnameapi = ns.upper() + "_API " + (rtype.rc_type if rtype else
"void") + " " + fname + "("
f.write(fnameapi f.write(fnameapi
+ (",\n" + ' ' * len(fnameapi)).join( + (",\n" + ' ' * len(fnameapi)).join(
list((a.c for a in args + (oint("ierr"), )))) list((a.c for a in args + (oint("ierr"), ))))
...@@ -1293,7 +1297,8 @@ class API: ...@@ -1293,7 +1297,8 @@ class API:
for a in args: for a in args:
if a.python_pre: f.write(indent + a.python_pre + "\n") if a.python_pre: f.write(indent + a.python_pre + "\n")
f.write(indent + "ierr = c_int()\n") f.write(indent + "ierr = c_int()\n")
f.write(indent + "api__result__ = " if ((rtype is oint) or (rtype is odouble)) else (indent)) f.write(indent + "api__result__ = " if ((rtype is oint) or
(rtype is odouble)) else (indent))
c_name = modulepath + name[0].upper() + name[1:] c_name = modulepath + name[0].upper() + name[1:]
f.write("lib." + c_name + "(\n " + indent + f.write("lib." + c_name + "(\n " + indent +
(",\n" + indent + " ").join( (",\n" + indent + " ").join(
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment