Removes need for matching begin-end scope names #509
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously nested scopes had to be closed in the reverse order than they
were opened e.g.
```f90
subroutine scope_1()
subroutine scope_2()
subroutine scope_3()
end subroutine scope_3
end subroutine scope_2
end subroutine scope_1
```
However with preprocessor conditionals that would be an issue since
```f90
subroutine scope_1()
#ifdef DEF
subroutine scope_2()
#else
subroutine scope_3()
#endif
#ifdef DEF
end subroutine scope_2()
#else
end subroutine scope_3()
#endif
end subroutine scope_1
```
`scope_2` and `scope_3` would be in the same level on the AST, so it is
no longer valid to expect `scope_3` to close before `scope_2`.
The solution to this is removing the strict requirement for scopes to
have matching begin-end names from the regex. The type of scopes
where this requirement is removed are:
- Functions
- Modules
- Programs
- Module Procedures
- Subroutines
- Submodules
Fixes Erroneous syntax highlighting with subroutine names and preprocessor conditionals #278
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removes need for matching begin-end scope names
Previously nested scopes had to be closed in the reverse order than they
were opened e.g.
However with preprocessor conditionals that would be an issue since
scope_2andscope_3would be in the same level on the AST, so it isno longer valid to expect
scope_3to close beforescope_2.The solution to this is removing the strict requirement for scopes to
have matching begin-end names from the regex. The type of scopes
where this requirement is removed are:
Fixes Erroneous syntax highlighting with subroutine names and preprocessor conditionals #278