Changeset d4b37ab for src/SymTab

Timestamp:

Jul 13, 2022, 11:16:56 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

af75a87, d958834b

Parents:

25404c7 (diff), b9f8274 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (3 diffs)
• FixFunction.h (modified) (3 diffs)
• Validate.cc (modified) (8 diffs)
• Validate.h (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:19:49 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 23:36:59 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 14:28:00 2022
+// Update Count     : 7
 //
 
@@ -122 +122 @@
                 }
 
+                void previsit( const ast::FunctionType * ) { visit_children = false; }
+
+                const ast::Type * postvisit( const ast::FunctionType * type ) {
+                        return new ast::PointerType( type );
+                }
+
                 void previsit( const ast::VoidType * ) { isVoid = true; }
 
@@ -145 +151 @@
 }
 
+const ast::Type * fixFunction( const ast::Type * type, bool & isVoid ) {
+        ast::Pass< FixFunction_new > fixer;
+        type = type->accept( fixer );
+        isVoid |= fixer.core.isVoid;
+        return type;
+}
+
 } // namespace SymTab
 

src/SymTab/FixFunction.h

@@ -10 +10 @@
 // Created On       : Sun May 17 17:02:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:45:55 2017
-// Update Count     : 4
+// Last Modified On : Tue Jul 12 14:19:00 2022
+// Update Count     : 5
 //
 
@@ -21 +21 @@
 namespace ast {
         class DeclWithType;
+        class Type;
 }
 
@@ -31 +32 @@
         /// Sets isVoid to true if type is void
         const ast::DeclWithType * fixFunction( const ast::DeclWithType * dwt, bool & isVoid );
+        const ast::Type * fixFunction( const ast::Type * type, bool & isVoid );
 } // namespace SymTab
 

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