Merge pull request swiftlang#21362 from akyrtzi/parserunit-parse

[Parser] Introduce ParserUnit::parse() function to avoid duplication of code

Author: akyrtzi

include/swift/Subsystems.h

@@ -342,6 +342,8 @@ namespace swift {
 
     ~ParserUnit();
 
+    void parse();
+
     Parser &getParser();
     SourceFile &getSourceFile();
     DiagnosticEngine &getDiagnosticEngine();

lib/IDE/Utils.cpp

@@ -104,16 +104,9 @@ ide::isSourceInputComplete(std::unique_ptr<llvm::MemoryBuffer> MemBuf,
   SourceManager SM;
   auto BufferID = SM.addNewSourceBuffer(std::move(MemBuf));
   ParserUnit Parse(SM, SFKind, BufferID);
-  Parser &P = Parse.getParser();
-
-  bool Done;
-  do {
-    P.parseTopLevel();
-    Done = P.Tok.is(tok::eof);
-  } while (!Done);
-
+  Parse.parse();
   SourceCompleteResult SCR;
-  SCR.IsComplete = !P.isInputIncomplete();
+  SCR.IsComplete = !Parse.getParser().isInputIncomplete();
 
   // Use the same code that was in the REPL code to track the indent level
   // for now. In the future we should get this from the Parser if possible.

lib/Parse/Parser.cpp

@@ -1098,6 +1098,16 @@ ParserUnit::~ParserUnit() {
   delete &Impl;
 }
 
+void ParserUnit::parse() {
+  auto &P = getParser();
+  bool Done = false;
+  while (!Done) {
+    P.parseTopLevel();
+    Done = P.Tok.is(tok::eof);
+  }
+  P.finalizeSyntaxTree();
+}
+
 Parser &ParserUnit::getParser() {
   return *Impl.TheParser;
 }

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -698,13 +698,7 @@ class SwiftDocumentSyntaxInfo {
   }
 
   void parse() {
-    auto &P = Parser->getParser();
-    bool Done = false;
-    while (!Done) {
-      P.parseTopLevel();
-      Done = P.Tok.is(tok::eof);
-    }
-    P.finalizeSyntaxTree();
+    Parser->parse();
   }
 
   SourceFile &getSourceFile() {

tools/driver/swift_format_main.cpp

@@ -65,10 +65,7 @@ class FormatterDocument {
                                 BufferID, CompInv.getLangOptions(),
                                 CompInv.getModuleName()));
     Parser->getDiagnosticEngine().addConsumer(DiagConsumer);
-    auto &P = Parser->getParser();
-    for (bool Done = false; !Done; Done = P.Tok.is(tok::eof)) {
-      P.parseTopLevel();
-    }
+    Parser->parse();
   }
 
   std::pair<LineRange, std::string> reformat(LineRange Range,