Changeset 884f1409 for src/ResolvExpr/FindOpenVars.cc
- Timestamp:
- Jul 19, 2019, 4:52:59 PM (5 years ago)
- 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:
- b5ce31e, fd642d2
- Parents:
- e723100 (diff), 335d81f (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/ResolvExpr/FindOpenVars.cc
re723100 r884f1409 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 09:42:48 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Sun May 17 09:45:25 201513 // Update Count : 311 // Last Modified By : Andrew 12 // Last Modified On : Fri Jul 12 14:18:00 2019 13 // Update Count : 4 14 14 // 15 15 … … 29 29 FindOpenVars_old( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ); 30 30 31 void previsit( PointerType * pointerType );32 void previsit( ArrayType * arrayType );33 void previsit( FunctionType * functionType );34 void previsit( TupleType * tupleType );31 void previsit( const PointerType * pointerType ); 32 void previsit( const ArrayType * arrayType ); 33 void previsit( const FunctionType * functionType ); 34 void previsit( const TupleType * tupleType ); 35 35 36 void common_action( Type *type );36 void common_action( const Type *type ); 37 37 38 38 OpenVarSet &openVars, &closedVars; … … 41 41 }; 42 42 43 void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {43 void findOpenVars( const Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) { 44 44 PassVisitor<FindOpenVars_old> finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen ); 45 45 type->accept( finder ); … … 50 50 } 51 51 52 void FindOpenVars_old::common_action( Type *type ) {52 void FindOpenVars_old::common_action( const Type * type ) { 53 53 if ( nextIsOpen ) { 54 for ( Type::ForallList::const_iterator i = type-> get_forall().begin(); i != type->get_forall().end(); ++i ) {54 for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) { 55 55 openVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) }; 56 56 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) { … … 61 61 } 62 62 } else { 63 for ( Type::ForallList::const_iterator i = type-> get_forall().begin(); i != type->get_forall().end(); ++i ) {63 for ( Type::ForallList::const_iterator i = type->forall.begin(); i != type->forall.end(); ++i ) { 64 64 closedVars[ (*i)->get_name() ] = TypeDecl::Data{ (*i) }; 65 65 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) { … … 78 78 } 79 79 80 void FindOpenVars_old::previsit( PointerType *pointerType) {80 void FindOpenVars_old::previsit(const PointerType * pointerType) { 81 81 common_action( pointerType ); 82 82 } 83 83 84 void FindOpenVars_old::previsit( ArrayType *arrayType) {84 void FindOpenVars_old::previsit(const ArrayType * arrayType) { 85 85 common_action( arrayType ); 86 86 } 87 87 88 void FindOpenVars_old::previsit( FunctionType *functionType) {88 void FindOpenVars_old::previsit(const FunctionType * functionType) { 89 89 common_action( functionType ); 90 90 nextIsOpen = ! nextIsOpen; … … 92 92 } 93 93 94 void FindOpenVars_old::previsit( TupleType *tupleType) {94 void FindOpenVars_old::previsit(const TupleType * tupleType) { 95 95 common_action( tupleType ); 96 96 } … … 104 104 bool nextIsOpen; 105 105 106 FindOpenVars_new( 107 ast::OpenVarSet & o, ast::OpenVarSet & c, ast::AssertionSet & n, 106 FindOpenVars_new( 107 ast::OpenVarSet & o, ast::OpenVarSet & c, ast::AssertionSet & n, 108 108 ast::AssertionSet & h, FirstMode firstIsOpen ) 109 109 : open( o ), closed( c ), need( n ), have( h ), nextIsOpen( firstIsOpen ) {} … … 135 135 } 136 136 137 void findOpenVars( 138 const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed, 137 void findOpenVars( 138 const ast::Type * type, ast::OpenVarSet & open, ast::OpenVarSet & closed, 139 139 ast::AssertionSet & need, ast::AssertionSet & have, FirstMode firstIsOpen ) { 140 140 ast::Pass< FindOpenVars_new > finder{ open, closed, need, have, firstIsOpen };
Note: See TracChangeset
for help on using the changeset viewer.