Skip to content

Merge call in visit_Expr() with visit_Call() #2306

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

Merge call in visit_Expr() with visit_Call() #2306

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cffd70
ASR: Remove unneeded ignore_return_value argument
ubaidsk Aug 27, 2023
4f6c5cf
ASR: Merge visit_Call() in visit_Expr() with visit_Call()
ubaidsk Aug 27, 2023
f5b0559
TEST: For user-defined func called as subroutine
ubaidsk Aug 27, 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
ASR: Remove unneeded ignore_return_value argument
  • Loading branch information
@ubaidsk
ubaidsk committed Aug 27, 2023
commit 0cffd70cfd13c5d8db61c93a9a8ede7ef519a4c5
15 changes: 5 additions & 10 deletions src/lpython/semantics/python_ast_to_asr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
// generic symbol then it changes the name accordingly.
ASR::asr_t* make_call_helper(Allocator &al, ASR::symbol_t* s, SymbolTable *current_scope,
Vec<ASR::call_arg_t> args, std::string call_name, const Location &loc,
bool ignore_return_value=false, AST::expr_t** pos_args=nullptr, size_t n_pos_args=0,
AST::expr_t** pos_args=nullptr, size_t n_pos_args=0,
AST::keyword_t* kwargs=nullptr, size_t n_kwargs=0) {
if (intrinsic_node_handler.is_present(call_name)) {
return intrinsic_node_handler.get_intrinsic_node(call_name, al, loc,
Expand Down Expand Up @@ -1293,7 +1293,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
new_call_arg.loc = args.p[i].loc;
new_args.push_back(al, new_call_arg);
}
return make_call_helper(al, t, current_scope, new_args, new_call_name, loc, ignore_return_value);
return make_call_helper(al, t, current_scope, new_args, new_call_name, loc);
}
if (args.size() != func->n_args) {
std::string fnd = std::to_string(args.size());
Expand Down Expand Up @@ -1326,14 +1326,9 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
visit_expr_list_with_cast(func->m_args, func->n_args, args_new, args,
!ASRUtils::is_intrinsic_function2(func));
dependencies.push_back(al, ASRUtils::symbol_name(stemp));
ASR::asr_t* func_call_asr = ASRUtils::make_FunctionCall_t_util(al, loc, stemp,
return ASRUtils::make_FunctionCall_t_util(al, loc, stemp,
s_generic, args_new.p, args_new.size(),
a_type, value, nullptr);
if( ignore_return_value ) {
return make_dummy_assignment(ASRUtils::EXPR(func_call_asr));
} else {
return func_call_asr;
}
} else {
Vec<ASR::call_arg_t> args_new;
args_new.reserve(al, func->n_args);
Expand Down Expand Up @@ -6761,7 +6756,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
x.base.base.loc);
}
tmp = make_call_helper(al, s, current_scope, args, call_name,
x.base.base.loc, true, c->m_args, c->n_args, c->m_keywords,
x.base.base.loc, c->m_args, c->n_args, c->m_keywords,
c->n_keywords);
return;
}
Expand Down Expand Up @@ -7860,7 +7855,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {

parse_args(x, args);
tmp = make_call_helper(al, s, current_scope, args, call_name, x.base.base.loc,
false, x.m_args, x.n_args, x.m_keywords, x.n_keywords);
x.m_args, x.n_args, x.m_keywords, x.n_keywords);
}

void visit_Global(const AST::Global_t &/*x*/) {
Expand Down