Changeset ae63a18 for src/SymTab

Timestamp:

Dec 18, 2015, 2:56:11 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

8762501

Parents:

baf7fee (diff), c23f807 (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:

resolving conflicts

Location:

src/SymTab

Files:

• Mangler.cc (modified) (5 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 )
-//{
-//}
+        std::string Mangler::mangleType( Type *ty ) {
+                Mangler mangler( false, true );
+                maybeAccept( ty, mangler );
+                return mangler.get_mangleName();
+        }
+        
+        Mangler::Mangler( bool mangleOverridable, bool typeMode )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
+                
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
                 varNums = rhs.varNums;
@@ -42 +44 @@
                 isTopLevel = rhs.isTopLevel;
                 mangleOverridable = rhs.mangleOverridable;
+                typeMode = rhs.typeMode;
         }
 
@@ -152 +155 @@
         void Mangler::mangleRef( ReferenceToType *refType, std::string prefix ) {
                 printQualifiers( refType );
+
                 mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
         }
 
+        void Mangler::mangleGenericRef( ReferenceToType *refType, std::string prefix ) {
+                printQualifiers( refType );
+
+                std::ostringstream oldName( mangleName.str() );
+                mangleName.clear();
+
+                mangleName << prefix << refType->get_name();
+
+                std::list< Expression* >& params = refType->get_parameters();
+                if ( ! params.empty() ) {
+                        mangleName << "_";
+                        for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                assert(paramType && "Aggregate parameters should be type expressions");
+                                maybeAccept( paramType->get_type(), *this );
+                        }
+                        mangleName << "_";
+                }
+
+                oldName << mangleName.str().length() << mangleName.str();
+                mangleName.str( oldName.str() );
+        }
+
         void Mangler::visit( StructInstType *aggregateUseType ) {
-                mangleRef( aggregateUseType, "s" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
+                else mangleRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType *aggregateUseType ) {
-                mangleRef( aggregateUseType, "u" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
+                else mangleRef( aggregateUseType, "u" );
         }
 
@@ -209 +238 @@
 
         void Mangler::printQualifiers( Type *type ) {
+                // skip if not including qualifiers
+                if ( typeMode ) return;
+                
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
@@ -227 +259 @@
                                 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, typeMode );
                                         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:
+                /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true ); // interface to clients
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true );
+                /// Mangle a type name; secondary interface
+                static std::string mangleType( Type* ty );
 
-///   using Visitor::visit;
                 virtual void visit( ObjectDecl *declaration );
                 virtual void visit( FunctionDecl *declaration );
@@ -45 +48 @@
                 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 typeMode;                  ///< Produce a unique mangled name for a type
   
-                Mangler( bool mangleOverridable );
+                Mangler( bool mangleOverridable, bool typeMode );
                 Mangler( const Mangler & );
   
                 void mangleDecl( DeclarationWithType *declaration );
                 void mangleRef( ReferenceToType *refType, std::string prefix );
+                void mangleGenericRef( ReferenceToType *refType, std::string prefix );
   
                 void printQualifiers( Type *type );
@@ -63 +68 @@
         template< typename SynTreeClass >
         std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
-                Mangler mangler( mangleOverridable );
+                Mangler mangler( mangleOverridable, false );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();