Changeset 80eefcb

Timestamp:

Feb 14, 2019, 11:14:50 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

no_list

Children:

99614c2

Parents:

8d25360

Message:

Forall list now uses vector

Location:

src

Files:

• ResolvExpr/Unify.cc (modified) (1 diff)
• SymTab/Demangle.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (2 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Type.h (modified) (3 diffs)

src/ResolvExpr/Unify.cc

@@ -282 +282 @@
 
         void markAssertions( AssertionSet &assertion1, AssertionSet &assertion2, Type *type ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
-                        for ( std::list< DeclarationWithType* >::const_iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
-                                markAssertionSet( assertion1, *assert );
-                                markAssertionSet( assertion2, *assert );
+                for ( auto tyvar : type->get_forall() ) {
+                        for ( auto assert : tyvar->get_assertions() ) {
+                                markAssertionSet( assertion1, assert );
+                                markAssertionSet( assertion2, assert );
                         } // for
                 } // for

src/SymTab/Demangle.cc

@@ -543 +543 @@
                                 if (done()) return nullptr;
 
-                                std::list<TypeDecl *> forall;
+                                Type::ForallList forall;
                                 if (isPrefix(Encoding::forall)) {
                                         PRINT( std::cerr << "polymorphic with..." << std::endl; )

src/SymTab/Indexer.cc

@@ -674 +674 @@
         }
 
-        void Indexer::addTypes( const std::list< TypeDecl * > & tds ) {
+        void Indexer::addTypes( const Type::ForallList & tds ) {
                 for ( auto td : tds ) {
                         addType( td );

src/SymTab/Indexer.h

@@ -21 +21 @@
 #include <functional>         // for function
 
+#include "SynTree/Type.h"  // for AST nodes
+#include "SynTree/SynTree.h"  // for AST nodes
 #include "SynTree/Visitor.h"  // for Visitor
-#include "SynTree/SynTree.h"  // for AST nodes
 
 namespace ResolvExpr {
@@ -119 +120 @@
 
                 /// convenience function for adding a list of forall parameters to the indexer
-                void addTypes( const std::list< TypeDecl * > & tds );
+                void addTypes( const Type::ForallList & tds );
 
                 /// convenience function for adding all of the declarations in a function type to the indexer

src/SymTab/Validate.cc

@@ -808 +808 @@
 
         /// Fix up assertions - flattens assertion lists, removing all trait instances
-        void forallFixer( std::list< TypeDecl * > & forall, BaseSyntaxNode * node ) {
+        template<typename container_t>
+        void forallFixer( container_t & forall, BaseSyntaxNode * node ) {
                 for ( TypeDecl * type : forall ) {
-                        std::list< DeclarationWithType * > asserts;
-                        asserts.splice( asserts.end(), type->assertions );
+                        decltype(type->assertions) asserts;
+                        std::swap(asserts, type->assertions );
                         // expand trait instances into their members
                         for ( DeclarationWithType * assertion : asserts ) {

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 25 14:14:01 2017
-// Update Count     : 154
+// Last Modified On : Fri Feb  8 09:17:09 2019
+// Update Count     : 164
 //
 
@@ -18 +18 @@
 #include <strings.h>         // for ffs
 #include <cassert>           // for assert, assertf
-#include <list>              // for list, _List_iterator
+#include <list>
 #include <ostream>           // for ostream, operator<<, basic_ostream
 #include <string>            // for string
-#include <vector>
+#include <vector>            // for vector
 
 #include "BaseSyntaxNode.h"  // for BaseSyntaxNode
@@ -134 +134 @@
         }; // Qualifiers
 
-        typedef std::list<TypeDecl *> ForallList;
+        typedef std::vector<TypeDecl *> ForallList;
 
         Qualifiers tq;