[flang] Remove a needless std::move() call, and be more careful about line continuation.

Original-commit: flang-compiler/f18@e26421513fd8d55680bf3b5a261c7aee036d9318
Reviewed-on: https://github.com/flang-compiler/f18/pull/48
Tree-same-pre-rewrite: false

diff --git a/flang/lib/parser/prescan.cc b/flang/lib/parser/prescan.cc
index 4ce764c..1f42903 100644 (file)
--- a/flang/lib/parser/prescan.cc
+++ b/flang/lib/parser/prescan.cc
@@ -171,7 +171,7 @@ TokenSequence Prescanner::TokenizePreprocessorDirective() {
   }
   inPreprocessorDirective_ = false;
   at_ = saveAt;
-  return {std::move(tokens)};  // TODO: is std::move() necessary?
+  return tokens;
 }
 
 void Prescanner::Say(Message &&message) { messages_.Put(std::move(message)); }
@@ -619,6 +619,9 @@ void Prescanner::SkipCommentLinesAndPreprocessorDirectives() {
     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;