Changeset be8518f

Timestamp:

Jun 7, 2019, 3:14:07 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

05d55ff, 9856ca9

Parents:

ef75948

Message:

Fixed up AssertAcyclic?.

Location:

src/AST

Files:

• AssertAcyclic.cpp (modified) (3 diffs)
• AssertAcyclic.hpp (modified) (2 diffs)
• Pass.hpp (modified) (1 diff)

src/AST/AssertAcyclic.cpp

@@ -10 +10 @@
 // Created On       : Thu Jun 06 15:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun 06 15:00:00 2019
-// Update Count     : 0
+// Last Modified On : Fri Jun 07 14:32:00 2019
+// Update Count     : 1
 //
 
@@ -20 +20 @@
 namespace {
 
-class NoStrongCyclesCore : public ast::WithGuards {
+class NoStrongCyclesCore {
     std::vector<const ast::Node *> parents;
 public:
-        void previsit ( const ast::Node * node ) {
-                for (auto & p : parents) {
-                        assert(p != node);
+        void previsit( const ast::Node * node ) {
+                for (auto & parent : parents) {
+                        assert(parent != node);
                 }
                 parents.push_back(node);
-                GuardAction( [this]() { parents.pop_back(); } );
+        }
+        void postvisit( const ast::Node * ) {
+                parents.pop_back();
         }
 };
@@ -36 +38 @@
 namespace ast {
 
-void assertAcyclic( const std::list< ast::ptr< ast::Decl > > translationUnit ) {
+void assertAcyclic( const std::list< ast::ptr< ast::Decl > > & translationUnit ) {
         Pass<NoStrongCyclesCore> visitor;
         for ( auto & decl : translationUnit ) {

src/AST/AssertAcyclic.hpp

@@ -8 +8 @@
 //
 // Author           : Andrew Beach
-// Created On       : Thr May 6 15:00:00 2019
+// Created On       : Thr Jun  6 15:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 6 15:00:00 2019
-// Update Count     : 0
+// Last Modified On : Fri Jun  7 14:32:00 2019
+// Update Count     : 1
 //
 
@@ -25 +25 @@
 namespace ast {
 
-void assertAcyclic( const std::list< ast::ptr< ast::Decl > > translationUnit );
+void assertAcyclic( const std::list< ast::ptr< ast::Decl > > & translationUnit );
 
 }

src/AST/Pass.hpp

@@ -287 +287 @@
                 at_cleanup( [func](void *) { func(); }, nullptr );
         }
+
+        /// When this node is finished being visited, call a member of an object.
+        template<typename T>
+        void GuardMethod( T * obj, void (T::*method)() ) {
+                at_cleanup( [ method ]( void * object ) {
+                        static_cast< T * >( object )->method();
+                }, static_cast< void * >( obj ) );
+        }
 };