Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ src/Makefile.in (revision 8f7cea185385710ca47eaacdb8bc3a59fb752db5) @@ -188,6 +188,5 @@ SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \ SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \ - Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \ - Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT) + Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) am_driver_cfa_cpp_OBJECTS = $(am__objects_1) driver_cfa_cpp_OBJECTS = $(am_driver_cfa_cpp_OBJECTS) @@ -401,6 +400,5 @@ SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \ SynTree/AddStmtVisitor.cc SynTree/TypeSubstitution.cc \ - SynTree/Attribute.cc Tuples/TupleAssignment.cc \ - Tuples/NameMatcher.cc + SynTree/Attribute.cc Tuples/TupleAssignment.cc MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \ ${cfa_cpplib_PROGRAMS}} @@ -769,6 +767,4 @@ Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT): \ Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp) -Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT): Tuples/$(am__dirstamp) \ - Tuples/$(DEPDIR)/$(am__dirstamp) driver/$(am__dirstamp): @$(MKDIR_P) driver @@ -877,5 +873,4 @@ -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT) -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT) -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) @@ -982,5 +977,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po@am__quote@ @@ -2400,18 +2394,4 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi` - -Tuples/driver_cfa_cpp-NameMatcher.o: Tuples/NameMatcher.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-NameMatcher.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo -c -o Tuples/driver_cfa_cpp-NameMatcher.o `test -f 'Tuples/NameMatcher.cc' || echo '$(srcdir)/'`Tuples/NameMatcher.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Tuples/NameMatcher.cc' object='Tuples/driver_cfa_cpp-NameMatcher.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-NameMatcher.o `test -f 'Tuples/NameMatcher.cc' || echo '$(srcdir)/'`Tuples/NameMatcher.cc - -Tuples/driver_cfa_cpp-NameMatcher.obj: Tuples/NameMatcher.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-NameMatcher.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo -c -o Tuples/driver_cfa_cpp-NameMatcher.obj `if test -f 'Tuples/NameMatcher.cc'; then $(CYGPATH_W) 'Tuples/NameMatcher.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/NameMatcher.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Tuples/NameMatcher.cc' object='Tuples/driver_cfa_cpp-NameMatcher.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o Tuples/driver_cfa_cpp-NameMatcher.obj `if test -f 'Tuples/NameMatcher.cc'; then $(CYGPATH_W) 'Tuples/NameMatcher.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/NameMatcher.cc'; fi` .ll.cc: Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ src/ResolvExpr/AlternativeFinder.cc (revision 8f7cea185385710ca47eaacdb8bc3a59fb752db5) @@ -39,5 +39,4 @@ #include "SymTab/Validate.h" #include "Tuples/TupleAssignment.h" -#include "Tuples/NameMatcher.h" #include "Common/utility.h" #include "InitTweak/InitTweak.h" @@ -265,10 +264,7 @@ Cost computeConversionCost( Alternative &alt, const SymTab::Indexer &indexer ) { - ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( alt.expr ); - assert( appExpr ); - PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() ); - assert( pointer ); - FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ); - assert( function ); + ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( alt.expr ); + PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() ); + FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() ); Cost convCost( 0, 0, 0 ); @@ -397,12 +393,4 @@ resultEnv.extractOpenVars( openVars ); - /* - Tuples::NameMatcher matcher( formals ); - try { - matcher.match( actuals ); - } catch ( Tuples::NoMatch &e ) { - std::cerr << "Alternative doesn't match: " << e.message << std::endl; - } - */ std::list< DeclarationWithType* >::iterator formal = formals.begin(); @@ -707,10 +695,7 @@ PRINT( - ApplicationExpr *appExpr = dynamic_cast< ApplicationExpr* >( withFunc->expr ); - assert( appExpr ); - PointerType *pointer = dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() ); - assert( pointer ); - FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ); - assert( function ); + ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( withFunc->expr ); + PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_results().front() ); + FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() ); std::cerr << "Case +++++++++++++" << std::endl; std::cerr << "formals are:" << std::endl; @@ -1068,4 +1053,8 @@ } } + + void AlternativeFinder::visit( TupleIndexExpr *tupleExpr ) { + alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) ); + } } // namespace ResolvExpr Index: src/ResolvExpr/AlternativeFinder.h =================================================================== --- src/ResolvExpr/AlternativeFinder.h (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ src/ResolvExpr/AlternativeFinder.h (revision 8f7cea185385710ca47eaacdb8bc3a59fb752db5) @@ -67,4 +67,5 @@ virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr ); virtual void visit( ConstructorExpr * ctorExpr ); + virtual void visit( TupleIndexExpr *tupleExpr ); /// Runs a new alternative finder on each element in [begin, end) /// and writes each alternative finder to out. Index: src/Tuples/NameMatcher.cc =================================================================== --- src/Tuples/NameMatcher.cc (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ (revision ) @@ -1,67 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// NameMatcher.cc -- -// -// Author : Rodolfo G. Esteves -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 18 15:00:06 2015 -// Update Count : 1 -// - -#include "NameMatcher.h" -#include "NameMatcher.h" - -namespace Tuples { - NameMatcher::NameMatcher( std::list< DeclarationWithType* > &formals ) : current( 0 ) { - int cnt = 0; - for ( std::list< DeclarationWithType *>::const_iterator f = formals.begin(); f != formals.end(); ++f ) { - table.insert( std::pair< std::string, int >( (*f)->get_name(), cnt++ ) ); - index.push_back(*f); - } // for - exprs.reserve( index.size() ); - } - - NameMatcher::~NameMatcher() {} - - void NameMatcher::match( ResolvExpr::AltList &alternatives ) throw (NoMatch) { - if ( alternatives.size() != index.size() ) - throw NoMatch("Length of actuals and formals differ"); - - for ( ResolvExpr::AltList::const_iterator a = alternatives.begin(); a != alternatives.end(); ++a ) { - if ( a->expr->get_argName() != 0 ) - if ( NameExpr *name = dynamic_cast( a->expr->get_argName() ) ) { - if ( table.find( name->get_name() ) != table.end() ) { - std::cerr << "Rearranging to " << table[ name->get_name() ] << "position in the list." << std::endl; - exprs[ table[ name->get_name() ] ] = &(*a); - } else - throw NoMatch( name->get_name() + "no such designation" ); - } /*else if ( TupleExpr *tup = dynamic_cast( a->expr->get_argName() ) ) - std::cerr << "Designated expression" << std::endl; */ - exprs.push_back( &(*a) ); - } // for - - /*std::cerr << "In matcher/match: "; - if ( exprs.size() != index.size() ) - std::cerr << "exprs and index differ in length" << std::endl; - else - std::cerr << "is all good." << std::endl; - */ - } - - ResolvExpr::Alternative &NameMatcher::get_next() throw (NoMoreElements) { - if ( current++ >= (int)(index.size()) ) - throw NoMoreElements(); - return *(new ResolvExpr::Alternative()); - } -} // namespace Tuples - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/Tuples/NameMatcher.h =================================================================== --- src/Tuples/NameMatcher.h (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ (revision ) @@ -1,62 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// NameMatcher.h -- -// -// Author : Rodolfo G. Esteves -// Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 18 15:01:37 2015 -// Update Count : 3 -// - -#ifndef _NAMEMATCHER_H_ -#define _NAMEMATCHER_H_ - -#include -#include -#include - -#include "SynTree/SynTree.h" -#include "SynTree/Mutator.h" - -#include "SynTree/Type.h" -#include "SynTree/Declaration.h" -#include "SynTree/Expression.h" -#include "SynTree/Statement.h" - -#include "ResolvExpr/Alternative.h" - -namespace Tuples { - struct NoMoreElements {}; - struct NoMatch { - NoMatch( std::string msg ) : message( msg ) {} - std::string message; - }; - - class NameMatcher { - public: - NameMatcher( std::list< DeclarationWithType* >& ); - ~NameMatcher(); - - void match( ResolvExpr::AltList &alternatives ) throw (NoMatch) ; - ResolvExpr::Alternative &get_next() throw (NoMoreElements); - - private: - int current; - std::vector< DeclarationWithType* > index; - std::vector< const ResolvExpr::Alternative * > exprs; - std::map< std::string, int> table; - }; -} // namespace Tuples - -#endif // _NAMEMATCHER_H_ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/Tuples/module.mk =================================================================== --- src/Tuples/module.mk (revision 908cc8363706be83b8dd16ee55ff542200c85e4e) +++ src/Tuples/module.mk (revision 8f7cea185385710ca47eaacdb8bc3a59fb752db5) @@ -6,5 +6,5 @@ ## file "LICENCE" distributed with Cforall. ## -## module.mk -- +## module.mk -- ## ## Author : Richard C. Bilson @@ -15,4 +15,3 @@ ############################################################################### -SRC += Tuples/TupleAssignment.cc \ - Tuples/NameMatcher.cc +SRC += Tuples/TupleAssignment.cc