Changeset 452747a for src/ResolvExpr/AlternativeFinder.h

Timestamp:

Nov 22, 2017, 3:43:50 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

5fe35d6

Parents:

7e4c4f4 (diff), c2c6177 (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/ResolvExpr/AlternativeFinder.h

@@ -31 +31 @@
 
 namespace ResolvExpr {
+        struct ArgPack;
+
         class AlternativeFinder : public Visitor {
           public:
@@ -36 +38 @@
 
                 AlternativeFinder( const AlternativeFinder& o )
-                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env), 
+                        : indexer(o.indexer), alternatives(o.alternatives), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder( AlternativeFinder&& o )
-                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env), 
+                        : indexer(o.indexer), alternatives(std::move(o.alternatives)), env(o.env),
                           targetType(o.targetType) {}
-                
+
                 AlternativeFinder& operator= ( const AlternativeFinder& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();
@@ -54 +56 @@
                 AlternativeFinder& operator= ( AlternativeFinder&& o ) {
                         if (&o == this) return *this;
-                        
+
                         // horrific nasty hack to rebind references...
                         alternatives.~AltList();
@@ -126 +128 @@
                 /// Adds alternatives for offsetof expressions, given the base type and name of the member
                 template< typename StructOrUnionType > void addOffsetof( StructOrUnionType *aggInst, const std::string &name );
+                /// Takes a final result and checks if its assertions can be satisfied
+                template<typename OutputIterator>
+                void validateFunctionAlternative( const Alternative &func, ArgPack& result, const std::vector<ArgPack>& results, OutputIterator out );
+                /// Finds matching alternatives for a function, given a set of arguments
                 template<typename OutputIterator>
                 void makeFunctionAlternatives( const Alternative &func, FunctionType *funcType, const std::vector< AlternativeFinder >& args, OutputIterator out );
+                /// Checks if assertion parameters match for a new alternative
                 template< typename OutputIterator >
                 void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );