Changes in src/SymTab/Mangler.cc [7cddf77:c3acf0aa]

File:

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

src/SymTab/Mangler.cc

@@ -31 +31 @@
 
 namespace SymTab {
-        std::string Mangler::mangleType( Type * ty ) {
+        std::string Mangler::mangleType( Type *ty ) {
                 Mangler mangler( false, true );
                 maybeAccept( ty, mangler );
@@ -48 +48 @@
         }
 
-        void Mangler::mangleDecl( DeclarationWithType * declaration ) {
+        void Mangler::mangleDecl( DeclarationWithType *declaration ) {
                 bool wasTopLevel = isTopLevel;
                 if ( isTopLevel ) {
@@ -79 +79 @@
         }
 
-        void Mangler::visit( ObjectDecl * declaration ) {
+        void Mangler::visit( ObjectDecl *declaration ) {
                 mangleDecl( declaration );
         }
 
-        void Mangler::visit( FunctionDecl * declaration ) {
+        void Mangler::visit( FunctionDecl *declaration ) {
                 mangleDecl( declaration );
         }
 
-        void Mangler::visit( VoidType * voidType ) {
+        void Mangler::visit( VoidType *voidType ) {
                 printQualifiers( voidType );
                 mangleName << "v";
         }
 
-        void Mangler::visit( BasicType * basicType ) {
+        void Mangler::visit( BasicType *basicType ) {
                 static const char *btLetter[] = {
                         "b",    // Bool
@@ -121 +121 @@
         }
 
-        void Mangler::visit( PointerType * pointerType ) {
+        void Mangler::visit( PointerType *pointerType ) {
                 printQualifiers( pointerType );
                 mangleName << "P";
@@ -127 +127 @@
         }
 
-        void Mangler::visit( ArrayType * arrayType ) {
+        void Mangler::visit( ArrayType *arrayType ) {
                 // TODO: encode dimension
                 printQualifiers( arrayType );
                 mangleName << "A0";
                 maybeAccept( arrayType->get_base(), *this );
-        }
-
-        void Mangler::visit( ReferenceType * refType ) {
-                printQualifiers( refType );
-                mangleName << "R";
-                maybeAccept( refType->get_base(), *this );
         }
 
@@ -149 +143 @@
         }
 
-        void Mangler::visit( FunctionType * functionType ) {
+        void Mangler::visit( FunctionType *functionType ) {
                 printQualifiers( functionType );
                 mangleName << "F";
@@ -160 +154 @@
         }
 
-        void Mangler::mangleRef( ReferenceToType * refType, std::string prefix ) {
+        void Mangler::mangleRef( ReferenceToType *refType, std::string prefix ) {
                 printQualifiers( refType );
 
@@ -166 +160 @@
         }
 
-        void Mangler::mangleGenericRef( ReferenceToType * refType, std::string prefix ) {
+        void Mangler::mangleGenericRef( ReferenceToType *refType, std::string prefix ) {
                 printQualifiers( refType );
 
@@ -189 +183 @@
         }
 
-        void Mangler::visit( StructInstType * aggregateUseType ) {
+        void Mangler::visit( StructInstType *aggregateUseType ) {
                 if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
                 else mangleRef( aggregateUseType, "s" );
         }
 
-        void Mangler::visit( UnionInstType * aggregateUseType ) {
+        void Mangler::visit( UnionInstType *aggregateUseType ) {
                 if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
                 else mangleRef( aggregateUseType, "u" );
         }
 
-        void Mangler::visit( EnumInstType * aggregateUseType ) {
+        void Mangler::visit( EnumInstType *aggregateUseType ) {
                 mangleRef( aggregateUseType, "e" );
         }
 
-        void Mangler::visit( TypeInstType * typeInst ) {
+        void Mangler::visit( TypeInstType *typeInst ) {
                 VarMapType::iterator varNum = varNums.find( typeInst->get_name() );
                 if ( varNum == varNums.end() ) {
@@ -231 +225 @@
         }
 
-        void Mangler::visit( TupleType * tupleType ) {
+        void Mangler::visit( TupleType *tupleType ) {
                 printQualifiers( tupleType );
                 mangleName << "T";
-                acceptAll( tupleType->types, *this );
+                acceptAll( tupleType->get_types(), *this );
                 mangleName << "_";
         }
 
-        void Mangler::visit( VarArgsType * varArgsType ) {
+        void Mangler::visit( VarArgsType *varArgsType ) {
                 printQualifiers( varArgsType );
                 mangleName << "VARGS";
         }
 
-        void Mangler::visit( ZeroType * ) {
+        void Mangler::visit( __attribute__((unused)) ZeroType *zeroType ) {
                 mangleName << "Z";
         }
 
-        void Mangler::visit( OneType * ) {
+        void Mangler::visit( __attribute__((unused)) OneType *oneType ) {
                 mangleName << "O";
         }
 
-        void Mangler::visit( TypeDecl * decl ) {
+        void Mangler::visit( TypeDecl *decl ) {
                 static const char *typePrefix[] = { "BT", "BD", "BF" };
-                mangleName << typePrefix[ decl->get_kind() ] << ( decl->name.length() + 1 ) << decl->name;
+                mangleName << typePrefix[ decl->get_kind() ] << ( decl->get_name().length() + 1 ) << decl->get_name();
         }
 
@@ -262 +256 @@
         }
 
-        void Mangler::printQualifiers( Type * type ) {
+        void Mangler::printQualifiers( Type *type ) {
                 // skip if not including qualifiers
                 if ( typeMode ) return;
@@ -270 +264 @@
                         int tcount = 0, dcount = 0, fcount = 0, vcount = 0;
                         mangleName << "A";
-                        for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
+                        for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
                                   case TypeDecl::Any:
@@ -287 +281 @@
                                         assert( false );
                                 } // switch
-                                varNums[ (*i)->name ] = std::pair< int, int >( nextVarNum++, (int)(*i)->get_kind() );
-                                for ( std::list< DeclarationWithType* >::iterator assert = (*i)->assertions.begin(); assert != (*i)->assertions.end(); ++assert ) {
+                                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, typeMode );
                                         sub_mangler.nextVarNum = nextVarNum;
@@ -309 +303 @@
                 // Removed due to restrict not affecting function compatibility in GCC
 //              if ( type->get_isRestrict() ) {
-//                      mangleName << "E";
+//                      mangleName << "R";
 //              } // if
                 if ( type->get_lvalue() ) {
-                        // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
                         mangleName << "L";
-                }
+                } // if
                 if ( type->get_atomic() ) {
                         mangleName << "A";