Skip to content

C: Fixes from LFortran #2289

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
certik merged 3 commits into from
Aug 22, 2023
Merged

C: Fixes from LFortran #2289

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
775b438
C: Fixes for param inout from LFortran
ubaidsk Aug 22, 2023
46dc1b6
TEST: Fix failing test
ubaidsk Aug 22, 2023
1954d73
TEST: Update reference tests
ubaidsk Aug 22, 2023
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
Next Next commit
C: Fixes for param inout from LFortran
  • Loading branch information
@ubaidsk
ubaidsk committed Aug 22, 2023
commit 775b438f84945f26b19e68c241d71d1a456640ef
36 changes: 25 additions & 11 deletions src/libasr/codegen/asr_to_c_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,15 +1041,21 @@ PyMODINIT_FUNC PyInit_lpython_module_)" + fn_name + R"((void) {
this->visit_expr(*x.m_arg);
}

std::string construct_call_args(size_t n_args, ASR::call_arg_t* m_args) {
std::string construct_call_args(ASR::Function_t* f, size_t n_args, ASR::call_arg_t* m_args) {
bracket_open++;
std::string args = "";
for (size_t i=0; i<n_args; i++) {
self().visit_expr(*m_args[i].m_value);
ASR::ttype_t* type = ASRUtils::expr_type(m_args[i].m_value);
if (ASR::is_a<ASR::Var_t>(*m_args[i].m_value)) {
if( ASRUtils::is_array(type) &&
ASRUtils::is_pointer(type) ) {
if (ASR::is_a<ASR::Var_t>(*m_args[i].m_value) &&
ASR::is_a<ASR::Variable_t>(
*(ASR::down_cast<ASR::Var_t>(m_args[i].m_value)->m_v))) {
ASR::Variable_t* param = ASRUtils::EXPR2VAR(f->m_args[i]);
if( (ASRUtils::is_array(type) &&
ASRUtils::is_pointer(type))
|| (is_c && (param->m_intent == ASRUtils::intent_inout
|| param->m_intent == ASRUtils::intent_out)
&& !ASRUtils::is_aggregate_type(param->m_type))) {
args += "&" + src;
} else {
args += src;
Expand Down Expand Up @@ -1107,7 +1113,7 @@ PyMODINIT_FUNC PyInit_lpython_module_)" + fn_name + R"((void) {
+ "' not implemented");
}
} else {
src = fn_name + "(" + construct_call_args(x.n_args, x.m_args) + ")";
src = fn_name + "(" + construct_call_args(fn, x.n_args, x.m_args) + ")";
}
last_expr_precedence = 2;
if( ASR::is_a<ASR::List_t>(*x.m_type) ) {
Expand Down Expand Up @@ -1762,11 +1768,19 @@ PyMODINIT_FUNC PyInit_lpython_module_)" + fn_name + R"((void) {
return;
}
ASR::Variable_t* sv = ASR::down_cast<ASR::Variable_t>(s);
if( (sv->m_intent == ASRUtils::intent_in ||
sv->m_intent == ASRUtils::intent_inout) &&
is_c && ASRUtils::is_array(sv->m_type) &&
ASRUtils::is_pointer(sv->m_type)) {
src = "(*" + std::string(ASR::down_cast<ASR::Variable_t>(s)->m_name) + ")";
if (is_c) {
if ((sv->m_intent == ASRUtils::intent_in
|| sv->m_intent == ASRUtils::intent_inout)
&& ASRUtils::is_array(sv->m_type)
&& ASRUtils::is_pointer(sv->m_type)) {
src = "(*" + std::string(ASR::down_cast<ASR::Variable_t>(s)->m_name) + ")";
} else if ((sv->m_intent == ASRUtils::intent_inout
|| sv->m_intent == ASRUtils::intent_out)
&& !ASRUtils::is_aggregate_type(sv->m_type)) {
src = "(*" + std::string(ASR::down_cast<ASR::Variable_t>(s)->m_name) + ")";
} else {
src = std::string(ASR::down_cast<ASR::Variable_t>(s)->m_name);
}
} else {
src = std::string(ASR::down_cast<ASR::Variable_t>(s)->m_name);
}
Expand Down Expand Up @@ -2736,7 +2750,7 @@ PyMODINIT_FUNC PyInit_lpython_module_)" + fn_name + R"((void) {
if (sym_name == "main") {
sym_name = "_xx_lcompilers_changed_main_xx";
}
src = indent + sym_name + "(" + construct_call_args(x.n_args, x.m_args) + ");\n";
src = indent + sym_name + "(" + construct_call_args(s, x.n_args, x.m_args) + ");\n";
}

#define SET_INTRINSIC_NAME(X, func_name) \
Expand Down