Changeset 24d6572 for src/GenPoly/ScrubTyVars.cc

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

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 Oct  7 15:42:00 2022
-// Update Count     : 5
+// Last Modified On : Wed Dec  7 17:01:00 2022
+// Update Count     : 6
 //
 
@@ -117 +117 @@
 namespace {
 
-enum class ScrubMode {
-        FromMap,
-        DynamicFromMap,
-        All,
-};
-
 struct ScrubTypeVars :
         public ast::WithGuards,
@@ -184 +178 @@
 
 ast::Type const * ScrubTypeVars::postvisit( ast::TypeInstType const * type ) {
+        ast::TypeDecl::Kind kind;
         // This implies that mode == ScrubMode::All.
         if ( !typeVars ) {
-                if ( ast::TypeDecl::Ftype == type->kind ) {
-                        return new ast::PointerType(
-                                new ast::FunctionType( ast::FixedArgs ) );
-                } else {
-                        return new ast::PointerType(
-                                new ast::VoidType( type->qualifiers ) );
-                }
-        }
-
-        auto typeVar = typeVars->find( *type );
-        if ( typeVar == typeVars->end() ) {
-                return type;
-        }
-
-        switch ( typeVar->second.kind ) {
-        case ::TypeDecl::Dtype:
-        case ::TypeDecl::Ttype:
+                kind = type->kind;
+        } else {
+                // Otherwise, only scrub the type var if it is in map.
+                auto typeVar = typeVars->find( *type );
+                if ( typeVar == typeVars->end() ) {
+                        return type;
+                }
+                kind = typeVar->second.kind;
+        }
+
+        switch ( kind ) {
+        case ast::TypeDecl::Dtype:
+        case ast::TypeDecl::Ttype:
                 return new ast::PointerType(
                         new ast::VoidType( type->qualifiers ) );
-        case ::TypeDecl::Ftype:
+        case ast::TypeDecl::Ftype:
                 return new ast::PointerType(
                         new ast::FunctionType( ast::VariableArgs ) );
         default:
-                assertf( false,
-                        "Unhandled type variable kind: %d", typeVar->second.kind );
+                assertf( false, "Unhandled type variable kind: %d", kind );
                 throw; // Just in case the assert is removed, stop here.
         }
@@ -253 +243 @@
 }
 
+} // namespace
+
 const ast::Node * scrubTypeVarsBase(
-                const ast::Node * target,
-                ScrubMode mode, const TypeVarMap * typeVars ) {
+                const ast::Node * node, const TypeVarMap * typeVars, ScrubMode mode ) {
         if ( ScrubMode::All == mode ) {
                 assert( nullptr == typeVars );
@@ -262 +253 @@
         }
         ast::Pass<ScrubTypeVars> visitor( mode, typeVars );
-        return target->accept( visitor );
-}
-
-} // 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<>
-ast::Node const * scrubAllTypeVars<ast::Node>( const ast::Node * target ) {
-        return scrubTypeVarsBase( target, ScrubMode::All, nullptr );
+        return node->accept( visitor );
 }