Changes in / [2b7f6f0:14d8a9b]

Location:

src

Files:

• AST/Pass.hpp (modified) (4 diffs)
• AST/Pass.proto.hpp (modified) (1 diff)
• ResolvExpr/ConversionCost.cc (modified) (2 diffs)
• ResolvExpr/ConversionCost.h (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (2 diffs)

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 >
@@ -93 +89 @@
         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 >
@@ -108 +96 @@
         }
 
-        /// 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.
+        template< typename... Args >
         static void run( std::list< ptr<Decl> > & decls ) {
                 Pass<core_t> visitor;
@@ -123 +102 @@
         }
 
-        static auto read( Node const * node ) {
-                Pass<core_t> visitor;
-                Node const * temp = node->accept( visitor );
-                assert( temp == node );
-                return visitor.get_result();
-        }
+        /// Storage for the actual pass
+        core_t core;
 
         /// 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

src/ResolvExpr/ConversionCost.cc

@@ -520 +520 @@
                 return convertToReferenceCost( src, refType, srcIsLvalue, symtab, env, localPtrsAssignable );
         } else {
-                return ast::Pass<ConversionCost_new>::read( src, dst, srcIsLvalue, symtab, env, localConversionCost );
+                ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
+                src->accept( converter );
+                return converter.core.cost;
         }
 }
@@ -561 +563 @@
                         }
                 } else {
-                        return ast::Pass<ConversionCost_new>::read( src, dst, srcIsLvalue, symtab, env, localConversionCost );
+                        ast::Pass<ConversionCost_new> converter( dst, srcIsLvalue, symtab, env, localConversionCost );
+                        src->accept( converter );
+                        return converter.core.cost;
                 }
         } else {

src/ResolvExpr/ConversionCost.h

@@ -88 +88 @@
         static size_t traceId;
         Cost cost;
-        Cost result() { return cost; }
 
         ConversionCost_new( const ast::Type * dst, bool srcIsLvalue, const ast::SymbolTable & symtab,

src/ResolvExpr/Resolver.cc

@@ -965 +965 @@
                 /// Finds deleted expressions in an expression tree
                 struct DeleteFinder_new final : public ast::WithShortCircuiting {
-                        const ast::DeletedExpr * result = nullptr;
+                        const ast::DeletedExpr * delExpr = nullptr;
 
                         void previsit( const ast::DeletedExpr * expr ) {
-                                if ( result ) { visit_children = false; }
-                                else { result = expr; }
+                                if ( delExpr ) { visit_children = false; }
+                                else { delExpr = expr; }
                         }
 
                         void previsit( const ast::Expr * ) {
-                                if ( result ) { visit_children = false; }
+                                if ( delExpr ) { visit_children = false; }
                         }
                 };
@@ -980 +980 @@
         /// Check if this expression is or includes a deleted expression
         const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
-                return ast::Pass<DeleteFinder_new>::read( expr );
+                ast::Pass<DeleteFinder_new> finder;
+                expr->accept( finder );
+                return finder.core.delExpr;
         }