Changeset 53bb8f1 for src/Common/PassVisitor.impl.h

Timestamp:

Mar 12, 2019, 3:00:54 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

30e32b2, a2545593

Parents:

9d9a451 (diff), 91d6584 (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 second draft of Aaron's thesis

File:

• src/Common/PassVisitor.impl.h (modified) (10 diffs)

src/Common/PassVisitor.impl.h

@@ -67 +67 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
+
+
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
@@ -83 +88 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -94 +100 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
@@ -109 +118 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -126 +136 @@
         if ( ! visitor.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -135 +149 @@
                 }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -153 +168 @@
         if ( ! mutator.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -163 +182 @@
                 } // try
         } // for
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -185 +205 @@
         DeclList_t* afterDecls  = get_afterDecls();
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
 
@@ -202 +225 @@
                 if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
         }
+        pass_visitor_stats.depth--;
 
         if ( !empty( afterDecls ) ) { splice( std::back_inserter( statements ), afterDecls); }