Changes in src/Parser/RunParser.cpp [c468150:64b3cda]

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 Mar  6  9:42:00 2023
-// Update Count     : 3
+// Last Modified On : Thr Dec 22 10:18:00 2022
+// Update Count     : 1
 //
 
@@ -20 +20 @@
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
-#include "Parser/DeclarationNode.h"         // for DeclarationNode, buildList
+#include "Parser/ParseNode.h"               // for DeclarationNode, buildList
 #include "Parser/TypedefTable.h"            // for TypedefTable
 
 // Variables global to the parsing code.
-ast::Linkage::Spec linkage = ast::Linkage::Cforall;
+LinkageSpec::Spec linkage = LinkageSpec::Cforall;
 TypedefTable typedefTable;
 DeclarationNode * parseTree = nullptr;
 
-void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit ) {
+void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit ) {
         extern int yyparse( void );
         extern FILE * yyin;
@@ -46 +46 @@
 
 ast::TranslationUnit buildUnit(void) {
-        std::vector<ast::ptr<ast::Decl>> decls;
-        buildList( parseTree, decls );
+        std::list<Declaration *> translationUnit;
+        buildList( parseTree, translationUnit );
+
         delete parseTree;
         parseTree = nullptr;
 
-        ast::TranslationUnit transUnit;
-        for ( auto decl : decls ) {
-                transUnit.decls.emplace_back( std::move( decl ) );
-        }
+        // 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;
 }