Changeset cc287800 for src/AST

Timestamp:

Nov 8, 2021, 5:28:21 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

36a05d7

Parents:

949339b (diff), 5ee153d (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/AST

Files:

• Decl.hpp (modified) (1 diff)
• Pass.hpp (modified) (2 diffs)
• Pass.impl.hpp (modified) (1 diff)
• Pass.proto.hpp (modified) (1 diff)
• Stmt.hpp (modified) (1 diff)
• TranslationUnit.hpp (modified) (1 diff)
• porting.md (modified) (1 diff)

src/AST/Decl.hpp

@@ -131 +131 @@
         // declared type, derived from parameter declarations
         ptr<FunctionType> type;
+        /// Null for the forward declaration of a function.
         ptr<CompoundStmt> stmts;
         std::vector< ptr<Expr> > withExprs;

src/AST/Pass.hpp

@@ -348 +348 @@
 
         /// When this node is finished being visited, restore the value of a variable
+        /// You may assign to the return value to set the new value in the same statement.
         template< typename T >
-        void GuardValue( T& val ) {
+        T& GuardValue( T& val ) {
                 at_cleanup( [ val ]( void * newVal ) {
                         * static_cast< T * >( newVal ) = val;
                 }, static_cast< void * >( & val ) );
+                return val;
         }
 
@@ -394 +396 @@
 };
 
+/// Used to get a pointer to the wrapping TranslationUnit.
+struct WithConstTranslationUnit {
+        const TranslationUnit * translationUnit = nullptr;
+
+        const TranslationUnit & transUnit() const {
+                assertf( translationUnit, "WithConstTranslationUnit not set-up." );
+                return *translationUnit;
+        }
+};
+
 }
 

src/AST/Pass.impl.hpp

@@ -420 +420 @@
 template< typename core_t >
 inline void ast::accept_all( ast::TranslationUnit & unit, ast::Pass< core_t > & visitor ) {
-        return ast::accept_all( unit.decls, visitor );
+        if ( auto ptr = __pass::translation_unit::get_cptr( visitor.core, 0 ) ) {
+                ValueGuard<const TranslationUnit *> guard( *ptr );
+                *ptr = &unit;
+                return ast::accept_all( unit.decls, visitor );
+        } else {
+                return ast::accept_all( unit.decls, visitor );
+        }
 }
 

src/AST/Pass.proto.hpp

@@ -426 +426 @@
         } // namespace forall
 
+        // For passes that need access to the global context. Sreaches `translationUnit`
+        namespace translation_unit {
+                template<typename core_t>
+                static inline auto get_cptr( core_t & core, int )
+                                -> decltype( &core.translationUnit ) {
+                        return &core.translationUnit;
+                }
+
+                template<typename core_t>
+                static inline const TranslationUnit ** get_cptr( core_t &, long ) {
+                        return nullptr;
+                }
+        }
+
         template<typename core_t>
         static inline auto get_result( core_t & core, char ) -> decltype( core.result() ) {

src/AST/Stmt.hpp

@@ -175 +175 @@
 class CaseStmt final : public Stmt {
 public:
+        /// Null for the default label.
         ptr<Expr> cond;
         std::vector<ptr<Stmt>> stmts;

src/AST/TranslationUnit.hpp

@@ -26 +26 @@
         std::list< ptr< Decl > > decls;
 
-        struct Globals {
+        struct Global {
                 std::map< UniqueId, Decl * > idMap;
 
-                const Type * sizeType;
+                ptr<Type> sizeType;
                 const FunctionDecl * dereference;
                 const StructDecl * dtorStruct;

src/AST/porting.md

@@ -98 +98 @@
         * `Initializer` => `ast::Init`
     * `Statement` => `ast::Stmt`
+    * `ReferenceToType` => `ast::BaseInstType`
         * any field names should follow a similar renaming
   * because they don't really belong to `Type` (and for consistency with `Linkage::Spec`):