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

src/Validate/ReplaceTypedef.cpp

@@ -10 +10 @@
 // Created On       : Tue Jun 29 14:59:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 13 14:45:00 2022
-// Update Count     : 1
+// Last Modified On : Tue Sep 20 17:00:00 2022
+// Update Count     : 2
 //
 
@@ -39 +39 @@
 
 struct ReplaceTypedefCore final :
-                public ast::WithVisitorRef<ReplaceTypedefCore>,
+                public ast::WithCodeLocation,
+                public ast::WithDeclsToAdd<>,
                 public ast::WithGuards,
                 public ast::WithShortCircuiting,
-                public ast::WithDeclsToAdd<> {
-
-        void previsit( ast::ParseNode const * node );
+                public ast::WithVisitorRef<ReplaceTypedefCore> {
+
         void previsit( ast::QualifiedType const * );
         ast::Type const * postvisit( ast::QualifiedType const * );
@@ -74 +74 @@
         TypedefMap typedefNames;
         TypeDeclMap typedeclNames;
-        CodeLocation const * nearestLocation = nullptr;
         int scopeLevel;
         bool isAtFunctionTop = false;
 };
-
-void ReplaceTypedefCore::previsit( ast::ParseNode const * node ) {
-        GuardValue( nearestLocation ) = &node->location;
-}
 
 void ReplaceTypedefCore::previsit( ast::QualifiedType const * ) {
@@ -115 +110 @@
                         auto rtt = dynamic_cast<ast::BaseInstType *>( ret );
                         if ( !rtt ) {
-                                assert( nearestLocation );
-                                SemanticError( *nearestLocation, "Cannot apply type parameters to base type of " + type->name );
+                                assert( location );
+                                SemanticError( *location, "Cannot apply type parameters to base type of " + type->name );
                         }
                         rtt->params.clear();
@@ -129 +124 @@
                 TypeDeclMap::const_iterator base = typedeclNames.find( type->name );
                 if ( base == typedeclNames.end() ) {
-                        assert( nearestLocation );
-                        SemanticError( *nearestLocation, toString( "Use of undefined type ", type->name ) );
+                        assert( location );
+                        SemanticError( *location, toString( "Use of undefined type ", type->name ) );
                 }
                 return ast::mutate_field( type, &ast::TypeInstType::base, base->second );
@@ -183 +178 @@
         } else if ( auto enumType = dynamic_cast<ast::EnumInstType const *>( designatorType ) ) {
                 declsToAddBefore.push_back( new ast::EnumDecl(
-                        decl->location, enumType->name, {}, decl->linkage,
+                        decl->location, enumType->name, false, {}, decl->linkage,
                         ( (enumType->base) ? enumType->base->base : nullptr )
                         ) );
@@ -191 +186 @@
 
 void ReplaceTypedefCore::previsit( ast::TypeDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
         TypedefMap::iterator iter = typedefNames.find( decl->name );
         if ( iter != typedefNames.end() ) {
@@ -199 +193 @@
 }
 
-void ReplaceTypedefCore::previsit( ast::FunctionDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
+void ReplaceTypedefCore::previsit( ast::FunctionDecl const * ) {
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
@@ -206 +199 @@
 }
 
-void ReplaceTypedefCore::previsit( ast::ObjectDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
+void ReplaceTypedefCore::previsit( ast::ObjectDecl const * ) {
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
@@ -217 +209 @@
                 using DWTVector = std::vector<ast::ptr<ast::DeclWithType>>;
                 using DeclVector = std::vector<ast::ptr<ast::TypeDecl>>;
-                CodeLocation const & location = decl->location;
+                CodeLocation const & declLocation = decl->location;
                 UniqueName paramNamer( decl->name + "Param" );
 
                 // Replace the current object declaration with a function declaration.
                 ast::FunctionDecl const * newDecl = new ast::FunctionDecl(
-                        location,
+                        declLocation,
                         decl->name,
                         map_range<DeclVector>( type->forall, []( const ast::TypeInstType * inst ) {
@@ -230 +222 @@
                                 return ast::deepCopy( expr->var );
                         } ),
-                        map_range<DWTVector>( type->params, [&location, &paramNamer]( const ast::Type * type ) {
+                        map_range<DWTVector>( type->params, [&declLocation, &paramNamer]( const ast::Type * type ) {
                                 assert( type );
-                                return new ast::ObjectDecl( location, paramNamer.newName(), ast::deepCopy( type ) );
+                                return new ast::ObjectDecl( declLocation, paramNamer.newName(), ast::deepCopy( type ) );
                         } ),
-                        map_range<DWTVector>( type->returns, [&location, &paramNamer]( const ast::Type * type ) {
+                        map_range<DWTVector>( type->returns, [&declLocation, &paramNamer]( const ast::Type * type ) {
                                 assert( type );
-                                return new ast::ObjectDecl( location, paramNamer.newName(), ast::deepCopy( type ) );
+                                return new ast::ObjectDecl( declLocation, paramNamer.newName(), ast::deepCopy( type ) );
                         } ),
                         nullptr,
@@ -249 +241 @@
 }
 
-void ReplaceTypedefCore::previsit( ast::CastExpr const * expr ) {
-        previsit( (ast::ParseNode const *)expr );
-        GuardScope( typedefNames );
-        GuardScope( typedeclNames );
-}
-
-void ReplaceTypedefCore::previsit( ast::CompoundStmt const * expr ) {
-        previsit( (ast::ParseNode const *)expr );
+void ReplaceTypedefCore::previsit( ast::CastExpr const * ) {
+        GuardScope( typedefNames );
+        GuardScope( typedeclNames );
+}
+
+void ReplaceTypedefCore::previsit( ast::CompoundStmt const * ) {
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
@@ -268 +258 @@
 
 ast::StructDecl const * ReplaceTypedefCore::previsit( ast::StructDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
         visit_children = false;
         addImplicitTypedef( decl );
@@ -275 +264 @@
 
 ast::UnionDecl const * ReplaceTypedefCore::previsit( ast::UnionDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
         visit_children = false;
         addImplicitTypedef( decl );
@@ -282 +270 @@
 
 void ReplaceTypedefCore::previsit( ast::EnumDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
         addImplicitTypedef( decl );
 }
 
-void ReplaceTypedefCore::previsit( ast::TraitDecl const * decl ) {
-        previsit( (ast::ParseNode const *)decl );
+void ReplaceTypedefCore::previsit( ast::TraitDecl const * ) {
         GuardScope( typedefNames );
         GuardScope( typedeclNames );