Changeset e6b42e7 for src/AST

Timestamp:

Sep 9, 2020, 11:33:01 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

2b7f6f0

Parents:

dfc13bb

Message:

Added the ast::Pass::read utility. Converted two passes to use its two different uses.

Location:

src/AST

Files:

• Pass.hpp (modified) (4 diffs)
• Pass.proto.hpp (modified) (1 diff)

src/AST/Pass.hpp

@@ -67 +67 @@
 // | WithSymbolTable       - provides symbol table functionality
 // | WithForallSubstitutor - maintains links between TypeInstType and TypeDecl under mutation
+//
+// Other Special Members:
+// | result                - Either a method that takes no parameters or a field. If a method (or
+//                           callable field) get_result calls it, otherwise the value is returned.
 //-------------------------------------------------------------------------------------------------
 template< typename core_t >
@@ -89 +93 @@
         virtual ~Pass() = default;
 
+        /// Storage for the actual pass.
+        core_t core;
+
+        /// If the core defines a result, call it if possible, otherwise return it.
+        inline auto get_result() -> decltype( __pass::get_result( core, '0' ) ) {
+                return __pass::get_result( core, '0' );
+        }
+
         /// Construct and run a pass on a translation unit.
         template< typename... Args >
@@ -96 +108 @@
         }
 
-        template< typename... Args >
+        /// Contruct and run a pass on a pointer to extract a value.
+        template< typename node_type, typename... Args >
+        static auto read( node_type const * node, Args&&... args ) {
+                Pass<core_t> visitor( std::forward<Args>( args )... );
+                node_type const * temp = node->accept( visitor );
+                assert( temp == node );
+                return visitor.get_result();
+        }
+
+        // Versions of the above for older compilers.
         static void run( std::list< ptr<Decl> > & decls ) {
                 Pass<core_t> visitor;
@@ -102 +123 @@
         }
 
-        /// Storage for the actual pass
-        core_t core;
+        static auto read( Node const * node ) {
+                Pass<core_t> visitor;
+                Node const * temp = node->accept( visitor );
+                assert( temp == node );
+                return visitor.get_result();
+        }
 
         /// Visit function declarations

src/AST/Pass.proto.hpp

@@ -421 +421 @@
 
         } // namespace forall
+
+        template<typename core_t>
+        static inline auto get_result( core_t & core, char ) -> decltype( core.result() ) {
+                return core.result();
+        }
+
+        template<typename core_t>
+        static inline auto get_result( core_t & core, int ) -> decltype( core.result ) {
+                return core.result;
+        }
+
+        template<typename core_t>
+        static inline void get_result( core_t &, long ) {}
 } // namespace __pass
 } // namespace ast