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

Implements Iterator trait and for loops. #5557

Merged
merged 5 commits into from
Feb 8, 2024
Merged

Conversation

esdrubal
Copy link
Contributor

@esdrubal esdrubal commented Feb 6, 2024

Description

This implements an Iterator trait in std-lib, and adds iter() to Vec.
This also adds parsing and desugaring of for loops.

    for pattern in iterator {
        code_block
    }

is desugared into:

    let mut iterable = iterator;
    while true {
        let value_opt = iterable.next();
        if value_opt.is_none() {
             break;
        }
        let value = value_opt.unwrap();
        code_block
    }

This also adds for loops documentation to the control flow docs.

We still have to fix this issues:

Closes #145

Checklist

  • I have linked to any relevant issues.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation where relevant (API docs, the reference, and the Sway book).
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added (or requested a maintainer to add) the necessary Breaking* or New Feature labels where relevant.
  • I have done my best to ensure that my PR adheres to the Fuel Labs Code Review Standards.
  • I have requested a review from the relevant team or maintainers.

@esdrubal esdrubal added enhancement New feature or request compiler General compiler. Should eventually become more specific as the issue is triaged language feature Core language features visible to end users labels Feb 6, 2024
@esdrubal esdrubal self-assigned this Feb 6, 2024
@esdrubal esdrubal force-pushed the esdrubal/for_loops branch 2 times, most recently from 2df9ebd to 8699d08 Compare February 6, 2024 10:33
@esdrubal esdrubal requested a review from a team February 6, 2024 10:36
@esdrubal esdrubal marked this pull request as ready for review February 6, 2024 10:36
@esdrubal esdrubal force-pushed the esdrubal/for_loops branch 3 times, most recently from 4c3a102 to 6028c9a Compare February 6, 2024 12:01
sway-lib-std/src/prelude.sw Outdated Show resolved Hide resolved
@esdrubal esdrubal force-pushed the esdrubal/for_loops branch 2 times, most recently from 4a8b6a2 to ee68e1d Compare February 7, 2024 10:05
@IGI-111
Copy link
Contributor

IGI-111 commented Feb 7, 2024

LGTM but @esdrubal can you create the issues you mention in the description before we merge this?

@esdrubal
Copy link
Contributor Author

esdrubal commented Feb 7, 2024

@IGI-111 I created the issues.

@xunilrj
Copy link
Contributor

xunilrj commented Feb 8, 2024

Any reason why we materialize next before the code block?
It makes sense to avoid the generation of the next item if the user wants to break the loop and it is not going to use it.

    let mut iterable = iterator;
    let mut value_opt = iterable.next();
    while value_opt.is_some() {
        let value = value_opt.unwrap();
        code_block                                     // <- swaped this
        value_opt = iterable.next();            // and this
    }

@esdrubal
Copy link
Contributor Author

esdrubal commented Feb 8, 2024

Any reason why we materialize next before the code block? It makes sense to avoid the generation of the next item if the user wants to break the loop and it is not going to use it.

    let mut iterable = iterator;
    let mut value_opt = iterable.next();
    while value_opt.is_some() {
        let value = value_opt.unwrap();
        code_block                                     // <- swaped this
        value_opt = iterable.next();            // and this
    }

You may have a continue inside the code_block that would skip the next() call if it is at the end as you suggested.

@esdrubal
Copy link
Contributor Author

esdrubal commented Feb 8, 2024

We could fix the issue of calling next prematurely by doing something like:

    let mut iterable = iterator;
    while true {
        let value_opt = iterable.next();
        if value_opt.is_none() {
             break;
        }
        let value = value_opt.unwrap();
        code_block
    }

@IGI-111
Copy link
Contributor

IGI-111 commented Feb 8, 2024

We could fix the issue of calling next prematurely by doing something like:

    let mut iterable = iterator;
    while true {
        let value_opt = iterable.next();
        if value_opt.is_none() {
             break;
        }
        let value = value_opt.unwrap();
        code_block
    }

That seems much more robust. 👍

```
    for pattern in iterator {
        code_block
    }
```
 is desugared into:
```
    let mut iterable = iterator;
    let mut value_opt = iterable.next();
    while value_opt.is_some() {
        let value = value_opt.unwrap();
        value_opt = iterable.next();
        code_block
    }
```
Improved generated desugared AST corrresponds to:
```
    let mut iterable = iterator;
    while true {
        let value_opt = iterable.next();
        if value_opt.is_none() {
             break;
        }
        let value = value_opt.unwrap();
        code_block
    }
```
@esdrubal
Copy link
Contributor Author

esdrubal commented Feb 8, 2024

Updated desugaring code to the better version.

@esdrubal esdrubal merged commit 80be608 into master Feb 8, 2024
38 checks passed
@esdrubal esdrubal deleted the esdrubal/for_loops branch February 8, 2024 18:26
sdankel pushed a commit that referenced this pull request Feb 8, 2024
## Description

This implements an Iterator trait in std-lib, and adds iter() to Vec.
This also adds parsing and desugaring of for loops.

```
    for pattern in iterator {
        code_block
    }
```
 is desugared into:
```
    let mut iterable = iterator;
    while true {
        let value_opt = iterable.next();
        if value_opt.is_none() {
             break;
        }
        let value = value_opt.unwrap();
        code_block
    }
```

This also adds for loops documentation to the control flow docs.

We still have to fix this issues:
 -  #5567
 -  #5568
 -  #5570
 -  #5571

Closes #145

## Checklist

- [x] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [x] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.
IGI-111 pushed a commit that referenced this pull request Feb 9, 2024
## Description

An issue was reported by @sdankel on #5477 caused by #5557.

A segmentation fault would occur when the for loop handling was
performed inside the match. This would occur even when that part of the
code was not called. Looks like a weird rust issue.

## Checklist

- [ ] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [ ] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [ ] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.

Co-authored-by: Igor Rončević <ironcev@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler General compiler. Should eventually become more specific as the issue is triaged enhancement New feature or request language feature Core language features visible to end users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement For Loops and Iterators
4 participants