Changeset b110bcc for src/Parser/RunParser.cpp

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

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