Index: src/Designators/Processor.cc
===================================================================
--- src/Designators/Processor.cc	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ 	(revision )
@@ -1,168 +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.
-//
-// Processor.cc -- 
-//
-// Author           : Rodolfo G. Esteves
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:23:10 2015
-// Update Count     : 2
-//
-
-#include <vector>
-#include <algorithm>
-
-#include "Processor.h"
-#include "SynTree/Declaration.h"
-
-namespace Designators {
-	Matcher::Matcher( const std::list< DeclarationWithType * > &decls ) {
-		int cnt = 0;
-		for ( std::list< DeclarationWithType * >::const_iterator i = decls.begin();
-			  i != decls.end(); i++, cnt++ ) {
-			std::string newName = (*i)->get_name();
-			if ( table.find( newName ) == table.end() ) {
-				table.insert( std::pair<std::string, int>(newName, cnt) );
-				order.push_back( newName );
-				declarations.push_back( *i );
-				alternatives.push_back( 0 );
-			} // if
-		} // for
-	}
-
-	template< class InputIterator >
-	bool Matcher::add(InputIterator begin, InputIterator end, ResolvExpr::Alternative &alt ) {
-		while ( begin != end ) {
-			if ( table.find( *begin ) != table.end() )
-				alternatives[ table[ *begin ] ] = new ResolvExpr::Alternative(alt);
-			else
-				return false;
-			begin++;
-		} // while
-		return true;
-	}
-
-	template< class InputIterator, class OutputIterator >
-	bool Matcher::slice(InputIterator begin, InputIterator end, OutputIterator out ) {
-		while ( begin != end )
-			if ( table.find( *begin ) != table.end() )
-				*out++ = declarations [ table[ *begin++ ] ];
-			else
-				return false; // throw 0;
-		return true;
-	}
-
-	template< class OutputIterator >
-	bool Matcher::get_reorderedCall( OutputIterator out ) {
-		// fill call with defaults, if need be
-		for (Matcher::iterator o = begin(); o != end(); o++ )
-			if ( alternatives[ table[ *o ] ] == 0 )
-				return false;
-			else
-				out++ = *alternatives[table[ *o ]];
-		return true;
-	}
-
-	bool fixDesignations( ResolvExpr::AlternativeFinder &finder, Expression *designation ) {
-		// Distribute `designation' over alternatives contained in `finder'
-		if ( ! designation) return false;
-		else
-			for ( ResolvExpr::AlternativeFinder::iterator alt = finder.begin(); alt != finder.end(); alt++ )
-				alt->expr->set_argName( designation );
-		return true;
-	}
-
-	template < class OutputIterator >
-	bool extractNames( Expression *expr, OutputIterator out, Matcher matcher ) {
-		Expression *designator = expr->get_argName();
-		if ( designator == 0 ) return false;
-
-		if ( NameExpr *ndes = dynamic_cast<NameExpr *>(designator) )
-			out++ = ndes->get_name();
-		else if ( TupleExpr *tdes = dynamic_cast<TupleExpr *>(designator) ) {
-			std::cerr << "Tuple designation" << std::endl;
-//      ObjectDecl *decl = extractTupleV(matcher, tdes); // xxx
-			// transform?
-			for ( std::list< Expression * >::iterator n = tdes->get_exprs().begin();
-				  n != tdes->get_exprs().end(); n++ ) {
-
-				if ( NameExpr *name = dynamic_cast<NameExpr *>(*n) )
-					out++ = name->get_name();
-				else
-					// flatten nested Tuples
-					throw SemanticError( "Invalid tuple designation." );
-			} // for
-		} // if
-		return true;
-	}
-
-	std::string extractName( Expression *expr ) /* throw NoNameExtraction */ {
-		if ( NameExpr *name = dynamic_cast< NameExpr *>(expr) )
-			return name->get_name();
-		else /* if () */
-			throw 0;
-	}
-
-	DeclarationWithType *gensym( DeclarationWithType *, std::string prefix ) {
-		return 0;
-	}
-
-	ObjectDecl *extractTupleV( Matcher matcher, TupleExpr *nmTuple ) {
-		// extract a subtuple of the function `fun' argument list, corresponding to the tuple of names requested by
-		// `nmTuple'.
-		std::list< Expression * > &exprs = nmTuple->get_exprs();
-		std::cerr << "In extractTupleV, the tuple has " << exprs.size() << " components." << std::endl;
-		std::list< std::string > names;
-		std::transform( exprs.begin(), exprs.end(), back_inserter(names), extractName );
-		std::list< DeclarationWithType * > decls;
-		matcher.slice( names.begin(), names.end(), back_inserter(decls) );
-		//std::for_each( decls.begin(), decls.end(), gensym );
-		std::cerr << "Returning declaration with " << decls.size() << " components." << std::endl;
-
-		return 0;//new ObjectDecl()
-	}
-
-	void check_alternative( FunctionType *fun, ResolvExpr::AltList &args ) {
-		using namespace ResolvExpr;
-
-		Matcher matcher( fun->get_parameters() );
-		for ( AltList::iterator a = args.begin(); a != args.end(); a++ ) {
-			std::list< std::string > actNames;
-			if ( ! extractNames( a->expr, back_inserter(actNames), matcher ) ) {
-				return; // not a designated call, leave alternative alone
-			} else {
-				// see if there's a match
-				matcher.add( actNames.begin(), actNames.end(), *a );
-			} // if
-		} // for
-		//AltList newArgs;
-		args.clear();
-		matcher.get_reorderedCall( back_inserter(args) );
-
-		return;
-	}
-#if 0
-	void pruneAlternatives( Expression *expr, ResolvExpr::AlternativeFinder &finder ) {
-		if ( expr->get_argName() != 0 ) {
-			// Looking at designated expression
-			using namespace ResolvExpr;
-			AltList &alternatives = finder.get_alternatives();
-			std::cerr << "Now printing alternatives: " << std::endl;
-			for ( AltList::iterator a = alternatives.begin(); a != alternatives.end(); a++ )
-				a->expr->print( std::cerr );
-			//std::cerr << "Looking for constructions of length no more than: " << tdes->get_exprs().size() << "." << std::endl;
-		}
-		return;
-	}
-#endif // 0
-} // namespaces Designators
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Designators/Processor.h
===================================================================
--- src/Designators/Processor.h	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ 	(revision )
@@ -1,78 +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.
-//
-// Processor.h -- 
-//
-// Author           : Rodolfo G. Esteves
-// Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:24:34 2015
-// Update Count     : 3
-//
-
-#include "SynTree/Declaration.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Type.h"
-#include "ResolvExpr/AlternativeFinder.h"
-
-#include <vector>
-#include <string>
-#include <list>
-#include <map>
-
-namespace Designators {
-	class Matcher;
-	class GenSym;
-
-	template < class OutputIterator >  bool extractNames( std::list< DeclarationWithType * > &, OutputIterator );
-	template < class OutputIterator >  bool extractNames( Expression *, OutputIterator, Matcher );
-	void check_alternative( FunctionType *, ResolvExpr::AltList & );
-	ObjectDecl *extractTupleV( Matcher, TupleExpr *names );
-	bool fixDesignations( ResolvExpr::AlternativeFinder &finder, Expression *designation );
-	DeclarationWithType *gensym( GenSym &, DeclarationWithType * );
-
-	class GenSym {
-	  public:
-		GenSym( std::string prefix = "" ) : gensym_count(0) {}
-		GenSym( GenSym &other ) { gensym_count = other.gensym_count; }
-
-//    std::string get_symbol() { }
-	  private:
-		std::string prefix;
-		int gensym_count;
-	};
-
-	// template< typename Key >
-	class Matcher {
-	  public:
-		typedef std::vector< std::string >::iterator iterator;
-
-		Matcher( const std::list< DeclarationWithType * > & );
-		~Matcher() {}
-
-		template< class OutputIterator > bool get_reorderedCall( OutputIterator );
-		template< class InputIterator >  bool add(InputIterator, InputIterator, ResolvExpr::Alternative &);
-		template< class InputIterator, class OutputIterator >  bool slice(InputIterator begin, InputIterator end, OutputIterator );
-		//std::vector<std::string> &get_order() const { return order; }
-
-		iterator begin() { return order.begin(); }
-		iterator end() { return order.end(); }
-
-		//Expression *operator[]( int idx ) { return table( order[ idx ] ); }
-	  private:
-		std::map< std::string, int > table;
-		std::vector<std::string> order;
-		std::vector<DeclarationWithType *> declarations;
-		std::vector<ResolvExpr::Alternative *> alternatives;
-	};
-	//  void pruneAlternatives( Expression *expr, ResolvExpr::AlternativeFinder & );
-} // namespace Designators
-
-// Local Variables: //
-// tab-width: 4 //
-// mode: c++ //
-// compile-command: "make install" //
-// End: //
Index: src/Designators/module.mk
===================================================================
--- src/Designators/module.mk	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ 	(revision )
@@ -1,17 +1,0 @@
-######################### -*- Mode: Makefile-Gmake -*- ########################
-##
-## 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.
-##
-## module.mk -- 
-##
-## Author           : Richard C. Bilson
-## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jun  1 17:52:06 2015
-## Update Count     : 1
-###############################################################################
-
-SRC += Designators/Processor.cc
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ src/Makefile.am	(revision 31468a2b995c7c930b775e67316f1d4ea96aaa2c)
@@ -29,5 +29,4 @@
 include Common/module.mk
 include ControlStruct/module.mk
-include Designators/module.mk
 include GenPoly/module.mk
 include InitTweak/module.mk
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ src/Makefile.in	(revision 31468a2b995c7c930b775e67316f1d4ea96aaa2c)
@@ -27,7 +27,4 @@
 #SRC +=  ArgTweak/Rewriter.cc \
 #	ArgTweak/Mutate.cc
-
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
 
 ######################### -*- Mode: Makefile-Gmake -*- ########################
@@ -77,10 +74,10 @@
 DIST_COMMON = $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk \
 	$(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk \
-	$(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk \
-	$(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/Parser/module.mk \
-	$(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk \
-	$(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk \
-	Parser/lex.cc Parser/parser.cc Parser/parser.h
+	$(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk \
+	$(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk \
+	$(srcdir)/Tuples/module.mk Parser/lex.cc Parser/parser.cc \
+	Parser/parser.h
 cfa_cpplib_PROGRAMS = driver/cfa-cpp$(EXEEXT)
 subdir = src
@@ -112,5 +109,4 @@
 	ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
 	ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) \
-	Designators/driver_cfa_cpp-Processor.$(OBJEXT) \
 	GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
 	GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
@@ -374,6 +370,6 @@
 	ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
 	ControlStruct/ForExprMutator.cc \
-	ControlStruct/LabelTypeChecker.cc Designators/Processor.cc \
-	GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
+	ControlStruct/LabelTypeChecker.cc GenPoly/Box.cc \
+	GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
 	GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
 	GenPoly/CopyParams.cc GenPoly/FindFunction.cc \
@@ -433,5 +429,5 @@
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -454,5 +450,5 @@
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
+$(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -553,13 +549,4 @@
 	ControlStruct/$(am__dirstamp) \
 	ControlStruct/$(DEPDIR)/$(am__dirstamp)
-Designators/$(am__dirstamp):
-	@$(MKDIR_P) Designators
-	@: > Designators/$(am__dirstamp)
-Designators/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) Designators/$(DEPDIR)
-	@: > Designators/$(DEPDIR)/$(am__dirstamp)
-Designators/driver_cfa_cpp-Processor.$(OBJEXT):  \
-	Designators/$(am__dirstamp) \
-	Designators/$(DEPDIR)/$(am__dirstamp)
 GenPoly/$(am__dirstamp):
 	@$(MKDIR_P) GenPoly
@@ -824,5 +811,4 @@
 	-rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT)
 	-rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT)
-	-rm -f Designators/driver_cfa_cpp-Processor.$(OBJEXT)
 	-rm -f GenPoly/driver_cfa_cpp-Box.$(OBJEXT)
 	-rm -f GenPoly/driver_cfa_cpp-CopyParams.$(OBJEXT)
@@ -934,5 +920,4 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-CopyParams.Po@am__quote@
@@ -1265,18 +1250,4 @@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelTypeChecker.obj `if test -f 'ControlStruct/LabelTypeChecker.cc'; then $(CYGPATH_W) 'ControlStruct/LabelTypeChecker.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelTypeChecker.cc'; fi`
 
-Designators/driver_cfa_cpp-Processor.o: Designators/Processor.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.o -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-
-Designators/driver_cfa_cpp-Processor.obj: Designators/Processor.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.obj -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-
 GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
@@ -2654,6 +2625,4 @@
 	-rm -f ControlStruct/$(DEPDIR)/$(am__dirstamp)
 	-rm -f ControlStruct/$(am__dirstamp)
-	-rm -f Designators/$(DEPDIR)/$(am__dirstamp)
-	-rm -f Designators/$(am__dirstamp)
 	-rm -f GenPoly/$(DEPDIR)/$(am__dirstamp)
 	-rm -f GenPoly/$(am__dirstamp)
@@ -2685,5 +2654,5 @@
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -2731,5 +2700,5 @@
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 8b6b552d2ca087e611b728834712598ff9d157d6)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 31468a2b995c7c930b775e67316f1d4ea96aaa2c)
@@ -38,5 +38,4 @@
 #include "SynTree/TypeSubstitution.h"
 #include "SymTab/Validate.h"
-#include "Designators/Processor.h"
 #include "Tuples/TupleAssignment.h"
 #include "Tuples/NameMatcher.h"