This is an archive of the discontinued LLVM Phabricator instance.

Differential D87638

[flang] Allow Fortran comments after #include path
ClosedPublic

Authored by klausler on Sep 14 2020, 2:50 PM.

Details

Reviewers
PeteSteinfeld
jdoerfert
DavidTruby
Commits
rG4706880f06fb: [flang] Allow Fortran comments after #include path
Summary

C-style /*comments*/ are removed during preprocessing directive
tokenization, but Fortran !comments need to be specifically
allowed.

Fixes LLVM bugzilla 47466.

Diff Detail

Event Timeline

klausler created this revision.Sep 14 2020, 2:50 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptSep 14 2020, 2:50 PM
Herald added a reviewer: DavidTruby. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
klausler requested review of this revision.Sep 14 2020, 2:50 PM
PeteSteinfeld accepted this revision.Sep 14 2020, 3:16 PM

All builds, tests, and looks good.

This revision is now accepted and ready to land.Sep 14 2020, 3:16 PM
Harbormaster completed remote builds in B71628: Diff 291697.Sep 14 2020, 3:24 PM
Closed by commit rG4706880f06fb: [flang] Allow Fortran comments after #include path (authored by klausler). · Explain WhySep 14 2020, 4:58 PM
This revision was automatically updated to reflect the committed changes.
klausler added a commit: rG4706880f06fb: [flang] Allow Fortran comments after #include path.

Revision Contents

PathSize
flang/
lib/
Parser/
16 lines
test/
Preprocessing/
18 lines

Diff 291697

flang/lib/Parser/preprocessor.cpp

Context not available.
return; return;
} }
std::string include; std::string include;
if (dir.TokenAt(j).ToString() == "<") { if (dir.TokenAt(j).ToString() == "<") { // #include <foo>
std::size_t k{j + 1}; std::size_t k{j + 1};
if (k >= tokens) { if (k >= tokens) {
prescanner->Say(dir.GetIntervalProvenanceRange(j, tokens - j), prescanner->Say(dir.GetIntervalProvenanceRange(j, tokens - j),
Context not available.
if (k >= tokens) { if (k >= tokens) {
prescanner->Say(dir.GetIntervalProvenanceRange(j, tokens - j), prescanner->Say(dir.GetIntervalProvenanceRange(j, tokens - j),
"#include: expected '>' at end of included file"_en_US); "#include: expected '>' at end of included file"_en_US);
} else if (k + 1 < tokens) {
prescanner->Say(dir.GetIntervalProvenanceRange(k + 1, tokens - k - 1),
"#include: extra stuff ignored after '>'"_en_US);
} }
TokenSequence braced{dir, j + 1, k - j - 1}; TokenSequence braced{dir, j + 1, k - j - 1};
include = ReplaceMacros(braced, *prescanner).ToString(); include = ReplaceMacros(braced, *prescanner).ToString();
} else if (j + 1 == tokens && j = k;
(include = dir.TokenAt(j).ToString()).substr(0, 1) == "\"" && } else if ((include = dir.TokenAt(j).ToString()).substr(0, 1) == "\"" &&
include.substr(include.size() - 1, 1) == "\"") { include.substr(include.size() - 1, 1) == "\"") { // #include "foo"
include = include.substr(1, include.size() - 2); include = include.substr(1, include.size() - 2);
} else { } else {
prescanner->Say(dir.GetTokenProvenanceRange(j < tokens ? j : tokens - 1), prescanner->Say(dir.GetTokenProvenanceRange(j < tokens ? j : tokens - 1),
Context not available.
"#include: empty include file name"_err_en_US); "#include: empty include file name"_err_en_US);
return; return;
} }
j = dir.SkipBlanks(j + 1);
if (j < tokens && dir.TokenAt(j).ToString() != "!") {
prescanner->Say(dir.GetIntervalProvenanceRange(j, tokens - j),
"#include: extra stuff ignored after file name"_en_US);
}
std::string buf; std::string buf;
llvm::raw_string_ostream error{buf}; llvm::raw_string_ostream error{buf};
const SourceFile *included{allSources_.Open(include, error)}; const SourceFile *included{allSources_.Open(include, error)};
Context not available.

flang/test/Preprocessing/empty.h

  • This file was added.
This is an empty file.

flang/test/Preprocessing/include-comment.F90

  • This file was added.
! RUN: %f18 -I%S -E %s 2>&1 | FileCheck %s
! CHECK-NOT: :3:
#include <empty.h> ! comment
! CHECK-NOT: :5:
#include <empty.h> /* comment */
! CHECK-NOT: :7:
#include <empty.h> !comment
! CHECK: :9:20: #include: extra stuff ignored after file name
#include <empty.h> comment
! CHECK-NOT: :11:
#include "empty.h" ! comment
! CHECK-NOT: :13:
#include "empty.h" /* comment */
! CHECK-NOT: :15:
#include "empty.h" !comment
! CHECK: :17:20: #include: extra stuff ignored after file name
#include "empty.h" comment
end