Changeset 265e460 for src/GenPoly/ScrubTyVars.h

Timestamp:

Oct 8, 2022, 9:43:21 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

b2ddaf3

Parents:

815943f (diff), d8c96a9 (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/GenPoly/ScrubTyVars.h (modified) (2 diffs)

src/GenPoly/ScrubTyVars.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 19 14:14:00 2022
-// Update Count     : 3
+// Last Modified On : Fri Oct  7 15:51:00 2022
+// Update Count     : 4
 //
 
@@ -109 +109 @@
         }
 
+/// For all polymorphic types with type variables in `typeVars`,
+/// replaces generic types, dtypes, and ftypes with the appropriate void type,
+/// and sizeof/alignof expressions with the proper variable.
+template<typename node_t>
+node_t const * scrubTypeVars(
+                node_t const * target, const TypeVarMap & typeVars ) {
+        return strict_dynamic_cast<node_t const *>(
+                        scrubTypeVars<ast::Node>( target ) );
+}
+
+/// For all dynamic-layout types with type variables in `typeVars`,
+/// replaces generic types, dtypes, and ftypes with the appropriate void type,
+/// and sizeof/alignof expressions with the proper variable.
+template<typename node_t>
+ast::Node const * scrubTypeVarsDynamic(
+                node_t const * target, const TypeVarMap & typeVars ) {
+        return strict_dynamic_cast<node_t const *>(
+                        scrubTypeVarsDynamic<ast::Node>( target, typeVars ) );
+}
+
 /// For all polymorphic types, replaces generic types, with the appropriate
 /// void type, and sizeof/alignof expressions with the proper variable.
 template<typename node_t>
 node_t const * scrubAllTypeVars( node_t const * target ) {
-        return strict_dynamic_cast<node_t const *>( scrubAllTypeVars<ast::Node>( target ) );
+        return strict_dynamic_cast<node_t const *>(
+                        scrubAllTypeVars<ast::Node>( target ) );
 }
+
+// We specialize for Node as a base case.
+template<>
+ast::Node const * scrubTypeVars<ast::Node>(
+                const ast::Node * target, const TypeVarMap & typeVars );
+
+template<>
+ast::Node const * scrubTypeVarsDynamic<ast::Node>(
+                ast::Node const * target, const TypeVarMap & typeVars );
 
 template<>