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.

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

Add support for dict methods with Const #2567

Merged
merged 40 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4d833da
Implement attributes for `Const dict`
kmr-srbh Mar 2, 2024
3d65739
Remove duplicate changes
kmr-srbh Mar 3, 2024
7cd71db
Improve checking for `Const` types
kmr-srbh Mar 7, 2024
005fb72
Simplify type checking for `Const dict`.
kmr-srbh Mar 7, 2024
d7ea3bb
Merge branch 'main' into const-dict-methods
kmr-srbh Mar 8, 2024
161bd8e
Add tests
kmr-srbh Mar 10, 2024
e75755b
Update test
kmr-srbh Mar 10, 2024
1a068c8
Update fetching attribute name logic
kmr-srbh Mar 10, 2024
68524a4
Update test references
kmr-srbh Mar 10, 2024
6337279
Update fetching `dict_type`
kmr-srbh Mar 10, 2024
c422524
Formatting changes
kmr-srbh Mar 10, 2024
a047e71
Update test references
kmr-srbh Mar 10, 2024
9917227
Update error test references
kmr-srbh Mar 10, 2024
03d5998
Tests: Update test references
kmr-srbh Mar 10, 2024
01748f7
Merge branch 'main' into const-dict-methods
kmr-srbh Mar 10, 2024
22009cd
Tests: Add runtime tests and update test references
kmr-srbh Mar 10, 2024
3b3a272
Merge branch 'main' into const-dict-methods
kmr-srbh Mar 11, 2024
5b1dcd4
Merge branch 'main' into const-dict-methods
kmr-srbh Mar 18, 2024
848f3e0
Merge branch 'main' into const-dict-methods
kmr-srbh Mar 19, 2024
e53a8bc
Merge branch 'main' into const-dict-methods
kmr-srbh Apr 7, 2024
3b61a29
Merge branch 'main' into const-dict-methods
kmr-srbh Apr 21, 2024
74dd5ce
Merge branch 'main' into const-dict-methods
kmr-srbh Apr 30, 2024
737acb4
Remove checks on the absent `Const` node
kmr-srbh May 1, 2024
4a2942f
Remove call to `get_contained_type()`
kmr-srbh May 1, 2024
6f19980
Tests: Add tests and update references
kmr-srbh May 1, 2024
5988ca2
Merge branch 'main' into const-dict-methods
kmr-srbh May 1, 2024
634011c
Style changes
kmr-srbh May 1, 2024
8579851
Tests: Update tests and add to CMakeLists
kmr-srbh May 1, 2024
809fe8d
Delete tests/reference/asr-test_const_dict-151acad.json
kmr-srbh May 1, 2024
f0de6cf
Delete tests/reference/asr-test_const_dict-151acad.stdout
kmr-srbh May 1, 2024
6c086e3
Delete tests/reference/asr-test_const_dict-59445d7.json
kmr-srbh May 1, 2024
7e0a8c2
Delete tests/reference/asr-test_dict_const-69479e2.json
kmr-srbh May 1, 2024
e0c4d62
Delete tests/reference/asr-test_dict_const-69479e2.stderr
kmr-srbh May 1, 2024
3307acf
Delete tests/reference/asr-test_dict_const-69479e2.stdout
kmr-srbh May 1, 2024
aa6c245
Delete tests/reference/runtime-test_dict_const-62054df.json
kmr-srbh May 1, 2024
cab3eea
Delete tests/reference/runtime-test_dict_const-62054df.stderr
kmr-srbh May 1, 2024
c740e70
Delete tests/reference/asr-test_const_dict-59445d7.stderr
kmr-srbh May 1, 2024
9581a31
Tests: Update error references
kmr-srbh May 1, 2024
78e4205
Undo formatting changes
kmr-srbh May 1, 2024
891c001
Remove extra newline
kmr-srbh May 1, 2024
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
1 change: 1 addition & 0 deletions integration_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ RUN(NAME test_tuple_03 LABELS cpython llvm llvm_jit c)
RUN(NAME test_tuple_04 LABELS cpython llvm llvm_jit c)
RUN(NAME test_tuple_concat LABELS cpython llvm llvm_jit)
RUN(NAME test_tuple_nested LABELS cpython llvm llvm_jit)
RUN(NAME test_const_dict LABELS cpython llvm llvm_jit)
RUN(NAME test_dict_01 LABELS cpython llvm llvm_jit c)
RUN(NAME test_dict_02 LABELS cpython llvm llvm_jit c NOFAST)
RUN(NAME test_dict_03 LABELS cpython llvm llvm_jit NOFAST)
Expand Down
24 changes: 24 additions & 0 deletions integration_tests/test_const_dict.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from lpython import i32, f64, Const

CONST_DICTIONARY_INTEGR: Const[dict[str, i32]] = {"a": 1, "b": 2, "c": 3}

print(CONST_DICTIONARY_INTEGR.get("a"))
assert CONST_DICTIONARY_INTEGR.get("a") == 1

print(CONST_DICTIONARY_INTEGR.keys())
assert len(CONST_DICTIONARY_INTEGR.keys()) == 3

print(CONST_DICTIONARY_INTEGR.values())
assert len(CONST_DICTIONARY_INTEGR.values()) == 3

CONST_DICTIONARY_FLOAT: Const[dict[str, f64]] = {"a": 1.0, "b": 2.0, "c": 3.0}

kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
print(CONST_DICTIONARY_FLOAT.get("a"))
assert CONST_DICTIONARY_FLOAT.get("a") == 1.0

print(CONST_DICTIONARY_FLOAT.keys())
assert len(CONST_DICTIONARY_FLOAT.keys()) == 3

print(CONST_DICTIONARY_FLOAT.values())
assert len(CONST_DICTIONARY_FLOAT.values()) == 3

3 changes: 3 additions & 0 deletions src/lpython/semantics/python_attribute_eval.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@ struct AttributeHandler {

static ASR::asr_t* eval_dict_pop(ASR::expr_t *s, Allocator &al, const Location &loc,
Vec<ASR::expr_t*> &args, diag::Diagnostics &diag) {
if (ASRUtils::is_const(s)) {
throw SemanticError("cannot pop elements from a const dict", loc);
}
if (args.size() != 1) {
throw SemanticError("'pop' takes only one argument for now", loc);
}
Expand Down
9 changes: 9 additions & 0 deletions tests/errors/test_const_dict.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from lpython import i32, f64, dict, Const


def test_const_dict():
CONST_DICTIONARY: Const[dict[str, i32]] = {"a": 1, "b": 2, "c": 3}
print(CONST_DICTIONARY.pop("a"))


test_const_dict()
13 changes: 13 additions & 0 deletions tests/reference/asr-test_const_dict-59445d7.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"basename": "asr-test_const_dict-59445d7",
"cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
"infile": "tests/errors/test_const_dict.py",
"infile_hash": "51130e98c759eb3cdbd50848e59879e4689d241c7a8674aa06a5b3c7",
"outfile": null,
"outfile_hash": null,
"stdout": null,
"stdout_hash": null,
"stderr": "asr-test_const_dict-59445d7.stderr",
"stderr_hash": "1d3729d80a7895dd01baaf0905c6cc9ebadd7f7ce623f4ae5970e2b8",
"returncode": 2
}
5 changes: 5 additions & 0 deletions tests/reference/asr-test_const_dict-59445d7.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
semantic error: cannot pop elements from a const dict
--> tests/errors/test_const_dict.py:6:11
|
6 | print(CONST_DICTIONARY.pop("a"))
| ^^^^^^^^^^^^^^^^^^^^^^^^^
4 changes: 4 additions & 0 deletions tests/tests.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,10 @@ run = true
filename = "errors/test_dict16.py"
run = true

[[test]]
filename = "errors/test_const_dict.py"
asr = true

[[test]]
filename = "errors/test_zero_division.py"
asr = true
Expand Down
Loading