Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision 7c40a241f7b1a3fab06e54892b0098c8ebb9e4d8) +++ src/InitTweak/FixInit.cc (revision 888339e49e0dfdc2d6c754b7216c77bd5a8afc43) @@ -44,5 +44,4 @@ #include "SymTab/Indexer.h" // for Indexer #include "SymTab/Mangler.h" // for Mangler -#include "SynTree/AddStmtVisitor.h" // for AddStmtVisitor #include "SynTree/Attribute.h" // for Attribute #include "SynTree/Constant.h" // for Constant Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision 7c40a241f7b1a3fab06e54892b0098c8ebb9e4d8) +++ src/Makefile.in (revision 888339e49e0dfdc2d6c754b7216c77bd5a8afc43) @@ -251,5 +251,4 @@ SynTree/driver_cfa_cpp-Visitor.$(OBJEXT) \ SynTree/driver_cfa_cpp-Mutator.$(OBJEXT) \ - SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT) \ SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \ SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \ @@ -532,8 +531,8 @@ SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \ SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \ - SynTree/AddStmtVisitor.cc SynTree/TypeSubstitution.cc \ - SynTree/Attribute.cc SynTree/VarExprReplacer.cc \ - Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \ - Tuples/Explode.cc Virtual/ExpandCasts.cc + SynTree/TypeSubstitution.cc SynTree/Attribute.cc \ + SynTree/VarExprReplacer.cc Tuples/TupleAssignment.cc \ + Tuples/TupleExpansion.cc Tuples/Explode.cc \ + Virtual/ExpandCasts.cc MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \ ${cfa_cpplib_PROGRAMS}} @@ -922,6 +921,4 @@ SynTree/driver_cfa_cpp-Mutator.$(OBJEXT): SynTree/$(am__dirstamp) \ SynTree/$(DEPDIR)/$(am__dirstamp) -SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT): \ - SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp) SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT): \ SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp) @@ -1047,5 +1044,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Po@am__quote@ @@ -2546,18 +2542,4 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-Mutator.obj `if test -f 'SynTree/Mutator.cc'; then $(CYGPATH_W) 'SynTree/Mutator.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Mutator.cc'; fi` - -SynTree/driver_cfa_cpp-AddStmtVisitor.o: SynTree/AddStmtVisitor.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddStmtVisitor.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.o `test -f 'SynTree/AddStmtVisitor.cc' || echo '$(srcdir)/'`SynTree/AddStmtVisitor.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SynTree/AddStmtVisitor.cc' object='SynTree/driver_cfa_cpp-AddStmtVisitor.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.o `test -f 'SynTree/AddStmtVisitor.cc' || echo '$(srcdir)/'`SynTree/AddStmtVisitor.cc - -SynTree/driver_cfa_cpp-AddStmtVisitor.obj: SynTree/AddStmtVisitor.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddStmtVisitor.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.obj `if test -f 'SynTree/AddStmtVisitor.cc'; then $(CYGPATH_W) 'SynTree/AddStmtVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddStmtVisitor.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SynTree/AddStmtVisitor.cc' object='SynTree/driver_cfa_cpp-AddStmtVisitor.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.obj `if test -f 'SynTree/AddStmtVisitor.cc'; then $(CYGPATH_W) 'SynTree/AddStmtVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddStmtVisitor.cc'; fi` SynTree/driver_cfa_cpp-TypeSubstitution.o: SynTree/TypeSubstitution.cc Index: c/SynTree/AddStmtVisitor.cc =================================================================== --- src/SynTree/AddStmtVisitor.cc (revision 7c40a241f7b1a3fab06e54892b0098c8ebb9e4d8) +++ (revision ) @@ -1,93 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// AddStmtVisitor.cc -- -// -// Author : Rob Schluntz -// Created On : Wed Jun 22 12:11:17 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Thu Aug 4 11:23:47 2016 -// Update Count : 16 -// - -#include "AddStmtVisitor.h" - -#include "Common/SemanticError.h" // for SemanticError -#include "Declaration.h" // for Declaration -#include "Expression.h" // for Expression -#include "Statement.h" // for CompoundStmt, ForStmt, IfStmt, Sta... -#include "SynTree/Label.h" // for Label, noLabels - -void AddStmtVisitor::visitStatementList( std::list< Statement* > &statements ) { - for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) { - if ( ! stmtsToAddAfter.empty() ) { - statements.splice( i, stmtsToAddAfter ); - } // if - (*i)->accept( *this ); - if ( ! stmtsToAdd.empty() ) { - statements.splice( i, stmtsToAdd ); - } // if - } // for - if ( ! stmtsToAddAfter.empty() ) { - statements.splice( statements.end(), stmtsToAddAfter ); - } // if -} - -Statement * AddStmtVisitor::visitStatement( Statement *stmt ) { - maybeAccept( stmt, *this ); - if ( ! stmtsToAdd.empty() || ! stmtsToAddAfter.empty() ) { - CompoundStmt *compound = new CompoundStmt( noLabels ); - compound->get_kids().splice( compound->get_kids().end(), stmtsToAdd ); - compound->get_kids().push_back( stmt ); - compound->get_kids().splice( compound->get_kids().end(), stmtsToAddAfter ); - return compound; - } else { - return stmt; - } -} - -void AddStmtVisitor::visit(CompoundStmt *compoundStmt) { - visitStatementList( compoundStmt->get_kids() ); -} - -void AddStmtVisitor::visit(IfStmt *ifStmt) { - ifStmt->set_thenPart( visitStatement( ifStmt->get_thenPart() ) ); - ifStmt->set_elsePart( visitStatement( ifStmt->get_elsePart() ) ); - maybeAccept( ifStmt->get_condition(), *this ); -} - -void AddStmtVisitor::visit(WhileStmt *whileStmt) { - whileStmt->set_body( visitStatement( whileStmt->get_body() ) ); - maybeAccept( whileStmt->get_condition(), *this ); -} - -void AddStmtVisitor::visit(ForStmt *forStmt) { - forStmt->set_body( visitStatement( forStmt->get_body() ) ); - acceptAll( forStmt->get_initialization(), *this ); - maybeAccept( forStmt->get_condition(), *this ); - maybeAccept( forStmt->get_increment(), *this ); -} - -void AddStmtVisitor::visit(SwitchStmt *switchStmt) { - visitStatementList( switchStmt->get_statements() ); - maybeAccept( switchStmt->get_condition(), *this ); -} - -void AddStmtVisitor::visit(CaseStmt *caseStmt) { - visitStatementList( caseStmt->get_statements() ); - maybeAccept( caseStmt->get_condition(), *this ); -} - -void AddStmtVisitor::visit(CatchStmt *catchStmt) { - catchStmt->set_body( visitStatement( catchStmt->get_body() ) ); - maybeAccept( catchStmt->get_decl(), *this ); -} - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: c/SynTree/AddStmtVisitor.h =================================================================== --- src/SynTree/AddStmtVisitor.h (revision 7c40a241f7b1a3fab06e54892b0098c8ebb9e4d8) +++ (revision ) @@ -1,47 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// AddStmtVisitor.h -- -// -// Author : Rob Schluntz -// Created On : Wed Jun 22 12:05:48 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 09:51:08 2017 -// Update Count : 9 -// - -#pragma once - -#include // for list - -#include "SynTree/SynTree.h" // for Visitor Nodes -#include "SynTree/Visitor.h" // for Visitor - -class AddStmtVisitor : public Visitor { - public: - typedef Visitor Parent; - - using Parent::visit; - virtual void visit(CompoundStmt *compoundStmt); - virtual void visit(IfStmt *ifStmt); - virtual void visit(WhileStmt *whileStmt); - virtual void visit(ForStmt *forStmt); - virtual void visit(SwitchStmt *switchStmt); - virtual void visit(CaseStmt *caseStmt); - virtual void visit(CatchStmt *catchStmt); - - protected: - void visitStatementList( std::list< Statement * > & ); - Statement * visitStatement( Statement * ); - std::list< Statement* > stmtsToAdd; - std::list< Statement* > stmtsToAddAfter; -}; - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/SynTree/module.mk =================================================================== --- src/SynTree/module.mk (revision 7c40a241f7b1a3fab06e54892b0098c8ebb9e4d8) +++ src/SynTree/module.mk (revision 888339e49e0dfdc2d6c754b7216c77bd5a8afc43) @@ -48,5 +48,4 @@ SynTree/Visitor.cc \ SynTree/Mutator.cc \ - SynTree/AddStmtVisitor.cc \ SynTree/TypeSubstitution.cc \ SynTree/Attribute.cc \