Changeset a32b204 for translator/SymTab


Ignore:
Timestamp:
May 17, 2015, 1:19:35 PM (9 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, 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:
0dd3a2f
Parents:
b87a5ed
Message:

licencing: second groups of files

Location:
translator/SymTab
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • translator/SymTab/AddVisit.h

    rb87a5ed ra32b204  
    1515addVisitStatementList( std::list< Statement* > &statements, Visitor &visitor )
    1616{
    17   for( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
     17  for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
    1818    addDecls( visitor.get_declsToAdd(), statements, i );
    1919    (*i)->accept( visitor );
    … …  
    2727{
    2828  maybeAccept( stmt, visitor );
    29 ///   if( !declsToAdd.empty() ) {
     29///   if ( ! declsToAdd.empty() ) {
    3030///     CompoundStmt *compound = new CompoundStmt( noLabels );
    3131///     compound->get_kids().push_back( stmt );

  • translator/SymTab/AggregateTable.h

    rb87a5ed ra32b204  
    2525  AggregateDeclClass *operator()( AggregateDeclClass *existing, AggregateDeclClass *added )
    2626  {
    27     if( existing->get_members().empty() ) {
     27    if ( existing->get_members().empty() ) {
    2828      return added;
    29     } else if( !added->get_members().empty() ) {
     29    } else if ( ! added->get_members().empty() ) {
    3030      throw SemanticError( "redeclaration of ", added );
    3131    }

  • translator/SymTab/IdTable.cc

    rb87a5ed ra32b204  
    3333IdTable::leaveScope()
    3434{
    35   for( OuterTableType::iterator outer = table.begin(); outer != table.end(); ++outer ) {
    36     for( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
     35  for ( OuterTableType::iterator outer = table.begin(); outer != table.end(); ++outer ) {
     36    for ( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
    3737      std::stack< DeclEntry >& entry = inner->second;
    38       if( !entry.empty() && entry.top().second == scopeLevel ) {
     38      if ( ! entry.empty() && entry.top().second == scopeLevel ) {
    3939        entry.pop();
    4040      }
    … …  
    5151  const string &name = decl->get_name();
    5252  string manglename;
    53   if( decl->get_linkage() == LinkageSpec::C ) {
     53  if ( decl->get_linkage() == LinkageSpec::C ) {
    5454    manglename = name;
    5555  } else {
    … …  
    5858  InnerTableType &declTable = table[ name ];
    5959  InnerTableType::iterator it = declTable.find( manglename );
    60   if( it == declTable.end() ) {
     60  if ( it == declTable.end() ) {
    6161    declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) );
    6262  } else {
    6363    std::stack< DeclEntry >& entry = it->second;
    64     if( !entry.empty() && entry.top().second == scopeLevel ) {
    65       if( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
     64    if ( ! entry.empty() && entry.top().second == scopeLevel ) {
     65      if ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
    6666        FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( decl );
    6767        FunctionDecl *old = dynamic_cast< FunctionDecl* >( entry.top().first );
    68         if( newentry && old && newentry->get_statements() && old->get_statements() ) {
     68        if ( newentry && old && newentry->get_statements() && old->get_statements() ) {
    6969          throw SemanticError( "duplicate function definition for ", decl );
    7070        } else {
    7171          ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( decl );
    7272          ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( entry.top().first );
    73           if( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
     73          if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
    7474            throw SemanticError( "duplicate definition for ", decl );
    7575          }
    … …  
    8383  }
    8484  // ensure the set of routines with C linkage cannot be overloaded
    85   for( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
    86     if( !i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {
     85  for ( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
     86    if ( ! i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {
    8787        InnerTableType::iterator j = i;
    88         for( j++; j != declTable.end(); ++j ) {
    89           if( !j->second.empty() && j->second.top().first->get_linkage() == LinkageSpec::C ) {
     88        for ( j++; j != declTable.end(); ++j ) {
     89          if ( ! j->second.empty() && j->second.top().first->get_linkage() == LinkageSpec::C ) {
    9090            throw SemanticError( "invalid overload of C function " );
    9191          }
    … …  
    9999{
    100100  OuterTableType::const_iterator outer = table.find( id );
    101   if( outer == table.end() ) return;
     101  if ( outer == table.end() ) return;
    102102  const InnerTableType &declTable = outer->second;
    103   for( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
     103  for ( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
    104104    const std::stack< DeclEntry >& entry = it->second;
    105     if( !entry.empty() ) {
     105    if ( ! entry.empty() ) {
    106106      decls.push_back( entry.top().first );
    107107    }
    … …  
    114114
    115115   OuterTableType::const_iterator outer = table.find( id );
    116    if( outer == table.end() ) return 0;
     116   if ( outer == table.end() ) return 0;
    117117   const InnerTableType &declTable = outer->second;
    118    for( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
     118   for ( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
    119119     const std::stack< DeclEntry >& entry = it->second;
    120      if( !entry.empty() && entry.top().second > depth ) {
     120     if ( ! entry.empty() && entry.top().second > depth ) {
    121121       result = entry.top().first;
    122122       depth = entry.top().second;
    … …  
    129129IdTable::dump( std::ostream &os ) const
    130130{
    131   for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
    132     for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
     131  for ( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
     132    for ( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
    133133#if 0
    134134      const std::stack< DeclEntry >& entry = inner->second;
    135       if( !entry.empty() ) { // && entry.top().second == scopeLevel ) {
     135      if ( ! entry.empty() ) { // && entry.top().second == scopeLevel ) {
    136136        os << outer->first << " (" << inner->first << ") (" << entry.top().second << ")" << std::endl;
    137137      } else {
    … …  
    142142      std::stack<DeclEntry> stack = inner->second;
    143143      os << "dumping a stack" << std::endl;
    144       while (!stack.empty()) {
     144      while (! stack.empty()) {
    145145        DeclEntry d = stack.top();
    146146        os << outer->first << " (" << inner->first << ") (" << d.second << ") " << std::endl;
    … …  
    151151  }
    152152#if 0
    153   for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
    154     for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
     153  for ( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
     154    for ( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
    155155      const std::stack< DeclEntry >& entry = inner->second;
    156       if( !entry.empty() && entry.top().second == scopeLevel ) {
     156      if ( ! entry.empty() && entry.top().second == scopeLevel ) {
    157157        os << outer->first << " (" << inner->first << ") (" << scopeLevel << ")" << std::endl;
    158158      }

  • translator/SymTab/ImplementationType.cc

    rb87a5ed ra32b204  
    4545  ImplementationType implementor( indexer );
    4646  type->accept( implementor );
    47   if( implementor.get_result() == 0 ) {
     47  if ( implementor.get_result() == 0 ) {
    4848    return type->clone();
    4949  } else {
    … …  
    8787{
    8888///   FunctionType *newType = functionType->clone();
    89 ///   for( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
     89///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
    9090///     i->set_type( implementationType( i->get_type(), indexer ) );
    9191///   }
    92 ///   for( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
     92///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
    9393///     i->set_type( implementationType( i->get_type(), indexer ) );
    9494///   }
    … …  
    119119{
    120120  NamedTypeDecl *typeDecl = indexer.lookupType( inst->get_name() );
    121   if( typeDecl && typeDecl->get_base() ) {
     121  if ( typeDecl && typeDecl->get_base() ) {
    122122    Type *base = implementationType( typeDecl->get_base(), indexer );
    123123    base->get_qualifiers() += inst->get_qualifiers();
    … …  
    130130{
    131131  TupleType *newType = new TupleType( Type::Qualifiers() );
    132   for( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
     132  for ( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
    133133    Type *implType = implementationType( *i, indexer );
    134134    implType->get_qualifiers() += tupleType->get_qualifiers();

  • translator/SymTab/ImplementationType.h

    rb87a5ed ra32b204  
    2020implementationTypeList( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer )
    2121{
    22   while( begin != end ) {
     22  while ( begin != end ) {
    2323    *out++ = implementationType( *begin++, indexer );
    2424  }

  • translator/SymTab/Mangler.cc

    rb87a5ed ra32b204  
    184184
    185185    void Mangler::printQualifiers( Type *type ) {
    186         if ( !type->get_forall().empty() ) {
     186        if ( ! type->get_forall().empty() ) {
    187187            std::list< std::string > assertionNames;
    188188            int tcount = 0, dcount = 0, fcount = 0;

  • translator/SymTab/StackTable.cc

    rb87a5ed ra32b204  
    1717        for ( typename TableType::iterator it = table.begin(); it != table.end(); ++it ) {
    1818            std::stack< Entry >& entry = it->second;
    19             if ( !entry.empty() && entry.top().second == scopeLevel ) {
     19            if ( ! entry.empty() && entry.top().second == scopeLevel ) {
    2020                entry.pop();
    2121            }
    … …  
    2828    void StackTable< Element, ConflictFunction >::add( Element *type ) {
    2929        std::stack< Entry >& entry = table[ type->get_name() ];
    30         if ( !entry.empty() && entry.top().second == scopeLevel ) {
     30        if ( ! entry.empty() && entry.top().second == scopeLevel ) {
    3131            entry.top().first = conflictFunction( entry.top().first, type );
    3232        } else {
    … …  
    4545        if ( it == table.end() ) {
    4646            return 0;
    47         } else if ( !it->second.empty() ) {
     47        } else if ( ! it->second.empty() ) {
    4848            return it->second.top().first;
    4949        } else {
    … …  
    5656        for ( typename TableType::const_iterator it = table.begin(); it != table.end(); ++it ) {
    5757            const std::stack< Entry >& entry = it->second;
    58             if ( !entry.empty() && entry.top().second == scopeLevel ) {
     58            if ( ! entry.empty() && entry.top().second == scopeLevel ) {
    5959                os << it->first << std::endl;
    6060            }

  • translator/SymTab/TypeTable.h

    rb87a5ed ra32b204  
    1717            if ( existing->get_base() == 0 ) {
    1818                return added;
    19             } else if( added->get_base() == 0 ) {
     19            } else if ( added->get_base() == 0 ) {
    2020                return existing;
    2121            } else {
Note: See TracChangeset for help on using the changeset viewer.