Changeset db4ecc5 for src/ResolvExpr

Timestamp:

Apr 14, 2016, 3:22:42 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:

70a06f6

Parents:

7eabc25

Message:

add ImplicitCopyCtorExpr? node, implicit copy constructors are inserted into the right places (but there is room for elision)

Location:

src/ResolvExpr

Files:

• Resolver.cc (modified) (5 diffs)
• Resolver.h (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 04 17:11:54 2016
+// Last Modified On : Thu Apr 14 11:18:12 2016
 // Update Count     : 203
 //
@@ -61 +61 @@
           void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator & );
           void fallbackInit( ConstructorInit * ctorInit );
-
                 std::list< Type * > functionReturn;
                 Type *initContext;
@@ -84 +83 @@
         }
 
+
         namespace {
                 void finishExpr( Expression *expr, const TypeEnvironment &env ) {
@@ -89 +89 @@
                         env.makeSubstitution( *expr->get_env() );
                 }
-
-                Expression *findVoidExpression( Expression *untyped, const SymTab::Indexer &indexer ) {
-                        global_renamer.reset();
-                        TypeEnvironment env;
-                        Expression *newExpr = resolveInVoidContext( untyped, indexer, env );
-                        finishExpr( newExpr, env );
-                        return newExpr;
-                }
-
+        } // namespace
+
+        Expression *findVoidExpression( Expression *untyped, const SymTab::Indexer &indexer ) {
+                global_renamer.reset();
+                TypeEnvironment env;
+                Expression *newExpr = resolveInVoidContext( untyped, indexer, env );
+                finishExpr( newExpr, env );
+                return newExpr;
+        }
+
+        namespace {
                 Expression *findSingleExpression( Expression *untyped, const SymTab::Indexer &indexer ) {
                         TypeEnvironment env;
@@ -484 +486 @@
 
         void Resolver::visit( ConstructorInit *ctorInit ) {
-                TypeEnvironment env;
                 try {
                         maybeAccept( ctorInit->get_ctor(), *this );

src/ResolvExpr/Resolver.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Resolver.h -- 
+// Resolver.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:18:34 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:19:32 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Apr 14 15:06:53 2016
 // Update Count     : 2
 //
@@ -24 +24 @@
         void resolve( std::list< Declaration * > translationUnit );
         Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer );
+        Expression *findVoidExpression( Expression *untyped, const SymTab::Indexer &indexer );
 } // namespace ResolvExpr