Changeset 78dd0da for src/SymTab

Timestamp:

Dec 15, 2015, 2:56:43 PM (9 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:

4389966, ffad73a

Parents:

5e92fee

Message:

Switched size/align parameters over to use SymTab::Mangler in preparation for addition of generic types

Location:

src/SymTab

Files:

• Mangler.cc (modified) (4 diffs)
• Mangler.h (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -30 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {
-        }
-
-//Mangler::Mangler( const Mangler & )
-//  : mangleName(), varNums( varNums ), nextVarNum( nextVarNum ), isTopLevel( isTopLevel )
-//{
-//}
+        Mangler::Mangler( bool mangleOverridable, bool includeQualifiers )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), includeQualifiers(includeQualifiers) {}
+                
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
                 varNums = rhs.varNums;
@@ -42 +38 @@
                 isTopLevel = rhs.isTopLevel;
                 mangleOverridable = rhs.mangleOverridable;
+                includeQualifiers = rhs.includeQualifiers;
         }
 
@@ -209 +206 @@
 
         void Mangler::printQualifiers( Type *type ) {
+                // skip if not including qualifiers
+                if ( ! includeQualifiers ) return;
+                
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
@@ -227 +227 @@
                                 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                        Mangler sub_mangler( mangleOverridable );
+                                        Mangler sub_mangler( mangleOverridable, includeQualifiers );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;

src/SymTab/Mangler.h

@@ -22 +22 @@
 
 namespace SymTab {
+        /// Mangles names to a unique C identifier
         class Mangler : public Visitor {
           public:
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true ); // interface to clients
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool includeQualifiers = true ); // interface to clients
 
-///   using Visitor::visit;
                 virtual void visit( ObjectDecl *declaration );
                 virtual void visit( FunctionDecl *declaration );
@@ -45 +45 @@
                 std::string get_mangleName() { return mangleName.str(); }
           private:
-                std::ostringstream mangleName;
+                std::ostringstream mangleName;  ///< Mangled name being constructed
                 typedef std::map< std::string, std::pair< int, int > > VarMapType;
-                VarMapType varNums;
-                int nextVarNum;
-                bool isTopLevel;
-                bool mangleOverridable;
+                VarMapType varNums;             ///< Map of type variables to indices
+                int nextVarNum;                 ///< Next type variable index
+                bool isTopLevel;                ///< Is the Mangler at the top level
+                bool mangleOverridable;         ///< Specially mangle overridable built-in methods
+                bool includeQualifiers;         ///< Include type qualifiers in mangled name
   
-                Mangler( bool mangleOverridable );
+                Mangler( bool mangleOverridable, bool includeQualifiers );
                 Mangler( const Mangler & );
   
@@ -62 +63 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
-                Mangler mangler( mangleOverridable );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool includeQualifiers ) {
+                Mangler mangler( mangleOverridable, includeQualifiers );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();