Changeset 74ec742 for src/Validate

Timestamp:

May 20, 2022, 10:36:45 AM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

25fa20a

Parents:

29d8c02 (diff), 7831e8fb (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/Validate

Files:

• Autogen.cpp (modified) (2 diffs)
• EliminateTypedef.cpp (added)
• EliminateTypedef.hpp (added)
• FixQualifiedTypes.cpp (added)
• FixQualifiedTypes.hpp (added)
• ForallPointerDecay.cpp (modified) (2 diffs)
• ForallPointerDecay.hpp (modified) (2 diffs)
• GenericParameter.cpp (modified) (3 diffs)
• HoistStruct.cpp (added)
• HoistStruct.hpp (added)
• NoIdSymbolTable.hpp (added)
• module.mk (modified) (2 diffs)

src/Validate/Autogen.cpp

@@ -350 +350 @@
                 name,
                 std::move( type_params ),
+                std::move( assertions ),
                 std::move( params ),
                 std::move( returns ),
@@ -360 +361 @@
                 // Auto-generated routines are inline to avoid conflicts.
                 ast::Function::Specs( ast::Function::Inline ) );
-        decl->assertions = std::move( assertions );
         decl->fixUniqueId();
         return decl;

src/Validate/ForallPointerDecay.cpp

@@ -10 +10 @@
 // Created On       : Tue Dec  7 16:15:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Feb 11 10:59:00 2022
-// Update Count     : 0
+// Last Modified On : Sat Apr 23 13:10:00 2022
+// Update Count     : 1
 //
 
@@ -237 +237 @@
 }
 
+std::vector<ast::ptr<ast::DeclWithType>> expandAssertions(
+                std::vector<ast::ptr<ast::DeclWithType>> const & old ) {
+        return TraitExpander::expandAssertions( old );
+}
+
 } // namespace Validate
 

src/Validate/ForallPointerDecay.hpp

@@ -10 +10 @@
 // Created On       : Tue Dec  7 16:15:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Dec  8 11:50:00 2021
-// Update Count     : 0
+// Last Modified On : Sat Apr 23 13:13:00 2022
+// Update Count     : 1
 //
 
 #pragma once
 
+#include <vector>
+#include "AST/Node.hpp"
+
 namespace ast {
+        class DeclWithType;
         class TranslationUnit;
 }
@@ -27 +31 @@
 void decayForallPointers( ast::TranslationUnit & transUnit );
 
+/// Expand all traits in an assertion list.
+std::vector<ast::ptr<ast::DeclWithType>> expandAssertions(
+        std::vector<ast::ptr<ast::DeclWithType>> const & );
+
 }
 

src/Validate/GenericParameter.cpp

@@ -10 +10 @@
 // Created On       : Fri Mar 21 10:02:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 13 10:09:00 2022
-// Update Count     : 0
+// Last Modified On : Fri Apr 22 16:43:00 2022
+// Update Count     : 1
 //
 
@@ -22 +22 @@
 #include "AST/TranslationUnit.hpp"
 #include "AST/Type.hpp"
+#include "Validate/NoIdSymbolTable.hpp"
 
 namespace Validate {
@@ -138 +139 @@
 // --------------------------------------------------------------------------
 
-// A SymbolTable that only has the operations used in the Translate Dimension
-// pass. More importantly, it doesn't have some methods that should no be
-// called by the Pass template (lookupId and addId).
-class NoIdSymbolTable {
-        ast::SymbolTable base;
-public:
-#       define FORWARD_X( func, types_and_names, just_names ) \
-        inline auto func types_and_names -> decltype( base.func just_names ) { \
-                return base.func just_names ; \
-        }
-#       define FORWARD_0( func )         FORWARD_X( func, (),             () )
-#       define FORWARD_1( func, type )   FORWARD_X( func, (type arg),     (arg) )
-#       define FORWARD_2( func, t0, t1 ) FORWARD_X( func, (t0 a0, t1 a1), (a0, a1) )
-
-        FORWARD_0( enterScope )
-        FORWARD_0( leaveScope )
-        FORWARD_1( lookupType, const std::string &        )
-        FORWARD_1( addType   , const ast::NamedTypeDecl * )
-        FORWARD_1( addStruct , const ast::StructDecl *    )
-        FORWARD_1( addEnum   , const ast::EnumDecl *      )
-        FORWARD_1( addUnion  , const ast::UnionDecl *     )
-        FORWARD_1( addTrait  , const ast::TraitDecl *     )
-        FORWARD_2( addWith   , const std::vector< ast::ptr<ast::Expr> > &, const ast::Decl * )
-};
-
-struct TranslateDimensionCore : public ast::WithGuards {
-        NoIdSymbolTable symtab;
+struct TranslateDimensionCore :
+                public WithNoIdSymbolTable, public ast::WithGuards {
 
         // SUIT: Struct- or Union- InstType

src/Validate/module.mk

@@ -10 +10 @@
 ## Author           : Rob Schluntz
 ## Created On       : Fri Jul 27 10:10:10 2018
-## Last Modified By : Rob Schluntz
-## Last Modified On : Fri Jul 27 10:10:26 2018
-## Update Count     : 2
+## Last Modified By : Andrew Beach
+## Last Modified On : Tue May 17 14:59:00 2022
+## Update Count     : 3
 ###############################################################################
 
 SRC_VALIDATE = \
+        Validate/FindSpecialDecls.cc \
+        Validate/FindSpecialDecls.h
+
+SRC += $(SRC_VALIDATE) \
         Validate/Autogen.cpp \
         Validate/Autogen.hpp \
         Validate/CompoundLiteral.cpp \
         Validate/CompoundLiteral.hpp \
+        Validate/EliminateTypedef.cpp \
+        Validate/EliminateTypedef.hpp \
+        Validate/FindSpecialDeclsNew.cpp \
+        Validate/FixQualifiedTypes.cpp \
+        Validate/FixQualifiedTypes.hpp \
         Validate/ForallPointerDecay.cpp \
         Validate/ForallPointerDecay.hpp \
@@ -26 +35 @@
         Validate/HandleAttributes.cc \
         Validate/HandleAttributes.h \
+        Validate/HoistStruct.cpp \
+        Validate/HoistStruct.hpp \
         Validate/InitializerLength.cpp \
         Validate/InitializerLength.hpp \
         Validate/LabelAddressFixer.cpp \
         Validate/LabelAddressFixer.hpp \
+        Validate/NoIdSymbolTable.hpp \
         Validate/ReturnCheck.cpp \
-        Validate/ReturnCheck.hpp \
-        Validate/FindSpecialDeclsNew.cpp \
-        Validate/FindSpecialDecls.cc \
-        Validate/FindSpecialDecls.h
+        Validate/ReturnCheck.hpp
 
-SRC += $(SRC_VALIDATE)
 SRCDEMANGLE += $(SRC_VALIDATE)