Changeset cbd1ba8

Timestamp:

Dec 19, 2022, 11:51:04 AM (19 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

d0bdb18

Parents:

c63f470

Message:

Moved parsing code out of main into the parsing directly, as an organizational improvement. The new files use the new naming convention, and should be converted to the new AST.

Location:

src

Files:

• Parser/RunParser.cpp (added)
• Parser/RunParser.hpp (added)
• Parser/module.mk (modified) (1 diff)
• main.cc (modified) (5 diffs)

src/Parser/module.mk

@@ -30 +30 @@
        Parser/parserutility.cc \
        Parser/parserutility.h \
+       Parser/RunParser.cpp \
+       Parser/RunParser.hpp \
        Parser/StatementNode.cc \
        Parser/TypeData.cc \

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() );