Changeset 7a36848 for src

Timestamp:

Apr 12, 2024, 4:40:06 PM (2 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

b1b3df5, dc58e5d

Parents:

90320ac

Message:

Further Pass template clean-up, reimplementing the translation unit getter with the standard tools. The only time we needed a mutable TranslationUnit/TranslationGlobal? it was implemented manually anyways.

Location:

src/AST

Files:

• Pass.impl.hpp (modified) (1 diff)
• Pass.proto.hpp (modified) (3 diffs)

src/AST/Pass.impl.hpp

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

src/AST/Pass.proto.hpp

@@ -257 +257 @@
         } else {
                 node = core.previsit( node );
-                assertf(node, "Previsit must not return NULL");
+                assertf( node, "Previsit must not return nullptr." );
         }
 }
@@ -310 +310 @@
 FIELD_PTR( at_cleanup, __pass::at_cleanup_t )
 FIELD_PTR( visitor, ast::Pass<core_t> * const )
+FIELD_PTR( translationUnit, const TranslationUnit * )
 
 // Remove the macro to make sure we don't clash
@@ -506 +507 @@
 } // namespace forall
 
-// For passes that need access to the global context. Searches `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;
-        }
-}
-
 // For passes, usually utility passes, that have a result.
 namespace result {