Changeset e9b5043 for src

Timestamp:

Feb 3, 2023, 3:11:51 PM (23 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

21a2a7d

Parents:

2f61765

Message:

Added contains to some of our containers. Also changed some code to use the new method.

Location:

src

Files:

• Common/ScopedMap.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (6 diffs)
• GenPoly/ErasableScopedMap.h (modified) (3 diffs)
• GenPoly/GenPoly.cc (modified) (4 diffs)
• GenPoly/ScopedSet.h (modified) (2 diffs)

src/Common/ScopedMap.h

@@ -181 +181 @@
                 return c;
         }
+
+        bool contains( const Key & key ) const {
+                return find( key ) != cend();
+        }
 };
 

src/GenPoly/Box.cc

@@ -488 +488 @@
                                 for ( FunctionType const * const funType : functions ) {
                                         std::string mangleName = mangleAdapterName( funType, scopeTyVars );
-                                        if ( adapters.find( mangleName ) == adapters.end() ) {
+                                        if ( !adapters.contains( mangleName ) ) {
                                                 std::string adapterName = makeAdapterName( mangleName );
                                                 adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, new ObjectDecl( adapterName, Type::StorageClasses(), LinkageSpec::C, nullptr, new PointerType( Type::Qualifiers(), makeAdapterType( funType, scopeTyVars ) ), nullptr ) ) );
@@ -1487 +1487 @@
                                         if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
                                                 // do not try to monomorphize generic parameters
-                                                if ( scopeTyVars.find( typeInst->get_name() ) != scopeTyVars.end() && ! genericParams.count( typeInst->name ) ) {
+                                                if ( scopeTyVars.contains( typeInst->get_name() ) && ! genericParams.count( typeInst->name ) ) {
                                                         // polymorphic aggregate members should be converted into monomorphic members.
                                                         // Using char[size_T] here respects the expected sizing rules of an aggregate type.
@@ -1696 +1696 @@
 
                         if ( auto typeInst = dynamic_cast< TypeInstType const * >( ty ) ) {
-                                if ( scopeTyVars.find( typeInst->get_name() ) != scopeTyVars.end() ) {
+                                if ( scopeTyVars.contains( typeInst->get_name() ) ) {
                                         // NOTE assumes here that getting put in the scopeTyVars included having the layout variables set
                                         return true;
@@ -1704 +1704 @@
                                 // check if this type already has a layout generated for it
                                 std::string typeName = mangleType( ty );
-                                if ( knownLayouts.find( typeName ) != knownLayouts.end() ) return true;
+                                if ( knownLayouts.contains( typeName ) ) return true;
 
                                 // check if any of the type parameters have dynamic layout; if none do, this type is (or will be) monomorphized
@@ -1741 +1741 @@
                                 // check if this type already has a layout generated for it
                                 std::string typeName = mangleType( ty );
-                                if ( knownLayouts.find( typeName ) != knownLayouts.end() ) return true;
+                                if ( knownLayouts.contains( typeName ) ) return true;
 
                                 // check if any of the type parameters have dynamic layout; if none do, this type is (or will be) monomorphized
@@ -1832 +1832 @@
                         } else {
                                 std::string offsetName = offsetofName( mangleType( ty ) );
-                                if ( knownOffsets.find( offsetName ) != knownOffsets.end() ) {
+                                if ( knownOffsets.contains( offsetName ) ) {
                                         // use the already-generated offsets for this type
                                         ret = new NameExpr( offsetName );

src/GenPoly/ErasableScopedMap.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScopedMap.h --
+// ErasableScopedMap.h --
 //
 // Author           : Aaron B. Moss
@@ -118 +118 @@
         std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
 
+        Value& operator[] ( const Key &key ) {
+                iterator slot = find( key );
+                if ( slot != end() ) return slot->second;
+                return insert( key, Value() ).first->second;
+        }
+
         /// Marks the given element as erased from this scope inward; returns 1 for erased an element, 0 otherwise
         size_type erase( const Key &key ) {
@@ -130 +136 @@
         }
 
-        Value& operator[] ( const Key &key ) {
-                iterator slot = find( key );
-                if ( slot != end() ) return slot->second;
-                return insert( key, Value() ).first->second;
+        bool contains( const Key & key ) const {
+                return find( key ) != cend();
         }
 };

src/GenPoly/GenPoly.cc

@@ -172 +172 @@
 
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
+                        if ( tyVars.contains( typeInst->get_name() ) ) {
                                 return type;
                         }
@@ -189 +189 @@
 
                 if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                        return tyVars.find(typeInst->typeString()) != tyVars.end() ? type : nullptr;
+                        if ( tyVars.contains( typeInst->typeString() ) ) return type;
                 } else if ( auto arrayType = dynamic_cast< const ast::ArrayType * >( type ) ) {
                         return isPolyType( arrayType->base, env );
@@ -205 +205 @@
 
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                if ( typeVars.find( *inst ) != typeVars.end() ) return type;
+                if ( typeVars.contains( *inst ) ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 return isPolyType( array->base, subst );
@@ -393 +393 @@
 
                 if ( TypeInstType *typeInstType = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( tyVars.find( typeInstType->get_name() ) != tyVars.end() ) {
+                        if ( tyVars.contains( typeInstType->get_name() ) ) {
                                 return true;
                         }

src/GenPoly/ScopedSet.h

@@ -29 +29 @@
         typedef std::vector< Scope > ScopeList;
 
-        ScopeList scopes; ///< scoped list of sets
+        /// Scoped list of sets.
+        ScopeList scopes;
 public:
         typedef typename Scope::key_type key_type;
@@ -100 +101 @@
                 return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
         }
+
+        bool contains( const Value & key ) const {
+                return find( key ) != cend();
+        }
 };