Changes in src/GenPoly/Box.cc [331ee52c:49db841]

File:

• src/GenPoly/Box.cc (modified) (3 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.
@@ -430 +432 @@
                         // 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 ) {
-                                name << ( isPolyType( ret->get_type(), tyVars ) ? 'P' : 'M' );
-                        }
-                        name << '_';
+                                if ( isPolyType( ret->get_type(), tyVars ) ) {
+                                        name << "P";
+                                } else {
+                                        name << "M";
+                                }
+                        }
+                        name << "_";
                         for ( DeclarationWithType const * const arg : function->parameters ) {
-                                name << ( isPolyType( arg->get_type(), tyVars ) ? 'P' : 'M' );
-                        }
+                                if ( isPolyType( arg->get_type(), tyVars ) ) {
+                                        name << "P";
+                                } else {
+                                        name << "M";
+                                }
+                        } // for
                         return name.str();
                 }
@@ -556 +565 @@
                         // even when converted to strings, sort in the original order.
                         // (At least, that is the best explination I have.)
-                        for ( std::pair<const std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
+                        for ( std::pair<std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
                                 if ( !tyParam.second.isComplete ) continue;
                                 Type *concrete = env->lookup( tyParam.first );