Changeset 77971f6 for src/Tuples/TupleExpansion.cc

Timestamp:

Oct 27, 2016, 3:24:02 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

3f0c6a5

Parents:

a1e67dd

git-author:

Rob Schluntz <rschlunt@…> (10/27/16 15:11:00)

git-committer:

Rob Schluntz <rschlunt@…> (10/27/16 15:24:02)

Message:

resolve ctor/dtors for UniqueExprs?

File:

• src/Tuples/TupleExpansion.cc (modified) (2 diffs)

src/Tuples/TupleExpansion.cc

@@ -141 +141 @@
 
         Expression * UniqueExprExpander::mutate( UniqueExpr * unqExpr ) {
-                static UniqueName tempNamer( "_unq_expr_" );
                 unqExpr = safe_dynamic_cast< UniqueExpr * > ( Parent::mutate( unqExpr ) );
                 if ( ! decls.count( unqExpr->get_id() ) ) {
@@ -160 +159 @@
                         // }
 
-                        // xxx - attach a resolved ConstructorInit node?
-                        // xxx - is it possible to make the objDecl's type const?
-                        ObjectDecl * objDecl = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::Cforall, nullptr, unqExpr->get_result()->clone(), nullptr );
-                        // must be done on two lines because genCtorInit accesses objDecl's fields
-                        objDecl->set_init( InitTweak::genCtorInit( objDecl ) );
-
+                        ObjectDecl * objDecl = unqExpr->get_object();
+                        unqExpr->set_object( nullptr );
                         decls[unqExpr->get_id()] = objDecl;
                         addDeclaration( objDecl );