Add support for item access from `Const` data-structures by kmr-srbh · Pull Request #2579 · lcompilers/lpython

kmr-srbh · 2024-03-07T06:45:54Z

Fixes #2578
The following changes were made:

Handle subscripts for mutable types dict and list. Return the corresponding value.
Throw an error for immutable types stating that Const is not required.

Fix

Dictionary

d: Const[dict[str, i32]] = {"a": 1, "b": 2, "c": 3}
print(d["a"])

(base) saurabh-kumar@Awadh:~/Projects/System/lpython$ ./src/bin/lpython ./examples/example.py
1

List

l: Const[list[i32]] = [1, 2, 3, 4, 5]
print(l[0])

(base) saurabh-kumar@Awadh:~/Projects/System/lpython$ ./src/bin/lpython ./examples/example.py
1

Tuple

t: Const[tuple[i32, i32, i32, i32, i32]] = (1, 2, 3, 4, 5)
print(t[0])

(base) saurabh-kumar@Awadh:~/Projects/System/lpython$ ./src/bin/lpython ./examples/example.py
semantic error: 'Const' not required as tuples are already immutable
  --> ./examples/example.py:10:4
   |
10 | t: Const[tuple[i32, i32, i32, i32, i32]] = (1, 2, 3, 4, 5)
   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 


Note: Please report unclear or confusing messages as bugs at
https://github.com/lcompilers/lpython/issues.

String

s: Const[str] = "Hello, LPython!"
print(s[0])

(base) saurabh-kumar@Awadh:~/Projects/System/lpython$ ./src/bin/lpython ./examples/example.py
semantic error: 'Const' not required as strings are already immutable
  --> ./examples/example.py:13:4
   |
13 | s: Const[str] = "Hello, LPython!"
   |    ^^^^^^^^^^ 


Note: Please report unclear or confusing messages as bugs at
https://github.com/lcompilers/lpython/issues.

Thirumalai-Shaktivel

Let's add test to intregration_tests and register in CMakeLists

src/libasr/codegen/asr_to_llvm.cpp

src/lpython/semantics/python_ast_to_asr.cpp

Thirumalai-Shaktivel · 2024-03-07T07:15:48Z

Please mark this PR ready for review once it is ready.

Co-authored-by: Thirumalai Shaktivel <[email protected]>

kmr-srbh · 2024-03-10T08:42:50Z

@Shaikh-Ubaid @Thirumalai-Shaktivel there is a considerable degree of redundancy here, like for dictionary and lists. I have to implement slicing on Const list and the problem will arise there too. What is the fix? Functions?

src/lpython/semantics/python_ast_to_asr.cpp

Thirumalai-Shaktivel · 2024-03-23T05:55:31Z

What is the status of this PR?

The CI seems to fail, please mark this PR ready for review once it is ready.

kmr-srbh · 2024-03-23T06:00:25Z

What is the status of this PR?

The CI seems to fail, please mark this PR ready for review once it is ready.

@Thirumalai-Shaktivel this PR is ready. The only blocker is the issue stated here - #2567 (comment). Could you please look into it?

kmr-srbh · 2024-04-21T02:52:03Z

@Shaikh-Ubaid , type_get_past_const was removed in the new additions from LFortran. What do we do here now? Use get_contained_type()?

ubaidsk · 2024-04-21T04:57:09Z

@Shaikh-Ubaid , type_get_past_const was removed in the new additions from LFortran. What do we do here now? Use get_contained_type()?

Simply remove the call to type_get_past_const(). Cont_t node no more exists. You need not use anything.

kmr-srbh · 2024-05-01T05:42:36Z

@Shaikh-Ubaid as the Const node was removed, this works out-of-the-box now. I have reverted all the previous unnecessary changes. The tests and semantic error for creating Const str and Const tuple have been retained. This is ready.

A related issue is the failing slicing on Const list and Const str. I will open an issue for it.

integration_tests/CMakeLists.txt

src/libasr/codegen/asr_to_llvm.cpp

src/lpython/semantics/python_ast_to_asr.cpp

tests/tests.toml

Co-authored-by: Shaikh Ubaid <[email protected]>

ubaidsk

@kmr-srbh For this PR, you can simply add an integration test that verifies that const list and dict and operation on them are supported by lpython. And it will be good to merge.

src/libasr/codegen/asr_to_llvm.cpp

src/lpython/semantics/python_ast_to_asr.cpp

ubaidsk

Looks good. Minimal changes that just do the task. Thanks for this.

Add support for accessing items from data-structures within Const

5d40049

Thirumalai-Shaktivel reviewed Mar 7, 2024

View reviewed changes

src/libasr/codegen/asr_to_llvm.cpp Show resolved Hide resolved

src/libasr/codegen/asr_to_llvm.cpp Outdated Show resolved Hide resolved

src/lpython/semantics/python_ast_to_asr.cpp Outdated Show resolved Hide resolved

src/lpython/semantics/python_ast_to_asr.cpp Show resolved Hide resolved

Thirumalai-Shaktivel marked this pull request as draft March 7, 2024 07:15

kmr-srbh and others added 6 commits March 7, 2024 13:16

Update type checking logic for Const dict

2fb304a

Co-authored-by: Thirumalai Shaktivel <[email protected]>

Minor formatting change

416d1c3

Co-authored-by: Thirumalai Shaktivel <[email protected]>

Merge branch 'main' into support-const-access

7077516

Handle negative indices for const list and minor formatting changes

e622a9d

Add tests

1a3a5d5

Update test references

1f74255

ubaidsk reviewed Mar 10, 2024

View reviewed changes

src/lpython/semantics/python_ast_to_asr.cpp Outdated Show resolved Hide resolved

kmr-srbh and others added 3 commits March 10, 2024 17:29

Heavily simplify handling const

20aa660

Merge branch 'main' into support-const-access

510b65b

Tests: Add compile time test

32b691e

kmr-srbh marked this pull request as ready for review March 12, 2024 11:24

kmr-srbh added 2 commits March 18, 2024 20:02

Merge branch 'main' into support-const-access

0553c04

Merge branch 'main' into support-const-access

c8a5020

kmr-srbh mentioned this pull request Mar 19, 2024

Add support for dict methods with Const #2567

Merged

Thirumalai-Shaktivel marked this pull request as draft March 23, 2024 05:55

Merge branch 'main' into support-const-access

b62f675

Merge branch 'main' into support-const-access

5ebc24f

kmr-srbh changed the title ~~Add support for accessing items from data-structures within Const~~ Add support for item access from Const data-structures May 1, 2024

kmr-srbh added 2 commits May 1, 2024 11:04

Remove calls to type_get_past_const()

cb8a0f2

Tests: Update test references

9803138

kmr-srbh requested a review from ubaidsk May 1, 2024 05:42

ubaidsk reviewed May 1, 2024

View reviewed changes

kmr-srbh and others added 9 commits May 1, 2024 18:19

Remove extra newline

d8d82ea

Co-authored-by: Shaikh Ubaid <[email protected]>

Delete tests/reference/asr-test_const_access-82a9a24.json

55ba905

Delete tests/reference/asr-test_const_access-82a9a24.stdout

89ad7e3

Delete tests/reference/asr-test_const_str_access-59ff543.stderr

36a1716

Delete tests/reference/asr-test_const_tuple_access-0d4c6df.json

b3bbe78

Delete tests/reference/asr-test_const_tuple_access-0d4c6df.stderr

3da9626

Delete tests/reference/asr-test_const_str_access-59ff543.json

733541e

Formatting changes

41514a2

Tests: Add test to CMakeLists and update error references

ed8662d

kmr-srbh requested a review from ubaidsk May 1, 2024 14:04

kmr-srbh marked this pull request as ready for review May 1, 2024 14:04

Merge branch 'main' into support-const-access

e69f52a

ubaidsk reviewed May 1, 2024

View reviewed changes

src/libasr/codegen/asr_to_llvm.cpp Outdated Show resolved Hide resolved

src/libasr/codegen/asr_to_llvm.cpp Outdated Show resolved Hide resolved

src/lpython/semantics/python_ast_to_asr.cpp Outdated Show resolved Hide resolved

kmr-srbh and others added 5 commits May 1, 2024 21:22

Update asr_to_llvm.cpp

334f429

Undo formatting changes

251b5d4

Undo formatting changes

be48acf

Revert throwing error for Const annotated tuples and strings

2620956

Tests: Remove error references

c0407b5

kmr-srbh requested a review from ubaidsk May 1, 2024 16:15

ubaidsk reviewed May 1, 2024

View reviewed changes

src/lpython/semantics/python_ast_to_asr.cpp Outdated Show resolved Hide resolved

kmr-srbh added 2 commits May 1, 2024 22:19

Remove redundant visitor

f489720

Undo moving index

970ce8c

kmr-srbh requested a review from ubaidsk May 1, 2024 16:52

ubaidsk approved these changes May 1, 2024

View reviewed changes

ubaidsk enabled auto-merge (squash) May 1, 2024 16:53

ubaidsk merged commit dfeacbc into lcompilers:main May 1, 2024

kmr-srbh deleted the support-const-access branch May 2, 2024 13:58

Conversation

kmr-srbh commented Mar 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fix

Dictionary

List

Tuple

String

Uh oh!

Thirumalai-Shaktivel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Thirumalai-Shaktivel commented Mar 7, 2024

Uh oh!

kmr-srbh commented Mar 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Thirumalai-Shaktivel commented Mar 23, 2024

Uh oh!

kmr-srbh commented Mar 23, 2024

Uh oh!

kmr-srbh commented Apr 21, 2024

Uh oh!

ubaidsk commented Apr 21, 2024

Uh oh!

kmr-srbh commented May 1, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ubaidsk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ubaidsk left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

kmr-srbh commented Mar 7, 2024 •

edited

Loading

kmr-srbh commented Mar 10, 2024 •

edited

Loading

ubaidsk left a comment •

edited

Loading