Changeset 981bdc6 for src/SymTab

Timestamp:

Jan 12, 2017, 2:05:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

File:

• src/SymTab/Mangler.h (modified) (2 diffs)

src/SymTab/Mangler.h

@@ -27 +27 @@
                 /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true );
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false );
                 /// Mangle a type name; secondary interface
                 static std::string mangleType( Type* ty );
@@ -70 +70 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
-                Mangler mangler( mangleOverridable, false );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode ) {
+                Mangler mangler( mangleOverridable, typeMode );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();