Changeset 68f9c43 for src/main.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

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

src/main.cc

@@ -37 +37 @@
 #include "Common/PassVisitor.h"
 #include "Common/CompilerError.h"           // for CompilerError
+#include "Common/GC.h"                                          // for GC
 #include "Common/SemanticError.h"           // for SemanticError
 #include "Common/UnimplementedError.h"      // for UnimplementedError
@@ -57 +58 @@
 #include "SymTab/Validate.h"                // for validate
 #include "SynTree/Declaration.h"            // for Declaration
+#include "SynTree/GcTracer.h"               // for GC << TranslationUnit
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
@@ -64 +66 @@
 
 #define OPTPRINT(x) if ( errorp ) cerr << x << endl;
-
 
 LinkageSpec::Spec linkage = LinkageSpec::Cforall;
@@ -233 +234 @@
                 delete parseTree;
                 parseTree = nullptr;
+                collect( translationUnit );
 
                 if ( astp ) {
@@ -242 +244 @@
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
-                if ( symtabp ) {
-                        deleteAll( translationUnit );
-                        return 0;
-                } // if
+                collect( translationUnit );
+                if ( symtabp ) return 0;
 
                 if ( expraltp ) {
@@ -266 +266 @@
                 OPTPRINT( "expandMemberTuples" );
                 Tuples::expandMemberTuples( translationUnit );
+                collect( translationUnit );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -273 +274 @@
                 if ( declstatsp ) {
                         CodeTools::printDeclStats( translationUnit );
-                        deleteAll( translationUnit );
                         return 0;
                 }
@@ -286 +286 @@
                 OPTPRINT( "resolve" )
                 ResolvExpr::resolve( translationUnit );
+                collect( translationUnit );
                 if ( exprp ) {
                         dump( translationUnit );
@@ -294 +295 @@
                 OPTPRINT( "fixInit" )
                 InitTweak::fix( translationUnit, filename, libcfap || treep );
+                collect( translationUnit );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -313 +315 @@
                 OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
                 Tuples::expandTuples( translationUnit );
+                collect( translationUnit );
                 if ( tuplep ) {
                         dump( translationUnit );
@@ -323 +326 @@
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );
+                collect( translationUnit );
                 if ( genericsp ) {
                         dump( translationUnit );
                         return 0;
                 }
+
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
-
-
+                collect( translationUnit );
                 if ( bboxp ) {
                         dump( translationUnit );
                         return 0;
                 } // if
+
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
-
+                collect( translationUnit );
                 if ( bcodegenp ) {
                         dump( translationUnit );
@@ -383 +388 @@
         } // try
 
-        deleteAll( translationUnit );
         return 0;
 } // main
@@ -568 +572 @@
                 printAll( decls, out );
         }
-        deleteAll( translationUnit );
 } // dump