[flang][OpenMP] Simplify LooselyStructuredBlockParser, NFC #156701
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
Part of the logic in this parser was dealing with a list of executable constructs that begins with BLOCK. Since after 6b92a3b we're doing it via a lookahead, this handling can be simplified.
|
@llvm/pr-subscribers-flang-parser Author: Krzysztof Parzyszek (kparzysz) ChangesPart of the logic in this parser was dealing with a list of executable constructs that begins with BLOCK. Since after 6b92a3b we're doing it via a lookahead, this handling can be simplified. Full diff: https://github.com/llvm/llvm-project/pull/156701.diff 1 Files Affected:
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index cc4e59d318bbe..f9ba5b4c72f39 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -1307,22 +1307,11 @@ struct LooselyStructuredBlockParser {
if (lookAhead(skipStuffBeforeStatement >> "BLOCK"_tok).Parse(state)) {
return std::nullopt;
}
- Block body;
- if (auto epc{attempt(Parser<ExecutionPartConstruct>{}).Parse(state)}) {
- if (!IsFortranBlockConstruct(*epc)) {
- body.emplace_back(std::move(*epc));
- if (auto &&blk{attempt(block).Parse(state)}) {
- for (auto &&s : *blk) {
- body.emplace_back(std::move(s));
- }
- }
- } else {
- // Fail if the first construct is BLOCK.
- return std::nullopt;
- }
+ if (auto &&body{block.Parse(state)}) {
+ // Empty body is ok.
+ return std::move(body);
}
- // Empty body is ok.
- return std::move(body);
+ return std::nullopt;
}
};
|
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.
Part of the logic in this parser was dealing with a list of executable constructs that begins with BLOCK. Since after 6b92a3b we're doing it via a lookahead, this handling can be simplified.