Changeset 1f44196 for src/SymTab/Mangler.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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

Conflicts:

src/Parser/parser.cc

File:

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

src/SymTab/Mangler.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mangler.cc -- 
+// Mangler.cc --
 //
 // Author           : Richard C. Bilson
@@ -35 +35 @@
                 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;
@@ -115 +115 @@
                         "Ir",   // LongDoubleImaginary
                 };
-  
+
                 printQualifiers( basicType );
                 mangleName << btLetter[ basicType->get_kind() ];
@@ -253 +253 @@
                 // skip if not including qualifiers
                 if ( typeMode ) return;
-                
+
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
                         int tcount = 0, dcount = 0, fcount = 0;
                         mangleName << "A";
-                        for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_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: