Changeset ef3d798

Timestamp:

Nov 30, 2017, 5:39:14 PM (7 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:

c3f551b

Parents:

1fbeebd

git-author:

Rob Schluntz <rschlunt@…> (11/30/17 17:38:11)

git-committer:

Rob Schluntz <rschlunt@…> (11/30/17 17:39:14)

Message:

Convert InitDepthChecker? to PassVisitor?

File:

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

src/InitTweak/InitTweak.cc

@@ -48 +48 @@
                 };
 
-                class InitDepthChecker : public Visitor {
-                public:
+                struct InitDepthChecker : public WithGuards {
                         bool depthOkay = true;
                         Type * type;
@@ -61 +60 @@
                                 maxDepth++;
                         }
-                        virtual void visit( ListInit * listInit ) {
+                        void previsit( ListInit * ) {
                                 curDepth++;
+                                GuardAction( [this]() { curDepth--; } );
                                 if ( curDepth > maxDepth ) depthOkay = false;
-                                Visitor::visit( listInit );
-                                curDepth--;
                         }
                 };
@@ -102 +100 @@
 
         bool checkInitDepth( ObjectDecl * objDecl ) {
-                InitDepthChecker checker( objDecl->get_type() );
-                maybeAccept( objDecl->get_init(), checker );
-                return checker.depthOkay;
+                PassVisitor<InitDepthChecker> checker( objDecl->type );
+                maybeAccept( objDecl->init, checker );
+                return checker.pass.depthOkay;
         }