Skip to content
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

Jump to bottom

Add dict.keys #2023

Merged
merged 6 commits into from
Jul 25, 2023
Merged

Add dict.keys #2023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ad9c8b
add dict keys
kabra1110 Jun 25, 2023
f28eaf0
fix dict keys and values for LP
kabra1110 Jul 8, 2023
493c859
modify test, incorrect
kabra1110 Jul 8, 2023
30b2cf6
Merge branch 'main' into dict_keys_values
kabra1110 Jul 20, 2023
24e4c25
add for SC
kabra1110 Jul 22, 2023
435562b
Merge branch 'main' into dict_keys_values
czgdp1807 Jul 25, 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
12 changes: 11 additions & 1 deletion src/libasr/asr_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,24 @@ static inline ASR::abiType symbol_abi(const ASR::symbol_t *f)
return ASR::abiType::Source;
}

static inline ASR::ttype_t* get_contained_type(ASR::ttype_t* asr_type) {
static inline ASR::ttype_t* get_contained_type(ASR::ttype_t* asr_type, int overload=0) {
switch( asr_type->type ) {
case ASR::ttypeType::List: {
return ASR::down_cast<ASR::List_t>(asr_type)->m_type;
}
case ASR::ttypeType::Set: {
return ASR::down_cast<ASR::Set_t>(asr_type)->m_type;
}
case ASR::ttypeType::Dict: {
switch( overload ) {
case 0:
return ASR::down_cast<ASR::Dict_t>(asr_type)->m_key_type;
case 1:
return ASR::down_cast<ASR::Dict_t>(asr_type)->m_value_type;
default:
return asr_type;
}
}
case ASR::ttypeType::Enum: {
ASR::Enum_t* enum_asr = ASR::down_cast<ASR::Enum_t>(asr_type);
ASR::EnumType_t* enum_type = ASR::down_cast<ASR::EnumType_t>(enum_asr->m_enum_type);
Expand Down
18 changes: 18 additions & 0 deletions src/libasr/codegen/asr_to_llvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,20 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
tmp = list_api->pop_position(plist, pos, asr_el_type, module.get(), name2memidx);
}

void generate_DictKeys(ASR::expr_t* m_arg) {
ASR::Dict_t* dict_type = ASR::down_cast<ASR::Dict_t>(
ASRUtils::expr_type(m_arg));

int64_t ptr_loads_copy = ptr_loads;
ptr_loads = 0;
this->visit_expr(*m_arg);
llvm::Value* pdict = tmp;

set_dict_api(dict_type);
ptr_loads = ptr_loads_copy;
tmp = llvm_utils->dict_api->get_key_list(pdict);
}

void visit_IntrinsicFunction(const ASR::IntrinsicFunction_t& x) {
switch (static_cast<ASRUtils::IntrinsicFunctions>(x.m_intrinsic_id)) {
case ASRUtils::IntrinsicFunctions::ListIndex: {
Expand Down Expand Up @@ -2115,6 +2129,10 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
}
break;
}
case ASRUtils::IntrinsicFunctions::DictKeys: {
generate_DictKeys(x.m_args[0]);
break;
}
case ASRUtils::IntrinsicFunctions::Exp: {
switch (x.m_overload_id) {
case 0: {
Expand Down
53 changes: 53 additions & 0 deletions src/libasr/pass/intrinsic_function_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ enum class IntrinsicFunctions : int64_t {
Partition,
ListReverse,
ListPop,
DictKeys,
SymbolicSymbol,
SymbolicAdd,
SymbolicSub,
Expand Down Expand Up @@ -1139,6 +1140,52 @@ static inline ASR::asr_t* create_ListPop(Allocator& al, const Location& loc,

} // namespace ListPop

namespace DictKeys {

static inline void verify_args(const ASR::IntrinsicFunction_t& x, diag::Diagnostics& diagnostics) {
ASRUtils::require_impl(x.n_args == 1, "Call to dict.keys must have no argument",
x.base.base.loc, diagnostics);
ASRUtils::require_impl(ASR::is_a<ASR::Dict_t>(*ASRUtils::expr_type(x.m_args[0])),
"Argument to dict.keys must be of dict type",
x.base.base.loc, diagnostics);
ASRUtils::require_impl(ASRUtils::check_equal_type(
ASRUtils::get_contained_type(x.m_type),
ASRUtils::get_contained_type(ASRUtils::expr_type(x.m_args[0]), 0)),
"Return type of dict.keys must be of list of dict key element type",
x.base.base.loc, diagnostics);
}

static inline ASR::expr_t *eval_dict_keys(Allocator &/*al*/,
const Location &/*loc*/, Vec<ASR::expr_t*>& /*args*/) {
// TODO: To be implemented for DictConstant expression
return nullptr;
}

static inline ASR::asr_t* create_DictKeys(Allocator& al, const Location& loc,
Vec<ASR::expr_t*>& args,
const std::function<void (const std::string &, const Location &)> err) {
if (args.size() != 1) {
err("Call to dict.keys must have no argument", loc);
}

ASR::expr_t* dict_expr = args[0];
ASR::ttype_t *type = ASRUtils::expr_type(dict_expr);
ASR::ttype_t *dict_keys_type = ASR::down_cast<ASR::Dict_t>(type)->m_key_type;

Vec<ASR::expr_t*> arg_values;
arg_values.reserve(al, args.size());
for( size_t i = 0; i < args.size(); i++ ) {
arg_values.push_back(al, ASRUtils::expr_value(args[i]));
}
ASR::expr_t* compile_time_value = eval_dict_keys(al, loc, arg_values);
ASR::ttype_t *to_type = List(dict_keys_type);
return ASR::make_IntrinsicFunction_t(al, loc,
static_cast<int64_t>(ASRUtils::IntrinsicFunctions::DictKeys),
args.p, args.size(), 0, to_type, compile_time_value);
}

} // namespace DictKeys

namespace Any {

static inline void verify_array(ASR::expr_t* array, ASR::ttype_t* return_type,
Expand Down Expand Up @@ -2212,6 +2259,8 @@ namespace IntrinsicFunctionRegistry {
{nullptr, &ListPop::verify_args}},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::ListReverse),
{nullptr, &ListReverse::verify_args}},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::DictKeys),
{nullptr, &DictKeys::verify_args}},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::SymbolicSymbol),
{nullptr, &SymbolicSymbol::verify_args}},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::SymbolicAdd),
Expand Down Expand Up @@ -2266,6 +2315,8 @@ namespace IntrinsicFunctionRegistry {
"list.reverse"},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::ListPop),
"list.pop"},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::DictKeys),
"dict.keys"},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::SymbolicSymbol),
"Symbol"},
{static_cast<int64_t>(ASRUtils::IntrinsicFunctions::SymbolicAdd),
Expand Down Expand Up @@ -2311,6 +2362,7 @@ namespace IntrinsicFunctionRegistry {
{"list.index", {&ListIndex::create_ListIndex, &ListIndex::eval_list_index}},
{"list.reverse", {&ListReverse::create_ListReverse, &ListReverse::eval_list_reverse}},
{"list.pop", {&ListPop::create_ListPop, &ListPop::eval_list_pop}},
{"dict.keys", {&DictKeys::create_DictKeys, &DictKeys::eval_dict_keys}},
{"Symbol", {&SymbolicSymbol::create_SymbolicSymbol, &SymbolicSymbol::eval_SymbolicSymbol}},
{"SymbolicAdd", {&SymbolicAdd::create_SymbolicAdd, &SymbolicAdd::eval_SymbolicAdd}},
{"SymbolicSub", {&SymbolicSub::create_SymbolicSub, &SymbolicSub::eval_SymbolicSub}},
Expand Down Expand Up @@ -2425,6 +2477,7 @@ inline std::string get_intrinsic_name(int x) {
INTRINSIC_NAME_CASE(Partition)
INTRINSIC_NAME_CASE(ListReverse)
INTRINSIC_NAME_CASE(ListPop)
INTRINSIC_NAME_CASE(DictKeys)
INTRINSIC_NAME_CASE(SymbolicSymbol)
INTRINSIC_NAME_CASE(SymbolicAdd)
INTRINSIC_NAME_CASE(SymbolicSub)
Expand Down
17 changes: 16 additions & 1 deletion src/lpython/semantics/python_attribute_eval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ struct AttributeHandler {
{"set@add", &eval_set_add},
{"set@remove", &eval_set_remove},
{"dict@get", &eval_dict_get},
{"dict@pop", &eval_dict_pop}
{"dict@pop", &eval_dict_pop},
{"dict@keys", &eval_dict_keys}
};

modify_attr_set = {"list@append", "list@remove",
Expand Down Expand Up @@ -388,6 +389,20 @@ struct AttributeHandler {
return make_DictPop_t(al, loc, s, args[0], value_type, nullptr);
}

static ASR::asr_t* eval_dict_keys(ASR::expr_t *s, Allocator &al, const Location &loc,
Vec<ASR::expr_t*> &args, diag::Diagnostics &/*diag*/) {
Vec<ASR::expr_t*> args_with_dict;
args_with_dict.reserve(al, args.size() + 1);
args_with_dict.push_back(al, s);
for(size_t i = 0; i < args.size(); i++) {
args_with_dict.push_back(al, args[i]);
}
ASRUtils::create_intrinsic_function create_function =
ASRUtils::IntrinsicFunctionRegistry::get_create_function("dict.keys");
return create_function(al, loc, args_with_dict, [&](const std::string &msg, const Location &loc)
{ throw SemanticError(msg, loc); });
}

}; // AttributeHandler

} // namespace LCompilers::LPython
Expand Down