Changeset 21300d7 for src/ResolvExpr/CandidateFinder.hpp

Timestamp:

Jun 12, 2019, 4:06:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

462a7c7, d60780c

Parents:

aaeacf4 (diff), 6625727 (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/CandidateFinder.hpp (modified) (3 diffs)

src/ResolvExpr/CandidateFinder.hpp

@@ -19 +19 @@
 #include "ResolvMode.h"
 #include "AST/Fwd.hpp"
+#include "AST/Node.hpp"
 #include "AST/SymbolTable.hpp"
 #include "AST/TypeEnvironment.hpp"
@@ -29 +30 @@
         const ast::SymbolTable & symtab;         ///< Symbol table to lookup candidates
         const ast::TypeEnvironment & env;        ///< Substitutions performed in this resolution
-        const ast::Type * targetType = nullptr;  ///< Target type for resolution
+        ast::ptr< ast::Type > targetType = nullptr;  ///< Target type for resolution
 
         CandidateFinder( const ast::SymbolTable & symtab, const ast::TypeEnvironment & env )
@@ -36 +37 @@
         /// Fill candidates with feasible resolutions for `expr`
         void find( const ast::Expr * expr, ResolvMode mode = {} );
+
+        /// Runs new candidate finder on each element in xs, returning the list of finders
+        std::vector< CandidateFinder > findSubExprs( const std::vector< ast::ptr< ast::Expr > > & xs );
+
+        using value_type = CandidateList::value_type;
+        using iterator = CandidateList::iterator;
+        using const_iterator = CandidateList::const_iterator;
+
+        iterator begin() { return candidates.begin(); }
+        const_iterator begin() const { return candidates.begin(); }
+        
+        iterator end() { return candidates.end(); }
+        const_iterator end() const { return candidates.end(); }
 };