Changes in src/Common/PassVisitor.impl.h [d55d7a6:0ac366b]

File:

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

src/Common/PassVisitor.impl.h

@@ -77 +77 @@
                         maybeAccept_impl( *i, visitor );
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -103 +104 @@
                         maybeMutate_impl( *i, mutator );
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -132 +134 @@
                         }
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -160 +163 @@
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try
@@ -196 +200 @@
 
                 } catch ( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -393 +398 @@
                 // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->withExprs );
+                indexerAddWith( node->withExprs, node );
                 {
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
@@ -423 +428 @@
                 // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->withExprs );
+                indexerAddWith( node->withExprs, node );
                 {
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
@@ -1064 +1069 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node->exprs, node );
                 maybeAccept_impl( node->stmt, *this );
         }
@@ -1077 +1082 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node->exprs, node );
                 maybeMutate_impl( node->stmt, *this );
         }
@@ -1971 +1976 @@
 }
 
+//--------------------------------------------------------------------------
+// DeletedExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DeletedExpr * node ) {
+        VISIT_START( node );
+
+        indexerScopedAccept( node->result, *this );
+        maybeAccept_impl( node->expr, *this );
+        // don't visit deleteStmt, because it is a pointer to somewhere else in the tree.
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::mutate( DeletedExpr * node ) {
+        MUTATE_START( node );
+
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->expr, *this );
+
+        MUTATE_END( Expression, node );
+}
+
+
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {