Changeset 52a4d69 for src/AST/Node.hpp

Timestamp:

Jun 5, 2020, 10:29:10 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d2de1be9

Parents:

5c9b20c

Message:

Improvements to ast::ptr_base::strict_as. Added null to null variant and both now inspect the node to see if it has a location to print.

File:

• src/AST/Node.hpp (modified) (3 diffs)

src/AST/Node.hpp

@@ -10 +10 @@
 // Created On       : Wed May 8 10:27:04 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun  3 13:26:00 2019
-// Update Count     : 5
+// Last Modified On : Fri Jun 5 9:47:00 2020
+// Update Count     : 6
 //
 
@@ -243 +243 @@
         const o_node_t * as() const { _check(); return dynamic_cast<const o_node_t *>(node); }
 
-        /// wrapper for convenient access to strict_dynamic_cast
+        /// Wrapper that makes sure dynamic_cast returns non-null.
         template<typename o_node_t>
-        const o_node_t * strict_as() const { _check(); return strict_dynamic_cast<const o_node_t *>(node); }
+        const o_node_t * strict_as() const {
+                if (const o_node_t * ret = as<o_node_t>()) return ret;
+                _strict_fail();
+        }
+
+        /// Wrapper that makes sure dynamic_cast does not fail.
+        template<typename o_node_t, decltype(nullptr) null>
+        const o_node_t * strict_as() const { return node ? strict_as<o_node_t>() : nullptr; }
 
         /// Returns a mutable version of the pointer in this node.
@@ -266 +273 @@
         void _dec( const node_t * other, bool do_delete = true );
         void _check() const;
+        void _strict_fail() const __attribute__((noreturn));
 
         const node_t * node;