Index: src/CodeGen/CodeGenerator.cc =================================================================== --- src/CodeGen/CodeGenerator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/CodeGen/CodeGenerator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Tus Jul 25 15:29:00 2017 -// Update Count : 486 +// Last Modified On : Fri Aug 18 15:34:00 2017 +// Update Count : 488 // #include "CodeGenerator.h" @@ -79,23 +79,33 @@ } - CodeGenerator::LineMarker::LineMarker( - CodeLocation const & loc, bool toPrint) : - loc(loc), toPrint(toPrint) - {} - - CodeGenerator::LineMarker CodeGenerator::lineDirective( - BaseSyntaxNode const * node) { - return LineMarker(node->location, lineMarks); - } - - std::ostream & operator<<(std::ostream & out, - CodeGenerator::LineMarker const & marker) { - if (marker.toPrint && marker.loc.isSet()) { - return out << "\n# " << marker.loc.linenumber << " \"" - << marker.loc.filename << "\"\n"; - } else if (marker.toPrint) { - return out << "\n/* Missing CodeLocation */\n"; - } else { - return out; + /* Using updateLocation at the beginning of a node and nextLine + * within a node should become the method of formating. + */ + void CodeGenerator::updateLocation( CodeLocation const & to ) { + if ( !lineMarks ) { + return; + } else if ( currentLocation.followedBy( to, 0 ) ) { + return; + } else if ( currentLocation.followedBy( to, 1 ) ) { + output << "\n" << indent; + currentLocation.linenumber += 1; + } else if ( currentLocation.followedBy( to, 2 ) ) { + output << "\n\n" << indent; + currentLocation.linenumber += 2; + } else { + output << "\n# " << to.linenumber << " \"" << to.filename + << "\"\n" << indent; + currentLocation = to; + } + output << std::flush; + } + + void CodeGenerator::updateLocation( BaseSyntaxNode const * to ) { + updateLocation( to->location ); + } + + void CodeGenerator::nextLine() { + if ( !lineMarks ) { + output << "\n" << indent << std::flush; } } @@ -195,5 +205,5 @@ ++indent; for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) { - output << lineDirective( *i ) << indent; + updateLocation( *i ); (*i)->accept( *this ); output << ";" << endl; @@ -218,5 +228,5 @@ void CodeGenerator::visit( EnumDecl * enumDecl ) { extension( enumDecl ); - output << lineDirective ( enumDecl ); + updateLocation( enumDecl ); output << "enum "; genAttributes( enumDecl->get_attributes() ); @@ -234,5 +244,6 @@ ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i ); assert( obj ); - output << lineDirective( obj ) << indent << mangleName( obj ); + updateLocation( obj ); + output << mangleName( obj ); if ( obj->get_init() ) { output << " = "; @@ -252,5 +263,5 @@ void CodeGenerator::visit( TypedefDecl * typeDecl ) { assertf( ! genC, "Typedefs are removed and substituted in earlier passes." ); - output << lineDirective( typeDecl ); + updateLocation( typeDecl ); output << "typedef "; output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl; @@ -741,10 +752,11 @@ void CodeGenerator::visit( StmtExpr * stmtExpr ) { std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids(); - output << lineDirective( stmtExpr) << "({" << std::endl; + updateLocation( stmtExpr ); + output << "({" << std::endl; ++indent; unsigned int numStmts = stmts.size(); unsigned int i = 0; for ( Statement * stmt : stmts ) { - output << lineDirective( stmt ) << indent; + updateLocation( stmt ); output << printLabels( stmt->get_labels() ); if ( i+1 == numStmts ) { @@ -832,5 +844,5 @@ void CodeGenerator::visit( IfStmt * ifStmt ) { - output << lineDirective( ifStmt ); + updateLocation( ifStmt ); output << "if ( "; ifStmt->get_condition()->accept( *this ); @@ -846,5 +858,5 @@ void CodeGenerator::visit( SwitchStmt * switchStmt ) { - output << lineDirective( switchStmt ); + updateLocation( switchStmt ); output << "switch ( " ; switchStmt->get_condition()->accept( *this ); @@ -859,6 +871,5 @@ void CodeGenerator::visit( CaseStmt * caseStmt ) { - output << lineDirective( caseStmt ); - output << indent; + updateLocation( caseStmt ); if ( caseStmt->isDefault()) { output << "default"; Index: src/CodeGen/CodeGenerator.h =================================================================== --- src/CodeGen/CodeGenerator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/CodeGen/CodeGenerator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Tus Jul 25 25:30:00 2017 -// Update Count : 54 +// Last Modified On : Fri Aug 18 15:40:00 2017 +// Update Count : 56 // @@ -21,10 +21,7 @@ #include "Common/Indenter.h" // for Indenter - #include "SynTree/Declaration.h" // for DeclarationWithType (ptr only), Fun... #include "SynTree/Visitor.h" // for Visitor #include "SynTree/SynTree.h" // for Visitor Nodes - -#include "Common/Indenter.h" // for Indenter namespace CodeGen { @@ -113,17 +110,10 @@ }; - struct LineMarker { - CodeLocation const & loc; - bool toPrint; - - LineMarker(CodeLocation const & loc, bool toPrint); - }; - - LineMarker lineDirective(BaseSyntaxNode const * node); - void asmName( DeclarationWithType *decl ); void extension( Expression *expr ); void extension( Declaration *decl ); + + void updateLocation( BaseSyntaxNode const * to ); private: Indenter indent; @@ -134,4 +124,8 @@ bool genC = false; // true if output has to be C code bool lineMarks = false; + + CodeLocation currentLocation; + void updateLocation( CodeLocation const & to ); + void nextLine(); void handleStorageClass( DeclarationWithType *decl ); @@ -160,7 +154,4 @@ /// returns C-compatible name of declaration std::string genName( DeclarationWithType * decl ); - - std::ostream & operator<<(std::ostream &, - CodeGenerator::LineMarker const &); } // namespace CodeGen Index: src/CodeGen/Generate.cc =================================================================== --- src/CodeGen/Generate.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/CodeGen/Generate.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Andrew Beach -// Last Modified On : Wed May 19 13:05:00 2017 -// Update Count : 6 +// Last Modified On : Fri Aug 18 15:39:00 2017 +// Update Count : 7 // #include "Generate.h" @@ -33,5 +33,5 @@ for ( auto & dcl : translationUnit ) { if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) { - os << cgv.lineDirective(dcl); + cgv.updateLocation( dcl ); dcl->accept(cgv); if ( doSemicolon( dcl ) ) { Index: src/CodeTools/TrackLoc.cc =================================================================== --- src/CodeTools/TrackLoc.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/CodeTools/TrackLoc.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -18,4 +18,5 @@ #include // for exit, EXIT_FAILURE #include // for operator<<, ostream, basic_ostream +#include // for back_inserter, inserter #include // for stack #include // for operator<<, string @@ -23,6 +24,9 @@ #include "Common/PassVisitor.h" // for PassVisitor +#include "Common/SemanticError.h" // for SemanticError #include "Common/utility.h" // for CodeLocation #include "SynTree/BaseSyntaxNode.h" // for BaseSyntaxNode +#include "SynTree/Mutator.h" // for mutateAll +#include "SynTree/Visitor.h" // for acceptAll class Declaration; Index: src/Common/CodeLocation.h =================================================================== --- src/Common/CodeLocation.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) +++ src/Common/CodeLocation.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -0,0 +1,70 @@ +// +// 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. +// +// CodeLocation.h -- +// +// Author : Andrew Beach +// Created On : Thr Aug 17 11:23:00 2017 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Aug 17 14:07:00 2017 +// Update Count : 0 +// + +#pragma once + +#include + +struct CodeLocation { + int linenumber; + std::string filename; + + /// Create a new unset CodeLocation. + CodeLocation() + : linenumber( -1 ) + , filename("") + {} + + /// Create a new CodeLocation with the given values. + CodeLocation( const char* filename, int lineno ) + : linenumber( lineno ) + , filename(filename ? filename : "") + {} + + CodeLocation( const CodeLocation& rhs ) = default; + + bool isSet () const { + return -1 != linenumber; + } + + bool isUnset () const { + return !isSet(); + } + + void unset () { + linenumber = -1; + filename = ""; + } + + // Use field access for set. + + bool followedBy( CodeLocation const & other, int seperation ) { + return (linenumber + seperation == other.linenumber && + filename == other.filename); + } + + bool operator==( CodeLocation const & other ) { + return followedBy( other, 0 ); + } + + bool operator!=( CodeLocation const & other ) { + return !(*this == other); + } +}; + +inline std::string to_string( const CodeLocation& location ) { + return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : ""; +} + Index: src/Common/PassVisitor.h =================================================================== --- src/Common/PassVisitor.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Common/PassVisitor.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -1,3 +1,5 @@ #pragma once + +// IWYU pragma: private, include "Common/PassVisitor.h" #include Index: src/Common/SemanticError.h =================================================================== --- src/Common/SemanticError.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Common/SemanticError.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 21 22:18:59 2017 -// Update Count : 6 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Aug 17 14:01:00 2017 +// Update Count : 7 // @@ -21,5 +21,5 @@ #include // for string -#include "utility.h" // for CodeLocation, toString +#include "CodeLocation.h" // for CodeLocation, toString struct error { Index: src/Common/utility.h =================================================================== --- src/Common/utility.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Common/utility.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 21 22:19:13 2017 -// Update Count : 33 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Aug 17 11:38:00 2017 +// Update Count : 34 // @@ -27,4 +27,5 @@ #include + template< typename T > static inline T * maybeClone( const T *orig ) { @@ -347,42 +348,4 @@ } -struct CodeLocation { - int linenumber; - std::string filename; - - /// Create a new unset CodeLocation. - CodeLocation() - : linenumber( -1 ) - , filename("") - {} - - /// Create a new CodeLocation with the given values. - CodeLocation( const char* filename, int lineno ) - : linenumber( lineno ) - , filename(filename ? filename : "") - {} - - CodeLocation( const CodeLocation& rhs ) = default; - - bool isSet () const { - return -1 != linenumber; - } - - bool isUnset () const { - return !isSet(); - } - - void unset () { - linenumber = -1; - filename = ""; - } - - // Use field access for set. -}; - -inline std::string to_string( const CodeLocation& location ) { - return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : ""; -} - // Local Variables: // // tab-width: 4 // Index: src/ControlStruct/ExceptTranslate.cc =================================================================== --- src/ControlStruct/ExceptTranslate.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/ExceptTranslate.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,16 +10,30 @@ // Created On : Wed Jun 14 16:49:00 2017 // Last Modified By : Andrew Beach -// Last Modified On : Tus Aug 8 16:54:00 2017 -// Update Count : 7 +// Last Modified On : Thr Aug 17 17:19:00 2017 +// Update Count : 9 // #include "ExceptTranslate.h" -#include "Common/PassVisitor.h" -#include "SynTree/Statement.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Type.h" -#include "SynTree/Attribute.h" -#include "SynTree/VarExprReplacer.h" + +#include // for NULL +#include // for assert, assertf +#include // for back_inserter, inserter +#include // for string, operator== + +#include "Common/PassVisitor.h" // for PassVisitor, WithGuards +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for CodeLocation +#include "Parser/LinkageSpec.h" // for Cforall +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for ObjectDecl, FunctionDecl, Struc... +#include "SynTree/Expression.h" // for UntypedExpr, ConstantExpr, Name... +#include "SynTree/Initializer.h" // for SingleInit, ListInit +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Mutator.h" // for mutateAll +#include "SynTree/Statement.h" // for CompoundStmt, CatchStmt, ThrowStmt +#include "SynTree/Type.h" // for FunctionType, Type, noQualifiers +#include "SynTree/VarExprReplacer.h" // for VarExprReplacer, VarExprReplace... +#include "SynTree/Visitor.h" // for acceptAll namespace ControlStruct { @@ -152,5 +166,6 @@ /*bitfieldWidth*/ NULL, new BasicType( noQualifiers, BasicType::Bool ), - /*init*/ NULL + /*init*/ NULL, + std::list{ new Attribute( "unused" ) } ); ObjectDecl voidptr_obj( @@ -169,7 +184,10 @@ ); + ObjectDecl * unused_index_obj = index_obj.clone(); + unused_index_obj->attributes.push_back( new Attribute( "unused" ) ); + catch_func_t.get_parameters().push_back( index_obj.clone() ); catch_func_t.get_parameters().push_back( exception_obj.clone() ); - match_func_t.get_returnVals().push_back( index_obj.clone() ); + match_func_t.get_returnVals().push_back( unused_index_obj ); match_func_t.get_parameters().push_back( exception_obj.clone() ); handle_func_t.get_returnVals().push_back( bool_obj.clone() ); @@ -403,6 +421,6 @@ } - body->push_back( new ReturnStmt( noLabels, new ConstantExpr( - Constant::from_int( 0 ) ) ) ); + body->push_back( new ReturnStmt( noLabels, + new ConstantExpr( Constant::from_int( 0 ) ) ) ); return new FunctionDecl("match", Type::StorageClasses(), @@ -435,5 +453,5 @@ CompoundStmt * body = new CompoundStmt( noLabels ); - FunctionType * func_type = match_func_t.clone(); + FunctionType * func_type = handle_func_t.clone(); DeclarationWithType * except_obj = func_type->get_parameters().back(); @@ -458,6 +476,6 @@ } - body->push_back( new ReturnStmt( noLabels, new ConstantExpr( - Constant::from_bool( false ) ) ) ); + body->push_back( new ReturnStmt( noLabels, + new ConstantExpr( Constant::from_bool( false ) ) ) ); return new FunctionDecl("handle", Type::StorageClasses(), Index: src/ControlStruct/ExceptTranslate.h =================================================================== --- src/ControlStruct/ExceptTranslate.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/ExceptTranslate.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,7 @@ #pragma once -#include -#include "SynTree/SynTree.h" +#include // for list + +class Declaration; namespace ControlStruct { Index: src/ControlStruct/ForExprMutator.cc =================================================================== --- src/ControlStruct/ForExprMutator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/ForExprMutator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,32 +9,39 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Tue Jul 14 12:14:44 2015 -// Update Count : 10 +// Last Modified By : Andrew Beach +// Last Modified On : Fri Aug 18 10:22:00 2017 +// Update Count : 12 // -#include "SynTree/Mutator.h" -#include "SynTree/Statement.h" +#include // for list, _List_iterator, list<>::iterator + #include "ForExprMutator.h" +#include "SynTree/Label.h" // for Label +#include "SynTree/Statement.h" // for Statement (ptr only), ForStmt, Compou... namespace ControlStruct { + Statement *hoist( Statement *originalStmt, std::list &init ) { + // If no hoisting is needed, skip: + if ( 0 == init.size() ) { + return originalStmt; + } + + // Create compound statement, move initializers outside, + // the resut of the original stays as is. + CompoundStmt *block = new CompoundStmt( std::list< Label >() ); + std::list &stmts = block->get_kids(); + stmts.splice( stmts.end(), init ); + + // Add for to the new block. + stmts.push_back( originalStmt ); + return block; + } + + Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) { + return hoist( ifStmt, ifStmt->initialization ); + } Statement *ForExprMutator::postmutate( ForStmt *forStmt ) { // hoist any initializer declarations to make them C89 (rather than C99) - std::list &init = forStmt->get_initialization(); - if ( init.size() == 0 ) { - return forStmt; - } // if - - // create compound statement, move initializers outside, leave _for_ as-is - CompoundStmt *block = new CompoundStmt( std::list< Label >() ); - std::list &stmts = block->get_kids(); - for ( std::list::iterator it = init.begin(); it != init.end(); ++it ) { - stmts.push_back( *it ); - } // for - - // add for to the new block - stmts.push_back( forStmt ); - forStmt->set_initialization( std::list() ); - return block; + return hoist( forStmt, forStmt->initialization ); } } // namespace ControlStruct Index: src/ControlStruct/ForExprMutator.h =================================================================== --- src/ControlStruct/ForExprMutator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/ForExprMutator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,16 +10,18 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 09:17:08 2017 -// Update Count : 4 +// Last Modified On : Thu Aug 17 15:32:48 2017 +// Update Count : 5 // #pragma once -#include "SynTree/Mutator.h" -#include "Common/utility.h" +class IfStmt; +class ForStmt; +class Statement; namespace ControlStruct { class ForExprMutator { public: + Statement *postmutate( IfStmt * ); Statement *postmutate( ForStmt * ); }; Index: src/ControlStruct/LabelFixer.cc =================================================================== --- src/ControlStruct/LabelFixer.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/LabelFixer.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,15 +14,15 @@ // -#include -#include +#include // for assert +#include // for list, _List_iterator, list... +#include // for operator+, string, operator== +#include // for pair +#include "ControlStruct/LabelGenerator.h" // for LabelGenerator #include "LabelFixer.h" -#include "MLEMutator.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Declaration.h" -#include "Common/utility.h" - -#include +#include "MLEMutator.h" // for MLEMutator +#include "SynTree/Declaration.h" // for FunctionDecl +#include "SynTree/Expression.h" // for NameExpr, Expression, Unty... +#include "SynTree/Statement.h" // for Statement, BranchStmt, Com... namespace ControlStruct { Index: src/ControlStruct/LabelFixer.h =================================================================== --- src/ControlStruct/LabelFixer.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/LabelFixer.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,13 +16,16 @@ #pragma once -#include "Common/utility.h" -#include "SynTree/SynTree.h" -#include "SynTree/Visitor.h" -#include "SynTree/Label.h" -#include "LabelGenerator.h" -#include +#include // for list +#include // for map + +#include "Common/SemanticError.h" // for SemanticError +#include "SynTree/Label.h" // for Label +#include "SynTree/Visitor.h" // for Visitor +#include "SynTree/SynTree.h" // for Visitor Nodes namespace ControlStruct { /// normalizes label definitions and generates multi-level exit labels +class LabelGenerator; + class LabelFixer final : public Visitor { typedef Visitor Parent; Index: src/ControlStruct/LabelGenerator.cc =================================================================== --- src/ControlStruct/LabelGenerator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/LabelGenerator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,16 +9,17 @@ // Author : Rodolfo G. Esteves // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jun 23 12:18:34 2015 -// Update Count : 13 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Aug 14 14:14:00 2015 +// Update Count : 14 // -#include -#include +#include // for operator<<, basic_ostream +#include // for ostringstream +#include // for list #include "LabelGenerator.h" -#include "SynTree/Label.h" -#include "SynTree/Attribute.h" -#include "SynTree/Statement.h" +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Label.h" // for Label, operator<< +#include "SynTree/Statement.h" // for Statement namespace ControlStruct { Index: src/ControlStruct/LabelGenerator.h =================================================================== --- src/ControlStruct/LabelGenerator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/LabelGenerator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,9 @@ #pragma once -#include "SynTree/SynTree.h" -#include +#include // for string + +#include "SynTree/Label.h" // for Label + +class Statement; namespace ControlStruct { Index: src/ControlStruct/MLEMutator.cc =================================================================== --- src/ControlStruct/MLEMutator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/MLEMutator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -20,11 +20,15 @@ // where these labels are generated. -#include -#include - +#include // for __alloc_traits<>::value_type +#include // for find, find_if +#include // for assert, assertf +#include // for allocator_traits<>::value_... + +#include "Common/utility.h" // for toString, operator+ +#include "ControlStruct/LabelGenerator.h" // for LabelGenerator #include "MLEMutator.h" -#include "SynTree/Statement.h" -#include "SynTree/Expression.h" -#include "SynTree/Attribute.h" +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Statement.h" // for BranchStmt, CompoundStmt namespace ControlStruct { Index: src/ControlStruct/MLEMutator.h =================================================================== --- src/ControlStruct/MLEMutator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/MLEMutator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,17 +16,19 @@ #pragma once -#include -#include +#include // for list +#include // for map +#include // for string -#include "Common/utility.h" -#include "SynTree/SynTree.h" -#include "SynTree/Mutator.h" -#include "SynTree/Label.h" - -#include "LabelGenerator.h" +#include "Common/SemanticError.h" // for SemanticError +#include "SynTree/Label.h" // for Label +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/SynTree.h" // for Visitor Nodes namespace ControlStruct { +class LabelGenerator; + class MLEMutator : public Mutator { class Entry; + typedef Mutator Parent; public: Index: src/ControlStruct/Mutate.cc =================================================================== --- src/ControlStruct/Mutate.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/Mutate.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,19 +14,18 @@ // -#include -#include -#include -#include +#include // for back_inserter, inserter +#include // for list +#include "Common/PassVisitor.h" // for mutateAll +#include "Common/SemanticError.h" // for SemanticError +#include "ForExprMutator.h" // for ForExprMutator +#include "LabelFixer.h" // for LabelFixer #include "Mutate.h" -#include "LabelFixer.h" -#include "MLEMutator.h" -#include "ForExprMutator.h" +#include "SynTree/Declaration.h" // for Declaration +#include "SynTree/Mutator.h" // for mutateAll //#include "ExceptMutator.h" -#include "Common/utility.h" -#include "Common/PassVisitor.h" - -#include "SynTree/Visitor.h" +#include "Common/PassVisitor.h" // for PassVisitor +#include "SynTree/Visitor.h" // for acceptAll using namespace std; Index: src/ControlStruct/Mutate.h =================================================================== --- src/ControlStruct/Mutate.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ControlStruct/Mutate.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,8 +16,7 @@ #pragma once -#include -#include +#include // for list -#include "SynTree/Declaration.h" +class Declaration; namespace ControlStruct { Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Box.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,52 +14,46 @@ // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include // for mismatch +#include // for assert, safe_dynamic_cast +#include // for operator<<, stringstream +#include // for list, list<>::iterator, _Lis... +#include // for _Rb_tree_const_iterator, map +#include // for auto_ptr +#include // for set +#include // for string, allocator, basic_string +#include // for pair #include "Box.h" -#include "DeclMutator.h" -#include "Lvalue.h" -#include "FindFunction.h" -#include "PolyMutator.h" -#include "ScopedSet.h" -#include "ScrubTyVars.h" - -#include "Parser/ParseNode.h" - -#include "SynTree/Attribute.h" -#include "SynTree/Constant.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" -#include "SynTree/Mutator.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" -#include "SynTree/TypeSubstitution.h" - -#include "ResolvExpr/TypeEnvironment.h" -#include "ResolvExpr/TypeMap.h" -#include "ResolvExpr/typeops.h" - -#include "SymTab/Indexer.h" -#include "SymTab/Mangler.h" - -#include "Common/ScopedMap.h" -#include "Common/SemanticError.h" -#include "Common/UniqueName.h" -#include "Common/utility.h" #include "CodeGen/OperatorTable.h" - -#include "InitTweak/InitTweak.h" - -#include // temporary +#include "Common/ScopedMap.h" // for ScopedMap, ScopedMap<>::iter... +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for toString +#include "DeclMutator.h" // for DeclMutator +#include "FindFunction.h" // for findFunction, findAndReplace... +#include "GenPoly/ErasableScopedMap.h" // for ErasableScopedMap<>::const_i... +#include "GenPoly/GenPoly.h" // for TyVarMap, isPolyType, mangle... +#include "InitTweak/InitTweak.h" // for getFunctionName, isAssignment +#include "Lvalue.h" // for generalizedLvalue +#include "Parser/LinkageSpec.h" // for C, Spec, Cforall, Intrinsic +#include "PolyMutator.h" // for PolyMutator +#include "ResolvExpr/TypeEnvironment.h" // for EqvClass +#include "ResolvExpr/typeops.h" // for typesCompatible +#include "ScopedSet.h" // for ScopedSet, ScopedSet<>::iter... +#include "ScrubTyVars.h" // for ScrubTyVars +#include "SymTab/Indexer.h" // for Indexer +#include "SymTab/Mangler.h" // for Mangler +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for DeclarationWithType, ObjectDecl +#include "SynTree/Expression.h" // for ApplicationExpr, UntypedExpr +#include "SynTree/Initializer.h" // for SingleInit, Initializer, Lis... +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Mutator.h" // for maybeMutate, Mutator, mutateAll +#include "SynTree/Statement.h" // for ExprStmt, DeclStmt, ReturnStmt +#include "SynTree/SynTree.h" // for UniqueId +#include "SynTree/Type.h" // for Type, FunctionType, PointerType +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution, operator<< namespace GenPoly { Index: src/GenPoly/Box.h =================================================================== --- src/GenPoly/Box.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Box.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,7 @@ #pragma once -#include -#include "SynTree/SynTree.h" +#include // for list + +class Declaration; namespace GenPoly { Index: src/GenPoly/CopyParams.cc =================================================================== --- src/GenPoly/CopyParams.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/CopyParams.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,14 +14,20 @@ // -#include -#include -#include +#include // for assert +#include // for list, _List_iterator, _List_const_... +#include // for map, _Rb_tree_const_iterator, map<... +#include // for set, set<>::const_iterator +#include // for string, operator== +#include // for pair -#include "SynTree/Declaration.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Visitor.h" -#include "Common/UniqueName.h" +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "SynTree/Declaration.h" // for DeclarationWithType, TypeDecl, Fun... +#include "SynTree/Expression.h" // for VariableExpr, ApplicationExpr, Add... +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Statement.h" // for CompoundStmt, DeclStmt, ExprStmt +#include "SynTree/SynTree.h" // for UniqueId +#include "SynTree/Type.h" // for FunctionType, TypeInstType, Type +#include "SynTree/Visitor.h" // for acceptAll, Visitor namespace GenPoly { Index: src/GenPoly/DeclMutator.cc =================================================================== --- src/GenPoly/DeclMutator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/DeclMutator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,11 @@ #include "DeclMutator.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" +#include // for allocator_traits<>::value_type + +#include "Common/SemanticError.h" // for SemanticError +#include "SynTree/Declaration.h" // for Declaration +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Statement.h" // for CatchStmt, Statement, CompoundStmt namespace GenPoly { Index: src/GenPoly/DeclMutator.h =================================================================== --- src/GenPoly/DeclMutator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/DeclMutator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,10 +16,9 @@ #pragma once -#include -#include +#include // for list +#include // for vector -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" -#include "SynTree/Mutator.h" +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/SynTree.h" // for Visitor Nodes namespace GenPoly { Index: src/GenPoly/FindFunction.cc =================================================================== --- src/GenPoly/FindFunction.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/FindFunction.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,9 +15,14 @@ #include "FindFunction.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Visitor.h" -#include "ScrubTyVars.h" +#include // for pair + +#include "Common/SemanticError.h" // for SemanticError +#include "GenPoly/ErasableScopedMap.h" // for ErasableScopedMap<>::iterator +#include "GenPoly/GenPoly.h" // for TyVarMap +#include "ScrubTyVars.h" // for ScrubTyVars +#include "SynTree/Declaration.h" // for DeclarationWithType, TypeDecl +#include "SynTree/Mutator.h" // for Mutator, mutateAll +#include "SynTree/Type.h" // for FunctionType, Type, Type::For... namespace GenPoly { Index: src/GenPoly/FindFunction.h =================================================================== --- src/GenPoly/FindFunction.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/FindFunction.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,10 @@ #pragma once -#include "SynTree/SynTree.h" -#include "GenPoly.h" +#include // for list + +#include "GenPoly.h" // for TyVarMap + +class FunctionType; +class Type; namespace GenPoly { Index: src/GenPoly/GenPoly.cc =================================================================== --- src/GenPoly/GenPoly.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/GenPoly.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,16 +15,20 @@ #include "GenPoly.h" -#include "assert.h" - -#include "SynTree/Expression.h" -#include "SynTree/Type.h" -#include "ResolvExpr/typeops.h" - -#include -#include -#include -#include -#include -#include + +#include // for assertf, assert +#include // for operator<<, ostream, basic_os... +#include // for back_insert_iterator, back_in... +#include // for list, _List_iterator, list<>:... +#include // for type_index +#include // for pair +#include // for vector + +#include "GenPoly/ErasableScopedMap.h" // for ErasableScopedMap<>::const_it... +#include "ResolvExpr/typeops.h" // for flatten +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Expression.h" // for Expression, TypeExpr, Constan... +#include "SynTree/Type.h" // for Type, StructInstType, UnionIn... +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution + using namespace std; Index: src/GenPoly/GenPoly.h =================================================================== --- src/GenPoly/GenPoly.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/GenPoly.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,15 +16,11 @@ #pragma once -#include -#include -#include +#include // for ostream +#include // for string, allocator, operator+, basic... -#include "ErasableScopedMap.h" - -#include "SymTab/Mangler.h" - -#include "SynTree/Declaration.h" -#include "SynTree/Type.h" -#include "SynTree/TypeSubstitution.h" +#include "ErasableScopedMap.h" // for ErasableScopedMap +#include "SymTab/Mangler.h" // for Mangler +#include "SynTree/Declaration.h" // for TypeDecl::Data, AggregateDecl, Type... +#include "SynTree/SynTree.h" // for Visitor Nodes namespace GenPoly { @@ -66,9 +62,9 @@ Type *hasPolyBase( Type *type, const TyVarMap &tyVars, int *levels = 0, const TypeSubstitution *env = 0 ); - /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one + /// true iff this type or some base of this type after dereferencing pointers is either polymorphic or a generic type with at least one /// polymorphic parameter; will look up substitution in env if provided. bool includesPolyType( Type *type, const TypeSubstitution *env = 0 ); - /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with + /// true iff this type or some base of this type after dereferencing pointers is either polymorphic in tyVars, or a generic type with /// at least one polymorphic parameter in tyVars; will look up substitution in env if provided. bool includesPolyType( Type *type, const TyVarMap &tyVars, const TypeSubstitution *env = 0 ); Index: src/GenPoly/InstantiateGeneric.cc =================================================================== --- src/GenPoly/InstantiateGeneric.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/InstantiateGeneric.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -13,30 +13,26 @@ // Update Count : 1 // - -#include -#include -#include -#include -#include - #include "InstantiateGeneric.h" -#include "GenPoly.h" -#include "ScopedSet.h" -#include "ScrubTyVars.h" - -#include "Common/PassVisitor.h" -#include "Common/ScopedMap.h" -#include "Common/UniqueName.h" -#include "Common/utility.h" - -#include "ResolvExpr/typeops.h" - -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Type.h" - - -#include "InitTweak/InitTweak.h" +#include // for assertf, assert +#include // for back_inserter, inserter +#include // for list, _List_const_iterator +#include // for move, pair +#include // for vector + +#include "Common/PassVisitor.h" // for PassVisitor, WithDeclsToAdd +#include "Common/ScopedMap.h" // for ScopedMap +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for deleteAll, cloneAll +#include "GenPoly.h" // for isPolyType, typesPolyCompatible +#include "ScopedSet.h" // for ScopedSet, ScopedSet<>::iterator +#include "ScrubTyVars.h" // for ScrubTyVars +#include "SynTree/Declaration.h" // for StructDecl, UnionDecl, TypeDecl +#include "SynTree/Expression.h" // for TypeExpr, Expression +#include "SynTree/Mutator.h" // for mutateAll +#include "SynTree/Type.h" // for StructInstType, UnionInstType +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution +#include "SynTree/Visitor.h" // for acceptAll Index: src/GenPoly/InstantiateGeneric.h =================================================================== --- src/GenPoly/InstantiateGeneric.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/InstantiateGeneric.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,5 +16,7 @@ #pragma once -#include "SynTree/SynTree.h" +#include // for list + +class Declaration; namespace GenPoly { Index: src/GenPoly/Lvalue.cc =================================================================== --- src/GenPoly/Lvalue.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Lvalue.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,29 +14,24 @@ // -#include - +#include // for safe_dynamic_cast +#include // for string + +#include "Common/PassVisitor.h" +#include "Common/SemanticError.h" // for SemanticError +#include "GenPoly.h" // for isPolyType #include "Lvalue.h" -#include "GenPoly.h" - -#include "SynTree/Declaration.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Visitor.h" -#include "SynTree/Mutator.h" -#include "SymTab/Indexer.h" +#include "Parser/LinkageSpec.h" // for Spec, isBuiltin, Intrinsic +#include "ResolvExpr/TypeEnvironment.h" // for AssertionSet, OpenVarSet +#include "ResolvExpr/Unify.h" // for unify +#include "ResolvExpr/typeops.h" #include "SymTab/Autogen.h" - -#include "ResolvExpr/Resolver.h" -#include "ResolvExpr/TypeEnvironment.h" -#include "ResolvExpr/typeops.h" -#include "ResolvExpr/Unify.h" - -#include "Common/UniqueName.h" -#include "Common/utility.h" -#include "Common/PassVisitor.h" - -#include "InitTweak/InitTweak.h" +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for Declaration, FunctionDecl +#include "SynTree/Expression.h" // for Expression, ConditionalExpr +#include "SynTree/Mutator.h" // for mutateAll, Mutator +#include "SynTree/Statement.h" // for ReturnStmt, Statement (ptr o... +#include "SynTree/Type.h" // for PointerType, Type, FunctionType +#include "SynTree/Visitor.h" // for Visitor, acceptAll #if 0 @@ -223,5 +218,5 @@ // at inner &, record depth D of reference type // at outer &, add D derefs. - void AddrRef::premutate( Expression * expr ) { + void AddrRef::premutate( Expression * ) { GuardValue( current ); GuardValue( first ); @@ -230,5 +225,5 @@ } - void AddrRef::premutate( AddressExpr * addrExpr ) { + void AddrRef::premutate( AddressExpr * ) { GuardValue( current ); GuardValue( first ); Index: src/GenPoly/Lvalue.h =================================================================== --- src/GenPoly/Lvalue.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Lvalue.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,7 +16,8 @@ #pragma once -#include +#include // for list -#include "SynTree/SynTree.h" +class Declaration; +class Expression; namespace GenPoly { Index: src/GenPoly/PolyMutator.cc =================================================================== --- src/GenPoly/PolyMutator.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/PolyMutator.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,10 +15,15 @@ #include "PolyMutator.h" -#include "SynTree/Declaration.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Mutator.h" -#include "SynTree/Initializer.h" + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for ValueGuard +#include "SynTree/Declaration.h" // for Declaration, TypeDecl, TypeDecl::Data +#include "SynTree/Expression.h" // for Expression, UntypedExpr, StmtExpr ... +#include "SynTree/Initializer.h" // for SingleInit, Initializer (ptr only) +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Mutator.h" // for maybeMutate, mutateAll +#include "SynTree/Statement.h" // for CatchStmt, CompoundStmt, ForStmt + +class TypeSubstitution; namespace GenPoly { Index: src/GenPoly/PolyMutator.h =================================================================== --- src/GenPoly/PolyMutator.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/PolyMutator.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,13 +16,9 @@ #pragma once -#include -#include -#include +#include // for list -#include "GenPoly.h" - -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" -#include "SynTree/Mutator.h" +#include "GenPoly.h" // for TyVarMap +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/SynTree.h" // for Visitor Nodes namespace GenPoly { Index: src/GenPoly/ScrubTyVars.cc =================================================================== --- src/GenPoly/ScrubTyVars.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/ScrubTyVars.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,13 +14,13 @@ // -#include -#include +#include // for pair -#include "GenPoly.h" +#include "GenPoly.h" // for mangleType, TyVarMap, alignof... +#include "GenPoly/ErasableScopedMap.h" // for ErasableScopedMap<>::const_it... #include "ScrubTyVars.h" - -#include "SynTree/Mutator.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" +#include "SynTree/Declaration.h" // for TypeDecl, TypeDecl::Data, Typ... +#include "SynTree/Expression.h" // for Expression (ptr only), NameExpr +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for PointerType, TypeInstType, Type namespace GenPoly { Index: src/GenPoly/ScrubTyVars.h =================================================================== --- src/GenPoly/ScrubTyVars.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/ScrubTyVars.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// ScrubTyVars.h -- +// ScrubTyVars.h -- // // Author : Richard C. Bilson @@ -16,10 +16,13 @@ #pragma once -#include +#include // for assert -#include "GenPoly.h" +#include "GenPoly.h" // for TyVarMap, isPolyType, isDynType +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for Type (ptr only), PointerType (ptr only) -#include "SynTree/SynTree.h" -#include "SynTree/Mutator.h" +class AlignofExpr; +class Expression; +class SizeofExpr; namespace GenPoly { @@ -66,8 +69,8 @@ // return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars ); } - + /// Mutates (possibly generic) aggregate types appropriately Type* mutateAggregateType( Type *ty ); - + const TyVarMap *tyVars; ///< Type variables to scrub ScrubMode mode; ///< which type variables to scrub? [FromMap] Index: src/GenPoly/Specialize.cc =================================================================== --- src/GenPoly/Specialize.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Specialize.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,23 +14,31 @@ // -#include - +#include // for assert, assertf +#include // for back_insert_iterator, back_i... +#include // for _Rb_tree_iterator, _Rb_tree_... +#include // for unique_ptr +#include // for string +#include // for get +#include // for pair + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for group_iterate +#include "GenPoly.h" // for getFunctionType +#include "InitTweak/InitTweak.h" // for isIntrinsicCallExpr +#include "Parser/LinkageSpec.h" // for C +#include "PolyMutator.h" // for PolyMutator +#include "ResolvExpr/FindOpenVars.h" // for findOpenVars +#include "ResolvExpr/TypeEnvironment.h" // for OpenVarSet, AssertionSet #include "Specialize.h" -#include "GenPoly.h" -#include "PolyMutator.h" - -#include "Parser/ParseNode.h" - -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" -#include "SynTree/Attribute.h" -#include "SynTree/TypeSubstitution.h" -#include "SynTree/Mutator.h" -#include "ResolvExpr/FindOpenVars.h" -#include "Common/UniqueName.h" -#include "Common/utility.h" -#include "InitTweak/InitTweak.h" -#include "Tuples/Tuples.h" +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Declaration.h" // for FunctionDecl, DeclarationWit... +#include "SynTree/Expression.h" // for ApplicationExpr, Expression +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Mutator.h" // for mutateAll +#include "SynTree/Statement.h" // for CompoundStmt, DeclStmt, Expr... +#include "SynTree/Type.h" // for FunctionType, TupleType, Type +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution +#include "SynTree/Visitor.h" // for Visitor namespace GenPoly { @@ -93,4 +101,26 @@ } + // walk into tuple type and find the number of components + size_t singleParameterSize( Type * type ) { + if ( TupleType * tt = dynamic_cast< TupleType * >( type ) ) { + size_t sz = 0; + for ( Type * t : *tt ) { + sz += singleParameterSize( t ); + } + return sz; + } else { + return 1; + } + } + + // find the total number of components in a parameter list + size_t functionParameterSize( FunctionType * ftype ) { + size_t sz = 0; + for ( DeclarationWithType * p : ftype->get_parameters() ) { + sz += singleParameterSize( p->get_type() ); + } + return sz; + } + bool needsTupleSpecialization( Type *formalType, Type *actualType ) { // Needs tuple specialization if the structure of the formal type and actual type do not match. @@ -103,5 +133,9 @@ FunctionType * aftype = getFunctionType( actualType->stripReferences() ); assertf( aftype, "formal type is a function type, but actual type is not: %s", toString( actualType ).c_str() ); + // Can't tuple specialize if parameter sizes deeply-differ. + if ( functionParameterSize( fftype ) != functionParameterSize( aftype ) ) return false; + // tuple-parameter sizes are the same, but actual parameter sizes differ - must tuple specialize if ( fftype->get_parameters().size() != aftype->get_parameters().size() ) return true; + // total parameter size can be the same, while individual parameters can have different structure for ( auto params : group_iterate( fftype->get_parameters(), aftype->get_parameters() ) ) { DeclarationWithType * formal = std::get<0>(params); Index: src/GenPoly/Specialize.h =================================================================== --- src/GenPoly/Specialize.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/GenPoly/Specialize.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,7 +16,7 @@ #pragma once -#include +#include // for list -#include "SynTree/SynTree.h" +class Declaration; namespace GenPoly { Index: src/InitTweak/FixGlobalInit.cc =================================================================== --- src/InitTweak/FixGlobalInit.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/FixGlobalInit.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,13 +15,22 @@ #include "FixGlobalInit.h" -#include "InitTweak.h" -#include "SynTree/Declaration.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Initializer.h" -#include "SynTree/Visitor.h" -#include "SynTree/Attribute.h" -#include + +#include // for assert +#include // for NULL +#include // for replace_if + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "InitTweak.h" // for isIntrinsicSingleArgCallStmt +#include "Parser/LinkageSpec.h" // for C +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for FunctionDecl, ObjectDecl, Declaration +#include "SynTree/Expression.h" // for ConstantExpr, Expression (ptr only) +#include "SynTree/Initializer.h" // for ConstructorInit, Initializer +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Statement.h" // for CompoundStmt, Statement (ptr only) +#include "SynTree/Type.h" // for Type, Type::StorageClasses, Functi... +#include "SynTree/Visitor.h" // for acceptAll, Visitor namespace InitTweak { Index: src/InitTweak/FixGlobalInit.h =================================================================== --- src/InitTweak/FixGlobalInit.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/FixGlobalInit.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,9 +16,8 @@ #pragma once -#include -#include +#include // for list +#include // for string -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" +class Declaration; namespace InitTweak { Index: src/InitTweak/FixInit.cc =================================================================== --- src/InitTweak/FixInit.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/FixInit.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -13,34 +13,50 @@ // Update Count : 74 // - -#include -#include -#include -#include -#include -#include - -#include "InitTweak.h" -#include "GenInit.h" #include "FixInit.h" -#include "FixGlobalInit.h" -#include "CodeGen/GenType.h" // for warning/error messages + +#include // for NULL +#include // for set_difference, copy_if +#include // for assert, safe_dynamic_cast +#include // for operator<<, ostream, basic_ost... +#include // for insert_iterator, back_inserter +#include // for _List_iterator, list, list<>::... +#include // for _Rb_tree_iterator, _Rb_tree_co... +#include // for allocator_traits<>::value_type +#include // for set, set<>::value_type +#include // for unordered_map, unordered_map<>... +#include // for unordered_set +#include // for pair + +#include "CodeGen/GenType.h" // for genPrettyType #include "CodeGen/OperatorTable.h" -#include "Common/PassVisitor.h" -#include "GenPoly/DeclMutator.h" -#include "GenPoly/PolyMutator.h" -#include "ResolvExpr/Resolver.h" -#include "ResolvExpr/typeops.h" -#include "SymTab/Autogen.h" -#include "SymTab/Indexer.h" -#include "SynTree/AddStmtVisitor.h" -#include "SynTree/Attribute.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" -#include "SynTree/Mutator.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" -#include "Tuples/Tuples.h" +#include "Common/PassVisitor.h" // for PassVisitor, WithStmtsToAdd +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for CodeLocation, ValueGuard, toSt... +#include "FixGlobalInit.h" // for fixGlobalInit +#include "GenInit.h" // for genCtorDtor +#include "GenPoly/DeclMutator.h" // for DeclMutator +#include "GenPoly/GenPoly.h" // for getFunctionType +#include "GenPoly/PolyMutator.h" // for PolyMutator +#include "InitTweak.h" // for getFunctionName, getCallArg +#include "Parser/LinkageSpec.h" // for C, Spec, Cforall, isBuiltin +#include "ResolvExpr/Resolver.h" // for findVoidExpression +#include "ResolvExpr/typeops.h" // for typesCompatible +#include "SymTab/Autogen.h" // for genImplicitCall +#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 +#include "SynTree/Declaration.h" // for ObjectDecl, FunctionDecl, Decl... +#include "SynTree/Expression.h" // for UniqueExpr, VariableExpr, Unty... +#include "SynTree/Initializer.h" // for ConstructorInit, SingleInit +#include "SynTree/Label.h" // for Label, noLabels, operator< +#include "SynTree/Mutator.h" // for mutateAll, Mutator, maybeMutate +#include "SynTree/Statement.h" // for ExprStmt, CompoundStmt, Branch... +#include "SynTree/Type.h" // for Type, Type::StorageClasses +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution, operator<< +#include "SynTree/Visitor.h" // for acceptAll, maybeAccept +#include "Tuples/Tuples.h" // for isTtype bool ctordtorp = false; // print all debug Index: src/InitTweak/FixInit.h =================================================================== --- src/InitTweak/FixInit.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/FixInit.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,10 +16,8 @@ #pragma once -#include -#include +#include // for list +#include // for string -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" -#include "SynTree/Mutator.h" +class Declaration; namespace InitTweak { Index: src/InitTweak/GenInit.cc =================================================================== --- src/InitTweak/GenInit.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/GenInit.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -13,29 +13,32 @@ // Update Count : 183 // - -#include -#include - -#include "InitTweak.h" #include "GenInit.h" -#include "Common/PassVisitor.h" +#include // for NULL +#include // for any_of +#include // for assert, safe_dynamic_cast, assertf +#include // for back_inserter, inserter, back_inse... +#include // for _List_iterator, list + #include "CodeGen/OperatorTable.h" - -#include "GenPoly/DeclMutator.h" -#include "GenPoly/PolyMutator.h" -#include "GenPoly/ScopedSet.h" - -#include "ResolvExpr/typeops.h" - -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" -#include "SynTree/Mutator.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" - -#include "SymTab/Autogen.h" -#include "SymTab/Mangler.h" +#include "Common/PassVisitor.h" // for PassVisitor, WithGuards, WithShort... +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for ValueGuard, maybeClone +#include "GenPoly/DeclMutator.h" // for DeclMutator +#include "GenPoly/GenPoly.h" // for getFunctionType, isPolyType +#include "GenPoly/ScopedSet.h" // for ScopedSet, ScopedSet<>::const_iter... +#include "InitTweak.h" // for isConstExpr, InitExpander, checkIn... +#include "Parser/LinkageSpec.h" // for isOverridable, C +#include "SymTab/Autogen.h" // for genImplicitCall, SizeType +#include "SymTab/Mangler.h" // for Mangler +#include "SynTree/Declaration.h" // for ObjectDecl, DeclarationWithType +#include "SynTree/Expression.h" // for VariableExpr, UntypedExpr, Address... +#include "SynTree/Initializer.h" // for ConstructorInit, SingleInit, Initi... +#include "SynTree/Label.h" // for Label +#include "SynTree/Mutator.h" // for mutateAll +#include "SynTree/Statement.h" // for CompoundStmt, ImplicitCtorDtorStmt +#include "SynTree/Type.h" // for Type, ArrayType, Type::Qualifiers +#include "SynTree/Visitor.h" // for acceptAll, maybeAccept namespace InitTweak { Index: src/InitTweak/GenInit.h =================================================================== --- src/InitTweak/GenInit.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/GenInit.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,10 +16,8 @@ #pragma once -#include -#include +#include // for list +#include // for string -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" -#include "SynTree/Mutator.h" +#include "SynTree/SynTree.h" // for Visitor Nodes namespace InitTweak { Index: src/InitTweak/InitTweak.cc =================================================================== --- src/InitTweak/InitTweak.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/InitTweak.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -1,11 +1,28 @@ -#include +#include // for NULL +#include // for find, all_of +#include // for assertf, assert, safe_dynamic_cast +#include // for ostream, cerr, endl +#include // for back_insert_iterator, back_inserter +#include // for __shared_ptr + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for toString, deleteAll, maybeClone +#include "GenPoly/GenPoly.h" // for getFunctionType #include "InitTweak.h" -#include "SynTree/Visitor.h" -#include "SynTree/Statement.h" -#include "SynTree/Initializer.h" -#include "SynTree/Expression.h" -#include "SynTree/Attribute.h" -#include "GenPoly/GenPoly.h" -#include "ResolvExpr/typeops.h" +#include "Parser/LinkageSpec.h" // for Spec, isBuiltin, Intrinsic +#include "ResolvExpr/typeops.h" // for typesCompatibleIgnoreQualifiers +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for ObjectDecl, DeclarationWithType +#include "SynTree/Expression.h" // for Expression, UntypedExpr, Applicati... +#include "SynTree/Initializer.h" // for Initializer, ListInit, Designation +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Statement.h" // for CompoundStmt, ExprStmt, BranchStmt +#include "SynTree/Type.h" // for FunctionType, ArrayType, PointerType +#include "SynTree/Visitor.h" // for Visitor, maybeAccept + +class UntypedValofExpr; namespace InitTweak { Index: src/InitTweak/InitTweak.h =================================================================== --- src/InitTweak/InitTweak.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/InitTweak/InitTweak.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,10 +16,9 @@ #pragma once -#include -#include +#include // for list +#include // for shared_ptr +#include // for string, allocator -#include "SynTree/SynTree.h" -#include "SynTree/Declaration.h" -#include "SynTree/Mutator.h" +#include "SynTree/SynTree.h" // for Visitor Nodes // helper functions for initialization @@ -99,4 +98,5 @@ class ExpanderImpl; + typedef std::list< Expression * > IndexList; private: Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/DeclarationNode.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,17 +14,26 @@ // -#include -#include -#include -#include -#include - -#include "TypeData.h" - -#include "SynTree/Attribute.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" - -#include "TypedefTable.h" +#include // for assert, assertf, safe_dynamic_cast +#include // for back_insert_iterator +#include // for list +#include // for unique_ptr +#include // for operator<<, ostream, basic_ostream +#include // for string, operator+, allocator, char... + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for maybeClone, maybeBuild, CodeLocation +#include "Parser/LinkageSpec.h" // for Spec, linkageName, Cforall +#include "Parser/ParseNode.h" // for DeclarationNode, ExpressionNode +#include "SynTree/Attribute.h" // for Attribute +#include "SynTree/Declaration.h" // for TypeDecl, ObjectDecl, Declaration +#include "SynTree/Expression.h" // for Expression, ConstantExpr +#include "SynTree/Statement.h" // for AsmStmt +#include "SynTree/Type.h" // for Type, Type::StorageClasses, Type::... +#include "TypeData.h" // for TypeData, TypeData::Aggregate_t +#include "TypedefTable.h" // for TypedefTable, TypedefTable::kind_t... + +class Initializer; + extern TypedefTable typedefTable; Index: src/Parser/ExpressionNode.cc =================================================================== --- src/Parser/ExpressionNode.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/ExpressionNode.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,13 +14,22 @@ // -#include // access INT_MAX, UINT_MAX, LONG_MAX, ULONG_MAX, LLONG_MAX -#include - -#include "ParseNode.h" -#include "TypeData.h" -#include "SynTree/Constant.h" -#include "SynTree/Expression.h" -#include "SynTree/Declaration.h" -#include "parserutility.h" +#include // for assert +#include // for sscanf, size_t +#include // for LLONG_MAX, LONG_MAX, INT_MAX, UINT... +#include // for list +#include // for basic_istream::operator>>, basic_i... +#include // for string, operator+, operator== + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for maybeMoveBuild, maybeBuild, CodeLo... +#include "ParseNode.h" // for ExpressionNode, maybeMoveBuildType +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for EnumDecl, StructDecl, UnionDecl +#include "SynTree/Expression.h" // for Expression, ConstantExpr, NameExpr +#include "SynTree/Statement.h" // for CompoundStmt, Statement +#include "SynTree/Type.h" // for BasicType, Type, Type::Qualifiers +#include "parserutility.h" // for notZeroExpr + +class Initializer; using namespace std; @@ -69,5 +78,5 @@ goto CLEANUP; } // if - + if ( str[0] == '0' ) { // octal/hex constant ? dec = false; Index: src/Parser/InitializerNode.cc =================================================================== --- src/Parser/InitializerNode.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/InitializerNode.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,11 +14,15 @@ // -#include -#include +#include // for operator<<, ostream, basic_ostream +#include // for list +#include // for operator<<, string + using namespace std; -#include "ParseNode.h" -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for maybeBuild +#include "ParseNode.h" // for InitializerNode, ExpressionNode +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Initializer.h" // for Initializer, ListInit, SingleInit InitializerNode::InitializerNode( ExpressionNode * _expr, bool aggrp, ExpressionNode * des ) Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/ParseNode.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,29 +10,35 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Andrew Beach -// Last Modified On : Thu Aug 10 16:54:00 2017 -// Update Count : 789 +// Last Modified On : Thr Aug 17 13:46:00 2017 +// Update Count : 795 // #pragma once -#include -#include -#include -#include - -#include "Parser/LinkageSpec.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Label.h" -#include "Common/utility.h" -#include "Common/UniqueName.h" - +#include // for move +#include // for assert, assertf +#include // for ostream +#include // for back_insert_iterator +#include // for list +#include // for unique_ptr, pointer_traits +#include // for string + +#include "Common/CodeLocation.h" // for CodeLocation +#include "Common/SemanticError.h" // for SemanticError +#include "Common/UniqueName.h" // for UniqueName +#include "Common/utility.h" // for maybeClone, maybeBuild +#include "Parser/LinkageSpec.h" // for Spec +#include "SynTree/Expression.h" // for Expression, ConstantExpr (ptr only) +#include "SynTree/Label.h" // for Label +#include "SynTree/Statement.h" // for Statement, BranchStmt, BranchStmt:... +#include "SynTree/Type.h" // for Type, Type::FuncSpecifiers, Type::... + +class Attribute; +class Declaration; +class DeclarationNode; +class DeclarationWithType; +class ExpressionNode; +class Initializer; class StatementNode; -class CompoundStmtNode; -class DeclarationNode; -class ExpressionNode; -class InitializerNode; -class Attribute; //############################################################################## @@ -371,4 +377,12 @@ Statement * build_expr( ExpressionNode * ctl ); +struct IfCtl { + IfCtl( DeclarationNode * decl, ExpressionNode * condition ) : + init( decl ? new StatementNode( decl ) : nullptr ), condition( condition ) {} + + StatementNode * init; + ExpressionNode * condition; +}; + struct ForCtl { ForCtl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) : @@ -382,5 +396,5 @@ }; -Statement * build_if( ExpressionNode * ctl, StatementNode * then_stmt, StatementNode * else_stmt ); +Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ); Statement * build_switch( ExpressionNode * ctl, StatementNode * stmt ); Statement * build_case( ExpressionNode * ctl ); Index: src/Parser/StatementNode.cc =================================================================== --- src/Parser/StatementNode.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/StatementNode.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,17 +10,23 @@ // Created On : Sat May 16 14:59:41 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 11 21:23:15 2017 -// Update Count : 331 -// - -#include -#include -#include - -#include "ParseNode.h" -#include "SynTree/Statement.h" -#include "SynTree/Expression.h" -#include "parserutility.h" -#include "Common/utility.h" +// Last Modified On : Thu Aug 17 16:01:31 2017 +// Update Count : 345 +// + +#include // for assert, safe_dynamic_cast, assertf +#include // for list +#include // for unique_ptr +#include // for string + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for maybeMoveBuild, maybeBuild +#include "ParseNode.h" // for StatementNode, ExpressionNode, bui... +#include "SynTree/Expression.h" // for Expression, ConstantExpr +#include "SynTree/Label.h" // for Label, noLabels +#include "SynTree/Declaration.h" +#include "SynTree/Statement.h" // for Statement, BranchStmt, CaseStmt +#include "parserutility.h" // for notZeroExpr + +class Declaration; using namespace std; @@ -74,5 +80,5 @@ } -Statement *build_if( ExpressionNode *ctl, StatementNode *then_stmt, StatementNode *else_stmt ) { +Statement *build_if( IfCtl * ctl, StatementNode *then_stmt, StatementNode *else_stmt ) { Statement *thenb, *elseb = 0; std::list< Statement * > branches; @@ -87,5 +93,13 @@ elseb = branches.front(); } // if - return new IfStmt( noLabels, notZeroExpr( maybeMoveBuild< Expression >(ctl) ), thenb, elseb ); + + std::list< Statement * > init; + if ( ctl->init != 0 ) { + buildMoveList( ctl->init, init ); + } // if + + Expression * cond = ctl->condition ? maybeMoveBuild< Expression >(ctl->condition) : new VariableExpr( dynamic_cast( dynamic_cast( init.back() )->decl ) ); + delete ctl; + return new IfStmt( noLabels, notZeroExpr( cond ), thenb, elseb, init ); } Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/TypeData.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,14 +14,19 @@ // -#include -#include -#include -#include "Common/utility.h" +#include // for assert +#include // for operator<<, ostream, basic_ostream + +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for maybeClone, maybeBuild, maybeMoveB... +#include "Parser/ParseNode.h" // for DeclarationNode, ExpressionNode +#include "SynTree/Declaration.h" // for TypeDecl, ObjectDecl, FunctionDecl +#include "SynTree/Expression.h" // for Expression, ConstantExpr (ptr only) +#include "SynTree/Initializer.h" // for SingleInit, Initializer (ptr only) +#include "SynTree/Statement.h" // for CompoundStmt, Statement +#include "SynTree/Type.h" // for BasicType, Type, Type::ForallList #include "TypeData.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" -#include "SynTree/Initializer.h" + +class Attribute; + using namespace std; Index: src/Parser/TypeData.h =================================================================== --- src/Parser/TypeData.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/TypeData.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,12 @@ #pragma once -#include "ParseNode.h" -#include "SynTree/Type.h" +#include // for ostream +#include // for list +#include // for string + +#include "ParseNode.h" // for DeclarationNode, DeclarationNode::Ag... +#include "Parser/LinkageSpec.h" // for Spec +#include "SynTree/Type.h" // for Type, ReferenceToType (ptr only) +#include "SynTree/SynTree.h" // for Visitor Nodes struct TypeData { Index: src/Parser/TypedefTable.cc =================================================================== --- src/Parser/TypedefTable.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/TypedefTable.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,12 +14,20 @@ // -#include -#include -#include +#include // for __alloc_traits<>::value_type +#include // for assert +#include // for list, _List_iterator, list<>::iterator +#include // for _Rb_tree_iterator, _Rb_tree_const_it... +#include // for allocator_traits<>::value_type +#include // for pair + +#include "Parser/ParserTypes.h" // for typedefTable +#include "Parser/parser.hh" // for IDENTIFIER #include "TypedefTable.h" + using namespace std; #if 0 #include + #define debugPrint( x ) cerr << x #else Index: src/Parser/TypedefTable.h =================================================================== --- src/Parser/TypedefTable.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/TypedefTable.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// TypedefTable.h -- +// TypedefTable.h -- // // Author : Rodolfo G. Esteves @@ -16,11 +16,11 @@ #pragma once -#include -#include -#include -#include +#include // for list +#include // for map, map<>::value_compare +#include // for stack +#include // for string #include "ParserTypes.h" -#include "parser.hh" +#include "parser.hh" // for IDENTIFIER, TYPEDEFname, TYPEGENname class TypedefTable { @@ -32,5 +32,5 @@ kind_t kind; }; - + struct DeferredEntry { std::string identifier; @@ -44,9 +44,9 @@ std::string currentTrait; int contextScope; - + typedef std::list< DeferredEntry > deferListType; std::stack< deferListType > deferListStack; std::map< std::string, deferListType > contexts; - + std::stack< std::string > nextIdentifiers; @@ -70,16 +70,16 @@ void addToEnclosingScope( const std::string &identifier, kind_t kind ); void addToEnclosingScope( kind_t kind ); // use nextIdentifiers.top() - + // "addToEnclosingScope2" adds the identifier/type pair to the scope that encloses the scope enclosing the the // current one. This is the right way to handle assertion names void addToEnclosingScope2( const std::string &identifier, kind_t kind ); void addToEnclosingScope2( kind_t kind ); // use nextIdentifiers.top() - + // set the next identifier to be used by an "add" operation without an identifier parameter within the current scope void setNextIdentifier( const std::string &identifier ); - + // dump the definitions from a pre-defined context into the current scope void openTrait( const std::string &contextName ); - + void enterScope(); void leaveScope(); Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/parser.yy (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,7 +9,7 @@ // Author : Peter A. Buhr // Created On : Sat Sep 1 20:22:55 2001 -// Last Modified By : Andrew Beach -// Last Modified On : Wed Aug 4 13:33:00 2017 -// Update Count : 2475 +// Last Modified By : Peter A. Buhr +// Last Modified On : Sun Aug 20 09:21:54 2017 +// Update Count : 2573 // @@ -98,4 +98,5 @@ StatementNode * sn; ConstantExpr * constant; + IfCtl * ifctl; ForCtl * fctl; LabelNode * label; @@ -130,5 +131,5 @@ %token ATTRIBUTE EXTENSION // GCC %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN -%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH // CFA +%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH // CFA %token ASM // C99, extension ISO/IEC 9899:1999 Section J.5.10(1) %token ALIGNAS ALIGNOF GENERIC STATICASSERT // C11 @@ -175,4 +176,5 @@ %type comma_expression comma_expression_opt %type argument_expression_list argument_expression default_initialize_opt +%type if_control_expression %type for_control_expression %type subrange @@ -794,10 +796,10 @@ selection_statement: - IF '(' comma_expression ')' statement %prec THEN + IF '(' push if_control_expression ')' statement %prec THEN // explicitly deal with the shift/reduce conflict on if/else - { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); } - | IF '(' comma_expression ')' statement ELSE statement - { $$ = new StatementNode( build_if( $3, $5, $7 ) ); } - | SWITCH '(' comma_expression ')' case_clause // CFA + { $$ = new StatementNode( build_if( $4, $6, nullptr ) ); } + | IF '(' push if_control_expression ')' statement ELSE statement + { $$ = new StatementNode( build_if( $4, $6, $8 ) ); } + | SWITCH '(' comma_expression ')' case_clause { $$ = new StatementNode( build_switch( $3, $5 ) ); } | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA @@ -819,4 +821,15 @@ } ; + +if_control_expression: + comma_expression pop + { $$ = new IfCtl( nullptr, $1 ); } + | c_declaration pop // no semi-colon + { $$ = new IfCtl( $1, nullptr ); } + | cfa_declaration pop // no semi-colon + { $$ = new IfCtl( $1, nullptr ); } + | declaration comma_expression // semi-colon separated + { $$ = new IfCtl( $1, $2 ); } + ; // CASE and DEFAULT clauses are only allowed in the SWITCH statement, precluding Duff's device. In addition, a case @@ -1091,5 +1104,5 @@ KR_declaration_list_opt: // used to declare parameter types in K&R style functions - pop + // empty { $$ = nullptr; } | KR_declaration_list @@ -1097,6 +1110,7 @@ KR_declaration_list: - c_declaration - | KR_declaration_list push c_declaration + push c_declaration pop ';' + { $$ = $2; } + | KR_declaration_list push c_declaration pop ';' { $$ = $1->appendList( $3 ); } ; @@ -1117,7 +1131,7 @@ ; -declaration: // CFA, new & old style declarations - cfa_declaration - | c_declaration +declaration: // old & new style declarations + c_declaration pop ';' + | cfa_declaration pop ';' // CFA ; @@ -1134,9 +1148,9 @@ cfa_declaration: // CFA - cfa_variable_declaration pop ';' - | cfa_typedef_declaration pop ';' - | cfa_function_declaration pop ';' - | type_declaring_list pop ';' - | trait_specifier pop ';' + cfa_variable_declaration + | cfa_typedef_declaration + | cfa_function_declaration + | type_declaring_list + | trait_specifier ; @@ -1338,11 +1352,11 @@ c_declaration: - declaration_specifier declaring_list pop ';' + declaration_specifier declaring_list { $$ = distAttr( $1, $2 ); } - | typedef_declaration pop ';' - | typedef_expression pop ';' // GCC, naming expression type - | sue_declaration_specifier pop ';' + | typedef_declaration + | typedef_expression // GCC, naming expression type + | sue_declaration_specifier ; @@ -2215,9 +2229,9 @@ $$ = $1->addFunctionBody( $2 ); } - | KR_function_declarator push KR_declaration_list_opt compound_statement + | KR_function_declarator KR_declaration_list_opt compound_statement { typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $1->addOldDeclList( $3 )->addFunctionBody( $4 ); + $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 ); } ; @@ -2263,29 +2277,29 @@ // Old-style K&R function definition, OBSOLESCENT (see 4) - | declaration_specifier KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement + | declaration_specifier KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addType( $1 ); - } - | type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement + $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addType( $1 ); + } + | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 ); + $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 ); } // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4) - | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement + | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 ); - } - | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement + $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 ); + } + | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement { typedefTable.addToEnclosingScope( TypedefTable::ID ); typedefTable.leaveScope(); - $$ = $3->addOldDeclList( $5 )->addFunctionBody( $7 )->addQualifiers( $2 )->addQualifiers( $1 ); + $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $2 )->addQualifiers( $1 ); } ; Index: src/Parser/parserutility.cc =================================================================== --- src/Parser/parserutility.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/parserutility.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,6 +15,11 @@ #include "parserutility.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" + +#include // for list +#include // for string + +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Expression.h" // for UntypedExpr, CastExpr, ConstantExpr +#include "SynTree/Type.h" // for BasicType, ZeroType, BasicType::Kind... // rewrite Index: src/Parser/parserutility.h =================================================================== --- src/Parser/parserutility.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/Parser/parserutility.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,5 +16,5 @@ #pragma once -#include "SynTree/SynTree.h" +class Expression; Expression *notZeroExpr( Expression *orig ); Index: src/ResolvExpr/AdjustExprType.cc =================================================================== --- src/ResolvExpr/AdjustExprType.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/AdjustExprType.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,8 +14,9 @@ // -#include "typeops.h" -#include "SynTree/Type.h" -#include "TypeEnvironment.h" -#include "SymTab/Indexer.h" +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for TypeDecl, TypeDecl::Kind::Ftype +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for PointerType, TypeInstType, Type +#include "TypeEnvironment.h" // for EqvClass, TypeEnvironment namespace ResolvExpr { Index: src/ResolvExpr/Alternative.cc =================================================================== --- src/ResolvExpr/Alternative.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Alternative.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,7 +15,13 @@ #include "Alternative.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "Common/utility.h" + +#include // for operator<<, ostream, basic_o... +#include // for operator<<, char_traits, string + +#include "Common/utility.h" // for maybeClone +#include "ResolvExpr/Cost.h" // for Cost, Cost::zero, operator<< +#include "ResolvExpr/TypeEnvironment.h" // for TypeEnvironment +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Type.h" // for Type namespace ResolvExpr { Index: src/ResolvExpr/Alternative.h =================================================================== --- src/ResolvExpr/Alternative.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Alternative.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,11 +16,15 @@ #pragma once -#include -#include "SynTree/SynTree.h" -#include "Cost.h" -#include "TypeEnvironment.h" +#include // for ostream +#include // for list + +#include "Cost.h" // for Cost +#include "TypeEnvironment.h" // for TypeEnvironment + +class Expression; namespace ResolvExpr { struct Alternative; + typedef std::list< Alternative > AltList; Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/AlternativeFinder.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,35 +14,35 @@ // -#include -#include -#include -#include -#include -#include -#include -#include - +#include // for copy +#include // for safe_dynamic_cast, assert, assertf +#include // for operator<<, cerr, ostream, endl +#include // for back_insert_iterator, back_inserter +#include // for _List_iterator, list, _List_const_... +#include // for _Rb_tree_iterator, map, _Rb_tree_c... +#include // for allocator_traits<>::value_type +#include // for pair + +#include "Alternative.h" // for AltList, Alternative #include "AlternativeFinder.h" -#include "Alternative.h" -#include "Cost.h" -#include "typeops.h" -#include "Unify.h" -#include "RenameVars.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" -#include "SymTab/Mangler.h" -#include "SynTree/TypeSubstitution.h" -#include "SymTab/Validate.h" -#include "Tuples/Tuples.h" -#include "Tuples/Explode.h" -#include "Common/utility.h" -#include "InitTweak/InitTweak.h" -#include "InitTweak/GenInit.h" -#include "ResolveTypeof.h" -#include "Resolver.h" +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for deleteAll, printAll, CodeLocation +#include "Cost.h" // for Cost, Cost::zero, operator<<, Cost... +#include "InitTweak/InitTweak.h" // for getFunctionName +#include "RenameVars.h" // for RenameVars, global_renamer +#include "ResolveTypeof.h" // for resolveTypeof +#include "Resolver.h" // for resolveStmtExpr +#include "SymTab/Indexer.h" // for Indexer +#include "SymTab/Mangler.h" // for Mangler +#include "SymTab/Validate.h" // for validateType +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for DeclarationWithType, TypeDecl, Dec... +#include "SynTree/Expression.h" // for Expression, CastExpr, NameExpr +#include "SynTree/Initializer.h" // for SingleInit, operator<<, Designation +#include "SynTree/SynTree.h" // for UniqueId +#include "SynTree/Type.h" // for Type, FunctionType, PointerType +#include "Tuples/Explode.h" // for explode +#include "Tuples/Tuples.h" // for isTtype, handleTupleAssignment +#include "Unify.h" // for unify +#include "typeops.h" // for adjustExprType, polyCost, castCost extern bool resolvep; @@ -979,6 +979,6 @@ void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) { if ( sizeofExpr->get_isType() ) { - // xxx - resolveTypeof? - alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) ); + Type * newType = sizeofExpr->get_type()->clone(); + alternatives.push_back( Alternative( new SizeofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) ); } else { // find all alternatives for the argument to sizeof @@ -1000,6 +1000,6 @@ void AlternativeFinder::visit( AlignofExpr *alignofExpr ) { if ( alignofExpr->get_isType() ) { - // xxx - resolveTypeof? - alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) ); + Type * newType = alignofExpr->get_type()->clone(); + alternatives.push_back( Alternative( new AlignofExpr( resolveTypeof( newType, indexer ) ), env, Cost::zero ) ); } else { // find all alternatives for the argument to sizeof Index: src/ResolvExpr/AlternativeFinder.h =================================================================== --- src/ResolvExpr/AlternativeFinder.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/AlternativeFinder.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,11 +16,17 @@ #pragma once -#include +#include // for copy +#include // for list +#include // for string -#include "Alternative.h" -#include "Unify.h" -#include "SynTree/SynTree.h" -#include "SymTab/Indexer.h" -#include "SynTree/TypeSubstitution.h" +#include "Alternative.h" // for AltList, Alternative +#include "ResolvExpr/Cost.h" // for Cost, Cost::infinity +#include "ResolvExpr/TypeEnvironment.h" // for AssertionSet, OpenVarSet +#include "SynTree/Visitor.h" // for Visitor +#include "SynTree/SynTree.h" // for Visitor Nodes + +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { Index: src/ResolvExpr/AlternativePrinter.cc =================================================================== --- src/ResolvExpr/AlternativePrinter.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/AlternativePrinter.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,10 +15,13 @@ #include "AlternativePrinter.h" -#include "AlternativeFinder.h" -#include "Alternative.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" -#include "SynTree/Expression.h" -#include "Common/utility.h" + +#include // for _List_const_iterator, list<>... + +#include "Alternative.h" // for AltList, Alternative +#include "AlternativeFinder.h" // for AlternativeFinder +#include "ResolvExpr/TypeEnvironment.h" // for TypeEnvironment +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Statement.h" // for ExprStmt +#include "SynTree/Type.h" // for Type namespace ResolvExpr { Index: src/ResolvExpr/AlternativePrinter.h =================================================================== --- src/ResolvExpr/AlternativePrinter.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/AlternativePrinter.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,8 +16,9 @@ #pragma once -#include +#include // for ostream -#include "Alternative.h" -#include "SymTab/Indexer.h" +#include "SymTab/Indexer.h" // for Indexer + +class ExprStmt; namespace ResolvExpr { Index: src/ResolvExpr/CastCost.cc =================================================================== --- src/ResolvExpr/CastCost.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/CastCost.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,10 +14,13 @@ // -#include "typeops.h" -#include "Cost.h" -#include "ConversionCost.h" -#include "SynTree/Type.h" -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" +#include // for assert + +#include "ConversionCost.h" // for ConversionCost +#include "Cost.h" // for Cost, Cost::infinity +#include "ResolvExpr/TypeEnvironment.h" // for TypeEnvironment, EqvClass +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for TypeDecl, NamedTypeDecl +#include "SynTree/Type.h" // for PointerType, Type, TypeInstType +#include "typeops.h" // for typesCompatibleIgnoreQualifiers Index: src/ResolvExpr/CommonType.cc =================================================================== --- src/ResolvExpr/CommonType.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/CommonType.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,7 +14,15 @@ // -#include "typeops.h" -#include "SynTree/Type.h" -#include "Unify.h" +#include // for safe_dynamic_cast +#include // for _Rb_tree_const_iterator +#include // for pair + +#include "ResolvExpr/TypeEnvironment.h" // for OpenVarSet, AssertionSet +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for TypeDecl, NamedTypeDecl (ptr... +#include "SynTree/Type.h" // for BasicType, BasicType::Kind::... +#include "SynTree/Visitor.h" // for Visitor +#include "Unify.h" // for unifyExact, bindVar, WidenMode +#include "typeops.h" // for isFtype // #define DEBUG Index: src/ResolvExpr/ConversionCost.cc =================================================================== --- src/ResolvExpr/ConversionCost.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/ConversionCost.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,8 +15,15 @@ #include "ConversionCost.h" -#include "typeops.h" -#include "SynTree/Type.h" -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" + +#include // for assert +#include // for list, list<>::const_iterator +#include // for operator==, string + +#include "ResolvExpr/Cost.h" // for Cost +#include "ResolvExpr/TypeEnvironment.h" // for EqvClass, TypeEnvironment +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for TypeDecl, NamedTypeDecl +#include "SynTree/Type.h" // for Type, BasicType, TypeInstType +#include "typeops.h" // for typesCompatibleIgnoreQualifiers namespace ResolvExpr { Index: src/ResolvExpr/ConversionCost.h =================================================================== --- src/ResolvExpr/ConversionCost.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/ConversionCost.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,10 +16,15 @@ #pragma once -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" -#include "Cost.h" -#include "TypeEnvironment.h" +#include "Cost.h" // for Cost +#include "SynTree/Visitor.h" // for Visitor +#include "SynTree/SynTree.h" // for Visitor Nodes + +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { +class TypeEnvironment; + class ConversionCost : public Visitor { public: Index: src/ResolvExpr/CurrentObject.cc =================================================================== --- src/ResolvExpr/CurrentObject.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/CurrentObject.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,15 +14,20 @@ // -#include -#include - +#include // for size_t +#include // for assertf, assert, safe_dynamic_... +#include // for ostream, operator<<, basic_ost... +#include // for stack +#include // for string, operator<<, allocator + +#include "Common/Indenter.h" // for Indenter, operator<< +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for toString #include "CurrentObject.h" - -#include "Common/Indenter.h" - -#include "SynTree/Declaration.h" -#include "SynTree/Initializer.h" -#include "SynTree/Type.h" -#include "SynTree/TypeSubstitution.h" +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for ObjectDecl, Declaration, Struc... +#include "SynTree/Expression.h" // for InitAlternative, VariableExpr +#include "SynTree/Initializer.h" // for Designation, operator<< +#include "SynTree/Type.h" // for Type, StructInstType, UnionIns... +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution #if 0 Index: src/ResolvExpr/CurrentObject.h =================================================================== --- src/ResolvExpr/CurrentObject.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/CurrentObject.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,8 +16,10 @@ #pragma once -#include +#include // for list +#include // for stack -#include "SynTree/SynTree.h" -#include "SynTree/Expression.h" +class Designation; +class Type; +struct InitAlternative; namespace ResolvExpr { Index: src/ResolvExpr/FindOpenVars.cc =================================================================== --- src/ResolvExpr/FindOpenVars.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/FindOpenVars.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,6 +15,11 @@ #include "FindOpenVars.h" -#include "SynTree/Type.h" -#include "SynTree/Visitor.h" + +#include // for _List_const_iterator, list<>::const... +#include // for map<>::mapped_type + +#include "SynTree/Declaration.h" // for TypeDecl, DeclarationWithType (ptr ... +#include "SynTree/Type.h" // for Type, Type::ForallList, ArrayType +#include "SynTree/Visitor.h" // for Visitor namespace ResolvExpr { Index: src/ResolvExpr/FindOpenVars.h =================================================================== --- src/ResolvExpr/FindOpenVars.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/FindOpenVars.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,7 @@ #pragma once -#include "Unify.h" -#include "SynTree/SynTree.h" +#include "ResolvExpr/TypeEnvironment.h" // for AssertionSet, OpenVarSet + +class Type; namespace ResolvExpr { Index: src/ResolvExpr/Occurs.cc =================================================================== --- src/ResolvExpr/Occurs.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Occurs.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,10 +14,10 @@ // -#include -#include -#include -#include "SynTree/Type.h" -#include "SynTree/Visitor.h" -#include "TypeEnvironment.h" +#include // for set, _Rb_tree_const_iterator +#include // for string + +#include "SynTree/Type.h" // for TypeInstType, Type +#include "SynTree/Visitor.h" // for Visitor +#include "TypeEnvironment.h" // for EqvClass, TypeEnvironment namespace ResolvExpr { Index: src/ResolvExpr/PolyCost.cc =================================================================== --- src/ResolvExpr/PolyCost.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/PolyCost.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,9 +14,8 @@ // -#include "typeops.h" -#include "SynTree/Type.h" -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" -#include "TypeEnvironment.h" +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Type.h" // for TypeInstType, Type +#include "SynTree/Visitor.h" // for Visitor +#include "TypeEnvironment.h" // for EqvClass, TypeEnvironment namespace ResolvExpr { Index: src/ResolvExpr/PtrsAssignable.cc =================================================================== --- src/ResolvExpr/PtrsAssignable.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/PtrsAssignable.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,8 +14,7 @@ // -#include "typeops.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Visitor.h" +#include "ResolvExpr/TypeEnvironment.h" // for EqvClass, TypeEnvironment +#include "SynTree/Type.h" // for TypeInstType, Type, BasicType +#include "SynTree/Visitor.h" // for Visitor Index: src/ResolvExpr/PtrsCastable.cc =================================================================== --- src/ResolvExpr/PtrsCastable.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/PtrsCastable.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,9 +14,10 @@ // -#include "typeops.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Visitor.h" -#include "SymTab/Indexer.h" +#include "ResolvExpr/TypeEnvironment.h" // for EqvClass, TypeEnvironment +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for TypeDecl, TypeDecl::Kind::Ftype +#include "SynTree/Type.h" // for TypeInstType, Type, BasicType +#include "SynTree/Visitor.h" // for Visitor +#include "typeops.h" // for ptrsAssignable Index: src/ResolvExpr/RenameVars.cc =================================================================== --- src/ResolvExpr/RenameVars.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/RenameVars.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,11 +14,15 @@ // -#include +#include // for __alloc_traits<>::value_type +#include // for allocator_traits<>::value_type +#include // for operator<<, basic_ostream, ostring... +#include // for pair +#include "Common/SemanticError.h" // for SemanticError #include "RenameVars.h" -#include "SynTree/Visitor.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" +#include "SynTree/Declaration.h" // for DeclarationWithType, TypeDecl, Dec... +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Type.h" // for Type, TypeInstType, TraitInstType +#include "SynTree/Visitor.h" // for acceptAll, maybeAccept namespace ResolvExpr { Index: src/ResolvExpr/RenameVars.h =================================================================== --- src/ResolvExpr/RenameVars.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/RenameVars.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// RenameVars.h -- +// RenameVars.h -- // // Author : Richard C. Bilson @@ -16,10 +16,10 @@ #pragma once -#include -#include -#include +#include // for list +#include // for map +#include // for string -#include "SynTree/SynTree.h" -#include "SynTree/Visitor.h" +#include "SynTree/SynTree.h" // for Visitor Nodes +#include "SynTree/Visitor.h" // for Visitor namespace ResolvExpr { Index: src/ResolvExpr/ResolveTypeof.cc =================================================================== --- src/ResolvExpr/ResolveTypeof.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/ResolveTypeof.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,10 +15,15 @@ #include "ResolveTypeof.h" -#include "Alternative.h" -#include "AlternativeFinder.h" -#include "Resolver.h" -#include "TypeEnvironment.h" -#include "SynTree/Expression.h" -#include "SynTree/Type.h" + +#include // for assert + +#include "Resolver.h" // for resolveInVoidContext +#include "SynTree/Expression.h" // for Expression +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for TypeofType, Type + +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { Index: src/ResolvExpr/ResolveTypeof.h =================================================================== --- src/ResolvExpr/ResolveTypeof.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/ResolveTypeof.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,8 @@ #pragma once -#include "SynTree/SynTree.h" -#include "SymTab/Indexer.h" +class Type; +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { Index: src/ResolvExpr/Resolver.cc =================================================================== --- src/ResolvExpr/Resolver.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Resolver.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,25 +14,29 @@ // -#include - -#include "Alternative.h" -#include "AlternativeFinder.h" -#include "CurrentObject.h" -#include "RenameVars.h" +#include // for NULL +#include // for safe_dynamic_cast, assert +#include // for allocator, allocator_traits<... +#include // for get + +#include "Alternative.h" // for Alternative, AltList +#include "AlternativeFinder.h" // for AlternativeFinder, resolveIn... +#include "Common/SemanticError.h" // for SemanticError +#include "Common/utility.h" // for ValueGuard, group_iterate +#include "CurrentObject.h" // for CurrentObject +#include "InitTweak/InitTweak.h" // for isIntrinsicSingleArgCallStmt +#include "RenameVars.h" // for RenameVars, global_renamer +#include "ResolvExpr/TypeEnvironment.h" // for TypeEnvironment +#include "ResolveTypeof.h" // for resolveTypeof #include "Resolver.h" -#include "ResolveTypeof.h" -#include "typeops.h" - -#include "SynTree/Expression.h" -#include "SynTree/Initializer.h" -#include "SynTree/Statement.h" -#include "SynTree/Type.h" - -#include "SymTab/Autogen.h" -#include "SymTab/Indexer.h" - -#include "Common/utility.h" - -#include "InitTweak/InitTweak.h" +#include "SymTab/Autogen.h" // for SizeType +#include "SymTab/Indexer.h" // for Indexer +#include "SynTree/Declaration.h" // for ObjectDecl, TypeDecl, Declar... +#include "SynTree/Expression.h" // for Expression, CastExpr, InitExpr +#include "SynTree/Initializer.h" // for ConstructorInit, SingleInit +#include "SynTree/Statement.h" // for ForStmt, Statement, BranchStmt +#include "SynTree/Type.h" // for Type, BasicType, PointerType +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution +#include "SynTree/Visitor.h" // for acceptAll, maybeAccept +#include "typeops.h" // for extractResultType using namespace std; @@ -390,4 +394,9 @@ void Resolver::visit( CatchStmt *catchStmt ) { + // inline Indexer::visit so that the exception variable is still in-scope for + // findSingleExpression() below + Parent::enterScope(); + Visitor::visit( catchStmt ); + if ( catchStmt->get_cond() ) { Expression * wrapped = new CastExpr( @@ -397,4 +406,6 @@ catchStmt->set_cond( findSingleExpression( wrapped, *this ) ); } + + Parent::leaveScope(); } Index: src/ResolvExpr/Resolver.h =================================================================== --- src/ResolvExpr/Resolver.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Resolver.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,6 +16,13 @@ #pragma once -#include "SynTree/SynTree.h" -#include "SymTab/Indexer.h" +#include // for list + +class ConstructorInit; +class Declaration; +class Expression; +class StmtExpr; +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { Index: src/ResolvExpr/TypeEnvironment.cc =================================================================== --- src/ResolvExpr/TypeEnvironment.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/TypeEnvironment.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,11 +14,13 @@ // -#include -#include - +#include // for assert +#include // for copy, set_intersection +#include // for ostream_iterator, insert_iterator +#include // for pair + +#include "Common/utility.h" // for maybeClone +#include "SynTree/Type.h" // for Type, FunctionType, Type::Fora... +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution #include "TypeEnvironment.h" -#include "SynTree/Type.h" -#include "SynTree/TypeSubstitution.h" -#include "Common/utility.h" namespace ResolvExpr { Index: src/ResolvExpr/TypeEnvironment.h =================================================================== --- src/ResolvExpr/TypeEnvironment.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/TypeEnvironment.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,13 +16,14 @@ #pragma once -#include -#include -#include -#include +#include // for ostream +#include // for list, list<>::iterator, list<>... +#include // for map, map<>::value_compare +#include // for set +#include // for string -#include "SynTree/SynTree.h" -#include "SynTree/Type.h" -#include "SynTree/TypeSubstitution.h" -#include "SynTree/Declaration.h" +#include "SynTree/Declaration.h" // for TypeDecl::Data, DeclarationWit... +#include "SynTree/SynTree.h" // for UniqueId +#include "SynTree/Type.h" // for Type, Type::ForallList +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution namespace ResolvExpr { Index: src/ResolvExpr/Unify.cc =================================================================== --- src/ResolvExpr/Unify.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Unify.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,17 +14,28 @@ // -#include -#include - +#include // for assertf, assert +#include // for back_insert_iterator, back_inserter +#include // for _Rb_tree_const_iterator, _Rb_tree_i... +#include // for unique_ptr, auto_ptr +#include // for set +#include // for string, operator==, operator!=, bas... +#include // for pair + +#include "FindOpenVars.h" // for findOpenVars +#include "Parser/LinkageSpec.h" // for C +#include "SynTree/Constant.h" // for Constant +#include "SynTree/Declaration.h" // for TypeDecl, TypeDecl::Data, Declarati... +#include "SynTree/Expression.h" // for TypeExpr, Expression, ConstantExpr +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for Type, TypeInstType, FunctionType +#include "SynTree/Visitor.h" // for Visitor +#include "Tuples/Tuples.h" // for isTtype +#include "TypeEnvironment.h" // for EqvClass, AssertionSet, OpenVarSet #include "Unify.h" -#include "TypeEnvironment.h" -#include "typeops.h" -#include "FindOpenVars.h" -#include "SynTree/Visitor.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SymTab/Indexer.h" -#include "Common/utility.h" -#include "Tuples/Tuples.h" +#include "typeops.h" // for flatten, occurs, commonType + +namespace SymTab { +class Indexer; +} // namespace SymTab // #define DEBUG Index: src/ResolvExpr/Unify.h =================================================================== --- src/ResolvExpr/Unify.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/ResolvExpr/Unify.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,12 +16,15 @@ #pragma once -#include -#include -#include "SynTree/SynTree.h" -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SymTab/Indexer.h" -#include "TypeEnvironment.h" -#include "Common/utility.h" +#include // for list + +#include "Common/utility.h" // for deleteAll +#include "SynTree/Declaration.h" // for TypeDecl, TypeDecl::Data +#include "TypeEnvironment.h" // for AssertionSet, OpenVarSet + +class Type; +class TypeInstType; +namespace SymTab { +class Indexer; +} // namespace SymTab namespace ResolvExpr { Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Autogen.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,4 +16,5 @@ #include "Autogen.h" +#include // for NULL #include // for count_if #include // for safe_dynamic_cast, assert, assertf @@ -21,4 +22,5 @@ #include // for list, _List_iterator, list<>::iter... #include // for set, _Rb_tree_const_iterator +#include // for pair #include // for vector Index: src/SymTab/Autogen.h =================================================================== --- src/SymTab/Autogen.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Autogen.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -17,18 +17,15 @@ #include // for assert -#include // for back_insert_iterator, back_inserter -#include // for list -#include // for string, operator== +#include // for string #include "Common/UniqueName.h" // for UniqueName #include "InitTweak/InitTweak.h" // for InitExpander -#include "Parser/LinkageSpec.h" // for C #include "SynTree/Constant.h" // for Constant -#include "SynTree/Declaration.h" // for ObjectDecl, Declaration (ptr only) -#include "SynTree/Expression.h" // for UntypedExpr, NameExpr, VariableExpr -#include "SynTree/Initializer.h" // for SingleInit -#include "SynTree/Label.h" // for Label, noLabels -#include "SynTree/Statement.h" // for Statement (ptr only), CompoundStmt +#include "SynTree/Declaration.h" // for DeclarationWithType, ObjectDecl +#include "SynTree/Expression.h" // for NameExpr, ConstantExpr, UntypedExpr... #include "SynTree/Type.h" // for Type, ArrayType, Type::Qualifiers + +class CompoundStmt; +class Statement; namespace SymTab { Index: src/SymTab/FixFunction.cc =================================================================== --- src/SymTab/FixFunction.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/FixFunction.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -20,4 +20,5 @@ #include "Common/utility.h" // for maybeClone #include "SynTree/Declaration.h" // for FunctionDecl, ObjectDecl, Declarati... +#include "SynTree/Expression.h" // for Expression #include "SynTree/Type.h" // for ArrayType, PointerType, Type, Basic... Index: src/SymTab/Indexer.cc =================================================================== --- src/SymTab/Indexer.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Indexer.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,6 +10,6 @@ // Created On : Sun May 17 21:37:33 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Mar 30 16:38:47 2017 -// Update Count : 19 +// Last Modified On : Thu Aug 17 16:08:40 2017 +// Update Count : 20 // @@ -355,4 +355,24 @@ } + void Indexer::visit( IfStmt *ifStmt ) { + // for statements introduce a level of scope + enterScope(); + Visitor::visit( ifStmt ); + leaveScope(); + } + + void Indexer::visit( ForStmt *forStmt ) { + // for statements introduce a level of scope + enterScope(); + Visitor::visit( forStmt ); + leaveScope(); + } + + void Indexer::visit( CatchStmt *catchStmt ) { + // catch statements introduce a level of scope (for the caught exception) + enterScope(); + Visitor::visit( catchStmt ); + leaveScope(); + } void Indexer::visit( ApplicationExpr *applicationExpr ) { @@ -558,13 +578,4 @@ leaveScope(); } - - void Indexer::visit( ForStmt *forStmt ) { - // for statements introduce a level of scope - enterScope(); - Visitor::visit( forStmt ); - leaveScope(); - } - - void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const { Index: src/SymTab/Indexer.h =================================================================== --- src/SymTab/Indexer.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Indexer.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -10,6 +10,6 @@ // Created On : Sun May 17 21:38:55 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 09:46:34 2017 -// Update Count : 7 +// Last Modified On : Thu Aug 17 16:09:12 2017 +// Update Count : 8 // @@ -45,4 +45,7 @@ virtual void visit( CompoundStmt *compoundStmt ); + virtual void visit( IfStmt *ifStmt ); + virtual void visit( ForStmt *forStmt ); + virtual void visit( CatchStmt *catchStmt ); virtual void visit( ApplicationExpr *applicationExpr ); @@ -81,6 +84,4 @@ virtual void visit( StructInstType *contextInst ); virtual void visit( UnionInstType *contextInst ); - - virtual void visit( ForStmt *forStmt ); // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer Index: src/SymTab/Mangler.cc =================================================================== --- src/SymTab/Mangler.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Mangler.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -20,7 +20,8 @@ #include // for ostream_iterator, back_insert_ite... #include // for _List_iterator, list, _List_const... -#include // for string, operator<<, basic_string +#include // for string, char_traits, operator<< #include "CodeGen/OperatorTable.h" // for OperatorInfo, operatorLookup +#include "Common/SemanticError.h" // for SemanticError #include "Common/utility.h" // for toString #include "Parser/LinkageSpec.h" // for Spec, isOverridable, AutoGen, Int... Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SymTab/Validate.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -40,40 +40,40 @@ #include "Validate.h" +#include // for assertf, assert #include // for size_t -#include // for move, transform -#include // for safe_dynamic_cast, assertf -#include // for back_inserter, inserter, back_... -#include // for list, _List_iterator, list<>::... -#include // for _Rb_tree_iterator, map, map<>:... -#include // for unique_ptr, allocator -#include // for string, operator+, operator== -#include // for get -#include // for pair, make_pair - -#include "AddVisit.h" // for addVisit -#include "Autogen.h" // for SizeType, autogenerateRoutines +#include // for list +#include // for string +#include // for pair + #include "CodeGen/CodeGenerator.h" // for genName #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign #include "Common/PassVisitor.h" // for PassVisitor, WithDeclsToAdd -#include "Common/ScopedMap.h" // for ScopedMap<>::const_iterator +#include "Common/ScopedMap.h" // for ScopedMap #include "Common/SemanticError.h" // for SemanticError #include "Common/UniqueName.h" // for UniqueName #include "Common/utility.h" // for operator+, cloneAll, deleteAll -#include "Concurrency/Keywords.h" // for applyKeywords, implementMutexF... +#include "Concurrency/Keywords.h" // for applyKeywords #include "FixFunction.h" // for FixFunction #include "Indexer.h" // for Indexer -#include "InitTweak/InitTweak.h" // for isCtorDtor, isCtorDtorAssign -#include "Parser/LinkageSpec.h" // for C, Cforall -#include "ResolvExpr/typeops.h" // for extractResultType, typesCompat... -#include "SynTree/Attribute.h" // for Attribute +#include "InitTweak/InitTweak.h" // for isCtorDtorAssign +#include "Parser/LinkageSpec.h" // for C +#include "ResolvExpr/typeops.h" // for typesCompatible +#include "SymTab/AddVisit.h" // for addVisit +#include "SymTab/Autogen.h" // for SizeType +#include "SynTree/Attribute.h" // for noAttributes, Attribute #include "SynTree/Constant.h" // for Constant -#include "SynTree/Declaration.h" // for EnumDecl, StructDecl, UnionDecl -#include "SynTree/Expression.h" // for TypeExpr, CompoundLiteralExpr -#include "SynTree/Initializer.h" // for ListInit, Initializer, noDesig... -#include "SynTree/Mutator.h" // for mutateAll, Mutator -#include "SynTree/Statement.h" // for CompoundStmt, DeclStmt, Return... -#include "SynTree/Type.h" // for Type, TypeInstType, TraitInstType -#include "SynTree/TypeSubstitution.h" // for TypeSubstitution, applySubstit... -#include "SynTree/Visitor.h" // for acceptAll, Visitor +#include "SynTree/Declaration.h" // for ObjectDecl, DeclarationWithType +#include "SynTree/Expression.h" // for CompoundLiteralExpr, Expressio... +#include "SynTree/Initializer.h" // for ListInit, Initializer +#include "SynTree/Label.h" // for operator==, Label +#include "SynTree/Mutator.h" // for Mutator +#include "SynTree/Type.h" // for Type, TypeInstType, EnumInstType +#include "SynTree/TypeSubstitution.h" // for TypeSubstitution +#include "SynTree/Visitor.h" // for Visitor + +class CompoundStmt; +class ReturnStmt; +class SwitchStmt; + #define debugPrint( x ) if ( doDebug ) { std::cout << x; } Index: src/SynTree/AddStmtVisitor.cc =================================================================== --- src/SynTree/AddStmtVisitor.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/AddStmtVisitor.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -15,8 +15,10 @@ #include "AddStmtVisitor.h" -#include "Statement.h" -#include "Declaration.h" -#include "Expression.h" -#include "Common/utility.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 ) { Index: src/SynTree/AddStmtVisitor.h =================================================================== --- src/SynTree/AddStmtVisitor.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/AddStmtVisitor.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,8 +16,8 @@ #pragma once -#include +#include // for list -#include "SynTree/SynTree.h" -#include "SynTree/Visitor.h" +#include "SynTree/SynTree.h" // for Visitor Nodes +#include "SynTree/Visitor.h" // for Visitor class AddStmtVisitor : public Visitor { Index: src/SynTree/AddressExpr.cc =================================================================== --- src/SynTree/AddressExpr.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/AddressExpr.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,7 +14,10 @@ // -#include "Expression.h" -#include "Type.h" -#include "Common/utility.h" +#include // for ostream, operator<<, basic_ostream, endl +#include // for operator<<, string + +#include "Common/utility.h" // for maybeClone +#include "Expression.h" // for AddressExpr, Expression +#include "Type.h" // for PointerType, Type, Type::Qualifiers // Address expressions are typed based on the following inference rules: Index: src/SynTree/AggregateDecl.cc =================================================================== --- src/SynTree/AggregateDecl.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/AggregateDecl.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,8 +14,13 @@ // -#include "Declaration.h" -#include "Attribute.h" -#include "Type.h" -#include "Common/utility.h" +#include // for list +#include // for operator<<, basic_ostream, ostream +#include // for operator<<, string, char_traits + +#include "Attribute.h" // for Attribute +#include "Common/utility.h" // for printAll, cloneAll, deleteAll +#include "Declaration.h" // for AggregateDecl, TypeDecl, Declaration +#include "Parser/LinkageSpec.h" // for Spec, linkageName, Cforall +#include "Type.h" // for Type, Type::StorageClasses Index: src/SynTree/ApplicationExpr.cc =================================================================== --- src/SynTree/ApplicationExpr.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/ApplicationExpr.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,12 +14,17 @@ // -#include +#include // for safe_dynamic_cast, assert +#include // for list +#include // for _Rb_tree_const_iterator, map, map<>:... +#include // for unique_ptr +#include // for operator<<, ostream, basic_ostream +#include // for operator<<, string, char_traits +#include // for pair -#include "Expression.h" -#include "Declaration.h" -#include "Type.h" -#include "TypeSubstitution.h" -#include "Common/utility.h" -#include "ResolvExpr/typeops.h" +#include "Common/utility.h" // for maybeClone, cloneAll, deleteAll, pri... +#include "Declaration.h" // for Declaration +#include "Expression.h" // for ParamEntry, ApplicationExpr, Expression +#include "ResolvExpr/typeops.h" // for extractResultType +#include "Type.h" // for Type, PointerType, FunctionType ParamEntry::ParamEntry( const ParamEntry &other ) : Index: src/SynTree/ArrayType.cc =================================================================== --- src/SynTree/ArrayType.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/ArrayType.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,7 +14,12 @@ // -#include "Type.h" -#include "Expression.h" -#include "Common/utility.h" +#include // for list +#include // for operator<<, ostream + +#include "Common/utility.h" // for maybeClone +#include "Expression.h" // for Expression +#include "Type.h" // for ArrayType, Type, Type::Qualifiers + +class Attribute; Index: src/SynTree/AttrType.cc =================================================================== --- src/SynTree/AttrType.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/AttrType.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,7 +14,13 @@ // -#include "Type.h" -#include "Expression.h" -#include "Common/utility.h" +#include // for list +#include // for operator<<, ostream, basic_ostream +#include // for char_traits, operator<<, string + +#include "Common/utility.h" // for maybeClone +#include "Expression.h" // for Expression +#include "Type.h" // for AttrType, Type, Type::Qualifiers + +class Attribute; Index: src/SynTree/Attribute.cc =================================================================== --- src/SynTree/Attribute.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/Attribute.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,9 +14,9 @@ // -#include +#include // for operator<<, ostream, basic_ostream, endl -#include "Common/utility.h" #include "Attribute.h" -#include "Expression.h" +#include "Common/utility.h" // for cloneAll, deleteAll, printAll +#include "Expression.h" // for Expression Attribute::Attribute( const Attribute &other ) : name( other.name ) { Index: src/SynTree/Attribute.h =================================================================== --- src/SynTree/Attribute.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/Attribute.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,5 +16,9 @@ #pragma once -#include "SynTree.h" +#include // for ostream +#include // for list +#include // for string, operator== + +class Expression; // GCC attribute Index: src/SynTree/BaseSyntaxNode.h =================================================================== --- src/SynTree/BaseSyntaxNode.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/BaseSyntaxNode.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -9,13 +9,13 @@ // Author : Thierry Delisle // Created On : Tue Feb 14 07:44:20 2017 -// Last Modified By : -// Last Modified On : -// Update Count : +// Last Modified By : Andrew Beach +// Last Modified On : Thr Aug 17 13:44:00 +// Update Count : 1 // #pragma once -#include "Common/utility.h" -#include "Visitor.h" +#include "Common/CodeLocation.h" +class Visitor; class BaseSyntaxNode { Index: src/SynTree/BasicType.cc =================================================================== --- src/SynTree/BasicType.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/BasicType.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,6 +14,11 @@ // -#include -#include "Type.h" +#include // for assert +#include // for list +#include // for operator<<, ostream + +#include "Type.h" // for BasicType, Type, BasicType::Kind, BasicType::Kind... + +class Attribute; BasicType::BasicType( const Type::Qualifiers &tq, Kind bt, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), kind( bt ) {} Index: src/SynTree/CommaExpr.cc =================================================================== --- src/SynTree/CommaExpr.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/CommaExpr.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,7 +14,10 @@ // -#include "Expression.h" -#include "Type.h" -#include "Common/utility.h" +#include // for ostream, endl, operator<<, basic_ostream +#include // for operator<<, string + +#include "Common/utility.h" // for maybeClone +#include "Expression.h" // for CommaExpr, Expression +#include "Type.h" // for Type CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname ) Index: src/SynTree/CompoundStmt.cc =================================================================== --- src/SynTree/CompoundStmt.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/CompoundStmt.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,11 +14,14 @@ // -#include "Statement.h" -#include "Common/utility.h" -#include -#include -#include "Expression.h" -#include "Declaration.h" -#include "SynTree/VarExprReplacer.h" +#include // for assert, safe_dynamic_cast +#include // for list, _List_const_iterator, lis... +#include // for operator<<, ostream, basic_ostream +#include // for operator==, string + +#include "Common/utility.h" // for cloneAll, deleteAll, printAll +#include "Declaration.h" // for DeclarationWithType, Declaration +#include "Statement.h" // for CompoundStmt, Statement, DeclStmt +#include "SynTree/Label.h" // for Label +#include "SynTree/VarExprReplacer.h" // for VarExprReplacer, VarExprReplace... using std::string; Index: src/SynTree/Constant.cc =================================================================== --- src/SynTree/Constant.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/Constant.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -14,10 +14,10 @@ // -#include -#include -#include +#include // for safe_dynamic_cast, assertf +#include // for operator<<, ostream, basic_ostream +#include // for to_string, string, char_traits, operator<< #include "Constant.h" -#include "Type.h" +#include "Type.h" // for BasicType, Type, Type::Qualifiers, PointerType Constant::Constant( Type * type, std::string rep, unsigned long long val ) : type( type ), rep( rep ), val( val ) {} Index: src/SynTree/Constant.h =================================================================== --- src/SynTree/Constant.h (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/Constant.h (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -16,7 +16,11 @@ #pragma once -#include "SynTree.h" -#include "Visitor.h" -#include "Mutator.h" +#include // for ostream +#include // for string + +#include "Mutator.h" // for Mutator +#include "Visitor.h" // for Visitor + +class Type; class Constant { Index: src/SynTree/DeclStmt.cc =================================================================== --- src/SynTree/DeclStmt.cc (revision fc56cdbf036d8e5a6b7f729bba6c22479005dd12) +++ src/SynTree/DeclStmt.cc (revision 8135d4c79504a6c3047246007261186efa5ba4c9) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// DeclStmt.cc -- +// DeclStmt.cc -- // // Author : Richard C. Bilson @@ -14,7 +14,12 @@ // -#include "Statement.h" -#include "Declaration.h" -#include "Common/utility.h" +#include // for assert +#include // for list +#include // for operator<<, ostream + +#include "Common/utility.h" // for maybeClone +#include "Declaration.h" // for Declaration +#include "Statement.h" // for DeclStmt, Statement +#include "SynTree/Label.h" // for Label DeclStmt::DeclStmt( std::list