Changeset eef8dfb for src/ResolvExpr/SpecCost.cc

Timestamp:

Jan 7, 2021, 2:55:57 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

58fe85a

Parents:

bdfc032 (diff), 44e37ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into dkobets-vector

File:

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

src/ResolvExpr/SpecCost.cc

@@ -10 +10 @@
 // Created On       : Tue Oct 02 15:50:00 2018
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 19 10:43:00 2019
-// Update Count     : 2
-//
-
+// Last Modified On : Wed Jul  3 11:07:00 2019
+// Update Count     : 3
+//
+
+#include <cassert>
 #include <limits>
 #include <list>
@@ -129 +130 @@
                         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>
@@ -134 +143 @@
                         for ( const auto & node : list ) {
                                 count = -1;
-                                mapper( node )->accept( *visitor );
+                                maybe_accept( mapper( node ) );
                                 if ( count != -1 && count < minimum ) minimum = count;
                         }
@@ -169 +178 @@
                 void previsit( const ast::FunctionType * fty ) {
                         int minCount = std::numeric_limits<int>::max();
-                        updateMinimumPresent( minCount, fty->params, decl_type );
-                        updateMinimumPresent( minCount, fty->returns, decl_type );
+                        updateMinimumPresent( minCount, fty->params, type_deref );
+                        updateMinimumPresent( minCount, fty->returns, type_deref );
                         // Add another level to minCount if set.
                         count = toNoneOrInc( minCount );
@@ -208 +217 @@
         }
         ast::Pass<SpecCounter> counter;
-        type->accept( *counter.pass.visitor );
-        return counter.pass.get_count();
+        type->accept( counter );
+        return counter.core.get_count();
 }