Changeset 8c49c0e for src/ResolvExpr

Timestamp:

Sep 19, 2016, 4:39:33 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

aefcc3b

Parents:

3c13c03

Message:

decouple code that uses Type's forall list from std::list in preparation for trying to replace with a managed list

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• FindOpenVars.cc (modified) (3 diffs)
• RenameVars.cc (modified) (2 diffs)
• TypeEnvironment.cc (modified) (1 diff)
• TypeEnvironment.h (modified) (1 diff)
• Unify.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -362 +362 @@
         /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
-                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         unifiableVars[ (*tyvar)->get_name() ] = (*tyvar)->get_kind();
                         for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {

src/ResolvExpr/FindOpenVars.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FindOpenVars.cc -- 
+// FindOpenVars.cc --
 //
 // Author           : Richard C. Bilson
@@ -47 +47 @@
         void FindOpenVars::common_action( Type *type ) {
                 if ( nextIsOpen ) {
-                        for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 openVars[ (*i)->get_name() ] = (*i)->get_kind();
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {
@@ -56 +56 @@
                         }
                 } else {
-                        for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 closedVars[ (*i)->get_name() ] = (*i)->get_kind();
                                 for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) {

src/ResolvExpr/RenameVars.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// RenameVars.cc -- 
+// RenameVars.cc --
 //
 // Author           : Richard C. Bilson
@@ -115 +115 @@
                         mapStack.push_front( mapStack.front() );
                         // renames all "forall" type names to `_${level}_${name}'
-                        for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 std::ostringstream output;
                                 output << "_" << level << "_" << (*i)->get_name();

src/ResolvExpr/TypeEnvironment.cc

@@ -158 +158 @@
         }
 
-        void TypeEnvironment::add( const std::list< TypeDecl* > &tyDecls ) {
-                for ( std::list< TypeDecl* >::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
+        void TypeEnvironment::add( const Type::ForallList &tyDecls ) {
+                for ( Type::ForallList::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) {
                         EqvClass newClass;
                         newClass.vars.insert( (*i)->get_name() );

src/ResolvExpr/TypeEnvironment.h

@@ -55 +55 @@
                 bool lookup( const std::string &var, EqvClass &eqvClass ) const;
                 void add( const EqvClass &eqvClass );
-                void add( const std::list< TypeDecl* > &tyDecls );
+                void add( const Type::ForallList &tyDecls );
                 template< typename SynTreeClass > int apply( SynTreeClass *&type ) const;
                 template< typename SynTreeClass > int applyFree( SynTreeClass *&type ) const;

src/ResolvExpr/Unify.cc

@@ -416 +416 @@
 
         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 ( Type::ForallList::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 );