Changeset 7f6a7c9 for src/Validate/FixQualifiedTypes.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/FixQualifiedTypes.cpp (modified) (4 diffs)

src/Validate/FixQualifiedTypes.cpp

@@ -10 +10 @@
 // Created On       : Thr Apr 21 11:13:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 22 11:36:00 2022
-// Update Count     : 0
+// Last Modified On : Tue Sep 20 16:15:00 2022
+// Update Count     : 1
 //
 
@@ -19 +19 @@
 #include "AST/TranslationUnit.hpp"
 #include "Validate/NoIdSymbolTable.hpp"
+#include "SymTab/Mangler.h"            // for Mangler
+#include "AST/LinkageSpec.hpp"                     // for Linkage
 
 namespace Validate {
@@ -25 +27 @@
 
 struct FixQualifiedTypesCore :
-                public WithNoIdSymbolTable, public ast::WithGuards {
-        CodeLocation const * location = nullptr;
-
-        void previsit( ast::ParseNode const * node ) {
-                GuardValue( location ) = &node->location;
-        }
-
+                public WithNoIdSymbolTable,
+                public ast::WithCodeLocation {
         ast::Type const * postvisit( ast::QualifiedType const * type ) {
                 assert( location );
@@ -89 +86 @@
                 }
         }
+
+        ast::Expr const * postvisit( ast::QualifiedNameExpr const * t) {
+                assert( location );
+                if ( t->type_decl ) {
+                auto enumName = t->type_decl->name;
+                const ast::EnumDecl * enumDecl = symtab.lookupEnum( enumName );
+                        for ( ast::ptr<ast::Decl> const & member : enumDecl->members ) {
+                                if ( auto memberAsObj = member.as<ast::ObjectDecl>() ) {
+                                        if ( memberAsObj->name == t->name ) {
+                                                return new ast::VariableExpr( t->location, memberAsObj );
+                                        }
+                                } else {
+                                        assertf( false, "unhandled qualified child type");
+                                }
+                        }
+
+
+                auto var = new ast::ObjectDecl( t->var->location, t->name,
+                         new ast::EnumInstType(enumDecl, ast::CV::Const), nullptr, {}, ast::Linkage::Cforall );
+                        var->scopeLevel = 1; // 1 for now; should copy the scopeLevel of the enumValue
+                        var->mangleName = Mangle::mangle( var );
+                        return new ast::VariableExpr( t->location, var );
+                // return ret;
+        }
+
+                return t;
+        }
+
 };