Changeset 0bd3faf for src/InitTweak/GenInit.cc

Timestamp:

Nov 13, 2023, 1:40:12 PM (6 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

6ea85b22

Parents:

25f2798

Message:

Removed forward declarations missed in the BaseSyntaxNode? removal. Removed code and modified names to support two versions of the ast.

File:

• src/InitTweak/GenInit.cc (modified) (10 diffs)

src/InitTweak/GenInit.cc

@@ -46 +46 @@
 namespace {
 
-#       warning Remove the _New suffix after the conversion is complete.
-
         // Outer pass finds declarations, for their type could wrap a type that needs hoisting
-        struct HoistArrayDimension_NoResolve_New final :
+        struct HoistArrayDimension_NoResolve final :
                         public ast::WithDeclsToAdd<>, public ast::WithShortCircuiting,
                         public ast::WithGuards, public ast::WithConstTranslationUnit,
-                        public ast::WithVisitorRef<HoistArrayDimension_NoResolve_New>,
+                        public ast::WithVisitorRef<HoistArrayDimension_NoResolve>,
                         public ast::WithSymbolTableX<ast::SymbolTable::ErrorDetection::IgnoreErrors> {
 
@@ -59 +57 @@
                                 public ast::WithShortCircuiting, public ast::WithGuards {
 
-                        HoistArrayDimension_NoResolve_New * outer;
-                        HoistDimsFromTypes( HoistArrayDimension_NoResolve_New * outer ) : outer(outer) {}
+                        HoistArrayDimension_NoResolve * outer;
+                        HoistDimsFromTypes( HoistArrayDimension_NoResolve * outer ) : outer(outer) {}
 
                         // Only intended for visiting through types.
@@ -211 +209 @@
 
 
-        struct ReturnFixer_New final :
+        struct ReturnFixer final :
                         public ast::WithStmtsToAdd<>, ast::WithGuards, ast::WithShortCircuiting {
                 void previsit( const ast::FunctionDecl * decl );
@@ -219 +217 @@
         };
 
-        void ReturnFixer_New::previsit( const ast::FunctionDecl * decl ) {
+        void ReturnFixer::previsit( const ast::FunctionDecl * decl ) {
                 if (decl->linkage == ast::Linkage::Intrinsic) visit_children = false;
                 GuardValue( funcDecl ) = decl;
         }
 
-        const ast::ReturnStmt * ReturnFixer_New::previsit(
+        const ast::ReturnStmt * ReturnFixer::previsit(
                         const ast::ReturnStmt * stmt ) {
                 auto & returns = funcDecl->returns;
@@ -265 +263 @@
 
         void genInit( ast::TranslationUnit & transUnit ) {
-                ast::Pass<HoistArrayDimension_NoResolve_New>::run( transUnit );
-                ast::Pass<ReturnFixer_New>::run( transUnit );
+                ast::Pass<HoistArrayDimension_NoResolve>::run( transUnit );
+                ast::Pass<ReturnFixer>::run( transUnit );
         }
 
         void fixReturnStatements( ast::TranslationUnit & transUnit ) {
-                ast::Pass<ReturnFixer_New>::run( transUnit );
-        }
-
-        bool ManagedTypes_new::isManaged( const ast::Type * type ) const {
+                ast::Pass<ReturnFixer>::run( transUnit );
+        }
+
+        bool ManagedTypes::isManaged( const ast::Type * type ) const {
                 // references are never constructed
                 if ( dynamic_cast< const ast::ReferenceType * >( type ) ) return false;
@@ -292 +290 @@
         }
 
-        bool ManagedTypes_new::isManaged( const ast::ObjectDecl * objDecl ) const {
+        bool ManagedTypes::isManaged( const ast::ObjectDecl * objDecl ) const {
                 const ast::Type * type = objDecl->type;
                 while ( auto at = dynamic_cast< const ast::ArrayType * >( type ) ) {
@@ -302 +300 @@
         }
 
-        void ManagedTypes_new::handleDWT( const ast::DeclWithType * dwt ) {
+        void ManagedTypes::handleDWT( const ast::DeclWithType * dwt ) {
                 // if this function is a user-defined constructor or destructor, mark down the type as "managed"
                 if ( ! dwt->linkage.is_overrideable && CodeGen::isCtorDtor( dwt->name ) ) {
@@ -313 +311 @@
         }
 
-        void ManagedTypes_new::handleStruct( const ast::StructDecl * aggregateDecl ) {
+        void ManagedTypes::handleStruct( const ast::StructDecl * aggregateDecl ) {
                 // don't construct members, but need to take note if there is a managed member,
                 // because that means that this type is also managed
@@ -329 +327 @@
         }
 
-        void ManagedTypes_new::beginScope() { managedTypes.beginScope(); }
-        void ManagedTypes_new::endScope() { managedTypes.endScope(); }
+        void ManagedTypes::beginScope() { managedTypes.beginScope(); }
+        void ManagedTypes::endScope() { managedTypes.endScope(); }
 
         ast::ptr<ast::Stmt> genCtorDtor (const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * objDecl, const ast::Expr * arg) {
                 assertf(objDecl, "genCtorDtor passed null objDecl");
-                InitExpander_new srcParam(arg);
+                InitExpander srcParam(arg);
                 return SymTab::genImplicitCall(srcParam, new ast::VariableExpr(loc, objDecl), loc, fname, objDecl);
         }
@@ -341 +339 @@
         // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each
         // constructable object
-        InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
+        InitExpander srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
         ast::ptr< ast::Expr > dstParam = new ast::VariableExpr(loc, objDecl);