Changeset 28e58fd for src/ResolvExpr/typeops.h

Timestamp:

Aug 25, 2017, 10:38:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

800d275

Parents:

af08051 (diff), 3eab308c (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/typeops.h (modified) (1 diff)

src/ResolvExpr/typeops.h

@@ -66 +66 @@
         Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
 
-        template< typename SrcIterator, typename DestIterator >
-        Cost castCostList( SrcIterator srcBegin, SrcIterator srcEnd, DestIterator destBegin, DestIterator destEnd, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
-                Cost ret;
-                if ( destBegin == destEnd ) {
-                        if ( srcBegin == srcEnd ) {
-                                return Cost::zero;
-                        } else {
-                                return Cost( 0, 0, 1 );
-                        } // if
-                } // if
-                while ( srcBegin != srcEnd && destBegin != destEnd ) {
-                        Cost thisCost = castCost( *srcBegin++, *destBegin++, indexer, env );
-                        if ( thisCost == Cost::infinity ) {
-                                return Cost::infinity;
-                        } // if
-                        ret += thisCost;
-                } // while
-                if ( srcBegin == srcEnd && destBegin == destEnd ) {
-                        return ret;
-                } else {
-                        return Cost::infinity;
-                } // if
-        }
-
         // in ConversionCost.cc
         Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
-
-        template< typename SrcIterator, typename DestIterator >
-        Cost conversionCostList( SrcIterator srcBegin, SrcIterator srcEnd, DestIterator destBegin, DestIterator destEnd, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
-                Cost ret;
-                while ( srcBegin != srcEnd && destBegin != destEnd ) {
-                        Cost thisCost = conversionCost( *srcBegin++, *destBegin++, indexer, env );
-                        if ( thisCost == Cost::infinity ) {
-                                return Cost::infinity;
-                        } // if
-                        ret += thisCost;
-                } // while
-                if ( srcBegin == srcEnd && destBegin == destEnd ) {
-                        return ret;
-                } else {
-                        return Cost::infinity;
-                } // if
-        }
 
         // in PtrsAssignable.cc