Changeset e9e9f56 for src/Validate/LinkReferenceToTypes.cpp

Timestamp:

Sep 21, 2022, 9:22:24 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

20737104

Parents:

b6c3688

Message:

Used the WithCodeLocation? helper in more passes. This cleans up some code and should improve efficiency.

File:

• src/Validate/LinkReferenceToTypes.cpp (modified) (6 diffs)

src/Validate/LinkReferenceToTypes.cpp

@@ -10 +10 @@
 // Created On       : Thr Apr 21 11:41:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 28 14:58:00 2022
-// Update Count     : 1
+// Last Modified On : Tue Sep 20 16:17:00 2022
+// Update Count     : 2
 //
 
@@ -26 +26 @@
 
 struct LinkTypesCore : public WithNoIdSymbolTable,
+                public ast::WithCodeLocation,
                 public ast::WithGuards,
-                public ast::WithVisitorRef<LinkTypesCore>,
-                public ast::WithShortCircuiting {
-
+                public ast::WithShortCircuiting,
+                public ast::WithVisitorRef<LinkTypesCore> {
         ast::TypeInstType const * postvisit( ast::TypeInstType const * type );
         ast::EnumInstType const * postvisit( ast::EnumInstType const * type );
@@ -38 +38 @@
         void postvisit( ast::QualifiedType const * type );
 
-        void previsit( ast::ParseNode const * node );
-
         ast::EnumDecl const * postvisit( ast::EnumDecl const * decl );
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
@@ -60 +58 @@
         ForwardEnumsType forwardEnums;
 
-        const CodeLocation * location = nullptr;
         /// true if currently in a generic type body,
         /// so that type parameter instances can be renamed appropriately
@@ -177 +174 @@
         // Linking only makes sense for the 'oldest ancestor' of the qualified type.
         type->parent->accept( *visitor );
-}
-
-void LinkTypesCore::previsit( ast::ParseNode const * node ) {
-        GuardValue( location ) = &node->location;
 }
 
@@ -225 +218 @@
         GuardValue( inGeneric ) = !decl->params.empty();
         if ( !inGeneric ) {
-                GuardValue( location ) = &decl->location;
                 return decl;
         }
         auto mut = ast::mutate( decl );
-        GuardValue( location ) = &mut->location;
         for ( ast::ptr<ast::TypeDecl> & typeDecl : mut->params ) {
                 typeDecl.get_and_mutate()->name = "__" + typeDecl->name + "_generic_";