Changeset ca1c11f

Timestamp:

Jan 20, 2016, 12:36:27 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, 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:

771b3c3

Parents:

f1e012b

Message:

added constructor debug flag -c, fixed mistake in removing extraneous destructor calls

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (3 diffs)
• main.cc (modified) (7 diffs)

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 13:25:13 2016
-// Update Count     : 27
+// Last Modified On : Tue Jan 19 16:36:59 2016
+// Update Count     : 30
 //
 
@@ -73 +73 @@
         CompoundStmt * FixInit::mutate( CompoundStmt * compoundStmt ) {
                 std::list< Statement * > & statements = compoundStmt->get_kids();
-                for ( std::list< Statement * >::iterator it = statements.begin(); it != statements.end(); ++it ) {
+                for ( std::list< Statement * >::iterator it = statements.begin(); it != statements.end(); ) {
                         // remove if instrinsic destructor statement
                         // xxx - test user manually calling intrinsic functions - what happens?
@@ -81 +81 @@
                                                 if ( function->get_var()->get_name() == "^?{}" && function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                                                         statements.erase(it++);
+                                                        continue;
+                                                } else {
                                                 }
                                         }
                                 }
                         }
+                        ++it;
                 }
                 // mutate non-destructor statements
-                return Mutator::mutate( compoundStmt );
+                return PolyMutator::mutate( compoundStmt );
         }
 

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 13:16:23 2016
-// Update Count     : 185
+// Last Modified On : Tue Jan 19 16:28:13 2016
+// Update Count     : 194
 //
 
@@ -62 +62 @@
         astp = false,
         bresolvep = false,
+        ctorinitp = false,
         exprp = false,
         expraltp = false,
@@ -75 +76 @@
         codegenp = false;
 
-enum { Ast, Bresolver, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Validate, };
+enum { Ast, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Validate, };
 
 static struct option long_opts[] = {
         { "ast", no_argument, 0, Ast },
         { "before-resolver", no_argument, 0, Bresolver },
+        { "ctorinitfix", no_argument, 0, CtorInitFix },
         { "expr", no_argument, 0, Expr },
         { "expralt", no_argument, 0, ExprAlt },
@@ -102 +104 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abcefFglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -111 +113 @@
                   case 'b':                                                                             // print before resolver steps
                         bresolvep = true;
+                        break;
+                        case CtorInitFix:
+                        case 'c':
+                        ctorinitp = true;
                         break;
                   case Expr:
@@ -264 +270 @@
                 if ( exprp ) {
                         dump( translationUnit );
+                        return 0;
                 }
 
@@ -269 +276 @@
                 // fix ObjectDecl - replaces ConstructorInit nodes
                 InitTweak::fix( translationUnit );
+                if ( ctorinitp ) {
+                        dump ( translationUnit );
+                        return 0;
+                }
 
                 OPTPRINT( "instantiateGeneric" )