Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision 82f322600e155f2e9d37c032384266623041e155) +++ src/Makefile.in (revision ad6cd6df0f23582ceb3b4b7e8ffea357ad0cb288) @@ -216,5 +216,4 @@ SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT) \ SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT) \ - SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT) \ SymTab/driver_cfa_cpp-Autogen.$(OBJEXT) \ SynTree/driver_cfa_cpp-Type.$(OBJEXT) \ @@ -515,10 +514,9 @@ SymTab/Indexer.cc SymTab/Mangler.cc SymTab/Validate.cc \ SymTab/FixFunction.cc SymTab/ImplementationType.cc \ - SymTab/TypeEquality.cc SymTab/Autogen.cc SynTree/Type.cc \ - SynTree/VoidType.cc SynTree/BasicType.cc \ - SynTree/PointerType.cc SynTree/ArrayType.cc \ - SynTree/ReferenceType.cc SynTree/FunctionType.cc \ - SynTree/ReferenceToType.cc SynTree/TupleType.cc \ - SynTree/TypeofType.cc SynTree/AttrType.cc \ + SymTab/Autogen.cc SynTree/Type.cc SynTree/VoidType.cc \ + SynTree/BasicType.cc SynTree/PointerType.cc \ + SynTree/ArrayType.cc SynTree/ReferenceType.cc \ + SynTree/FunctionType.cc SynTree/ReferenceToType.cc \ + SynTree/TupleType.cc SynTree/TypeofType.cc SynTree/AttrType.cc \ SynTree/VarArgsType.cc SynTree/ZeroOneType.cc \ SynTree/Constant.cc SynTree/Expression.cc SynTree/TupleExpr.cc \ @@ -846,6 +844,4 @@ SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT): \ SymTab/$(am__dirstamp) SymTab/$(DEPDIR)/$(am__dirstamp) -SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT): SymTab/$(am__dirstamp) \ - SymTab/$(DEPDIR)/$(am__dirstamp) SymTab/driver_cfa_cpp-Autogen.$(OBJEXT): SymTab/$(am__dirstamp) \ SymTab/$(DEPDIR)/$(am__dirstamp) @@ -1043,5 +1039,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Indexer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Mangler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po@am__quote@ @@ -2053,18 +2048,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 SymTab/driver_cfa_cpp-ImplementationType.obj `if test -f 'SymTab/ImplementationType.cc'; then $(CYGPATH_W) 'SymTab/ImplementationType.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/ImplementationType.cc'; fi` - -SymTab/driver_cfa_cpp-TypeEquality.o: SymTab/TypeEquality.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-TypeEquality.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Tpo -c -o SymTab/driver_cfa_cpp-TypeEquality.o `test -f 'SymTab/TypeEquality.cc' || echo '$(srcdir)/'`SymTab/TypeEquality.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SymTab/TypeEquality.cc' object='SymTab/driver_cfa_cpp-TypeEquality.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 SymTab/driver_cfa_cpp-TypeEquality.o `test -f 'SymTab/TypeEquality.cc' || echo '$(srcdir)/'`SymTab/TypeEquality.cc - -SymTab/driver_cfa_cpp-TypeEquality.obj: SymTab/TypeEquality.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SymTab/driver_cfa_cpp-TypeEquality.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Tpo -c -o SymTab/driver_cfa_cpp-TypeEquality.obj `if test -f 'SymTab/TypeEquality.cc'; then $(CYGPATH_W) 'SymTab/TypeEquality.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/TypeEquality.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SymTab/TypeEquality.cc' object='SymTab/driver_cfa_cpp-TypeEquality.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 SymTab/driver_cfa_cpp-TypeEquality.obj `if test -f 'SymTab/TypeEquality.cc'; then $(CYGPATH_W) 'SymTab/TypeEquality.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/TypeEquality.cc'; fi` SymTab/driver_cfa_cpp-Autogen.o: SymTab/Autogen.cc Index: src/SymTab/TypeEquality.cc =================================================================== --- src/SymTab/TypeEquality.cc (revision 82f322600e155f2e9d37c032384266623041e155) +++ (revision ) @@ -1,218 +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. -// -// TypeEquality.cc -- -// -// Author : Rob Schluntz -// Created On : Tue Jul 07 16:28:29 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Mon Jul 20 14:16:11 2015 -// Update Count : 37 -// -#include "TypeEquality.h" - -#include // for assert -#include // for list, list<>::iterator, _List_iterator -#include // for operator==, string, basic_string - -#include "SynTree/Constant.h" // for Constant -#include "SynTree/Declaration.h" // for DeclarationWithType -#include "SynTree/Expression.h" // for ConstantExpr, Expression -#include "SynTree/Type.h" // for Type, ArrayType, FunctionType, Enum... -#include "SynTree/Visitor.h" // for Visitor - -namespace SymTab { - class TypeEquality : public Visitor { - public: - TypeEquality( Type * other, bool vlaErr ) : result( true ), other( other ), - vlaErr( vlaErr ) {} - bool result; - - private: - virtual void visit( FunctionType *funcType ); - virtual void visit( VoidType *voidType ); - virtual void visit( BasicType *basicType ); - virtual void visit( PointerType *pointerType ); - virtual void visit( ArrayType *arrayType ); - virtual void visit( StructInstType *structInst ); - virtual void visit( UnionInstType *unionInst ); - virtual void visit( EnumInstType *enumInst ); - virtual void visit( TypeInstType *typeInst ); - virtual void visit( VarArgsType *varArgsType ); - virtual void visit( ZeroType *zeroType ); - virtual void visit( OneType *oneType ); - - void handleQualifiers( Type * t ); - - Type * other; - bool vlaErr; - }; - - bool typeEquals( Type * t1, Type * t2, bool vlaErr ) { - TypeEquality teq( t2, vlaErr ); - t1->accept( teq ); - return teq.result; - } - - void TypeEquality::handleQualifiers( Type * t ) { - result = result && t->get_qualifiers() == other->get_qualifiers(); - } - - void TypeEquality::visit( VoidType *voidType ) { - handleQualifiers( voidType ); - if ( ! dynamic_cast< VoidType * >( other ) ) { - result = false; - } - } - - void TypeEquality::visit( BasicType *basicType ) { - handleQualifiers( basicType ); - if ( BasicType * bt = dynamic_cast< BasicType * >( other ) ) { - result = result && basicType->get_kind() == bt->get_kind(); - } else { - result = false; - } - } - - void TypeEquality::visit( PointerType *pointerType ) { - handleQualifiers( pointerType ); - if ( PointerType * pt = dynamic_cast< PointerType * >( other ) ) { - other = pt->get_base(); - pointerType->get_base()->accept( *this ); - } else { - result = false; - } - } - - void TypeEquality::visit( ArrayType *arrayType ) { - handleQualifiers( arrayType ); - - if ( ArrayType * at = dynamic_cast< ArrayType * >( other ) ) { - // to be equal, array types must both be VLA or both not VLA - // and must both have a dimension expression or not have a dimension - result = result && arrayType->get_isVarLen() == at->get_isVarLen() - && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0) - || (arrayType->get_dimension() == 0 && at->get_dimension() == 0)); - - if ( vlaErr ) { - // useful for comparing typedef types - in this case, we - // want types to appear distinct if either is a VLA type - if ( arrayType->get_isVarLen() || at->get_isVarLen() ) { - result = false; - } - } - - if ( ! arrayType->get_isVarLen() && ! at->get_isVarLen() && - arrayType->get_dimension() != 0 && at->get_dimension() != 0 ) { - ConstantExpr * ce1 = dynamic_cast< ConstantExpr * >( arrayType->get_dimension() ); - ConstantExpr * ce2 = dynamic_cast< ConstantExpr * >( at->get_dimension() ); - assert(ce1 && ce2); - - Constant * c1 = ce1->get_constant(); - Constant * c2 = ce2->get_constant(); - - result = result && c1->get_value() == c2->get_value(); - } - - other = at->get_base(); - arrayType->get_base()->accept( *this ); - } else { - result = false; - } - } - - void TypeEquality::visit( FunctionType *funcType ) { - handleQualifiers( funcType ); - - if ( FunctionType * ft = dynamic_cast< FunctionType * >( other ) ) { - // function types must have the same number of return types - // and parameters to be equivalent - result = result && funcType->get_returnVals().size() == ft->get_returnVals().size() - && funcType->get_parameters().size() == ft->get_parameters().size() - && funcType->get_isVarArgs() == ft->get_isVarArgs(); - - std::list< DeclarationWithType * >::iterator it1, it2; - - // return types must be equivalent - it1 = funcType->get_returnVals().begin(); - it2 = ft->get_returnVals().begin(); - for ( ; it1 != funcType->get_returnVals().end(); ++it1, ++it2 ) { - if ( ! result ) return; - other = (*it2)->get_type(); - (*it1)->get_type()->accept( *this ); - } - - // parameter types must be equivalent - it1 = funcType->get_parameters().begin(); - it2 = ft->get_parameters().begin(); - for ( ; it1 != funcType->get_parameters().end(); ++it1, ++it2 ) { - if ( ! result ) return; - other = (*it2)->get_type(); - (*it1)->get_type()->accept( *this ); - } - } else { - result = false; - } - } - - // aggregate types only need to have the same name - void TypeEquality::visit( StructInstType *structInst ) { - handleQualifiers( structInst ); - if ( StructInstType * st = dynamic_cast< StructInstType * >( other ) ) { - result = result && structInst->get_name() == st->get_name(); - } else { - result = false; - } - } - - void TypeEquality::visit( UnionInstType *unionInst ) { - handleQualifiers( unionInst ); - if ( UnionInstType * ut = dynamic_cast< UnionInstType * >( other ) ) { - result = result && unionInst->get_name() == ut->get_name(); - } else { - result = false; - } - } - - void TypeEquality::visit( EnumInstType *enumInst ) { - handleQualifiers( enumInst ); - if ( EnumInstType * et = dynamic_cast< EnumInstType * >( other ) ) { - result = result && enumInst->get_name() == et->get_name(); - } else { - result = false; - } - } - - void TypeEquality::visit( TypeInstType *typeInst ) { - handleQualifiers( typeInst ); - if ( TypeInstType * tt = dynamic_cast< TypeInstType * >( other ) ) { - result = result && typeInst->get_name() == tt->get_name(); - } else { - result = false; - } - } - - void TypeEquality::visit( VarArgsType *varArgsType ) { - handleQualifiers( varArgsType ); - if ( ! dynamic_cast< VarArgsType * >( other ) ) { - result = false; - } - } - - void TypeEquality::visit( ZeroType *zeroType ) { - handleQualifiers( zeroType ); - if ( ! dynamic_cast< ZeroType * >( other ) ) { - result = false; - } - } - - void TypeEquality::visit( OneType *oneType ) { - handleQualifiers( oneType ); - if ( ! dynamic_cast< OneType * >( other ) ) { - result = false; - } - } -} // namespace SymTab Index: src/SymTab/TypeEquality.h =================================================================== --- src/SymTab/TypeEquality.h (revision 82f322600e155f2e9d37c032384266623041e155) +++ (revision ) @@ -1,23 +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. -// -// TypeEquality.h -- -// -// Author : Rob Schluntz -// Created On : Tue Jul 07 16:30:07 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Jul 08 12:41:15 2015 -// Update Count : 6 -// - -class Type; - -namespace SymTab { - // compare types t1 and t2 for equality - // if vlaErr is true, then if at least one of the types is a - // variable-length array type, then the result will be false - bool typeEquals( Type * t1, Type * t2, bool vlaErr = false ); -} // namespace SymTab Index: src/SymTab/module.mk =================================================================== --- src/SymTab/module.mk (revision 82f322600e155f2e9d37c032384266623041e155) +++ src/SymTab/module.mk (revision ad6cd6df0f23582ceb3b4b7e8ffea357ad0cb288) @@ -20,4 +20,3 @@ SymTab/FixFunction.cc \ SymTab/ImplementationType.cc \ - SymTab/TypeEquality.cc \ SymTab/Autogen.cc