Changeset 7f6a7c9 for src/Validate/LinkReferenceToTypes.cpp

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

• src/Validate/LinkReferenceToTypes.cpp (modified) (8 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 );
@@ -46 +44 @@
         void postvisit( ast::UnionDecl const * decl );
         ast::TraitDecl const * postvisit( ast::TraitDecl const * decl );
+        ast::QualifiedNameExpr const * previsit( ast::QualifiedNameExpr const * decl);
 
 private:
@@ -59 +58 @@
         ForwardEnumsType forwardEnums;
 
-        const CodeLocation * location = nullptr;
         /// true if currently in a generic type body,
         /// so that type parameter instances can be renamed appropriately
@@ -176 +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;
 }
 
@@ -224 +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_";
@@ -292 +284 @@
 }
 
+ast::QualifiedNameExpr const * LinkTypesCore::previsit( ast::QualifiedNameExpr const * decl ) {
+        // Try to lookup type
+        if ( auto objDecl = decl->type_decl.as<ast::ObjectDecl>() ) {
+                if ( auto inst = objDecl->type.as<ast::TypeInstType>()) {
+                        if ( auto enumDecl = symtab.lookupEnum ( inst->name ) ) {
+                                auto mut = ast::mutate( decl );
+                                mut->type_decl = enumDecl;
+                                auto enumInst = new ast::EnumInstType( enumDecl );
+                                enumInst->name = decl->name;
+                                // Adding result; addCandidate() use result
+                                mut->result = enumInst;
+                                decl = mut;
+                        }
+                }
+        } else if ( auto enumDecl = decl->type_decl.as<ast::EnumDecl>() ) {
+                auto mut = ast::mutate( decl );
+                auto enumInst = new ast::EnumInstType( enumDecl );
+                enumInst->name = decl->name;
+                // Adding result; addCandidate() use result
+                mut->result = enumInst;
+                decl = mut;
+        }
+        // ast::EnumDecl const * decl = symtab.lookupEnum( type->name );
+        // // It's not a semantic error if the enum is not found, just an implicit forward declaration.
+        // if ( decl ) {
+        //      // Just linking in the node.
+        //      auto mut = ast::mutate( type );
+        //      mut->base = const_cast<ast::EnumDecl *>( decl );
+        //      type = mut;
+        // }
+        return decl;
+}
+
 } // namespace