Changeset 95e5018 for src/AST

Timestamp:

Sep 15, 2022, 11:28:46 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

747d0fa, a2fd937

Parents:

25793da

Message:

Changed ast::pass::make_location_guard so it should work with C++14.

Location:

src/AST

Files:

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

src/AST/Pass.impl.hpp ¶

@@ -26 +26 @@
         using namespace ast; \
         /* back-up the last known code location */ \
-        __attribute__((unused)) auto loc_guard = ast::__pass::make_location_guard( core, node ); \
+        __attribute__((unused)) auto loc_guard = ast::__pass::make_location_guard( core, node, 0 ); \
         /* back-up the visit children */ \
         __attribute__((unused)) ast::__pass::visit_children_guard guard1( ast::__pass::visit_children(core, 0) ); \

src/AST/Pass.proto.hpp ¶

@@ -295 +295 @@
         FIELD_PTR( at_cleanup, __pass::at_cleanup_t )
         FIELD_PTR( visitor, ast::Pass<core_t> * const )
-        FIELD_PTR( location, const CodeLocation * )
 
         // Remove the macro to make sure we don't clash
@@ -328 +327 @@
 
         template< typename core_t, typename node_t >
-        static auto make_location_guard(core_t & core, node_t * node) -> ValueGuardPtr<const CodeLocation *> {
-                if constexpr (std::is_base_of<ParseNode, node_t>::value) {
-                        const CodeLocation ** p = location(core, 0);
-                        if(p) {
-                                ValueGuardPtr<const CodeLocation *> g = { p };
-                                *p = &node->location;
-                                return g;
-                        }
-                }
-                (void)node;
-                return { nullptr };
+        static auto make_location_guard( core_t & core, node_t * node, int )
+                        -> decltype( node->location, ValueGuardPtr<const CodeLocation *>( &core.location ) ) {
+                ValueGuardPtr<const CodeLocation *> guard( &core.location );
+                core.location = &node->location;
+                return guard;
+        }
+
+        template< typename core_t, typename node_t >
+        static auto make_location_guard( core_t &, node_t *, long ) -> int {
+                return 0;
         }