Changeset 23a08aa0 for src/GenPoly/SpecializeNew.cpp

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:

• src/GenPoly/SpecializeNew.cpp (modified) (1 diff)

src/GenPoly/SpecializeNew.cpp

@@ -240 +240 @@
 }
 
-namespace {
-        struct TypeInstFixer : public ast::WithShortCircuiting {
-                std::map<const ast::TypeDecl *, std::pair<int, int>> typeMap;
-
-                void previsit(const ast::TypeDecl *) { visit_children = false; }
-                const ast::TypeInstType * postvisit(const ast::TypeInstType * typeInst) {
-                        if (typeMap.count(typeInst->base)) {
-                                ast::TypeInstType * newInst = mutate(typeInst);
-                                auto const & pair = typeMap[typeInst->base];
-                                newInst->expr_id = pair.first;
-                                newInst->formal_usage = pair.second;
-                                return newInst;
-                        }
-                        return typeInst;
-                }
-        };
-}
+struct TypeInstFixer final : public ast::WithShortCircuiting {
+        std::map<const ast::TypeDecl *, std::pair<int, int>> typeMap;
+
+        void previsit(const ast::TypeDecl *) { visit_children = false; }
+        const ast::TypeInstType * postvisit(const ast::TypeInstType * typeInst) {
+                if (typeMap.count(typeInst->base)) {
+                        ast::TypeInstType * newInst = mutate(typeInst);
+                        auto const & pair = typeMap[typeInst->base];
+                        newInst->expr_id = pair.first;
+                        newInst->formal_usage = pair.second;
+                        return newInst;
+                }
+                return typeInst;
+        }
+};
 
 const ast::Expr * SpecializeCore::createThunkFunction(