Changeset cbaee0d for src/main.cc

Timestamp:

Aug 16, 2016, 9:49:29 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5ead9f9

Parents:

08ac489

Message:

more refactoring of parser code

File:

• src/main.cc (modified) (6 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 17:47:52 2016
-// Update Count     : 252
+// Last Modified On : Tue Aug 16 21:33:49 2016
+// Update Count     : 260
 //
 
@@ -55 +55 @@
 LinkageSpec::Type linkage = LinkageSpec::Cforall;
 TypedefTable typedefTable;
-DeclarationNode *parseTree = nullptr;                                   // program parse tree
+DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
 bool
@@ -78 +78 @@
 static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
 static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
-static void parse_cmdline( int argc, char *argv[], const char *&filename );
-
-
-int main( int argc, char *argv[] ) {
-        FILE *input;
-        std::ostream *output = &std::cout;
+static void parse_cmdline( int argc, char *argv[], const char *& filename );
+
+
+int main( int argc, char * argv[] ) {
+        FILE * input;
+        std::ostream *output = & std::cout;
         std::list< Declaration * > translationUnit;
         const char *filename = NULL;
@@ -155 +155 @@
                 buildList( parseTree, translationUnit );
                 delete parseTree;
+                parseTree = nullptr;
 
                 if ( astp ) {
@@ -268 +269 @@
 } // main
 
-void parse_cmdline( int argc, char *argv[], const char *&filename ) {
+void parse_cmdline( int argc, char * argv[], const char *& filename ) {
         enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
 
@@ -376 +377 @@
 static void parse( FILE * input, LinkageSpec::Type link, bool shouldExit ) {
         extern int yyparse( void );
-        extern FILE *yyin;
+        extern FILE * yyin;
         extern int yylineno;