Skip to content

[flang][preprocessor] Fixed-form continuation across preprocessing di… #95332

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

Merged
merged 1 commit into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions flang/include/flang/Parser/provenance.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ class CookedSource {
provenanceMap_.Put(pm);
}

void MarkPossibleFixedFormContinuation() {
possibleFixedFormContinuations_.push_back(BufferedBytes());
}

std::size_t BufferedBytes() const;
void Marshal(AllCookedSources &); // marshals text into one contiguous block
void CompileProvenanceRangeToOffsetMappings(AllSources &);
Expand All @@ -269,6 +273,7 @@ class CookedSource {
std::string data_; // all of it, prescanned and preprocessed
OffsetToProvenanceMappings provenanceMap_;
ProvenanceRangeToOffsetMappings invertedMap_;
std::list<std::size_t> possibleFixedFormContinuations_;
};

class AllCookedSources {
Expand Down
1 change: 1 addition & 0 deletions flang/include/flang/Parser/token-sequence.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class TokenSequence {
TokenSequence &ClipComment(const Prescanner &, bool skipFirst = false);
const TokenSequence &CheckBadFortranCharacters(
Messages &, const Prescanner &, bool allowAmpersand) const;
bool BadlyNestedParentheses() const;
const TokenSequence &CheckBadParentheses(Messages &) const;
void Emit(CookedSource &) const;
llvm::raw_ostream &Dump(llvm::raw_ostream &) const;
Expand Down
20 changes: 17 additions & 3 deletions flang/lib/Parser/prescan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,13 @@ void Prescanner::CheckAndEmitLine(
// Applications play shenanigans with line continuation before and
// after #include'd subprogram argument lists.
if (!isNestedInIncludeDirective_ && !omitNewline_ &&
!afterIncludeDirective_) {
tokens.CheckBadParentheses(messages_);
!afterIncludeDirective_ && tokens.BadlyNestedParentheses()) {
if (inFixedForm_ && nextLine_ < limit_ &&
IsPreprocessorDirectiveLine(nextLine_)) {
// don't complain
} else {
tokens.CheckBadParentheses(messages_);
}
}
tokens.Emit(cooked_);
if (omitNewline_) {
Expand Down Expand Up @@ -350,7 +355,16 @@ void Prescanner::LabelField(TokenSequence &token) {
++column_;
}
if (badColumn && !preprocessor_.IsNameDefined(token.CurrentOpenToken())) {
if (features_.ShouldWarn(common::UsageWarning::Scanning)) {
if (prescannerNesting_ > 0 && *badColumn == 6 &&
cooked_.BufferedBytes() == firstCookedCharacterOffset_) {
// This is the first source line in #included text or conditional
// code under #if.
// If it turns out that the preprocessed text begins with a
// fixed form continuation line, the newline at the end
// of the latest source line beforehand will be deleted in
// CookedSource::Marshal().
cooked_.MarkPossibleFixedFormContinuation();
} else if (features_.ShouldWarn(common::UsageWarning::Scanning)) {
Say(GetProvenance(start + *badColumn - 1),
*badColumn == 6
? "Statement should not begin with a continuation line"_warn_en_US
Expand Down
2 changes: 2 additions & 0 deletions flang/lib/Parser/prescan.h
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ class Prescanner {
bool omitNewline_{false};
bool skipLeadingAmpersand_{false};

const std::size_t firstCookedCharacterOffset_{cooked_.BufferedBytes()};

const Provenance spaceProvenance_{
allSources_.CompilerInsertionProvenance(' ')};
const Provenance backslashProvenance_{
Expand Down
10 changes: 10 additions & 0 deletions flang/lib/Parser/provenance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,16 @@ void CookedSource::Marshal(AllCookedSources &allCookedSources) {
"(after end of source)"));
data_ = buffer_.Marshal();
buffer_.clear();
for (std::size_t ffStart : possibleFixedFormContinuations_) {
if (ffStart > 0 && ffStart + 1 < data_.size() &&
data_[ffStart - 1] == '\n' && data_[ffStart] == ' ') {
// This fixed form include line is the first source line in an
// #include file (or after an empty one). Connect it with the previous
// source line by deleting its terminal newline.
data_[ffStart - 1] = ' ';
}
}
possibleFixedFormContinuations_.clear();
allCookedSources.Register(*this);
}

Expand Down
12 changes: 8 additions & 4 deletions flang/lib/Parser/token-sequence.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,7 @@ const TokenSequence &TokenSequence::CheckBadFortranCharacters(
return *this;
}

const TokenSequence &TokenSequence::CheckBadParentheses(
Messages &messages) const {
// First, a quick pass with no allocation for the common case
bool TokenSequence::BadlyNestedParentheses() const {
int nesting{0};
std::size_t tokens{SizeInTokens()};
for (std::size_t j{0}; j < tokens; ++j) {
Expand All @@ -394,8 +392,14 @@ const TokenSequence &TokenSequence::CheckBadParentheses(
}
}
}
if (nesting != 0) {
return nesting != 0;
}

const TokenSequence &TokenSequence::CheckBadParentheses(
Messages &messages) const {
if (BadlyNestedParentheses()) {
// There's an error; diagnose it
std::size_t tokens{SizeInTokens()};
std::vector<std::size_t> stack;
for (std::size_t j{0}; j < tokens; ++j) {
CharBlock token{TokenAt(j)};
Expand Down
1 change: 1 addition & 0 deletions flang/test/Preprocessing/ff-args.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
+3.14159)
14 changes: 14 additions & 0 deletions flang/test/Preprocessing/ff-include-args.F
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! RUN: %flang -E %s 2>&1 | FileCheck %s
! CHECK: call foo ( 3.14159)
! CHECK: subroutine foo(test)
call foo (
#include "ff-args.h"
end
#define TEST
subroutine foo(
#ifdef TEST
+test)
#else
+)
#endif
end
Loading