Index: translator/Common/utility.h
===================================================================
--- translator/Common/utility.h	(revision 51b734528489f81a5af985bfee9aa3b6625b9774)
+++ translator/Common/utility.h	(revision a32b204359041ff1f6ef505a929495bcfe7a54f3)
@@ -22,5 +22,5 @@
 maybeClone( const T *orig )
 {
-  if( orig ) {
+  if ( orig ) {
     return orig->clone();
   } else {
@@ -33,5 +33,5 @@
 maybeBuild( const U *orig )
 {
-  if( orig ) {
+  if ( orig ) {
     return orig->build();
   } else {
@@ -44,5 +44,5 @@
 printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os )
 {
-  for( Input_iterator i = begin; i != end; ++i ) {
+  for ( Input_iterator i = begin; i != end; ++i ) {
     os << name_array[ *i ] << ' ';
   }
@@ -53,5 +53,5 @@
 deleteAll( Container &container )
 {
-  for( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
+  for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
     delete *i;
   }
@@ -62,6 +62,6 @@
 printAll( const Container &container, std::ostream &os, int indent = 0 )
 {
-  for( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
-    if( *i ) {
+  for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
+    if ( *i ) {
       os << std::string(indent,  ' ');
       (*i)->print( os, indent + 2 );
@@ -77,5 +77,5 @@
   typename SrcContainer::const_iterator in = src.begin();
   std::back_insert_iterator< DestContainer > out( dest );
-  while( in != src.end() ) {
+  while ( in != src.end() ) {
     *out++ = (*in++)->clone();
   }
@@ -87,6 +87,6 @@
 {
   int count = 0;
-  for( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
-    if( !(*i) ) {
+  for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
+    if ( !(*i) ) {
       std::cerr << count << " is null" << std::endl;
     }
@@ -97,5 +97,5 @@
 assign_strptr( std::string *str )
 {
-  if( str == 0 ) {
+  if ( str == 0 ) {
     return "";
   } else {
@@ -115,5 +115,5 @@
 std::list<T> tail( std::list<T> l )
 {
-  if(! l.empty()){
+  if (! l.empty()){
     std::list<T> ret(++(l.begin()), l.end());
     return ret;
@@ -127,5 +127,5 @@
   Ts ret;
 
-  switch( l.size() ){
+  switch ( l.size() ){
   case 0:
     return ret;
@@ -193,5 +193,5 @@
 {
   while ( begin++ != end )
-    if( pred(*begin) ) *out++ = *begin;
+    if ( pred(*begin) ) *out++ = *begin;
 
   return;
@@ -200,5 +200,5 @@
 template< class InputIterator1, class InputIterator2, class OutputIterator >
 void zip( InputIterator1 b1, InputIterator1 e1, InputIterator2 b2, InputIterator2 e2, OutputIterator out ) {
-  while( b1 != e1 && b2 != e2 )
+  while ( b1 != e1 && b2 != e2 )
     *out++ = std::pair<typename InputIterator1::value_type, typename InputIterator2::value_type>(*b1++, *b2++);
 }
@@ -206,5 +206,5 @@
 template< class InputIterator1, class InputIterator2, class OutputIterator, class BinFunction >
 void zipWith( InputIterator1 b1, InputIterator1 e1, InputIterator2 b2, InputIterator2 e2, OutputIterator out, BinFunction func ) {
-  while( b1 != e1 && b2 != e2 )
+  while ( b1 != e1 && b2 != e2 )
     *out++ = func(*b1++, *b2++);
 }