Changeset 4550bcf

Timestamp:

Aug 14, 2015, 3:30:35 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, string, with_gc

Children:

4aa0858, 8a4da06, aa99647

Parents:

f32c7f4 (diff), 09f800b (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 branch 'master' into designate

Location:

src

Files:

• GenPoly/PolyMutator.cc (modified) (3 diffs)
• GenPoly/PolyMutator.h (modified) (2 diffs)
• ResolvExpr/CastCost.cc (modified) (3 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/ResolvExpr/CastCost.cc

@@ -66 +66 @@
 
         void CastCost::visit( BasicType *basicType ) {
-                if ( dynamic_cast< PointerType* >( dest ) ) {
+                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
+                if ( destAsPointer && basicType->isInteger() ) {
                         cost = Cost( 1, 0, 0 );
                 } else {
@@ -77 +78 @@
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
                                 cost = Cost( 0, 0, 1 );
-                        } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                                if ( destAsBasic->isInteger() ) {
-                                        cost = Cost( 1, 0, 0 );
-                                } // if
                         } else {
                                 TypeEnvironment newEnv( env );
@@ -92 +89 @@
                                 } // if
                         } // if
-                } // if
+                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                        if ( destAsBasic->isInteger() ) {
+                                cost = Cost( 1, 0, 0 );
+                        } // if
+                }
         }
 } // namespace ResolvExpr