Changeset d99a716 for src/GenPoly

Timestamp:

Jan 4, 2023, 1:44:19 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

339e30a, a14926b

Parents:

0348fd8 (diff), 66a89e7 (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

Location:

src/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• ScrubTyVars.cc (modified) (4 diffs)
• ScrubTyVars.h (modified) (5 diffs)

src/GenPoly/Box.cc

@@ -424 +424 @@
         namespace {
                 std::string makePolyMonoSuffix( FunctionType const * function, const TyVarMap &tyVars ) {
-                        std::stringstream name;
-
                         // NOTE: this function previously used isPolyObj, which failed to produce
                         // the correct thing in some situations. It's not clear to me why this wasn't working.
@@ -432 +430 @@
                         // to take those polymorphic types as pointers. Therefore, there can be two different functions
                         // with the same mangled name, so we need to further mangle the names.
+                        std::stringstream name;
                         for ( DeclarationWithType const * const ret : function->returnVals ) {
-                                if ( isPolyType( ret->get_type(), tyVars ) ) {
-                                        name << "P";
-                                } else {
-                                        name << "M";
-                                }
-                        }
-                        name << "_";
+                                name << ( isPolyType( ret->get_type(), tyVars ) ? 'P' : 'M' );
+                        }
+                        name << '_';
                         for ( DeclarationWithType const * const arg : function->parameters ) {
-                                if ( isPolyType( arg->get_type(), tyVars ) ) {
-                                        name << "P";
-                                } else {
-                                        name << "M";
-                                }
-                        } // for
+                                name << ( isPolyType( arg->get_type(), tyVars ) ? 'P' : 'M' );
+                        }
                         return name.str();
                 }
@@ -565 +556 @@
                         // even when converted to strings, sort in the original order.
                         // (At least, that is the best explination I have.)
-                        for ( std::pair<std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
+                        for ( std::pair<const std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
                                 if ( !tyParam.second.isComplete ) continue;
                                 Type *concrete = env->lookup( tyParam.first );

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,
@@ -253 +247 @@
 }
 
+} // 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 +257 @@
         }
         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 );
 }
 

src/GenPoly/ScrubTyVars.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:51:00 2022
-// Update Count     : 4
+// Last Modified On : Wed Dec  7 16:57:00 2022
+// Update Count     : 5
 //
 
@@ -109 +109 @@
         }
 
+// ScrubMode and scrubTypeVarsBase are internal.
+enum class ScrubMode { FromMap, DynamicFromMap, All };
+
+const ast::Node * scrubTypeVarsBase(
+        const ast::Node * target, const TypeVarMap * typeVars, ScrubMode mode );
+
+
 /// For all polymorphic types with type variables in `typeVars`,
 /// replaces generic types, dtypes, and ftypes with the appropriate void type,
@@ -116 +123 @@
                 node_t const * target, const TypeVarMap & typeVars ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubTypeVars<ast::Node>( target, typeVars ) );
+                        scrubTypeVarsBase( target, &typeVars, ScrubMode::FromMap ) );
 }
 
@@ -123 +130 @@
 /// and sizeof/alignof expressions with the proper variable.
 template<typename node_t>
-ast::Node const * scrubTypeVarsDynamic(
+node_t const * scrubTypeVarsDynamic(
                 node_t const * target, const TypeVarMap & typeVars ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubTypeVarsDynamic<ast::Node>( target, typeVars ) );
+                        scrubTypeVarsBase( target, &typeVars, ScrubMode::DynamicFromMap ) );
 }
 
@@ -134 +141 @@
 node_t const * scrubAllTypeVars( node_t const * target ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubAllTypeVars<ast::Node>( target ) );
+                        scrubTypeVarsBase( target, nullptr, ScrubMode::All ) );
 }
-
-// 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<>
-ast::Node const * scrubAllTypeVars<ast::Node>( const ast::Node * target );
 
 } // namespace GenPoly