Changes in src/GenPoly/InstantiateGenericNew.cpp [c36814a:01865fb]

File:

• src/GenPoly/InstantiateGenericNew.cpp (modified) (3 diffs)

src/GenPoly/InstantiateGenericNew.cpp

@@ -85 +85 @@
 
 /// Maps a key and a TypeList to a valuue. Also supports scoping.
-class InstantiationMap final {
+class InstantiationMap {
         /// Wraps value for a specific (AggregateDecl, TypeList) combination.
         using Instantiation = std::pair<TypeList, ast::ptr<ast::AggregateDecl>>;
@@ -417 +417 @@
 
 struct GenericInstantiator final :
+                public ast::WithCodeLocation,
+                public ast::WithConstTypeSubstitution,
+                public ast::WithDeclsToAdd<>,
                 public ast::WithGuards,
-                public ast::WithVisitorRef<GenericInstantiator>,
-                public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<> {
+                public ast::WithVisitorRef<GenericInstantiator>
+{
         /// Map of (generic type, parameter list) pairs
         /// to concrete type instantiations.
@@ -435 +437 @@
         /// member from an instantiation.
         int memberIndex = -1;
-        /// Keep track of the nearest location to fill in locations.
-        CodeLocation const * location = nullptr;
 
         GenericInstantiator() :