Changeset b9f8274

Timestamp:

Jul 12, 2022, 3:40:38 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

d4b37ab

Parents:

1931bb01

Message:

Removed the validate sub-pass interface. This also showed an extra include in CandidateFinder?, also removed.

Location:

src

Files:

• ResolvExpr/CandidateFinder.cpp (modified) (3 diffs)
• SymTab/Validate.cc (modified) (8 diffs)
• SymTab/Validate.h (modified) (2 diffs)
• main.cc (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -41 +41 @@
 #include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
-#include "SymTab/Validate.h"      // for validateType
 #include "Tuples/Tuples.h"        // for handleTupleAssignment
 #include "InitTweak/InitTweak.h"  // for getPointerBase
@@ -1091 +1090 @@
                         assert( toType );
                         toType = resolveTypeof( toType, context );
-                        // toType = SymTab::validateType( castExpr->location, toType, symtab );
                         toType = adjustExprType( toType, tenv, symtab );
 
@@ -1582 +1580 @@
                                 // calculate target type
                                 const ast::Type * toType = resolveTypeof( initAlt.type, context );
-                                // toType = SymTab::validateType( initExpr->location, toType, symtab );
                                 toType = adjustExprType( toType, tenv, symtab );
                                 // The call to find must occur inside this loop, otherwise polymorphic return

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 17 14:36:00 2022
-// Update Count     : 366
+// Last Modified On : Tue Jul 12 15:00:00 2022
+// Update Count     : 367
 //
 
@@ -294 +294 @@
         };
 
-        void validate_A( std::list< Declaration * > & translationUnit ) {
+        void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 PassVisitor<HoistTypeDecls> hoistDecls;
                 {
@@ -305 +305 @@
                         decayEnumsAndPointers( translationUnit ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes_old because it is an indexer and needs correct types for mangling
                 }
-        }
-
-        void validate_B( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<FixQualifiedTypes> fixQual;
                 {
@@ -317 +314 @@
                         EliminateTypedef::eliminateTypedef( translationUnit );
                 }
-        }
-
-        void validate_C( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ValidateGenericParameters> genericParams;
                 PassVisitor<ResolveEnumInitializers> rei( nullptr );
@@ -343 +337 @@
                         });
                 }
-        }
-
-        void validate_D( std::list< Declaration * > & translationUnit ) {
                 {
                         Stats::Heap::newPass("validate-D");
@@ -362 +353 @@
                         });
                 }
-        }
-
-        void validate_E( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<CompoundLiteral> compoundliteral;
                 {
@@ -384 +372 @@
                         }
                 }
-        }
-
-        void validate_F( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
                 {
@@ -410 +395 @@
                         }
                 }
-        }
-
-        void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
-                validate_A( translationUnit );
-                validate_B( translationUnit );
-                validate_C( translationUnit );
-                validate_D( translationUnit );
-                validate_E( translationUnit );
-                validate_F( translationUnit );
         }
 

src/SymTab/Validate.h

@@ -11 +11 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 17 14:35:00 2022
-// Update Count     : 5
+// Last Modified On : Tue Jul 12 15:30:00 2022
+// Update Count     : 6
 //
 
@@ -19 +19 @@
 #include <list>  // for list
 
-struct CodeLocation;
-class  Declaration;
-class  Type;
-
-namespace ast {
-        class Type;
-        class SymbolTable;
-}
+class Declaration;
 
 namespace SymTab {
-        class Indexer;
-
         /// Normalizes struct and function declarations
         void validate( std::list< Declaration * > &translationUnit, bool doDebug = false );
-
-        // Sub-passes of validate.
-        void validate_A( std::list< Declaration * > &translationUnit );
-        void validate_B( std::list< Declaration * > &translationUnit );
-        void validate_C( std::list< Declaration * > &translationUnit );
-        void validate_D( std::list< Declaration * > &translationUnit );
-        void validate_E( std::list< Declaration * > &translationUnit );
-        void validate_F( std::list< Declaration * > &translationUnit );
 } // namespace SymTab
 

src/main.cc

@@ -474 +474 @@
                 } else {
                         // add the assignment statement after the initialization of a type parameter
-                        PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
-                        PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
-                        PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
-                        PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
-                        PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
-                        PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
+                        PASS( "Validate", SymTab::validate( translationUnit ) );
 
                         if ( symtabp ) {