Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Simplify array size determination for negative index #2619

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
merged 2 commits into from
Mar 21, 2024
Merged

Simplify array size determination for negative index #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
891d923
Remove condition for dimension size
hankluo6 Mar 21, 2024
2e4057f
Add negative index test for descriptor array
hankluo6 Mar 21, 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 @@ -435,6 +435,7 @@ RUN(NAME array_expr_06 LABELS cpython llvm c)
RUN(NAME array_expr_07 LABELS cpython llvm c)
RUN(NAME array_expr_08 LABELS cpython llvm c)
RUN(NAME array_expr_09 LABELS cpython llvm c)
RUN(NAME array_expr_10 LABELS cpython llvm c)
RUN(NAME array_size_01 LABELS cpython llvm c)
RUN(NAME array_size_02 LABELS cpython llvm c)
RUN(NAME array_01 LABELS cpython llvm wasm c)
Expand Down
17 changes: 17 additions & 0 deletions integration_tests/array_expr_10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from lpython import i32
from numpy import empty, int32, array

def foo(x: i32[:]):
print(x[3], x[4], x[-1], x[-2])
assert x[-1] == 5
assert x[-2] == 4
assert x[-3] == 3
assert x[-4] == 2
assert x[-5] == 1

def main():
x: i32[5] = empty(5, dtype=int32)
x = array([1, 2, 3, 4, 5])
foo(x)

main()
13 changes: 5 additions & 8 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 @@ -3907,15 +3907,12 @@ class CommonVisitor : public AST::BaseVisitor<Struct> {
ASR::ttype_t *int_type = ASRUtils::TYPE(ASR::make_Integer_t(
al, loc, 4));
ASR::expr_t *neg_idx = ASRUtils::expr_value(index);
ASR::expr_t *dim_size;
if (ASRUtils::extract_physical_type(type) != ASR::array_physical_typeType::DescriptorArray)
dim_size = ASR::down_cast<ASR::Array_t>(type)->m_dims[idx].m_length;
else {
ASR::expr_t *idx_expr = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, idx + 1, int_type));
dim_size = ASRUtils::EXPR(ASRUtils::make_ArraySize_t_util(al, loc, value, idx_expr, int_type, nullptr, false));
}
// null if the dimension is not known at compile time
ASR::expr_t *dim_size = ASR::down_cast<ASR::Array_t>(type)->m_dims[idx].m_length;
ASR::expr_t *idx_expr = ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, idx + 1, int_type));
ASR::expr_t *size_expr = ASRUtils::EXPR(ASRUtils::make_ArraySize_t_util(al, loc, value, idx_expr, int_type, dim_size, false));
index = ASRUtils::EXPR(ASR::make_IntegerBinOp_t(al, loc,
dim_size, ASR::binopType::Add, neg_idx, int_type, nullptr));
size_expr, ASR::binopType::Add, neg_idx, int_type, nullptr));
}
}
} else {
Expand Down