Reformatting using AStyle

2025-12-06 17:27:52 +00:00 · 2013-06-14 08:45:13 -07:00
parent 36bd8f7173
commit 521e812fc4
294 changed files with 54609 additions and 47598 deletions
--- a/modules/ripple_json/json/json_valueiterator.inl
+++ b/modules/ripple_json/json/json_valueiterator.inl
@@ -10,198 +10,229 @@
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////

-ValueIteratorBase::ValueIteratorBase()
+ValueIteratorBase::ValueIteratorBase ()
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   : current_()
-   , isNull_( true )
+    : current_ ()
+    , isNull_ ( true )
 {
 }
 #else
-   : isArray_( true )
-   , isNull_( true )
+    :
+    isArray_ ( true )
+    , isNull_ ( true )
 {
-   iterator_.array_ = ValueInternalArray::IteratorState();
+    iterator_.array_ = ValueInternalArray::IteratorState ();
 }
 #endif


 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator &current )
-   : current_( current )
-   , isNull_( false )
+ValueIteratorBase::ValueIteratorBase ( const Value::ObjectValues::iterator& current )
+    : current_ ( current )
+    , isNull_ ( false )
 {
 }
 #else
-ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
-   : isArray_( true )
+ValueIteratorBase::ValueIteratorBase ( const ValueInternalArray::IteratorState& state )
+    : isArray_ ( true )
 {
-   iterator_.array_ = state;
+    iterator_.array_ = state;
 }


-ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
-   : isArray_( false )
+ValueIteratorBase::ValueIteratorBase ( const ValueInternalMap::IteratorState& state )
+    : isArray_ ( false )
 {
-   iterator_.map_ = state;
+    iterator_.map_ = state;
 }
 #endif

-Value &
-ValueIteratorBase::deref() const
+Value&
+ValueIteratorBase::deref () const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   return current_->second;
+    return current_->second;
 #else
-   if ( isArray_ )
-      return ValueInternalArray::dereference( iterator_.array_ );
-   return ValueInternalMap::value( iterator_.map_ );
+
+    if ( isArray_ )
+        return ValueInternalArray::dereference ( iterator_.array_ );
+
+    return ValueInternalMap::value ( iterator_.map_ );
 #endif
 }


-void 
-ValueIteratorBase::increment()
+void
+ValueIteratorBase::increment ()
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ++current_;
+    ++current_;
 #else
-   if ( isArray_ )
-      ValueInternalArray::increment( iterator_.array_ );
-   ValueInternalMap::increment( iterator_.map_ );
+
+    if ( isArray_ )
+        ValueInternalArray::increment ( iterator_.array_ );
+
+    ValueInternalMap::increment ( iterator_.map_ );
 #endif
 }


-void 
-ValueIteratorBase::decrement()
+void
+ValueIteratorBase::decrement ()
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   --current_;
+    --current_;
 #else
-   if ( isArray_ )
-      ValueInternalArray::decrement( iterator_.array_ );
-   ValueInternalMap::decrement( iterator_.map_ );
+
+    if ( isArray_ )
+        ValueInternalArray::decrement ( iterator_.array_ );
+
+    ValueInternalMap::decrement ( iterator_.map_ );
 #endif
 }


-ValueIteratorBase::difference_type 
-ValueIteratorBase::computeDistance( const SelfType &other ) const
+ValueIteratorBase::difference_type
+ValueIteratorBase::computeDistance ( const SelfType& other ) const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
 # ifdef JSON_USE_CPPTL_SMALLMAP
-   return current_ - other.current_;
+    return current_ - other.current_;
 # else
-   // Iterator for null value are initialized using the default
-   // constructor, which initialize current_ to the default
-   // std::map::iterator. As begin() and end() are two instance 
-   // of the default std::map::iterator, they can not be compared.
-   // To allow this, we handle this comparison specifically.
-   if ( isNull_  &&  other.isNull_ )
-   {
-      return 0;
-   }
+
+    // Iterator for null value are initialized using the default
+    // constructor, which initialize current_ to the default
+    // std::map::iterator. As begin() and end() are two instance
+    // of the default std::map::iterator, they can not be compared.
+    // To allow this, we handle this comparison specifically.
+    if ( isNull_  &&  other.isNull_ )
+    {
+        return 0;
+    }


-   // Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
-   // which is the one used by default).
-   // Using a portable hand-made version for non random iterator instead:
-   //   return difference_type( std::distance( current_, other.current_ ) );
-   difference_type myDistance = 0;
-   for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
-   {
-      ++myDistance;
-   }
-   return myDistance;
+    // Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
+    // which is the one used by default).
+    // Using a portable hand-made version for non random iterator instead:
+    //   return difference_type( std::distance( current_, other.current_ ) );
+    difference_type myDistance = 0;
+
+    for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
+    {
+        ++myDistance;
+    }
+
+    return myDistance;
 # endif
 #else
-   if ( isArray_ )
-      return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
+
+    if ( isArray_ )
+        return ValueInternalArray::distance ( iterator_.array_, other.iterator_.array_ );
+
+    return ValueInternalMap::distance ( iterator_.map_, other.iterator_.map_ );
 #endif
 }


-bool 
-ValueIteratorBase::isEqual( const SelfType &other ) const
+bool
+ValueIteratorBase::isEqual ( const SelfType& other ) const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   if ( isNull_ )
-   {
-      return other.isNull_;
-   }
-   return current_ == other.current_;
+
+    if ( isNull_ )
+    {
+        return other.isNull_;
+    }
+
+    return current_ == other.current_;
 #else
-   if ( isArray_ )
-      return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
+
+    if ( isArray_ )
+        return ValueInternalArray::equals ( iterator_.array_, other.iterator_.array_ );
+
+    return ValueInternalMap::equals ( iterator_.map_, other.iterator_.map_ );
 #endif
 }


-void 
-ValueIteratorBase::copy( const SelfType &other )
+void
+ValueIteratorBase::copy ( const SelfType& other )
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   current_ = other.current_;
+    current_ = other.current_;
 #else
-   if ( isArray_ )
-      iterator_.array_ = other.iterator_.array_;
-   iterator_.map_ = other.iterator_.map_;
+
+    if ( isArray_ )
+        iterator_.array_ = other.iterator_.array_;
+
+    iterator_.map_ = other.iterator_.map_;
 #endif
 }


-Value 
-ValueIteratorBase::key() const
+Value
+ValueIteratorBase::key () const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( czstring.c_str() )
-   {
-      if ( czstring.isStaticString() )
-         return Value( StaticString( czstring.c_str() ) );
-      return Value( czstring.c_str() );
-   }
-   return Value( czstring.index() );
+    const Value::CZString czstring = (*current_).first;
+
+    if ( czstring.c_str () )
+    {
+        if ( czstring.isStaticString () )
+            return Value ( StaticString ( czstring.c_str () ) );
+
+        return Value ( czstring.c_str () );
+    }
+
+    return Value ( czstring.index () );
 #else
-   if ( isArray_ )
-      return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
-   bool isStatic;
-   const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
-   if ( isStatic )
-      return Value( StaticString( memberName ) );
-   return Value( memberName );
+
+    if ( isArray_ )
+        return Value ( ValueInternalArray::indexOf ( iterator_.array_ ) );
+
+    bool isStatic;
+    const char* memberName = ValueInternalMap::key ( iterator_.map_, isStatic );
+
+    if ( isStatic )
+        return Value ( StaticString ( memberName ) );
+
+    return Value ( memberName );
 #endif
 }


-UInt 
-ValueIteratorBase::index() const
+UInt
+ValueIteratorBase::index () const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( !czstring.c_str() )
-      return czstring.index();
-   return Value::UInt( -1 );
+    const Value::CZString czstring = (*current_).first;
+
+    if ( !czstring.c_str () )
+        return czstring.index ();
+
+    return Value::UInt ( -1 );
 #else
-   if ( isArray_ )
-      return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
-   return Value::UInt( -1 );
+
+    if ( isArray_ )
+        return Value::UInt ( ValueInternalArray::indexOf ( iterator_.array_ ) );
+
+    return Value::UInt ( -1 );
 #endif
 }


-const char *
-ValueIteratorBase::memberName() const
+const char*
+ValueIteratorBase::memberName () const
 {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const char *name = (*current_).first.c_str();
-   return name ? name : "";
+    const char* name = (*current_).first.c_str ();
+    return name ? name : "";
 #else
-   if ( !isArray_ )
-      return ValueInternalMap::key( iterator_.map_ );
-   return "";
+
+    if ( !isArray_ )
+        return ValueInternalMap::key ( iterator_.map_ );
+
+    return "";
 #endif
 }

@@ -214,33 +245,33 @@ ValueIteratorBase::memberName() const
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////

-ValueConstIterator::ValueConstIterator()
+ValueConstIterator::ValueConstIterator ()
 {
 }


 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
+ValueConstIterator::ValueConstIterator ( const Value::ObjectValues::iterator& current )
+    : ValueIteratorBase ( current )
 {
 }
 #else
-ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
+ValueConstIterator::ValueConstIterator ( const ValueInternalArray::IteratorState& state )
+    : ValueIteratorBase ( state )
 {
 }

-ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
+ValueConstIterator::ValueConstIterator ( const ValueInternalMap::IteratorState& state )
+    : ValueIteratorBase ( state )
 {
 }
 #endif

-ValueConstIterator &
-ValueConstIterator::operator =( const ValueIteratorBase &other )
+ValueConstIterator&
+ValueConstIterator::operator = ( const ValueIteratorBase& other )
 {
-   copy( other );
-   return *this;
+    copy ( other );
+    return *this;
 }


@@ -252,41 +283,41 @@ ValueConstIterator::operator =( const ValueIteratorBase &other )
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////

-ValueIterator::ValueIterator()
+ValueIterator::ValueIterator ()
 {
 }


 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIterator::ValueIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
+ValueIterator::ValueIterator ( const Value::ObjectValues::iterator& current )
+    : ValueIteratorBase ( current )
 {
 }
 #else
-ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
+ValueIterator::ValueIterator ( const ValueInternalArray::IteratorState& state )
+    : ValueIteratorBase ( state )
 {
 }

-ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
+ValueIterator::ValueIterator ( const ValueInternalMap::IteratorState& state )
+    : ValueIteratorBase ( state )
 {
 }
 #endif

-ValueIterator::ValueIterator( const ValueConstIterator &other )
-   : ValueIteratorBase( other )
+ValueIterator::ValueIterator ( const ValueConstIterator& other )
+    : ValueIteratorBase ( other )
 {
 }

-ValueIterator::ValueIterator( const ValueIterator &other )
-   : ValueIteratorBase( other )
+ValueIterator::ValueIterator ( const ValueIterator& other )
+    : ValueIteratorBase ( other )
 {
 }

-ValueIterator &
-ValueIterator::operator =( const SelfType &other )
+ValueIterator&
+ValueIterator::operator = ( const SelfType& other )
 {
-   copy( other );
-   return *this;
+    copy ( other );
+    return *this;
 }