Changeset d2ded3e7 for src/GenPoly

Timestamp:

Oct 28, 2015, 3:47:29 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

37a3b8f9, 4673385, e56cfdb0

Parents:

698664b3 (diff), 097e2b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge changes into current branch

Location:

src/GenPoly

Files:

• PolyMutator.cc (modified) (3 diffs)
• PolyMutator.h (modified) (2 diffs)
• Specialize.cc (modified) (2 diffs)

src/GenPoly/PolyMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:50:58 2015
-// Update Count     : 3
+// Last Modified On : Fri Aug 14 15:28:50 2015
+// Update Count     : 11
 //
 
@@ -20 +20 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Mutator.h"
-
+#include "SynTree/Initializer.h"
 
 namespace GenPoly {
@@ -146 +146 @@
         }
  
+ 
+        Initializer *PolyMutator::mutate( SingleInit *singleInit ) {
+                singleInit->set_value( mutateExpression( singleInit->get_value() ) );
+                return singleInit;
+        }
+
+
         /* static class method */
         void PolyMutator::makeTyVarMap( Type *type, TyVarMap &tyVarMap ) {

src/GenPoly/PolyMutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:46:45 2015
-// Update Count     : 1
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Aug 14 15:27:38 2015
+// Update Count     : 4
 //
 
@@ -45 +45 @@
   
                 virtual Expression* mutate(UntypedExpr *untypedExpr);
-  
+
+                virtual Initializer* mutate(SingleInit *SingleInit);
+
                 // template method
                 virtual void doBeginScope() {}

src/GenPoly/Specialize.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 15:54:07 2015
-// Update Count     : 6
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Sep 22 14:04:13 2015
+// Update Count     : 15
 //
 
@@ -200 +200 @@
         Expression * Specialize::mutate( AddressExpr *addrExpr ) {
                 addrExpr->get_arg()->acceptMutator( *this );
+                assert( ! addrExpr->get_results().empty() );
                 addrExpr->set_arg( doSpecialization( addrExpr->get_results().front(), addrExpr->get_arg() ) );
                 return addrExpr;