Skip to content

Support/Enforce dtype for empty() #2294

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

Support/Enforce dtype for empty() #2294

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9b99b13
ASR: Process shape and dtype in empty()
ubaidsk Aug 24, 2023
5eab8a7
ASR: Support ListConstant in fill_dims_for_asr_type()
ubaidsk Aug 24, 2023
fd78f27
ASR: Check for dims as well when comparing types
ubaidsk Aug 24, 2023
a053339
ASRUtils: Simple and (hopefully) robust dims comparison
ubaidsk Aug 24, 2023
f0b6ee1
ASRUtils: Support constructing string for multi-dims
ubaidsk Aug 24, 2023
455de7e
ASR: Support struct types in empty()
ubaidsk Aug 24, 2023
b36a37d
PASS: Support extracting arr size from ttype_t in implied_do_loops
ubaidsk Aug 24, 2023
eaec0ac
ASR: Support TypeParameter in numpy2lpythontypes
ubaidsk Aug 24, 2023
26a5b35
ASRUtils: Support TypeParameter in types_equal()
ubaidsk Aug 24, 2023
5171314
ASR: Support runtime dimensions for allocatable targets
ubaidsk Aug 27, 2023
c59961b
ASR: Merge assign_ast_target, ann_assign_target_type to assign_asr_ta…
ubaidsk Aug 27, 2023
ca516bc
ASR: Support Allocate statement using empty()
ubaidsk Aug 28, 2023
a6741b5
ASRUtils: Support ListConstant in is_value_constant()
ubaidsk Aug 28, 2023
8d6a579
TEST: Fix tests to use dtype in empty()
ubaidsk Aug 24, 2023
976905f
TEST: Fix error tests to use dtype
ubaidsk Aug 24, 2023
289e6e2
TEST: Make err bound less stricter for elemental_02
ubaidsk Aug 24, 2023
a3151c6
ASRUtils: Do not encode start dimensions
ubaidsk Aug 28, 2023
d0b31d5
TEST: Update reference tests
ubaidsk Aug 24, 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
Prev Previous commit
Next Next commit
ASR: Merge assign_ast_target, ann_assign_target_type to assign_asr_ta… 
…rget
  • Loading branch information
@ubaidsk
ubaidsk committed Aug 28, 2023
commit c59961b8843519eca169846ad980dd40c9ec73a2
51 changes: 25 additions & 26 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 @@ -496,8 +496,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
current_body does not exist for Modules, ClassDef/Structs.
*/
Vec<ASR::stmt_t*> *current_body;
ASR::ttype_t* ann_assign_target_type;
AST::expr_t* assign_ast_target;
ASR::expr_t* assign_asr_target;

std::map<std::string, int> generic_func_nums;
std::map<std::string, std::map<std::string, ASR::ttype_t*>> generic_func_subs;
Expand Down Expand Up @@ -534,8 +533,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
std::vector<std::string> import_paths, bool allow_implicit_casting_)
: diag{diagnostics}, al{al}, lm{lm}, current_scope{symbol_table}, main_module{main_module}, module_name{module_name},
ast_overload{ast_overload}, parent_dir{parent_dir}, import_paths{import_paths},
current_body{nullptr}, ann_assign_target_type{nullptr},
assign_ast_target{nullptr}, allow_implicit_casting{allow_implicit_casting_} {
current_body{nullptr}, assign_asr_target{nullptr}, allow_implicit_casting{allow_implicit_casting_} {
current_module_dependencies.reserve(al, 4);
global_init.reserve(al, 1);
}
Expand Down Expand Up @@ -1177,8 +1175,9 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
}

if (call_name == "list" && (args.size() == 0 || args[0].m_value == nullptr)) {
if (ann_assign_target_type) {
ASR::ttype_t *type = ASRUtils::get_contained_type(ann_assign_target_type);
if (assign_asr_target) {
ASR::ttype_t *type = ASRUtils::get_contained_type(
ASRUtils::type_get_past_const(ASRUtils::expr_type(assign_asr_target)));
ASR::ttype_t* list_type = ASRUtils::TYPE(ASR::make_List_t(al, loc, type));
Vec<ASR::expr_t*> list;
list.reserve(al, 1);
Expand Down Expand Up @@ -2821,8 +2820,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
}
this->visit_expr(*x.m_args[0]);
ASR::expr_t* cptr = ASRUtils::EXPR(tmp);
this->visit_expr(*assign_ast_target);
ASR::expr_t* pptr = ASRUtils::EXPR(tmp);
ASR::expr_t* pptr = assign_asr_target;
ASR::expr_t* target_shape = nullptr;
if( x.n_args == 3 ) {
this->visit_expr(*x.m_args[2]);
Expand Down Expand Up @@ -3020,8 +3018,6 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
handle_lambda_function_declaration(var_name, fn_type, x.m_value, x.base.base.loc);
return;
}
ASR::ttype_t* ann_assign_target_type_copy = ann_assign_target_type;
ann_assign_target_type = type;
if( ASR::is_a<ASR::Struct_t>(*type) &&
wrap_derived_type_in_pointer ) {
type = ASRUtils::TYPE(ASR::make_Pointer_t(al, type->base.loc, type));
Expand All @@ -3035,6 +3031,10 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
create_add_variable_to_scope(var_name, type,
x.base.base.loc, abi, storage_type);

ASR::expr_t* assign_asr_target_copy = assign_asr_target;
this->visit_expr(*x.m_target);
assign_asr_target = ASRUtils::EXPR(tmp);

if( !init_expr ) {
tmp = nullptr;
if (x.m_value) {
Expand Down Expand Up @@ -3086,7 +3086,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
ASR::is_a<ASR::CPtrToPointer_t>(*ASR::down_cast<ASR::stmt_t>(tmp))) ) {
tmp = nullptr;
}
ann_assign_target_type = ann_assign_target_type_copy;
assign_asr_target = assign_asr_target_copy;
}

void visit_ClassMembers(const AST::ClassDef_t& x,
Expand Down Expand Up @@ -5063,8 +5063,6 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
// We treat this as a declaration
std::string var_name;
std::string var_annotation;
AST::expr_t* assign_ast_target_copy = assign_ast_target;
assign_ast_target = x.m_target;
if (AST::is_a<AST::Name_t>(*x.m_target)) {
AST::Name_t *n = AST::down_cast<AST::Name_t>(x.m_target);
var_name = n->m_id;
Expand All @@ -5085,7 +5083,6 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
}
ASR::expr_t *init_expr = nullptr;
visit_AnnAssignUtil(x, var_name, init_expr);
assign_ast_target = assign_ast_target_copy;
}

void visit_Delete(const AST::Delete_t &x) {
Expand Down Expand Up @@ -5250,10 +5247,11 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {

void visit_Assign(const AST::Assign_t &x) {
ASR::expr_t *target, *assign_value = nullptr, *tmp_value;
AST::expr_t* assign_ast_target_copy = assign_ast_target;
assign_ast_target = x.m_targets[0];
ASR::expr_t* assign_asr_target_copy = assign_asr_target;
this->visit_expr(*x.m_targets[0]);
assign_asr_target = ASRUtils::EXPR(tmp);
this->visit_expr(*x.m_value);
assign_ast_target = assign_ast_target_copy;
assign_asr_target = assign_asr_target_copy;
if (tmp) {
if (ASR::is_a<ASR::stmt_t>(*tmp)) {
// This happens for c_p_pointer()
Expand Down Expand Up @@ -5406,11 +5404,12 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
list.push_back(al, expr);
}
} else {
if( ann_assign_target_type == nullptr ) {
if( assign_asr_target == nullptr ) {
tmp = nullptr;
return ;
}
type = ASRUtils::get_contained_type(ann_assign_target_type);
type = ASRUtils::get_contained_type(
ASRUtils::type_get_past_const(ASRUtils::expr_type(assign_asr_target)));
}
ASR::ttype_t* list_type = ASRUtils::TYPE(ASR::make_List_t(al, x.base.base.loc, type));
tmp = ASR::make_ListConstant_t(al, x.base.base.loc, list.p,
Expand Down Expand Up @@ -6190,9 +6189,9 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
void visit_Dict(const AST::Dict_t &x) {
LCOMPILERS_ASSERT(x.n_keys == x.n_values);
if( x.n_keys == 0 ) {
if( ann_assign_target_type != nullptr ) {
if( assign_asr_target != nullptr ) {
tmp = ASR::make_DictConstant_t(al, x.base.base.loc, nullptr, 0,
nullptr, 0, ann_assign_target_type);
nullptr, 0, ASRUtils::expr_type(assign_asr_target));
}
else {
tmp = nullptr;
Expand Down Expand Up @@ -6584,10 +6583,10 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
if( ASR::is_a<ASR::Const_t>(*target_type) ) {
target_type = ASRUtils::get_contained_type(target_type);
}
ASR::ttype_t* ann_assign_target_type_copy = ann_assign_target_type;
ann_assign_target_type = target_type;
ASR::expr_t* assign_asr_target_copy = assign_asr_target;
assign_asr_target = target;
this->visit_expr(*x.m_value);
ann_assign_target_type = ann_assign_target_type_copy;
assign_asr_target = assign_asr_target_copy;
ASR::expr_t *value = ASRUtils::EXPR(tmp);
ASR::ttype_t *value_type = ASRUtils::expr_type(value);
if( ASR::is_a<ASR::Const_t>(*value_type) ) {
Expand Down Expand Up @@ -7567,8 +7566,8 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
// TODO: check that `empty_c_void_p uses` has arguments that are compatible
// with the type
ASR::ttype_t* type;
if (ann_assign_target_type) {
type = ann_assign_target_type;
if (assign_asr_target) {
type = ASRUtils::expr_type(assign_asr_target);
} else {
type = ASRUtils::TYPE(ASR::make_CPtr_t(al, x.base.base.loc));
}
Expand Down