Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision a09e45b1ba904ce92f02b3ad9409aa1c53244ed8) +++ src/Makefile.in (revision d16d159c20c0dfd7fa228ef48ab2a37a11be43c6) @@ -215,5 +215,4 @@ SymTab/driver_cfa_cpp-Validate.$(OBJEXT) \ SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT) \ - SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT) \ SymTab/driver_cfa_cpp-Autogen.$(OBJEXT) \ SynTree/driver_cfa_cpp-Type.$(OBJEXT) \ @@ -513,10 +512,10 @@ ResolvExpr/CurrentObject.cc ResolvExpr/ExplodedActual.cc \ SymTab/Indexer.cc SymTab/Mangler.cc SymTab/Validate.cc \ - SymTab/FixFunction.cc SymTab/ImplementationType.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/FixFunction.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 \ @@ -842,6 +841,4 @@ SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT): SymTab/$(am__dirstamp) \ SymTab/$(DEPDIR)/$(am__dirstamp) -SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT): \ - SymTab/$(am__dirstamp) SymTab/$(DEPDIR)/$(am__dirstamp) SymTab/driver_cfa_cpp-Autogen.$(OBJEXT): SymTab/$(am__dirstamp) \ SymTab/$(DEPDIR)/$(am__dirstamp) @@ -1036,5 +1033,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-FixFunction.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Po@am__quote@ @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@ @@ -2035,18 +2031,4 @@ @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-FixFunction.obj `if test -f 'SymTab/FixFunction.cc'; then $(CYGPATH_W) 'SymTab/FixFunction.cc'; else $(CYGPATH_W) '$(srcdir)/SymTab/FixFunction.cc'; fi` -SymTab/driver_cfa_cpp-ImplementationType.o: SymTab/ImplementationType.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-ImplementationType.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Tpo -c -o SymTab/driver_cfa_cpp-ImplementationType.o `test -f 'SymTab/ImplementationType.cc' || echo '$(srcdir)/'`SymTab/ImplementationType.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SymTab/ImplementationType.cc' object='SymTab/driver_cfa_cpp-ImplementationType.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-ImplementationType.o `test -f 'SymTab/ImplementationType.cc' || echo '$(srcdir)/'`SymTab/ImplementationType.cc - -SymTab/driver_cfa_cpp-ImplementationType.obj: SymTab/ImplementationType.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-ImplementationType.obj -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Tpo -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` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Tpo SymTab/$(DEPDIR)/driver_cfa_cpp-ImplementationType.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='SymTab/ImplementationType.cc' object='SymTab/driver_cfa_cpp-ImplementationType.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-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-Autogen.o: SymTab/Autogen.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-Autogen.o -MD -MP -MF SymTab/$(DEPDIR)/driver_cfa_cpp-Autogen.Tpo -c -o SymTab/driver_cfa_cpp-Autogen.o `test -f 'SymTab/Autogen.cc' || echo '$(srcdir)/'`SymTab/Autogen.cc Index: src/SymTab/ImplementationType.cc =================================================================== --- src/SymTab/ImplementationType.cc (revision a09e45b1ba904ce92f02b3ad9409aa1c53244ed8) +++ (revision ) @@ -1,114 +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. -// -// ImplementationType.cc -- -// -// Author : Richard C. Bilson -// Created On : Sun May 17 21:32:01 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Thu Mar 16 15:54:08 2017 -// Update Count : 4 -// - -#include "ImplementationType.h" - -#include // for list, _List_iterator, list<>::iterator - -#include "SymTab/Indexer.h" // for Indexer -#include "SynTree/Declaration.h" // for NamedTypeDecl -#include "SynTree/Type.h" // for TupleType, Type, ArrayType, Pointer... -#include "SynTree/Visitor.h" // for Visitor - - -namespace SymTab { - class ImplementationType : public Visitor { - public: - ImplementationType( const SymTab::Indexer &indexer ); - - Type *get_result() { return result; } - private: - virtual void visit(VoidType *voidType); - virtual void visit(BasicType *basicType); - virtual void visit(PointerType *pointerType); - virtual void visit(ArrayType *arrayType); - virtual void visit(FunctionType *functionType); - virtual void visit(StructInstType *aggregateUseType); - virtual void visit(UnionInstType *aggregateUseType); - virtual void visit(EnumInstType *aggregateUseType); - virtual void visit(TraitInstType *aggregateUseType); - virtual void visit(TypeInstType *aggregateUseType); - virtual void visit(TupleType *tupleType); - virtual void visit(VarArgsType *varArgsType); - virtual void visit(ZeroType *zeroType); - virtual void visit(OneType *oneType); - - Type *result; // synthesized - const SymTab::Indexer &indexer; - }; - - Type * implementationType( Type *type, const SymTab::Indexer& indexer ) { - ImplementationType implementor( indexer ); - type->accept( implementor ); - if ( implementor.get_result() == 0 ) { - return type->clone(); - } else { - return implementor.get_result(); - } // if - } - - ImplementationType::ImplementationType( const SymTab::Indexer &indexer ) : result( 0 ), indexer( indexer ) { - } - - void ImplementationType::visit( __attribute__((unused)) VoidType *voidType ) {} - void ImplementationType::visit( __attribute__((unused)) BasicType *basicType ) {} - - void ImplementationType::visit(PointerType *pointerType) { - PointerType *newType = pointerType->clone(); - newType->set_base( implementationType( pointerType->get_base(), indexer ) ); - result = newType; - } - - void ImplementationType::visit(ArrayType *arrayType) { - ArrayType *newType = arrayType->clone(); - newType->set_base( implementationType( arrayType->get_base(), indexer ) ); - result = newType; - } - - void ImplementationType::visit( __attribute__((unused)) FunctionType *functionType ) {} - void ImplementationType::visit( __attribute__((unused)) StructInstType * aggregateUseType ) {} - void ImplementationType::visit( __attribute__((unused)) UnionInstType * aggregateUseType ) {} - void ImplementationType::visit( __attribute__((unused)) EnumInstType * aggregateUseType ) {} - void ImplementationType::visit( __attribute__((unused)) TraitInstType * aggregateUseType ) {} - - void ImplementationType::visit(TypeInstType *inst) { - NamedTypeDecl *typeDecl = indexer.lookupType( inst->get_name() ); - if ( typeDecl && typeDecl->get_base() ) { - Type *base = implementationType( typeDecl->get_base(), indexer ); - base->get_qualifiers() |= inst->get_qualifiers(); - result = base; - } // if - } - - void ImplementationType::visit(TupleType *tupleType) { - std::list< Type * > types; - for ( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) { - Type *implType = implementationType( *i, indexer ); - implType->get_qualifiers() |= tupleType->get_qualifiers(); - types.push_back( implType ); - } // for - result = new TupleType( Type::Qualifiers(), types ); - } - - void ImplementationType::visit( __attribute__((unused)) VarArgsType *varArgsType ) {} - void ImplementationType::visit( __attribute__((unused)) ZeroType *zeroType ) {} - void ImplementationType::visit( __attribute__((unused)) OneType *oneType ) {} -} // namespace SymTab - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/SymTab/ImplementationType.h =================================================================== --- src/SymTab/ImplementationType.h (revision a09e45b1ba904ce92f02b3ad9409aa1c53244ed8) +++ (revision ) @@ -1,37 +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. -// -// ImplementationType.h -- -// -// Author : Richard C. Bilson -// Created On : Sun May 17 21:35:41 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 22 09:46:19 2017 -// Update Count : 3 -// - -#pragma once - -class Type; - -namespace SymTab { -class Indexer; - - Type *implementationType( Type *, const SymTab::Indexer &indexer ); - - template< typename InputIterator, typename OutputIterator > - void implementationTypeList( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer ) { - while ( begin != end ) { - *out++ = implementationType( *begin++, indexer ); - } // while - } -} // namespace SymTab - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/SymTab/module.mk =================================================================== --- src/SymTab/module.mk (revision a09e45b1ba904ce92f02b3ad9409aa1c53244ed8) +++ src/SymTab/module.mk (revision d16d159c20c0dfd7fa228ef48ab2a37a11be43c6) @@ -19,4 +19,3 @@ SymTab/Validate.cc \ SymTab/FixFunction.cc \ - SymTab/ImplementationType.cc \ SymTab/Autogen.cc