Changeset d99a716 for src/Parser

Timestamp:

Jan 4, 2023, 1:44:19 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

Children:

339e30a, a14926b

Parents:

0348fd8 (diff), 66a89e7 (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

Location:

src/Parser

Files:

• RunParser.cpp (modified) (3 diffs)
• RunParser.hpp (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
@@ -41 +45 @@
 } // parse
 
-void dumpParseTree( std::ostream & out ) {
-        parseTree->printList( out );
-        delete parseTree;
-        parseTree = nullptr;
-}
-
-std::list<Declaration *> buildUnit(void) {
+ast::TranslationUnit buildUnit(void) {
         std::list<Declaration *> translationUnit;
         buildList( parseTree, translationUnit );
@@ -54 +52 @@
         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;
 }
 

src/Parser/RunParser.hpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 10:42: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:23:00 2022
+// Update Count     : 1
 //
 
@@ -17 +17 @@
 
 #include <iosfwd>                           // for ostream
-#include <list>                             // for list
 
 #include "SynTree/LinkageSpec.h"            // for Spec
-class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 // The Parser does not have an enclosing namespace.
@@ -30 +31 @@
 void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
 
-/// Drain the internal accumulator of parsed code and print it to the stream.
-void dumpParseTree( std::ostream & );
-
 /// Drain the internal accumulator of parsed code and build a translation
 /// unit from it.
-std::list<Declaration *> buildUnit(void);
+ast::TranslationUnit buildUnit(void);
 
 // Local Variables: //