Changeset 25793da for src/GenPoly

Timestamp:

Sep 14, 2022, 4:36:56 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95e5018

Parents:

01865fb (diff), ce31925 (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:

• InstantiateGenericNew.cpp (modified) (1 diff)
• SpecializeNew.cpp (modified) (1 diff)

src/GenPoly/InstantiateGenericNew.cpp

@@ -85 +85 @@
 
 /// Maps a key and a TypeList to a valuue. Also supports scoping.
-class InstantiationMap {
+class InstantiationMap final {
         /// Wraps value for a specific (AggregateDecl, TypeList) combination.
         using Instantiation = std::pair<TypeList, ast::ptr<ast::AggregateDecl>>;

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(