Changeset f8d05ee for src/SymTab

Timestamp:

Aug 12, 2020, 12:19:39 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

74807be, fb0ae06

Parents:

7f66cec (diff), 7ff3e522 (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 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

Location:

src/SymTab

Files:

• FixFunction.cc (modified) (1 diff)
• Mangler.cc (modified) (2 diffs)

src/SymTab/FixFunction.cc

@@ -141 +141 @@
         ast::Pass< FixFunction_new > fixer;
         dwt = dwt->accept( fixer );
-        isVoid |= fixer.pass.isVoid;
+        isVoid |= fixer.core.isVoid;
         return dwt;
 }

src/SymTab/Mangler.cc

@@ -447 +447 @@
                 ast::Pass<Mangler_new> mangler( mode );
                 maybeAccept( decl, mangler );
-                return mangler.pass.get_mangleName();
+                return mangler.core.get_mangleName();
         }
 
@@ -691 +691 @@
                                                                 mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
                                                         assert->accept( sub_mangler );
-                                                        assertionNames.push_back( sub_mangler.pass.get_mangleName() );
+                                                        assertionNames.push_back( sub_mangler.core.get_mangleName() );
                                                         acount++;
                                                 } // for