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

Add support for item access from Const data-structures #2579

Merged
merged 33 commits into from
May 1, 2024
Merged

Add support for item access from Const data-structures #2579

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5d40049
Add support for accessing items from data-structures within `Const`
kmr-srbh Mar 7, 2024
2fb304a
Update type checking logic for `Const dict`
kmr-srbh Mar 7, 2024
416d1c3
Minor formatting change
kmr-srbh Mar 7, 2024
7077516
Merge branch 'main' into support-const-access
kmr-srbh Mar 8, 2024
e622a9d
Handle negative indices for `const list` and minor formatting changes
kmr-srbh Mar 10, 2024
1a3a5d5
Add tests
kmr-srbh Mar 10, 2024
1f74255
Update test references
kmr-srbh Mar 10, 2024
20aa660
Heavily simplify handling `const`
kmr-srbh Mar 10, 2024
510b65b
Merge branch 'main' into support-const-access
kmr-srbh Mar 11, 2024
32b691e
Tests: Add compile time test
kmr-srbh Mar 12, 2024
0553c04
Merge branch 'main' into support-const-access
kmr-srbh Mar 18, 2024
c8a5020
Merge branch 'main' into support-const-access
kmr-srbh Mar 19, 2024
b62f675
Merge branch 'main' into support-const-access
kmr-srbh Apr 21, 2024
5ebc24f
Merge branch 'main' into support-const-access
kmr-srbh May 1, 2024
cb8a0f2
Remove calls to `type_get_past_const()`
kmr-srbh May 1, 2024
9803138
Tests: Update test references
kmr-srbh May 1, 2024
d8d82ea
Remove extra newline
kmr-srbh May 1, 2024
55ba905
Delete tests/reference/asr-test_const_access-82a9a24.json
kmr-srbh May 1, 2024
89ad7e3
Delete tests/reference/asr-test_const_access-82a9a24.stdout
kmr-srbh May 1, 2024
36a1716
Delete tests/reference/asr-test_const_str_access-59ff543.stderr
kmr-srbh May 1, 2024
b3bbe78
Delete tests/reference/asr-test_const_tuple_access-0d4c6df.json
kmr-srbh May 1, 2024
3da9626
Delete tests/reference/asr-test_const_tuple_access-0d4c6df.stderr
kmr-srbh May 1, 2024
733541e
Delete tests/reference/asr-test_const_str_access-59ff543.json
kmr-srbh May 1, 2024
41514a2
Formatting changes
kmr-srbh May 1, 2024
ed8662d
Tests: Add test to CMakeLists and update error references
kmr-srbh May 1, 2024
e69f52a
Merge branch 'main' into support-const-access
kmr-srbh May 1, 2024
334f429
Update asr_to_llvm.cpp
kmr-srbh May 1, 2024
251b5d4
Undo formatting changes
kmr-srbh May 1, 2024
be48acf
Undo formatting changes
kmr-srbh May 1, 2024
2620956
Revert throwing error for `Const` annotated tuples and strings
kmr-srbh May 1, 2024
c0407b5
Tests: Remove error references
kmr-srbh May 1, 2024
f489720
Remove redundant visitor
kmr-srbh May 1, 2024
970ce8c
Undo moving `index`
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ RUN(NAME test_math_02 LABELS cpython llvm llvm_jit NOFAST)
RUN(NAME test_math_03 LABELS llvm llvm_jit) #1595: TODO: Test using CPython (3.11 recommended)
RUN(NAME test_pass_compare LABELS cpython llvm llvm_jit c)
RUN(NAME test_c_interop_01 LABELS cpython llvm llvm_jit c)

kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
RUN(NAME test_c_interop_02 LABELS cpython llvm c
EXTRAFILES test_c_interop_02b.c)
RUN(NAME test_c_interop_03 LABELS cpython llvm c
Expand Down
14 changes: 14 additions & 0 deletions integration_tests/test_const_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from lpython import i32, str, list, dict, Const


def test_const_access():
CONST_LIST: Const[list[i32]] = [1, 2, 3, 4, 5]
CONST_DICTIONARY: Const[dict[str, i32]] = {"a": 1, "b": 2, "c": 3}

assert CONST_LIST[0] == 1
assert CONST_LIST[-2] == 4

assert CONST_DICTIONARY["a"] == 1


test_const_access()
7 changes: 3 additions & 4 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 @@ -1524,8 +1524,7 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
}

void visit_ListItem(const ASR::ListItem_t& x) {
ASR::ttype_t* el_type = ASRUtils::get_contained_type(
kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
ASRUtils::expr_type(x.m_a));
ASR::ttype_t *el_type = ASRUtils::get_contained_type(ASRUtils::expr_type(x.m_a));
kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
int64_t ptr_loads_copy = ptr_loads;
ptr_loads = 0;
this->visit_expr(*x.m_a);
Expand All @@ -1541,8 +1540,8 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
}

void visit_DictItem(const ASR::DictItem_t& x) {
ASR::Dict_t* dict_type = ASR::down_cast<ASR::Dict_t>(
ASRUtils::expr_type(x.m_a));
ASR::Dict_t *dict_type = ASR::down_cast<ASR::Dict_t>(ASRUtils::expr_type(x.m_a));

kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
int64_t ptr_loads_copy = ptr_loads;
ptr_loads = 0;
this->visit_expr(*x.m_a);
Expand Down
11 changes: 10 additions & 1 deletion 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 @@ -1780,6 +1780,14 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
is_allocatable, is_const, raise_error, abi, is_argument);
return ASRUtils::TYPE(ASR::make_Pointer_t(al, loc, type));
} else if (var_annotation == "Const") {
ASR::ttype_t *type = ast_expr_to_asr_type(loc, *s->m_slice,
is_allocatable, is_const, raise_error, abi, is_argument);
if (ASR::is_a<ASR::Tuple_t>(*type)) {
throw SemanticError("'Const' not required as tuples are already immutable", loc);
}
else if (ASR::is_a<ASR::Character_t>(*type)) {
throw SemanticError("'Const' not required as strings are already immutable", loc);
}
kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
is_const = true;
return ast_expr_to_asr_type(loc, *s->m_slice,
is_allocatable, is_const, raise_error, abi, is_argument);
Expand Down Expand Up @@ -3822,6 +3830,7 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
}
return final_result;
} else {
ASR::expr_t *index = nullptr;
this->visit_expr(*m_slice);
if (!ASR::is_a<ASR::Dict_t>(*type) &&
!ASRUtils::is_integer(*ASRUtils::expr_type(ASRUtils::EXPR(tmp)))) {
Expand All @@ -3835,8 +3844,8 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
);
throw SemanticAbort();
}
ASR::expr_t *index = nullptr;
if (ASR::is_a<ASR::Dict_t>(*type)) {
kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
this->visit_expr(*m_slice);
kmr-srbh marked this conversation as resolved.
Show resolved Hide resolved
index = ASRUtils::EXPR(tmp);
ASR::ttype_t *key_type = ASR::down_cast<ASR::Dict_t>(type)->m_key_type;
if (!ASRUtils::check_equal_type(ASRUtils::expr_type(index), key_type)) {
Expand Down
8 changes: 8 additions & 0 deletions tests/errors/test_const_str_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from lpython import str, Const


def test_const_str_access():
CONST_STRING: Const[str] = "Hello, LPython!"


test_const_str_access()
9 changes: 9 additions & 0 deletions tests/errors/test_const_tuple_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from lpython import str, tuple, Const


def test_const_tuple_access():
CONST_TUPLE: Const[tuple[str, str, str]] = ("hello", "LPython", "!")


test_const_tuple_access()

13 changes: 13 additions & 0 deletions tests/reference/asr-test_const_access-82a9a24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"basename": "asr-test_const_access-82a9a24",
"cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
"infile": "tests/../integration_tests/test_const_access.py",
"infile_hash": "c25c7c1c19db38e066b47dc2891abaa5ddd7379b4df07892cebb94e3",
"outfile": null,
"outfile_hash": null,
"stdout": "asr-test_const_access-82a9a24.stdout",
"stdout_hash": "b524387188bc417588767959fdd79bfe6d5360ab6fb08d5e5e0d9452",
"stderr": null,
"stderr_hash": null,
"returncode": 0
}
262 changes: 262 additions & 0 deletions tests/reference/asr-test_const_access-82a9a24.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
(TranslationUnit
(SymbolTable
1
{
__main__:
(Module
(SymbolTable
2
{
__main__global_stmts:
(Function
(SymbolTable
4
{

})
__main__global_stmts
(FunctionType
[]
()
Source
Implementation
()
.false.
.false.
.false.
.false.
.false.
[]
.false.
)
[test_const_access]
[]
[(SubroutineCall
2 test_const_access
()
[]
()
)]
()
Public
.false.
.false.
()
),
test_const_access:
(Function
(SymbolTable
3
{
CONST_DICTIONARY:
(Variable
3
CONST_DICTIONARY
[]
Local
(DictConstant
[(StringConstant
"a"
(Character 1 1 ())
)
(StringConstant
"b"
(Character 1 1 ())
)
(StringConstant
"c"
(Character 1 1 ())
)]
[(IntegerConstant 1 (Integer 4))
(IntegerConstant 2 (Integer 4))
(IntegerConstant 3 (Integer 4))]
(Dict
(Character 1 1 ())
(Integer 4)
)
)
(DictConstant
[(StringConstant
"a"
(Character 1 1 ())
)
(StringConstant
"b"
(Character 1 1 ())
)
(StringConstant
"c"
(Character 1 1 ())
)]
[(IntegerConstant 1 (Integer 4))
(IntegerConstant 2 (Integer 4))
(IntegerConstant 3 (Integer 4))]
(Dict
(Character 1 1 ())
(Integer 4)
)
)
Parameter
(Dict
(Character 1 -2 ())
(Integer 4)
)
()
Source
Public
Required
.false.
),
CONST_LIST:
(Variable
3
CONST_LIST
[]
Local
(ListConstant
[(IntegerConstant 1 (Integer 4))
(IntegerConstant 2 (Integer 4))
(IntegerConstant 3 (Integer 4))
(IntegerConstant 4 (Integer 4))
(IntegerConstant 5 (Integer 4))]
(List
(Integer 4)
)
)
(ListConstant
[(IntegerConstant 1 (Integer 4))
(IntegerConstant 2 (Integer 4))
(IntegerConstant 3 (Integer 4))
(IntegerConstant 4 (Integer 4))
(IntegerConstant 5 (Integer 4))]
(List
(Integer 4)
)
)
Parameter
(List
(Integer 4)
)
()
Source
Public
Required
.false.
)
})
test_const_access
(FunctionType
[]
()
Source
Implementation
()
.false.
.false.
.false.
.false.
.false.
[]
.false.
)
[]
[]
[(Assert
(IntegerCompare
(ListItem
(Var 3 CONST_LIST)
(IntegerConstant 0 (Integer 4))
(Integer 4)
()
)
Eq
(IntegerConstant 1 (Integer 4))
(Logical 4)
()
)
()
)
(Assert
(IntegerCompare
(ListItem
(Var 3 CONST_LIST)
(IntegerBinOp
(ListLen
(Var 3 CONST_LIST)
(Integer 4)
()
)
Add
(IntegerConstant -2 (Integer 4))
(Integer 4)
()
)
(Integer 4)
()
)
Eq
(IntegerConstant 4 (Integer 4))
(Logical 4)
()
)
()
)
(Assert
(IntegerCompare
(DictItem
(Var 3 CONST_DICTIONARY)
(StringConstant
"a"
(Character 1 1 ())
)
()
(Integer 4)
()
)
Eq
(IntegerConstant 1 (Integer 4))
(Logical 4)
()
)
()
)]
()
Public
.false.
.false.
()
)
})
__main__
[]
.false.
.false.
),
main_program:
(Program
(SymbolTable
5
{
__main__global_stmts:
(ExternalSymbol
5
__main__global_stmts
2 __main__global_stmts
__main__
[]
__main__global_stmts
Public
)
})
main_program
[__main__]
[(SubroutineCall
5 __main__global_stmts
2 __main__global_stmts
[]
()
)]
)
})
[]
)
13 changes: 13 additions & 0 deletions tests/reference/asr-test_const_str_access-59ff543.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"basename": "asr-test_const_str_access-59ff543",
"cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
"infile": "tests/errors/test_const_str_access.py",
"infile_hash": "356d24d72537679b048256fe36e06defe1525ea6abbdef9d9a05bce7",
"outfile": null,
"outfile_hash": null,
"stdout": null,
"stdout_hash": null,
"stderr": "asr-test_const_str_access-59ff543.stderr",
"stderr_hash": "22aab31426a34d40549295ecdbdac10ecdf67689aa464522f42b0f52",
"returncode": 2
}
5 changes: 5 additions & 0 deletions tests/reference/asr-test_const_str_access-59ff543.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
semantic error: 'Const' not required as strings are already immutable
--> tests/errors/test_const_str_access.py:5:19
|
5 | CONST_STRING: Const[str] = "Hello, LPython!"
| ^^^^^^^^^^
Loading
Loading