Changeset c13e8dc8 for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (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 cleanup-dtors

File:

• src/ResolvExpr/AlternativeFinder.h (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.h

@@ -142 +142 @@
                 template< typename OutputIterator >
                 void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
-                void resolveAttr( DeclarationWithType *funcDecl, FunctionType *function, Type *argType, const TypeEnvironment &env );
 
                 const SymTab::Indexer &indexer;
@@ -151 +150 @@
 
         Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env );
-        void referenceToRvalueConversion( Expression *& expr );
 
         template< typename InputIterator, typename OutputIterator >
@@ -174 +172 @@
 
         Cost sumCost( const AltList &in );
+        void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
 
         template< typename InputIterator >
@@ -181 +180 @@
                 }
         }
+
 } // namespace ResolvExpr