Changeset 5625427

Timestamp:

Nov 13, 2023, 3:41:02 PM (13 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

8d182b1

Parents:

6ea85b22

Message:

Remove the warning directive from SpecCost?, you can't actually use the standard maybe_accept here, it does not allow the user to insert code between visiting elements in a container.

File:

• src/ResolvExpr/SpecCost.cc (modified) (6 diffs)

src/ResolvExpr/SpecCost.cc

@@ -16 +16 @@
 #include <cassert>
 #include <limits>
-#include <list>
 #include <type_traits>
 
@@ -25 +24 @@
 
 namespace {
+
+const ast::Type * expr_result( const ast::ptr< ast::Expr > & expr ) {
+        return expr->result.get();
+}
+
+const ast::Type * type_deref( const ast::ptr< ast::Type > & type ) {
+        return type.get();
+}
+
         /// The specialization counter inner class.
         class SpecCounter : public ast::WithShortCircuiting, public ast::WithVisitorRef<SpecCounter> {
@@ -38 +46 @@
                         typename std::add_pointer<ast::Type const *(typename T::value_type const &)>::type;
 
-                #warning Should use a standard maybe_accept
-                void maybe_accept( ast::Type const * type ) {
-                        if ( type ) {
-                                auto node = type->accept( *visitor );
-                                assert( node == nullptr || node == type );
-                        }
-                }
-
                 // Update the minimum to the new lowest non-none value.
                 template<typename T>
@@ -51 +51 @@
                         for ( const auto & node : list ) {
                                 count = -1;
-                                maybe_accept( mapper( node ) );
+
+                                if ( ast::Type const * type = mapper( node ) ) {
+                                        ast::Type const * newType = type->accept( *visitor );
+                                        assert( newType == nullptr || newType == type );
+                                }
+
                                 if ( count != -1 && count < minimum ) minimum = count;
                         }
@@ -62 +67 @@
                         updateMinimumPresent( minCount, list, mapper );
                         return toNoneOrInc( minCount );
-                }
-
-                // The three mappers:
-                static const ast::Type * decl_type( const ast::ptr< ast::DeclWithType > & decl ) {
-                        return decl->get_type();
-                }
-                static const ast::Type * expr_result( const ast::ptr< ast::Expr > & expr ) {
-                        return expr->result;
-                }
-                static const ast::Type * type_deref( const ast::ptr< ast::Type > & type ) {
-                        return type.get();
                 }
 
@@ -122 +116 @@
 
 int specCost( const ast::Type * type ) {
-        if ( nullptr == type ) {
-                return 0;
-        }
-        return ast::Pass<SpecCounter>::read( type );
+        return ( nullptr == type ) ? 0 : ast::Pass<SpecCounter>::read( type );
 }