Changeset 4e2b9710 for src/CodeGen/GenType.cc

Timestamp:

Aug 25, 2016, 9:14:18 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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, with_gc

Children:

a839867

Parents:

c1c1112 (diff), 486341f (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 plg2:software/cfa/cfa-cc

File:

• src/CodeGen/GenType.cc (modified) (8 diffs)

src/CodeGen/GenType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenType.cc -- 
+// GenType.cc --
 //
 // Author           : Richard C. Bilson
@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString );
+                GenType( const std::string &typeString, bool mangle = true );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
-  
+
                 virtual void visit( FunctionType *funcType );
                 virtual void visit( VoidType *voidType );
@@ -42 +42 @@
                 virtual void visit( TypeInstType *typeInst );
                 virtual void visit( VarArgsType *varArgsType );
-  
+
           private:
                 void handleQualifiers( Type *type );
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
-  
+
                 std::string typeString;
+                bool mangle = true;
         };
 
-        std::string genType( Type *type, const std::string &baseString ) {
-                GenType gt( baseString );
+        std::string genType( Type *type, const std::string &baseString, bool mangle ) {
+                GenType gt( baseString, mangle );
                 type->accept( gt );
                 return gt.get_typeString();
         }
 
-        GenType::GenType( const std::string &typeString ) : typeString( typeString ) {}
+        GenType::GenType( const std::string &typeString, bool mangle ) : typeString( typeString ), mangle( mangle ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -100 +101 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os );
+                        CodeGenerator cg( os, mangle );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -109 +110 @@
 
                 typeString = os.str();
-  
+
                 base->accept( *this );
         }
@@ -142 +143 @@
                         } // if
                 } // if
-  
+
                 /************* parameters ***************/
 
@@ -154 +155 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os );
+                        CodeGenerator cg( os, mangle );
                         os << "(" ;
 
@@ -164 +165 @@
                         os << ")";
                 } // if
-  
+
                 typeString = os.str();