Changeset 4550bcf


Ignore:
Timestamp:
Aug 14, 2015, 3:30:35 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/PolyMutator.cc

    rf32c7f4 r4550bcf  
    1010// Created On       : Mon May 18 07:44:20 2015
    1111// Last Modified By : Rob Schluntz
    12 // Last Modified On : Wed Jul 15 14:50:58 2015
    13 // Update Count     : 3
     12// Last Modified On : Fri Aug 14 15:28:50 2015
     13// Update Count     : 11
    1414//
    1515
     
    2020#include "SynTree/Statement.h"
    2121#include "SynTree/Mutator.h"
    22 
     22#include "SynTree/Initializer.h"
    2323
    2424namespace GenPoly {
     
    146146        }
    147147 
     148 
     149        Initializer *PolyMutator::mutate( SingleInit *singleInit ) {
     150                singleInit->set_value( mutateExpression( singleInit->get_value() ) );
     151                return singleInit;
     152        }
     153
     154
    148155        /* static class method */
    149156        void PolyMutator::makeTyVarMap( Type *type, TyVarMap &tyVarMap ) {
  • src/GenPoly/PolyMutator.h

    rf32c7f4 r4550bcf  
    99// Author           : Richard C. Bilson
    1010// Created On       : Mon May 18 07:44:20 2015
    11 // Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue May 19 07:46:45 2015
    13 // Update Count     : 1
     11// Last Modified By : Rob Schluntz
     12// Last Modified On : Fri Aug 14 15:27:38 2015
     13// Update Count     : 4
    1414//
    1515
     
    4545 
    4646                virtual Expression* mutate(UntypedExpr *untypedExpr);
    47  
     47
     48                virtual Initializer* mutate(SingleInit *SingleInit);
     49
    4850                // template method
    4951                virtual void doBeginScope() {}
  • src/ResolvExpr/CastCost.cc

    rf32c7f4 r4550bcf  
    6666
    6767        void CastCost::visit( BasicType *basicType ) {
    68                 if ( dynamic_cast< PointerType* >( dest ) ) {
     68                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
     69                if ( destAsPointer && basicType->isInteger() ) {
    6970                        cost = Cost( 1, 0, 0 );
    7071                } else {
     
    7778                        if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
    7879                                cost = Cost( 0, 0, 1 );
    79                         } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
    80                                 if ( destAsBasic->isInteger() ) {
    81                                         cost = Cost( 1, 0, 0 );
    82                                 } // if
    8380                        } else {
    8481                                TypeEnvironment newEnv( env );
     
    9289                                } // if
    9390                        } // if
    94                 } // if
     91                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
     92                        if ( destAsBasic->isInteger() ) {
     93                                cost = Cost( 1, 0, 0 );
     94                        } // if
     95                }
    9596        }
    9697} // namespace ResolvExpr
Note: See TracChangeset for help on using the changeset viewer.