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

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 {
+class InstantiationMap final {
         /// 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::WithGuards,
+                public ast::WithVisitorRef<GenericInstantiator>,
                 public ast::WithConstTypeSubstitution,
-                public ast::WithDeclsToAdd<>,
-                public ast::WithGuards,
-                public ast::WithVisitorRef<GenericInstantiator>
-{
+                public ast::WithDeclsToAdd<> {
         /// Map of (generic type, parameter list) pairs
         /// to concrete type instantiations.
@@ -437 +435 @@
         /// member from an instantiation.
         int memberIndex = -1;
+        /// Keep track of the nearest location to fill in locations.
+        CodeLocation const * location = nullptr;
 
         GenericInstantiator() :