Skip to content

add IGRAPH_R_CHECK #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ntamas merged 1 commit into from
Apr 3, 2023
Merged

add IGRAPH_R_CHECK #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/stimulus/generators/r.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ def handle_argument_check(param: ParamSpec) -> str:
## completely ignored, so giving an empty CALL field is
## different than not giving it at all.

out.write(" on.exit( .Call(C_R_igraph_finalizer) )\n")
out.write(" on.exit( .Call(R_igraph_finalizer) )\n")
out.write(" # Function call\n")
out.write(" res <- .Call(C_R_" + function + ", ")
out.write(" res <- .Call(R_" + function + ", ")

parts = []
for param in spec.iter_input_parameters():
Expand Down Expand Up @@ -464,9 +464,11 @@ def chunk_call(self, desc: FunctionDescriptor) -> str:
calls.append(call)

calls = ", ".join(calls)
res = f" {desc.name}({calls});\n"
if not desc.has_output_parameter:
res = f" c_result={res}"
res = ""
if desc.has_output_parameter:
res = f" IGRAPH_R_CHECK({desc.name}({calls}));\n"
else:
res = f" c_result={desc.name}({calls});\n"

return res

Expand Down Expand Up @@ -531,7 +533,7 @@ def do_par(param: ParamSpec) -> str:
for index, param in enumerate(retpars)
]
names = [
f' SET_STRING_ELT(r_names, {index}, CREATE_STRING_VECTOR("{param.name_in_higher_level_interface}"));'
f' SET_STRING_ELT(r_names, {index}, Rf_mkChar("{param.name_in_higher_level_interface}"));'
for index, param in enumerate(retpars)
]
ret = "\n".join(
Expand Down