Changeset 7e23d0a for src/SymTab/Mangler.h

Timestamp:

Nov 25, 2015, 2:53:26 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

32d281d, 704c9dd

Parents:

02ec390 (diff), 5189888 (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.h (modified) (4 diffs)

src/SymTab/Mangler.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:44:03 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:47:14 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 19 15:48:46 2015
+// Update Count     : 14
 //
 
@@ -25 +25 @@
           public:
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl ); // interface to clients
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true ); // interface to clients
 
 ///   using Visitor::visit;
@@ -50 +50 @@
                 int nextVarNum;
                 bool isTopLevel;
+                bool mangleOverridable;
   
-                Mangler();
+                Mangler( bool mangleOverridable );
                 Mangler( const Mangler & );
   
@@ -61 +62 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl ) {
-                Mangler mangler;
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
+                Mangler mangler( mangleOverridable );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();