Changeset 1afda5a2 for src/main.cc

Timestamp:

Dec 19, 2022, 9:37:55 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

199456c, ebbe941

Parents:

8e64cb4 (diff), d18540f (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/main.cc (modified) (5 diffs)

src/main.cc

@@ -59 +59 @@
 #include "InitTweak/GenInit.h"              // for genInit
 #include "MakeLibCfa.h"                     // for makeLibCfa
-#include "Parser/ParseNode.h"               // for DeclarationNode, buildList
-#include "Parser/TypedefTable.h"            // for TypedefTable
+#include "Parser/RunParser.hpp"             // for buildList, dumpParseTree,...
 #include "ResolvExpr/CandidatePrinter.hpp"  // for printCandidates
 #include "ResolvExpr/Resolver.h"            // for resolve
@@ -109 +108 @@
         Stats::Time::StopBlock();
 
-LinkageSpec::Spec linkage = LinkageSpec::Cforall;
-TypedefTable typedefTable;
-DeclarationNode * parseTree = nullptr;                                  // program parse tree
-
 static bool waiting_for_gdb = false;                                    // flag to set cfa-cpp to wait for gdb on start
 
@@ -118 +113 @@
 
 static void parse_cmdline( int argc, char * argv[] );
-static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
 static void dump( ast::TranslationUnit && transUnit, ostream & out = cout );
@@ -301 +295 @@
 
                 if ( parsep ) {
-                        parseTree->printList( cout );
-                        delete parseTree;
-                        return EXIT_SUCCESS;
-                } // if
-
-                buildList( parseTree, translationUnit );
-                delete parseTree;
-                parseTree = nullptr;
+                        dumpParseTree( cout );
+                        return EXIT_SUCCESS;
+                } // if
+
+                translationUnit = buildUnit();
 
                 if ( astp ) {
@@ -748 +739 @@
 } // parse_cmdline
 
-static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit ) {
-        extern int yyparse( void );
-        extern FILE * yyin;
-        extern int yylineno;
-
-        ::linkage = linkage;                                                            // set globals
-        yyin = input;
-        yylineno = 1;
-        int parseStatus = yyparse();
-
-        fclose( input );
-        if ( shouldExit || parseStatus != 0 ) {
-                exit( parseStatus );
-        } // if
-} // parse
-
 static bool notPrelude( Declaration * decl ) {
         return ! LinkageSpec::isBuiltin( decl->get_linkage() );