Changeset 019b2d3 for src/Parser/RunParser.cpp

Timestamp:

Dec 22, 2022, 3:17:52 PM (19 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

64b3cda

Parents:

be3b952

Message:

Moved new to old ast conversion up into the RunParser? module. As far as main is concerned the new ast is used from the beginning (except for LinkageSpec::Spec).

File:

• src/Parser/RunParser.cpp (modified) (3 diffs)

src/Parser/RunParser.cpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 11:00:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec 19 11:15:00 2022
-// Update Count     : 0
+// Last Modified On : Thr Dec 22 10:18:00 2022
+// Update Count     : 1
 //
 
 #include "RunParser.hpp"
 
+#include "AST/Convert.hpp"                  // for convert
+#include "AST/TranslationUnit.hpp"          // for TranslationUnit
+#include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Parser/ParseNode.h"               // for DeclarationNode, buildList
 #include "Parser/TypedefTable.h"            // for TypedefTable
@@ -47 +51 @@
 }
 
-std::list<Declaration *> buildUnit(void) {
+ast::TranslationUnit buildUnit(void) {
         std::list<Declaration *> translationUnit;
         buildList( parseTree, translationUnit );
@@ -54 +58 @@
         parseTree = nullptr;
 
-        return translationUnit;
+        // When the parse/buildList code is translated to the new ast, these
+        // fill passes (and the one after 'Hoist Type Decls') should be redundent
+        // because the code locations should already be filled.
+        CodeTools::fillLocations( translationUnit );
+        ast::TranslationUnit transUnit = convert( std::move( translationUnit ) );
+        forceFillCodeLocations( transUnit );
+        return transUnit;
 }