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

Fix #1767 #1770

Merged
Merged

Conversation

andrevidela
Copy link
Collaborator

The if then else syntax expects a block for the then and else
parts. Before this patch, the token InterpEnd was not a valid
follow up token to end a block. This adds InterpEnd as a closing
token for blocks, allowing if then else in interpolation slices
without additional parens.

The `if then else` syntax expects a block for the `then` and `else`
parts. Before this patch, the token `InterpEnd` was not a valid
follow up token to end a block. This adds `InterpEnd` as a closing
token for blocks, allowing `if then else` in interpolation slices
without additional parens.
@andrevidela andrevidela force-pushed the fix-if-then-else-interpolation branch from 2f5a18b to bab3897 Compare July 22, 2021 12:18
@andylokandy
Copy link
Contributor

Would you like to also include the fix for token printing?

@andrevidela
Copy link
Collaborator Author

Ah that's a good idea, let's do that quickly, which commit should I cherry-pick?

@andylokandy
Copy link
Contributor

andylokandy commented Jul 22, 2021

Ah that's a good idea, let's do that quickly, which commit should I cherry-pick?

hmm, i didn't start to write the code. But it should be just swapping the "multiple string begin" and "string begin" I refered in the issue.

@andrevidela
Copy link
Collaborator Author

I just fixed it now, commit inc

Co-authored-by: Andy Lok <andylokandy@hotmail.com>
@andrevidela andrevidela merged commit 5389f8c into idris-lang:main Jul 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants