Changeset d672350 for src/AST/TypeSubstitution.hpp

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (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/AST/TypeSubstitution.hpp (modified) (4 diffs)

src/AST/TypeSubstitution.hpp

@@ -37 +37 @@
   public:
         TypeSubstitution();
+        template< typename FormalContainer, typename ActualContainer >
+        TypeSubstitution( FormalContainer formals, ActualContainer actuals );
         template< typename FormalIterator, typename ActualIterator >
         TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
@@ -76 +78 @@
         bool empty() const;
 
+        template< typename FormalContainer, typename ActualContainer >
+        void addAll( FormalContainer formals, ActualContainer actuals );
         template< typename FormalIterator, typename ActualIterator >
-        void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
+        void addAll( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
 
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
@@ -112 +116 @@
 };
 
+template< typename FormalContainer, typename ActualContainer >
+TypeSubstitution::TypeSubstitution( FormalContainer formals, ActualContainer actuals ) {
+        assert( formals.size() == actuals.size() );
+        addAll( formals.begin(), formals.end(), actuals.begin() );
+}
+
+template< typename FormalIterator, typename ActualIterator >
+TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
+        addAll( formalBegin, formalEnd, actualBegin );
+}
+
+template< typename FormalContainer, typename ActualContainer >
+void TypeSubstitution::addAll( FormalContainer formals, ActualContainer actuals ) {
+        assert( formals.size() == actuals.size() );
+        addAll( formals.begin(), formals.end(), actuals.begin() );
+}
+
 // this is the only place where type parameters outside a function formal may be substituted.
 template< typename FormalIterator, typename ActualIterator >
-void TypeSubstitution::add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
+void TypeSubstitution::addAll( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
         // FormalIterator points to a TypeDecl
         // ActualIterator points to a Type
@@ -129 +150 @@
                         } // if
                 } else {
-                        
+                        // Is this an error?
                 } // if
         } // for
 }
-
-
-
-template< typename FormalIterator, typename ActualIterator >
-TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
-        add( formalBegin, formalEnd, actualBegin );
-}
-
 
 } // namespace ast