Changeset fd236ed

Timestamp:

Nov 30, 2017, 5:11:36 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1cb934d

Parents:

c50d54d

Message:

Convert HasDesignations? to PassVisitor?

File:

• src/InitTweak/InitTweak.cc (modified) (3 diffs)

src/InitTweak/InitTweak.cc

@@ -5 +5 @@
 #include <memory>                  // for __shared_ptr
 
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
@@ -29 +30 @@
 namespace InitTweak {
         namespace {
-                class HasDesignations : public Visitor {
+                class HasDesignations : public WithShortCircuiting {
                 public:
                         bool hasDesignations = false;
-                        virtual void visit( Designation * des ) {
-                                if ( ! des->get_designators().empty() ) hasDesignations = true;
-                                else Visitor::visit( des );
+
+                        void previsit( BaseSyntaxNode * ) {
+                                // short circuit if we already know there are designations
+                                if ( hasDesignations ) visit_children = false;
+                        }
+
+                        void previsit( Designation * des ) {
+                                // short circuit if we already know there are designations
+                                if ( hasDesignations ) visit_children = false;
+                                else if ( ! des->get_designators().empty() ) {
+                                        hasDesignations = true;
+                                        visit_children = false;
+                                }
                         }
                 };
@@ -86 +97 @@
 
         bool isDesignated( Initializer * init ) {
-                HasDesignations finder;
+                PassVisitor<HasDesignations> finder;
                 maybeAccept( init, finder );
-                return finder.hasDesignations;
+                return finder.pass.hasDesignations;
         }