Changeset 2a301ff for src/GenPoly

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• ErasableScopedMap.h (modified) (2 diffs)
• ScopedSet.h (modified) (8 diffs)
• SpecializeNew.cpp (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -1538 +1538 @@
                 }
 
+                /// Checks if memberDecl matches the decl from an aggregate.
+                bool isMember( DeclarationWithType *memberDecl, Declaration * decl ) {
+                        if ( memberDecl->get_name() != decl->get_name() )
+                                return false;
+
+                        if ( memberDecl->get_name().empty() ) {
+                                // Plan-9 Field: match on unique_id.
+                                return ( memberDecl->get_uniqueId() == decl->get_uniqueId() );
+                        }
+
+                        DeclarationWithType *declWithType = strict_dynamic_cast< DeclarationWithType* >( decl );
+
+                        if ( memberDecl->get_mangleName().empty() || declWithType->get_mangleName().empty() ) {
+                                // Tuple-Element Field: expect neither had mangled name; accept match on simple name (like field_2) only.
+                                assert( memberDecl->get_mangleName().empty() && declWithType->get_mangleName().empty() );
+                                return true;
+                        }
+
+                        // Ordinary Field: Use full name to accommodate overloading.
+                        return ( memberDecl->get_mangleName() == declWithType->get_mangleName() );
+                }
+
                 /// Finds the member in the base list that matches the given declaration; returns its index, or -1 if not present
                 long findMember( DeclarationWithType *memberDecl, std::list< Declaration* > &baseDecls ) {
                         for ( auto pair : enumerate( baseDecls ) ) {
-                                Declaration * decl = pair.val;
-                                size_t i = pair.idx;
-                                if ( memberDecl->get_name() != decl->get_name() )
-                                        continue;
-
-                                if ( memberDecl->get_name().empty() ) {
-                                        // plan-9 field: match on unique_id
-                                        if ( memberDecl->get_uniqueId() == decl->get_uniqueId() )
-                                                return i;
-                                        else
-                                                continue;
-                                }
-
-                                DeclarationWithType *declWithType = strict_dynamic_cast< DeclarationWithType* >( decl );
-
-                                if ( memberDecl->get_mangleName().empty() || declWithType->get_mangleName().empty() ) {
-                                        // tuple-element field: expect neither had mangled name; accept match on simple name (like field_2) only
-                                        assert( memberDecl->get_mangleName().empty() && declWithType->get_mangleName().empty() );
-                                        return i;
-                                }
-
-                                // ordinary field: use full name to accommodate overloading
-                                if ( memberDecl->get_mangleName() == declWithType->get_mangleName() )
-                                        return i;
-                                else
-                                        continue;
+                                if ( isMember( memberDecl, pair.val ) ) {
+                                        return pair.idx;
+                                }
                         }
                         return -1;

src/GenPoly/ErasableScopedMap.h

@@ -57 +57 @@
         /// Starts a new scope
         void beginScope() {
-                Scope scope;
-                scopes.push_back(scope);
+                scopes.emplace_back();
         }
 
@@ -145 +144 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ErasableScopedMap;
-        typedef typename std::map< Key, Value >::iterator wrapped_iterator;
-        typedef typename std::vector< std::map< Key, Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item

src/GenPoly/ScopedSet.h

@@ -47 +47 @@
         /// Starts a new scope
         void beginScope() {
-                Scope scope;
-                scopes.push_back(scope);
+                scopes.emplace_back();
         }
 
@@ -85 +84 @@
         iterator findNext( const_iterator &it, const Value &key ) {
                 if ( it.i == 0 ) return end();
-                        for ( size_type i = it.i - 1; ; --i ) {
+                for ( size_type i = it.i - 1; ; --i ) {
                         typename Scope::iterator val = scopes[i].find( key );
                         if ( val != scopes[i].end() ) return iterator( scopes, val, i );
@@ -112 +111 @@
         friend class ScopedSet;
         friend class const_iterator;
-        typedef typename std::set< Value >::iterator wrapped_iterator;
-        typedef typename std::vector< std::set< Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -133 +131 @@
         }
 
-        iterator(scope_list const &_scopes, const wrapped_iterator &_it, size_type _i)
+        iterator(ScopeList const &_scopes, const wrapped_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -176 +174 @@
 
 private:
-        scope_list const *scopes;
+        ScopeList const *scopes;
         wrapped_iterator it;
         size_type i;
@@ -185 +183 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ScopedSet;
-        typedef typename std::set< Value >::iterator wrapped_iterator;
-        typedef typename std::set< Value >::const_iterator wrapped_const_iterator;
-        typedef typename std::vector< std::set< Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename Scope::const_iterator wrapped_const_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -207 +204 @@
         }
 
-        const_iterator(scope_list const &_scopes, const wrapped_const_iterator &_it, size_type _i)
+        const_iterator(ScopeList const &_scopes, const wrapped_const_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -255 +252 @@
 
 private:
-        scope_list const *scopes;
+        ScopeList const *scopes;
         wrapped_const_iterator it;
         size_type i;

src/GenPoly/SpecializeNew.cpp

@@ -104 +104 @@
 
 bool needsPolySpecialization(
-                const ast::Type * formalType,
+                const ast::Type * /*formalType*/,
                 const ast::Type * actualType,
                 const ast::TypeSubstitution * subs ) {
@@ -126 +126 @@
                         if ( closedVars.find( *inst ) == closedVars.end() ) {
                                 return true;
-                        }
-                        else {
+                        } else {
                                 assertf(false, "closed: %s", inst->name.c_str());
                         }