Changeset c8837e5 for src/GenPoly/ScrubTyVars.cc

Timestamp:

Oct 7, 2022, 4:09:36 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

d8c96a9

Parents:

8c91088

Message:

Rewrite in GenPoly? to avoid mixing new AST and TyVarMap? (which internally has old AST code). Some nearby functions got writen out even though they are not used, and hence not tested.

File:

• src/GenPoly/ScrubTyVars.cc (modified) (5 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 19 16:10:00 2022
-// Update Count     : 4
+// Last Modified On : Fri Oct  7 15:42:00 2022
+// Update Count     : 5
 //
 
@@ -128 +128 @@
         public ast::WithVisitorRef<ScrubTypeVars> {
 
-        ScrubTypeVars( ScrubMode m, TyVarMap const * tv ) :
+        ScrubTypeVars( ScrubMode m, TypeVarMap const * tv ) :
                         mode ( m ), typeVars( tv ) {}
 
@@ -148 +148 @@
         ScrubMode const mode;
         /// Type varriables to scrub.
-        TyVarMap const * const typeVars;
+        TypeVarMap const * const typeVars;
         /// Value cached by primeBaseScrub.
         ast::Type const * dynType = nullptr;
@@ -255 +255 @@
 const ast::Node * scrubTypeVarsBase(
                 const ast::Node * target,
-                ScrubMode mode, const TyVarMap * typeVars ) {
+                ScrubMode mode, const TypeVarMap * typeVars ) {
         if ( ScrubMode::All == mode ) {
                 assert( nullptr == typeVars );
@@ -266 +266 @@
 
 } // namespace
+
+template<>
+ast::Node const * scrubTypeVars<ast::Node>(
+        const ast::Node * target, const TypeVarMap & typeVars ) {
+        return scrubTypeVarsBase( target, ScrubMode::FromMap, &typeVars );
+}
+
+template<>
+ast::Node const * scrubTypeVarsDynamic<ast::Node>(
+        ast::Node const * target, const TypeVarMap & typeVars ) {
+        return scrubTypeVarsBase( target, ScrubMode::DynamicFromMap, &typeVars );
+}
 
 template<>