Index: translator/SymTab/AddVisit.h
===================================================================
--- translator/SymTab/AddVisit.h	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/AddVisit.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -15,5 +15,5 @@
 addVisitStatementList( std::list< Statement* > &statements, Visitor &visitor )
 {
-  for( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
+  for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
     addDecls( visitor.get_declsToAdd(), statements, i );
     (*i)->accept( visitor );
@@ -27,5 +27,5 @@
 {
   maybeAccept( stmt, visitor );
-///   if( !declsToAdd.empty() ) {
+///   if ( ! declsToAdd.empty() ) {
 ///     CompoundStmt *compound = new CompoundStmt( noLabels );
 ///     compound->get_kids().push_back( stmt );
Index: translator/SymTab/AggregateTable.h
===================================================================
--- translator/SymTab/AggregateTable.h	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/AggregateTable.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -25,7 +25,7 @@
   AggregateDeclClass *operator()( AggregateDeclClass *existing, AggregateDeclClass *added )
   {
-    if( existing->get_members().empty() ) {
+    if ( existing->get_members().empty() ) {
       return added;
-    } else if( !added->get_members().empty() ) {
+    } else if ( ! added->get_members().empty() ) {
       throw SemanticError( "redeclaration of ", added );
     }
Index: translator/SymTab/IdTable.cc
===================================================================
--- translator/SymTab/IdTable.cc	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/IdTable.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -33,8 +33,8 @@
 IdTable::leaveScope()
 {
-  for( OuterTableType::iterator outer = table.begin(); outer != table.end(); ++outer ) {
-    for( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
+  for ( OuterTableType::iterator outer = table.begin(); outer != table.end(); ++outer ) {
+    for ( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
       std::stack< DeclEntry >& entry = inner->second;
-      if( !entry.empty() && entry.top().second == scopeLevel ) {
+      if ( ! entry.empty() && entry.top().second == scopeLevel ) {
         entry.pop();
       }
@@ -51,5 +51,5 @@
   const string &name = decl->get_name();
   string manglename;
-  if( decl->get_linkage() == LinkageSpec::C ) {
+  if ( decl->get_linkage() == LinkageSpec::C ) {
     manglename = name;
   } else {
@@ -58,18 +58,18 @@
   InnerTableType &declTable = table[ name ];
   InnerTableType::iterator it = declTable.find( manglename );
-  if( it == declTable.end() ) {
+  if ( it == declTable.end() ) {
     declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) );
   } else {
     std::stack< DeclEntry >& entry = it->second;
-    if( !entry.empty() && entry.top().second == scopeLevel ) {
-      if( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
+    if ( ! entry.empty() && entry.top().second == scopeLevel ) {
+      if ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
         FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( decl );
         FunctionDecl *old = dynamic_cast< FunctionDecl* >( entry.top().first );
-        if( newentry && old && newentry->get_statements() && old->get_statements() ) {
+        if ( newentry && old && newentry->get_statements() && old->get_statements() ) {
           throw SemanticError( "duplicate function definition for ", decl );
         } else {
           ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( decl );
           ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( entry.top().first );
-          if( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
+          if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
             throw SemanticError( "duplicate definition for ", decl );
           }
@@ -83,9 +83,9 @@
   }
   // ensure the set of routines with C linkage cannot be overloaded
-  for( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
-    if( !i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {
+  for ( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
+    if ( ! i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {
 	InnerTableType::iterator j = i;
-	for( j++; j != declTable.end(); ++j ) {
-	  if( !j->second.empty() && j->second.top().first->get_linkage() == LinkageSpec::C ) {
+	for ( j++; j != declTable.end(); ++j ) {
+	  if ( ! j->second.empty() && j->second.top().first->get_linkage() == LinkageSpec::C ) {
 	    throw SemanticError( "invalid overload of C function " );
 	  }
@@ -99,9 +99,9 @@
 {
   OuterTableType::const_iterator outer = table.find( id );
-  if( outer == table.end() ) return;
+  if ( outer == table.end() ) return;
   const InnerTableType &declTable = outer->second;
-  for( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
+  for ( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
     const std::stack< DeclEntry >& entry = it->second;
-    if( !entry.empty() ) {
+    if ( ! entry.empty() ) {
       decls.push_back( entry.top().first );
     }
@@ -114,9 +114,9 @@
 
    OuterTableType::const_iterator outer = table.find( id );
-   if( outer == table.end() ) return 0;
+   if ( outer == table.end() ) return 0;
    const InnerTableType &declTable = outer->second;
-   for( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
+   for ( InnerTableType::const_iterator it = declTable.begin(); it != declTable.end(); ++it ) {
      const std::stack< DeclEntry >& entry = it->second;
-     if( !entry.empty() && entry.top().second > depth ) {
+     if ( ! entry.empty() && entry.top().second > depth ) {
        result = entry.top().first;
        depth = entry.top().second;
@@ -129,9 +129,9 @@
 IdTable::dump( std::ostream &os ) const
 {
-  for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
-    for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
+  for ( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
+    for ( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
 #if 0
       const std::stack< DeclEntry >& entry = inner->second;
-      if( !entry.empty() ) { // && entry.top().second == scopeLevel ) {
+      if ( ! entry.empty() ) { // && entry.top().second == scopeLevel ) {
         os << outer->first << " (" << inner->first << ") (" << entry.top().second << ")" << std::endl;
       } else {
@@ -142,5 +142,5 @@
       std::stack<DeclEntry> stack = inner->second;
       os << "dumping a stack" << std::endl;
-      while (!stack.empty()) {
+      while (! stack.empty()) {
         DeclEntry d = stack.top();
         os << outer->first << " (" << inner->first << ") (" << d.second << ") " << std::endl;
@@ -151,8 +151,8 @@
   }
 #if 0
-  for( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
-    for( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
+  for ( OuterTableType::const_iterator outer = table.begin(); outer != table.end(); ++outer ) {
+    for ( InnerTableType::const_iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
       const std::stack< DeclEntry >& entry = inner->second;
-      if( !entry.empty() && entry.top().second == scopeLevel ) {
+      if ( ! entry.empty() && entry.top().second == scopeLevel ) {
         os << outer->first << " (" << inner->first << ") (" << scopeLevel << ")" << std::endl;
       }
Index: translator/SymTab/ImplementationType.cc
===================================================================
--- translator/SymTab/ImplementationType.cc	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/ImplementationType.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -45,5 +45,5 @@
   ImplementationType implementor( indexer );
   type->accept( implementor );
-  if( implementor.get_result() == 0 ) {
+  if ( implementor.get_result() == 0 ) {
     return type->clone();
   } else {
@@ -87,8 +87,8 @@
 {
 ///   FunctionType *newType = functionType->clone();
-///   for( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
+///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
 ///     i->set_type( implementationType( i->get_type(), indexer ) );
 ///   }
-///   for( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
+///   for ( std::list< DeclarationWithType* >::iterator i = newType->get_parameters().begin(); i != newType->get_parameters().end(); ++i ) {
 ///     i->set_type( implementationType( i->get_type(), indexer ) );
 ///   }
@@ -119,5 +119,5 @@
 {
   NamedTypeDecl *typeDecl = indexer.lookupType( inst->get_name() );
-  if( typeDecl && typeDecl->get_base() ) {
+  if ( typeDecl && typeDecl->get_base() ) {
     Type *base = implementationType( typeDecl->get_base(), indexer );
     base->get_qualifiers() += inst->get_qualifiers();
@@ -130,5 +130,5 @@
 {
   TupleType *newType = new TupleType( Type::Qualifiers() );
-  for( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
+  for ( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
     Type *implType = implementationType( *i, indexer );
     implType->get_qualifiers() += tupleType->get_qualifiers();
Index: translator/SymTab/ImplementationType.h
===================================================================
--- translator/SymTab/ImplementationType.h	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/ImplementationType.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -20,5 +20,5 @@
 implementationTypeList( InputIterator begin, InputIterator end, OutputIterator out, const SymTab::Indexer &indexer )
 {
-  while( begin != end ) {
+  while ( begin != end ) {
     *out++ = implementationType( *begin++, indexer );
   }
Index: translator/SymTab/Mangler.cc
===================================================================
--- translator/SymTab/Mangler.cc	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/Mangler.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -184,5 +184,5 @@
 
     void Mangler::printQualifiers( Type *type ) {
-	if ( !type->get_forall().empty() ) {
+	if ( ! type->get_forall().empty() ) {
 	    std::list< std::string > assertionNames;
 	    int tcount = 0, dcount = 0, fcount = 0;
Index: translator/SymTab/StackTable.cc
===================================================================
--- translator/SymTab/StackTable.cc	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/StackTable.cc	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -17,5 +17,5 @@
 	for ( typename TableType::iterator it = table.begin(); it != table.end(); ++it ) {
 	    std::stack< Entry >& entry = it->second;
-	    if ( !entry.empty() && entry.top().second == scopeLevel ) {
+	    if ( ! entry.empty() && entry.top().second == scopeLevel ) {
 		entry.pop();
 	    }
@@ -28,5 +28,5 @@
     void StackTable< Element, ConflictFunction >::add( Element *type ) {
 	std::stack< Entry >& entry = table[ type->get_name() ];
-	if ( !entry.empty() && entry.top().second == scopeLevel ) {
+	if ( ! entry.empty() && entry.top().second == scopeLevel ) {
 	    entry.top().first = conflictFunction( entry.top().first, type );
 	} else {
@@ -45,5 +45,5 @@
 	if ( it == table.end() ) {
 	    return 0;
-	} else if ( !it->second.empty() ) {
+	} else if ( ! it->second.empty() ) {
 	    return it->second.top().first;
 	} else {
@@ -56,5 +56,5 @@
 	for ( typename TableType::const_iterator it = table.begin(); it != table.end(); ++it ) {
 	    const std::stack< Entry >& entry = it->second;
-	    if ( !entry.empty() && entry.top().second == scopeLevel ) {
+	    if ( ! entry.empty() && entry.top().second == scopeLevel ) {
 		os << it->first << std::endl;
 	    }
Index: translator/SymTab/TypeTable.h
===================================================================
--- translator/SymTab/TypeTable.h	(revision 5c7fb6c8dfabfe6c6b4c365a4f378706430fd1bf)
+++ translator/SymTab/TypeTable.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -17,5 +17,5 @@
 	    if ( existing->get_base() == 0 ) {
 		return added;
-	    } else if( added->get_base() == 0 ) {
+	    } else if ( added->get_base() == 0 ) {
 		return existing;
 	    } else {