Changeset 71f4e4f for src/InitTweak

Timestamp:

Jan 13, 2016, 5:19:47 PM (9 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:

f1e012b

Parents:

02c7d04

Message:

added ConstructorInit?, simple constructors and destructors work correctly

Location:

src/InitTweak

Files:

• FixInit.cc (added)
• FixInit.h (added)
• RemoveInit.cc (modified) (3 diffs)
• module.mk (modified) (1 diff)

src/InitTweak/RemoveInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jan 11 16:10:45 2016
-// Update Count     : 150
+// Last Modified On : Wed Jan 13 15:19:35 2016
+// Update Count     : 154
 //
 
@@ -148 +148 @@
                 }
 
-                ExprStmt * makeCtorDtorStmt( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
+                Expression * makeCtorDtorExpr( std::string name, ObjectDecl * objDecl, std::list< Expression * > args ) {
                         UntypedExpr * expr = new UntypedExpr( new NameExpr( name ) );
                         expr->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
                         expr->get_args().splice( expr->get_args().end(), args );
-                        return new ExprStmt( noLabels, expr );
+                        return expr;
                 }
 
@@ -186 +186 @@
                 // hands off if designated or if @=
                 if ( tryConstruct( objDecl ) ) {
-                        ExprStmt * ctor = makeCtorDtorStmt( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
-                        ExprStmt * dtor = makeCtorDtorStmt( "^?{}", objDecl, std::list< Expression * >() );
-
-                        // set_ctor...
+                        Expression * ctor = makeCtorDtorExpr( "?{}", objDecl, makeInitList( objDecl->get_init() ) );
+                        Expression * dtor = makeCtorDtorExpr( "^?{}", objDecl, std::list< Expression * >() );
+
                         // need to remember init expression, in case no ctors exist
-                        // if ctor does exist, want to use ctor stmt instead of init
-                        objDecl->set_ctor( ctor );
-                        destructorStmts.push_front( dtor );
+                        // if ctor does exist, want to use ctor expression instead of init
+                        // push this decision to the resolver
+                        objDecl->set_init( new ConstructorInit( ctor, objDecl->get_init() ) );
+                        destructorStmts.push_front( new ExprStmt( noLabels, dtor ) );
                 }
                 return objDecl;

src/InitTweak/module.mk

@@ -11 +11 @@
 ## Created On       : Mon Jun  1 17:49:17 2015
 ## Last Modified By : Rob Schluntz
-## Last Modified On : Mon Jan 11 14:40:16 2016
-## Update Count     : 2
+## Last Modified On : Wed Jan 13 16:29:03 2016
+## Update Count     : 3
 ###############################################################################
 
-SRC += InitTweak/RemoveInit.cc
-
+SRC += InitTweak/RemoveInit.cc \
+        InitTweak/FixInit.cc