Changeset aac5dfd for src/SymTab

Timestamp:

Dec 12, 2020, 7:30:31 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:

5d1aa2f

Parents:

6ce9a4f2 (diff), 4803a901 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Mangler.cc (modified) (1 diff)
• Validate.cc (modified) (1 diff)

src/SymTab/Mangler.cc

@@ -666 +666 @@
                         // skip if not including qualifiers
                         if ( typeMode ) return;
-                        if ( auto ptype = dynamic_cast< const ast::ParameterizedType * >(type) ) {
+                        if ( auto ptype = dynamic_cast< const ast::FunctionType * >(type) ) {
                                 if ( ! ptype->forall.empty() ) {
                                         std::list< std::string > assertionNames;

src/SymTab/Validate.cc

@@ -1793 +1793 @@
                 static const node_t * forallFixer(
                         const CodeLocation & loc, const node_t * node,
-                        ast::ParameterizedType::ForallList parent_t::* forallField
+                        ast::FunctionType::ForallList parent_t::* forallField
                 ) {
                         for ( unsigned i = 0; i < (node->* forallField).size(); ++i ) {