Changeset 58fe85a for src/ResolvExpr/FindOpenVars.cc

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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:

Merge branch 'master' into park_unpark

File:

• src/ResolvExpr/FindOpenVars.cc (modified) (1 diff)

src/ResolvExpr/FindOpenVars.cc

@@ -112 +112 @@
                                 // mark open/closed variables
                                 if ( nextIsOpen ) {
-                                        for ( const ast::TypeDecl * decl : type->forall ) {
-                                                open[ decl->name ] = ast::TypeDecl::Data{ decl };
-                                                for ( const ast::DeclWithType * assert : decl->assertions ) {
-                                                        need[ assert ].isUsed = false;
-                                                }
+                                        for ( auto & decl : type->forall ) {
+                                                open[ *decl ] = ast::TypeDecl::Data{ decl->base };
+                                        }
+                                        for ( auto & assert : type->assertions ) {
+                                                need[ assert ].isUsed = false;
                                         }
                                 } else {
-                                        for ( const ast::TypeDecl * decl : type->forall ) {
-                                                closed[ decl->name ] = ast::TypeDecl::Data{ decl };
-                                                for ( const ast::DeclWithType * assert : decl->assertions ) {
-                                                        have[ assert ].isUsed = false;
-                                                }
+                                        for ( auto & decl : type->forall ) {
+                                                closed[ *decl ] = ast::TypeDecl::Data{ decl->base };    
+                                        }
+                                        for ( auto & assert : type->assertions ) {
+                                                have[ assert ].isUsed = false;
                                         }
                                 }