Changeset 63be3387 for src/SymTab/Mangler.cc

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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

File:

• src/SymTab/Mangler.cc (modified) (4 diffs)

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 21:56:06 2021
-// Update Count     : 74
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Oct 21 16:18:00 2022
+// Update Count     : 75
 //
 #include "Mangler.h"
@@ -418 +418 @@
                         void postvisit( const ast::QualifiedType * qualType );
 
-                        std::string get_mangleName() { return mangleName; }
+                        /// The result is the current constructed mangled name.
+                        std::string result() const { return mangleName; }
                   private:
                         std::string mangleName;         ///< Mangled name being constructed
@@ -444 +445 @@
         } // namespace
 
-
         std::string mangle( const ast::Node * decl, Mangle::Mode mode ) {
-                ast::Pass<Mangler_new> mangler( mode );
-                maybeAccept( decl, mangler );
-                return mangler.core.get_mangleName();
+                return ast::Pass<Mangler_new>::read( decl, mode );
         }
 
@@ -689 +687 @@
                                         } // for
                                         for ( auto & assert : ptype->assertions ) {
-                                                ast::Pass<Mangler_new> sub_mangler(
-                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
-                                                assert->var->accept( sub_mangler );
-                                                assertionNames.push_back( sub_mangler.core.get_mangleName() );
+                                                assertionNames.push_back( ast::Pass<Mangler_new>::read(
+                                                        assert->var.get(),
+                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums ) );
                                                 acount++;
                                         } // for