Changeset e563edf for src/ResolvExpr/Unify.cc

Timestamp:

Jan 17, 2023, 11:57:46 AM (16 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

7b5694d

Parents:

9845cb6

Message:

Header Clean-up: Clearing out typeops, moving things to Unify because that header already exist.

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -50 +50 @@
 
 namespace SymTab {
-class Indexer;
+        class Indexer;
 }  // namespace SymTab
 
@@ -56 +56 @@
 
 namespace ResolvExpr {
+
+// Template Helpers:
+template< typename Iterator1, typename Iterator2 >
+bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, std::list< Type* > &commonTypes ) {
+        for ( ; list1Begin != list1End && list2Begin != list2End; ++list1Begin, ++list2Begin ) {
+                Type *commonType = 0;
+                if ( ! unify( *list1Begin, *list2Begin, env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
+                        return false;
+                } // if
+                commonTypes.push_back( commonType );
+        } // for
+        return ( list1Begin == list1End && list2Begin == list2End );
+}
+
+template< typename Iterator1, typename Iterator2 >
+bool unifyList( Iterator1 list1Begin, Iterator1 list1End, Iterator2 list2Begin, Iterator2 list2End, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
+        std::list< Type* > commonTypes;
+        if ( unifyList( list1Begin, list1End, list2Begin, list2End, env, needAssertions, haveAssertions,  openVars, indexer, commonTypes ) ) {
+                deleteAll( commonTypes );
+                return true;
+        } else {
+                return false;
+        } // if
+}
 
         struct Unify_old : public WithShortCircuiting {