maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Don't process preprocessor directives amid continuation lines any more. 

Original-commit: flang-compiler/f18@4a3dbb5d3e
Reviewed-on: https://github.com/flang-compiler/f18/pull/81
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2018-05-01 15:54:04 -07:00
parent d9ff8df5db
commit 795df00209
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flang/lib/parser/prescan.cc
View File

@ -37,7 +37,7 @@ Prescanner::Prescanner(const Prescanner &that)
: messages_{that.messages_}, cooked_{that.cooked_},
preprocessor_{that.preprocessor_}, inFixedForm_{that.inFixedForm_},
fixedFormColumnLimit_{that.fixedFormColumnLimit_},
enableOldDebugLines_{that.enableOldDebugLines_},
encoding_{that.encoding_}, enableOldDebugLines_{that.enableOldDebugLines_},
enableBackslashEscapesInCharLiterals_{
that.enableBackslashEscapesInCharLiterals_},
warnOnNonstandardUsage_{that.warnOnNonstandardUsage_},
@ -633,19 +633,10 @@ bool Prescanner::IsNextLinePreprocessorDirective() const {
return IsPreprocessorDirectiveLine(lineStart_);
}
void Prescanner::SkipCommentLinesAndPreprocessorDirectives() {
while (lineStart_ < limit_) {
LineClassification line{ClassifyLine(lineStart_)};
switch (line.kind) {
case LineClassification::Kind::PreprocessorDirective:
if (inPreprocessorDirective_) {
return;
}
preprocessor_.Directive(TokenizePreprocessorDirective(), this);
break;
case LineClassification::Kind::Comment: NextLine(); break;
default: return;
}
void Prescanner::SkipCommentLines() {
while (lineStart_ < limit_ &&
ClassifyLine(lineStart_).kind == LineClassification::Kind::Comment) {
NextLine();
}
}
@ -711,7 +702,7 @@ bool Prescanner::FixedFormContinuation() {
if (*at_ == '&' && inCharLiteral_) {
return false;
}
SkipCommentLinesAndPreprocessorDirectives();
SkipCommentLines();
const char *cont{FixedFormContinuationLine()};
if (cont == nullptr) {
return false;
@ -732,7 +723,7 @@ bool Prescanner::FreeFormContinuation() {
if (*p != '\n' && (inCharLiteral_ || *p != '!')) {
return false;
}
SkipCommentLinesAndPreprocessorDirectives();
SkipCommentLines();
p = lineStart_;
if (p >= limit_) {
return false;

2
flang/lib/parser/prescan.h
View File

@ -148,7 +148,7 @@ private:
void QuotedCharacterLiteral(TokenSequence *);
void Hollerith(TokenSequence *, int);
bool PadOutCharacterLiteral(TokenSequence *);
void SkipCommentLinesAndPreprocessorDirectives();
void SkipCommentLines();
bool IsFixedFormCommentLine(const char *) const;
bool IsFreeFormComment(const char *) const;
std::optional<std::size_t> IsIncludeLine(const char *) const;