Index: src/Validate/EliminateTypedef.cpp =================================================================== --- src/Validate/EliminateTypedef.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/EliminateTypedef.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,79 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// EliminateTypedef.cpp -- Removes TypedefDecl nodes from the AST. +// +// Author : Andrew Beach +// Created On : Wed Apr 20 16:37:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Mon Apr 25 14:26:00 2022 +// Update Count : 0 +// + +#include "Validate/EliminateTypedef.hpp" + +#include + +#include "AST/Decl.hpp" +#include "AST/Pass.hpp" +#include "AST/Stmt.hpp" +#include "Common/utility.h" + +namespace Validate { + +namespace { + +struct EliminateTypedefCore { + ast::StructDecl const * previsit( ast::StructDecl const * decl ); + ast::UnionDecl const * previsit( ast::UnionDecl const * decl ); + ast::CompoundStmt const * previsit( ast::CompoundStmt const * stmt ); +}; + +bool isTypedef( ast::ptr const & decl ) { + return (nullptr != decl.as()); +} + +bool isTypedefStmt( ast::ptr const & stmt ) { + if ( auto declStmt = stmt.as() ) { + return isTypedef( declStmt->decl ); + } + return false; +} + +template +node_t const * field_erase_if( node_t const * node, field_t super_t::*field, pred_t && pred) { + node_t * mut = ast::mutate( node ); + erase_if( mut->*field, pred ); + return mut; +} + +ast::StructDecl const * EliminateTypedefCore::previsit( ast::StructDecl const * decl ) { + return field_erase_if( decl, &ast::StructDecl::members, isTypedef ); +} + +ast::UnionDecl const * EliminateTypedefCore::previsit( ast::UnionDecl const * decl ) { + return field_erase_if( decl, &ast::UnionDecl::members, isTypedef ); +} + +ast::CompoundStmt const * EliminateTypedefCore::previsit( ast::CompoundStmt const * stmt ) { + return field_erase_if( stmt, &ast::CompoundStmt::kids, isTypedefStmt ); +} + +} // namespace + +/// Removes TypedefDecl nodes from the AST. +void eliminateTypedef( ast::TranslationUnit & translationUnit ) { + ast::Pass::run( translationUnit ); + erase_if( translationUnit.decls, isTypedef ); +} + +} // namespace Validate + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/EliminateTypedef.hpp =================================================================== --- src/Validate/EliminateTypedef.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/EliminateTypedef.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,33 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// EliminateTypedef.hpp -- Removes TypedefDecl nodes from the AST. +// +// Author : Andrew Beach +// Created On : Wed Apr 20 16:35:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Wed Apr 20 16:38:00 2022 +// Update Count : 0 +// + +#pragma once + +namespace ast { + class TranslationUnit; +} + +namespace Validate { + +/// Removes TypedefDecl nodes from the AST. +void eliminateTypedef( ast::TranslationUnit & translationUnit ); + +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/FixQualifiedTypes.cpp =================================================================== --- src/Validate/FixQualifiedTypes.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/FixQualifiedTypes.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,106 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// FixQualifiedTypes.cpp -- +// +// Author : Andrew Beach +// Created On : Thr Apr 21 11:13:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Fri Apr 22 11:36:00 2022 +// Update Count : 0 +// + +#include "Validate/FixQualifiedTypes.hpp" + +#include "AST/Pass.hpp" +#include "AST/TranslationUnit.hpp" +#include "Validate/NoIdSymbolTable.hpp" + +namespace Validate { + +namespace { + +struct FixQualifiedTypesCore : + public WithNoIdSymbolTable, public ast::WithGuards { + CodeLocation const * location = nullptr; + + void previsit( ast::ParseNode const * node ) { + GuardValue( location ) = &node->location; + } + + ast::Type const * postvisit( ast::QualifiedType const * type ) { + assert( location ); + + ast::ptr const & parent = type->parent; + ast::ptr const & child = type->child; + if ( parent.as() ) { + // .T => lookup T at global scope. + if ( auto inst = child.as() ) { + auto td = symtab.globalLookupType( inst->name ); + if ( !td ) { + SemanticError( *location, toString("Use of undefined global type ", inst->name) ); + } + auto base = td->base; + assert( base ); + ast::Type * ret = ast::deepCopy( base ); + ret->qualifiers = type->qualifiers; + return ret; + } else { + // .T => T is not a type name. + assertf( false, "unhandled global qualified child type: %s", toCString(child) ); + } + } else { + // S.T => S must be an aggregate type, find the declaration for T in S. + ast::AggregateDecl const * aggr = nullptr; + ast::BaseInstType const * instp = nullptr; + if ( auto inst = parent.as() ) { + aggr = inst->base; + instp = inst; + } else if ( auto inst = parent.as() ) { + aggr = inst->base; + instp = inst; + } else { + SemanticError( *location, toString("Qualified type requires an aggregate on the left, but has: ", parent) ); + } + // TODO: Need to handle forward declarations. + assert( aggr ); + for ( ast::ptr const & member : aggr->members ) { + if ( auto inst = child.as() ) { + if ( auto decl = member.as() ) { + if ( decl->name == inst->name ) { + assert( decl->base ); + ast::Type * ret = ast::deepCopy( decl->base ); + ret->qualifiers = type->qualifiers; + ast::TypeSubstitution sub( aggr->params, instp->params ); + // = parent->genericSubstitution(); + auto result = sub.apply(ret); + return result.node.release(); + } + } + } else { + // S.T - S is not an aggregate => error. + assertf( false, "unhandled qualified child type: %s", toCString(type) ); + } + } + // failed to find a satisfying definition of type + SemanticError( *location, toString("Undefined type in qualified type: ", type) ); + } + } +}; + +} // namespace + +void fixQualifiedTypes( ast::TranslationUnit & translationUnit ) { + ast::Pass::run( translationUnit ); +} + +} // namespace Validate + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/FixQualifiedTypes.hpp =================================================================== --- src/Validate/FixQualifiedTypes.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/FixQualifiedTypes.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,32 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// FixQualifiedTypes.hpp -- +// +// Author : Andrew Beach +// Created On : Thr Apr 21 11:11:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Apr 21 11:11:00 2022 +// Update Count : 0 +// + +#pragma once + +namespace ast { + class TranslationUnit; +} + +namespace Validate { + +void fixQualifiedTypes( ast::TranslationUnit & translationUnit ); + +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/ForallPointerDecay.cpp =================================================================== --- src/Validate/ForallPointerDecay.cpp (revision 4ec9513d69051bd7c1fc15bed54720534c629acf) +++ src/Validate/ForallPointerDecay.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -10,6 +10,6 @@ // Created On : Tue Dec 7 16:15:00 2021 // Last Modified By : Andrew Beach -// Last Modified On : Fri Feb 11 10:59:00 2022 -// Update Count : 0 +// Last Modified On : Sat Apr 23 13:10:00 2022 +// Update Count : 1 // @@ -237,4 +237,9 @@ } +std::vector> expandAssertions( + std::vector> const & old ) { + return TraitExpander::expandAssertions( old ); +} + } // namespace Validate Index: src/Validate/ForallPointerDecay.hpp =================================================================== --- src/Validate/ForallPointerDecay.hpp (revision 4ec9513d69051bd7c1fc15bed54720534c629acf) +++ src/Validate/ForallPointerDecay.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -10,11 +10,15 @@ // Created On : Tue Dec 7 16:15:00 2021 // Last Modified By : Andrew Beach -// Last Modified On : Tue Dec 8 11:50:00 2021 -// Update Count : 0 +// Last Modified On : Sat Apr 23 13:13:00 2022 +// Update Count : 1 // #pragma once +#include +#include "AST/Node.hpp" + namespace ast { + class DeclWithType; class TranslationUnit; } @@ -27,4 +31,8 @@ void decayForallPointers( ast::TranslationUnit & transUnit ); +/// Expand all traits in an assertion list. +std::vector> expandAssertions( + std::vector> const & ); + } Index: src/Validate/GenericParameter.cpp =================================================================== --- src/Validate/GenericParameter.cpp (revision 4ec9513d69051bd7c1fc15bed54720534c629acf) +++ src/Validate/GenericParameter.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -10,6 +10,6 @@ // Created On : Fri Mar 21 10:02:00 2022 // Last Modified By : Andrew Beach -// Last Modified On : Wed Apr 13 10:09:00 2022 -// Update Count : 0 +// Last Modified On : Fri Apr 22 16:43:00 2022 +// Update Count : 1 // @@ -22,4 +22,5 @@ #include "AST/TranslationUnit.hpp" #include "AST/Type.hpp" +#include "Validate/NoIdSymbolTable.hpp" namespace Validate { @@ -138,31 +139,6 @@ // -------------------------------------------------------------------------- -// A SymbolTable that only has the operations used in the Translate Dimension -// pass. More importantly, it doesn't have some methods that should no be -// called by the Pass template (lookupId and addId). -class NoIdSymbolTable { - ast::SymbolTable base; -public: -# define FORWARD_X( func, types_and_names, just_names ) \ - inline auto func types_and_names -> decltype( base.func just_names ) { \ - return base.func just_names ; \ - } -# define FORWARD_0( func ) FORWARD_X( func, (), () ) -# define FORWARD_1( func, type ) FORWARD_X( func, (type arg), (arg) ) -# define FORWARD_2( func, t0, t1 ) FORWARD_X( func, (t0 a0, t1 a1), (a0, a1) ) - - FORWARD_0( enterScope ) - FORWARD_0( leaveScope ) - FORWARD_1( lookupType, const std::string & ) - FORWARD_1( addType , const ast::NamedTypeDecl * ) - FORWARD_1( addStruct , const ast::StructDecl * ) - FORWARD_1( addEnum , const ast::EnumDecl * ) - FORWARD_1( addUnion , const ast::UnionDecl * ) - FORWARD_1( addTrait , const ast::TraitDecl * ) - FORWARD_2( addWith , const std::vector< ast::ptr > &, const ast::Decl * ) -}; - -struct TranslateDimensionCore : public ast::WithGuards { - NoIdSymbolTable symtab; +struct TranslateDimensionCore : + public WithNoIdSymbolTable, public ast::WithGuards { // SUIT: Struct- or Union- InstType Index: src/Validate/HoistStruct.cpp =================================================================== --- src/Validate/HoistStruct.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/HoistStruct.cpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,145 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// HoistStruct.cpp -- Flattens nested type declarations. +// +// Author : Andrew Beach +// Created On : Thr Apr 21 10:34:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Apr 21 10:34:00 2022 +// Update Count : 0 +// + +#include "Validate/HoistStruct.hpp" + +#include "AST/Pass.hpp" +#include "AST/TranslationUnit.hpp" +#include "Common/utility.h" + +namespace Validate { + +namespace { + +bool shouldHoist( ast::Decl const * decl ) { + return dynamic_cast< ast::StructDecl const * >( decl ) + || dynamic_cast< ast::UnionDecl const * >( decl ) + || dynamic_cast< ast::StaticAssertDecl const * >( decl ); +} + +/* This pass also does some renaming and internal field alteration, but the + * complex part is the actual hoisting. Hoisted declarations should always + * appear before the declaration they are hoisted out of and if two types are + * nested in the same declaration their order should not change. + */ +struct HoistStructCore final : + public ast::WithDeclsToAdd<>, public ast::WithGuards { + ast::StructDecl const * previsit( ast::StructDecl const * decl ); + ast::StructDecl const * postvisit( ast::StructDecl const * decl ); + ast::UnionDecl const * previsit( ast::UnionDecl const * decl ); + ast::UnionDecl const * postvisit( ast::UnionDecl const * decl ); + ast::StructInstType const * previsit( ast::StructInstType const * type ); + ast::UnionInstType const * previsit( ast::UnionInstType const * type ); + ast::EnumInstType const * previsit( ast::EnumInstType const * type ); + +private: + template + AggrDecl const * preAggregate( AggrDecl const * ); + template + AggrDecl const * postAggregate( AggrDecl const * ); + + ast::AggregateDecl const * parent = nullptr; +}; + +void qualifiedName( ast::AggregateDecl const * decl, std::ostringstream & ss ) { + if ( decl->parent ) { + qualifiedName( decl->parent, ss ); + } + ss << "__" << decl->name; +} + +std::string qualifiedName( ast::AggregateDecl const * decl ) { + std::ostringstream ss; + qualifiedName( decl, ss ); + return ss.str(); +} + +template +AggrDecl const * HoistStructCore::preAggregate( AggrDecl const * decl ) { + if ( parent ) { + auto mut = ast::mutate( decl ); + mut->parent = parent; + mut->name = qualifiedName( mut ); + return mut; + } else { + GuardValue( parent ) = decl; + return decl; + } +} + +template +AggrDecl const * HoistStructCore::postAggregate( AggrDecl const * decl ) { + auto mut = ast::mutate( decl ); + for ( auto it = mut->members.begin() ; it != mut->members.end() ; ) { + if ( shouldHoist( *it ) ) { + // This is the place where the actual hoisting happens. + declsToAddBefore.push_back( it->get() ); + it = mut->members.erase( it ); + } else { + ++it; + } + } + return mut; +} + +ast::StructDecl const * HoistStructCore::previsit( ast::StructDecl const * decl ) { + return preAggregate( decl ); +} + +ast::StructDecl const * HoistStructCore::postvisit( ast::StructDecl const * decl ) { + return postAggregate( decl ); +} + +ast::UnionDecl const * HoistStructCore::previsit( ast::UnionDecl const * decl ) { + return preAggregate( decl ); +} + +ast::UnionDecl const * HoistStructCore::postvisit( ast::UnionDecl const * decl ) { + return postAggregate( decl ); +} + +template +InstType const * preInstType( InstType const * type ) { + assert( type->base ); + auto mut = ast::mutate( type ); + mut->name = mut->base->name; + return mut; +} + +ast::StructInstType const * HoistStructCore::previsit( ast::StructInstType const * type ) { + return preInstType( type ); +} + +ast::UnionInstType const * HoistStructCore::previsit( ast::UnionInstType const * type ) { + return preInstType( type ); +} + +ast::EnumInstType const * HoistStructCore::previsit( ast::EnumInstType const * type ) { + return preInstType( type ); +} + +} // namespace + +void hoistStruct( ast::TranslationUnit & translationUnit ) { + ast::Pass::run( translationUnit ); +} + +} // namespace Validate + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/HoistStruct.hpp =================================================================== --- src/Validate/HoistStruct.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/HoistStruct.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,33 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// HoistStruct.hpp -- Flattens nested type declarations. +// +// Author : Andrew Beach +// Created On : Thr Apr 21 10:33:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Apr 21 10:39:00 2022 +// Update Count : 0 +// + +#pragma once + +namespace ast { + class TranslationUnit; +} + +namespace Validate { + +/// Flattens nested type declarations. +void hoistStruct( ast::TranslationUnit & translationUnit ); + +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/NoIdSymbolTable.hpp =================================================================== --- src/Validate/NoIdSymbolTable.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) +++ src/Validate/NoIdSymbolTable.hpp (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -0,0 +1,70 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// NoIdSymbolTable.hpp -- Special WithSymbolTable variant ast::Pass helper. +// +// Author : Andrew Beach +// Created On : Thr Apr 21 11:57:00 2022 +// Last Modified By : Andrew Beach +// Last Modified On : Thr Apr 21 11:57:00 2022 +// Update Count : 0 +// + +#pragma once + +#include "AST/SymbolTable.hpp" + +namespace Validate { + +// A SymbolTable that only has the operations used in the Translate Dimension +// pass. More importantly, it doesn't have some methods that should no be +// called by the Pass template (lookupId and addId). +class NoIdSymbolTable { + ast::SymbolTable base; +public: +# define FORWARD_X( func, types_and_names, just_names ) \ + inline auto func types_and_names -> decltype( base.func just_names ) { \ + return base.func just_names ; \ + } +# define FORWARD_0( func ) FORWARD_X( func, (), () ) +# define FORWARD_1( func, type ) FORWARD_X( func, (type arg), (arg) ) +# define FORWARD_2( func, t0, t1 ) FORWARD_X( func, (t0 a0, t1 a1), (a0, a1) ) + + FORWARD_0( enterScope ) + FORWARD_0( leaveScope ) + FORWARD_1( lookupType , const std::string & ) + FORWARD_1( lookupStruct, const std::string & ) + FORWARD_1( lookupEnum , const std::string & ) + FORWARD_1( lookupUnion , const std::string & ) + FORWARD_1( lookupTrait , const std::string & ) + FORWARD_1( addType , const ast::NamedTypeDecl * ) + FORWARD_1( addStruct, const ast::StructDecl * ) + FORWARD_1( addEnum , const ast::EnumDecl * ) + FORWARD_1( addUnion , const ast::UnionDecl * ) + FORWARD_1( addTrait , const ast::TraitDecl * ) + FORWARD_1( addStruct, const std::string & ) + FORWARD_1( addUnion , const std::string & ) + FORWARD_2( addWith , const std::vector< ast::ptr > &, const ast::Decl * ) + + FORWARD_1( globalLookupType, const std::string & ) + +# undef FORWARD_2 +# undef FORWARD_1 +# undef FORWARD_0 +# undef FORWARD_X +}; + +struct WithNoIdSymbolTable { + NoIdSymbolTable symtab; +}; + +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/Validate/module.mk =================================================================== --- src/Validate/module.mk (revision 4ec9513d69051bd7c1fc15bed54720534c629acf) +++ src/Validate/module.mk (revision 298fe57025894ebcfae9883bdbc21d0e39e12ee8) @@ -20,4 +20,8 @@ Validate/CompoundLiteral.cpp \ Validate/CompoundLiteral.hpp \ + Validate/EliminateTypedef.cpp \ + Validate/EliminateTypedef.hpp \ + Validate/FixQualifiedTypes.cpp \ + Validate/FixQualifiedTypes.hpp \ Validate/ForallPointerDecay.cpp \ Validate/ForallPointerDecay.hpp \ @@ -26,8 +30,11 @@ Validate/HandleAttributes.cc \ Validate/HandleAttributes.h \ + Validate/HoistStruct.cpp \ + Validate/HoistStruct.hpp \ Validate/InitializerLength.cpp \ Validate/InitializerLength.hpp \ Validate/LabelAddressFixer.cpp \ Validate/LabelAddressFixer.hpp \ + Validate/NoIdSymbolTable.hpp \ Validate/ReturnCheck.cpp \ Validate/ReturnCheck.hpp \