Kaydet (Commit) fd014c0e authored tarafından Herbert Dürr's avatar Herbert Dürr

#i122853# replace use of size() method for single linked lists

üst d7c2bf91
...@@ -74,7 +74,6 @@ class EStack : private std::slist<ELEM> ...@@ -74,7 +74,6 @@ class EStack : private std::slist<ELEM>
// INQUIRY // INQUIRY
const value_type & top() const { return base::front(); } const value_type & top() const { return base::front(); }
size_type size() const { return base::size(); }
bool empty() const { return base::empty(); } bool empty() const { return base::empty(); }
// ACCESS // ACCESS
......
...@@ -121,7 +121,7 @@ inline ary::cpp::Class * ...@@ -121,7 +121,7 @@ inline ary::cpp::Class *
ContextForAry:: ContextForAry::
S_OwnerStack::CurClass() const S_OwnerStack::CurClass() const
{ {
return aStack_Classes.size() > 0 return !aStack_Classes.empty()
? aStack_Classes.top().first ? aStack_Classes.top().first
: (ary::cpp::Class *) 0; : (ary::cpp::Class *) 0;
} }
...@@ -130,7 +130,7 @@ inline void ...@@ -130,7 +130,7 @@ inline void
ContextForAry:: ContextForAry::
S_OwnerStack::SetOwner_2CurNamespace() S_OwnerStack::SetOwner_2CurNamespace()
{ {
csv_assert( aStack_Namespaces.size() > 0 ); csv_assert( !aStack_Namespaces.empty() );
pOwner_Cur = pOwner_Namespace.MutablePtr(); pOwner_Cur = pOwner_Namespace.MutablePtr();
pOwner_Namespace->SetAnotherNamespace( CurNamespace() ); pOwner_Namespace->SetAnotherNamespace( CurNamespace() );
} }
...@@ -139,7 +139,7 @@ inline void ...@@ -139,7 +139,7 @@ inline void
ContextForAry:: ContextForAry::
S_OwnerStack::SetOwner_2CurClass() S_OwnerStack::SetOwner_2CurClass()
{ {
csv_assert( aStack_Classes.size() > 0 ); csv_assert( !aStack_Classes.empty() );
pOwner_Cur = pOwner_Class.MutablePtr(); pOwner_Cur = pOwner_Class.MutablePtr();
pOwner_Class->SetAnotherClass( *CurClass() ); pOwner_Class->SetAnotherClass( *CurClass() );
} }
...@@ -173,7 +173,7 @@ inline void ...@@ -173,7 +173,7 @@ inline void
ContextForAry:: ContextForAry::
S_OwnerStack::SetGlobalNamespace( ary::cpp::Namespace & io_rGlobalNamespace ) S_OwnerStack::SetGlobalNamespace( ary::cpp::Namespace & io_rGlobalNamespace )
{ {
csv_assert( aStack_Namespaces.size() == 0 ); csv_assert( aStack_Namespaces.empty() );
aStack_Namespaces.push(&io_rGlobalNamespace); aStack_Namespaces.push(&io_rGlobalNamespace);
SetOwner_2CurNamespace(); SetOwner_2CurNamespace();
} }
...@@ -187,7 +187,7 @@ inline void ...@@ -187,7 +187,7 @@ inline void
ContextForAry:: ContextForAry::
S_OwnerStack::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ) S_OwnerStack::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
{ {
csv_assert( aStack_Namespaces.size() > 0 OR io_rOpenedNamespace.Parent() == 0 ); csv_assert( !aStack_Namespaces.empty() OR io_rOpenedNamespace.Parent() == 0 );
aStack_Namespaces.push(&io_rOpenedNamespace); aStack_Namespaces.push(&io_rOpenedNamespace);
SetOwner_2CurNamespace(); SetOwner_2CurNamespace();
} }
...@@ -228,7 +228,7 @@ inline E_Protection ...@@ -228,7 +228,7 @@ inline E_Protection
ContextForAry:: ContextForAry::
S_OwnerStack::CurProtection() const S_OwnerStack::CurProtection() const
{ {
return aStack_Classes.size() > 0 return !aStack_Classes.empty()
? aStack_Classes.top().second ? aStack_Classes.top().second
: ary::cpp::PROTECT_global; : ary::cpp::PROTECT_global;
} }
...@@ -271,15 +271,15 @@ S_OwnerStack::CloseBlock() ...@@ -271,15 +271,15 @@ S_OwnerStack::CloseBlock()
} }
else else
{ {
// csv_assert( aStack_Classes.size() == 0 ); // csv_assert( aStack_Classes.empty() );
if ( aStack_Classes.size() > 0 ) if ( !aStack_Classes.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
csv_assert( pCurEnum == 0 ); csv_assert( pCurEnum == 0 );
aStack_Namespaces.pop(); aStack_Namespaces.pop();
// csv_assert( aStack_Namespaces.size() > 0 ); // csv_assert( !aStack_Namespaces.empty() );
if( aStack_Namespaces.size() == 0 ) if( aStack_Namespaces.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
} }
...@@ -290,12 +290,12 @@ void ...@@ -290,12 +290,12 @@ void
ContextForAry:: ContextForAry::
S_OwnerStack::CloseClass() S_OwnerStack::CloseClass()
{ {
// csv_assert( aStack_Classes.size() > 0 ); // csv_assert( !aStack_Classes.empty() );
if ( aStack_Classes.size() == 0 ) if ( aStack_Classes.empty() )
throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0); throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
aStack_Classes.pop(); aStack_Classes.pop();
if ( aStack_Classes.size() > 0 ) if ( !aStack_Classes.empty() )
SetOwner_2CurClass(); SetOwner_2CurClass();
else else
SetOwner_2CurNamespace(); SetOwner_2CurNamespace();
...@@ -307,7 +307,7 @@ S_OwnerStack::CloseEnum() ...@@ -307,7 +307,7 @@ S_OwnerStack::CloseEnum()
{ {
csv_assert( pCurEnum != 0 ); csv_assert( pCurEnum != 0 );
pCurEnum = 0; pCurEnum = 0;
if ( aStack_Classes.size() > 0 ) if ( !aStack_Classes.empty() )
SetOwner_2CurClass(); SetOwner_2CurClass();
else else
SetOwner_2CurNamespace(); SetOwner_2CurNamespace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment