// Created: 22/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleskandars Gluchovas
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-# pragma implementation "srcparser.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
bool sortContent
)
{
- mSiblingSkipped = FALSE;
- mChildSkipped = FALSE;
+ mSiblingSkipped = false;
+ mChildSkipped = false;
mContextMask = SP_CTX_ANY; // FIXME:: should be an arg.
if ( sortContent && !atContext.IsSorted() )
for( size_t i = 0; i != members.size(); ++i )
{
if ( mSiblingSkipped )
-
+
return;
if ( !mChildSkipped )
void spVisitor::SkipSiblings()
{
- mSiblingSkipped = TRUE;
+ mSiblingSkipped = true;
}
void spVisitor::SkipChildren()
{
- mChildSkipped = TRUE;
+ mChildSkipped = true;
}
void spVisitor::SetFilter( int contextMask )
return mStartsPar;
}
-string& spComment::GetText()
+wxString& spComment::GetText()
{
- return mText;
+ return m_Text;
}
-string spComment::GetText() const
+wxString spComment::GetText() const
{
- return mText;
+ return m_Text;
}
/***** Implementation for class spContext *****/
spContext::spContext()
- : mpParent ( NULL ),
+ : m_pParent ( NULL ),
mpFirstOccurence( NULL ),
- mAlreadySorted ( FALSE ),
+ mAlreadySorted ( false ),
mSrcLineNo (-1),
mSrcOffset (-1),
mVisibility( SP_VIS_PRIVATE ),
- mIsVirtualContext ( FALSE ),
- mVirtualContextHasChildren( FALSE ),
+ mIsVirtualContext ( false ),
+ mVirtualContextHasChildren( false ),
mpUserData( NULL )
{}
void spContext::RemoveChildren()
{
for( size_t i = 0; i != mMembers.size(); ++i )
-
+
delete mMembers[i];
mMembers.erase( mMembers.begin(), mMembers.end() );
RemoveChildren();
for( size_t i = 0; i != mComments.size(); ++i )
-
+
delete mComments[i];
}
return;
}
- // the given child should exist on the parent's list
+ // the given child should exist on the parent's list
wxASSERT( 0 );
}
{
spContext* cur = this->GetParent();
- while ( cur && !(cur->GetContextType() & mask) )
-
+ while ( cur && !(cur->GetContextType() & mask) )
+
cur = cur->GetParent();
return cur;
return mVirtualContextHasChildren;
}
-string spContext::GetVirtualContextBody()
+wxString spContext::GetVirtualContextBody()
{
wxASSERT( mIsVirtualContext );
return mVirtualContextBody;
}
-string spContext::GetFooterOfVirtualContextBody()
+wxString spContext::GetFooterOfVirtualContextBody()
{
wxASSERT( mIsVirtualContext );
}
-void spContext::SetVirtualContextBody( const string& body,
- bool hasChildren,
- const string& footer )
+void spContext::SetVirtualContextBody( const wxString& body,
+ bool hasChildren,
+ const wxString& footer )
{
mVirtualContextHasChildren = hasChildren;
// atuomaticllay becomes virtual context
- mIsVirtualContext = TRUE;
+ mIsVirtualContext = true;
}
-string spContext::GetBody( spContext* pCtx )
+wxString spContext::GetBody( spContext* pCtx )
{
- if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
-
+ if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
return mVirtualContextBody;
if ( GetParent() )
-
return GetParent()->GetBody( ( pCtx != NULL ) ? pCtx : this );
else
- return ""; // source-fragment cannot be found
+ return wxEmptyString; // source-fragment cannot be found
}
-string spContext::GetHeader( spContext* pCtx )
+wxString spContext::GetHeader( spContext* pCtx )
{
if ( GetParent() )
-
return GetParent()->GetHeader( ( pCtx != NULL ) ? pCtx : this );
else
- return ""; // source-fragment cannot be found
+ return wxEmptyString; // source-fragment cannot be found
}
bool spContext::IsFirstOccurence()
spContext* spContext::GetFirstOccurence()
{
- // this object should not itself be
+ // this object should not itself be
// the first occurence of the context
wxASSERT( mpFirstOccurence != 0 );
{
mMembers.push_back( pMember );
- pMember->mpParent = this;
+ pMember->m_pParent = this;
}
void spContext::AddComment( spComment* pComment )
return mMembers;
}
-spContext* spContext::FindContext( const string& identifier,
+spContext* spContext::FindContext( const wxString& identifier,
int contextType,
bool searchSubMembers
)
{
spContext& member = *mMembers[i];
- if ( member.GetName() == identifier &&
+ if ( member.GetName() == identifier &&
( contextType & member.GetContextType() )
)
if ( searchSubMembers )
{
- spContext* result =
+ spContext* result =
member.FindContext( identifier, contextType, 1 );
if ( result ) return result;
void spContext::RemoveThisContext()
{
- if ( mpParent )
- mpParent->RemoveChild( this );
+ if ( m_pParent )
+ m_pParent->RemoveChild( this );
else
// context should have a parent
wxFAIL_MSG("Context should have a parent");
spContext* spContext::GetOutterContext()
{
- return mpParent;
+ return m_pParent;
}
bool spContext::HasOutterContext()
{
- return ( mpParent != 0 );
+ return ( m_pParent != 0 );
}
bool spContext::IsInFile()
spClass& spContext::GetClass()
{
wxASSERT( GetOutterContext()->GetType() == SP_CTX_CLASS );
- return *((spClass*)mpParent );
+ return *((spClass*)m_pParent );
}
spFile& spContext::GetFile()
{
wxASSERT( GetOutterContext()->GetType() == SP_CTX_FILE );
- return *((spFile*)mpParent );
+ return *((spFile*)m_pParent );
}
spNameSpace& spContext::GetNameSpace()
{
wxASSERT( GetOutterContext()->GetType() == SP_CTX_NAMESPACE );
- return *((spNameSpace*)mpParent );
+ return *((spNameSpace*)m_pParent );
}
spOperation& spContext::GetOperation()
{
wxASSERT( GetOutterContext()->GetType() == SP_CTX_OPERATION );
- return *((spOperation*)mpParent );
+ return *((spOperation*)m_pParent );
}
/***** Implementation for class spClass *****/
spOperation::spOperation()
- : mHasDefinition( FALSE )
+ : mHasDefinition( false )
{
mIsConstant =
mIsVirtual =
mHasDefinition = false;
}
-string spOperation::GetFullName(MarkupTagsT tags)
+wxString spOperation::GetFullName(MarkupTagsT tags)
{
- string txt = tags[TAG_BOLD].start + mRetType;
- txt += " ";
- txt += mName;
- txt += "( ";
+ wxString txt = tags[TAG_BOLD].start + m_RetType;
+ txt += _T(" ");
+ txt += m_Name;
+ txt += _T("( ");
txt += tags[TAG_BOLD].end;
-
+
for( size_t i = 0; i != mMembers.size(); ++i )
{
// DBG::
spParameter& param = *((spParameter*)mMembers[i]);
if ( i != 0 )
- txt += ", ";
-
+ txt += _T(", ");
+
txt += tags[TAG_BOLD].start;
-
- txt += param.mType;
+
+ txt += param.m_Type;
txt += tags[TAG_BOLD].end;
txt += tags[TAG_ITALIC].start;
- txt += " ";
- txt += param.mName;
+ txt += _T(" ");
+ txt += param.m_Name;
- if ( param.mInitVal != "" )
+ if ( !param.m_InitVal.empty() )
{
- txt += " = ";
+ txt += _T(" = ");
txt += tags[TAG_BOLD].start;
- txt += param.mInitVal;
+ txt += param.m_InitVal;
txt += tags[TAG_BOLD].end;
}
/***** Implemenentation for class spPreprocessorLine *****/
-string spPreprocessorLine::CPP_GetIncludedFileNeme() const
+wxString spPreprocessorLine::CPP_GetIncludedFileNeme() const
{
wxASSERT( GetStatementType() == SP_PREP_DEF_INCLUDE_FILE );
size_t i = 0;
- while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' )
-
+ while( i < m_Line.length() && m_Line[i] != _T('"') && m_Line[i] != _T('<') )
+
++i;
++i;
size_t start = i;
- while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' )
+ while( i < m_Line.length() && m_Line[i] != _T('"') && m_Line[i] != _T('>') )
++i;
- if ( start < mLine.length() )
+ if ( start < m_Line.length() )
{
- string fname;
- fname.append( mLine, start, ( i - start ) );
+ wxString fname;
+ fname.append( m_Line, start, ( i - start ) );
return fname;
}
else
- return ""; // syntax error probably
+ return wxEmptyString; // syntax error probably
}
FILE* fp = fopen( fname, "rt" );
- if ( (int)fp == -1 || !fp ) return NULL;
+ if ( !fp ) return NULL;
int sz = fread( mpFileBuf, 1, mFileBufSz, fp );
}
}
-void spContext::DumpThis(const wxString& indent) const
+void spContext::DumpThis(const wxString& WXUNUSED(indent)) const
{
wxFAIL_MSG("abstract base class can't be found in parser tree!");
}
void spParameter::DumpThis(const wxString& indent) const
{
wxLogDebug("%sparam named '%s' of type '%s'",
- indent.c_str(), mName.c_str(), mType.c_str());
+ indent.c_str(), m_Name.c_str(), m_Type.c_str());
}
void spAttribute::DumpThis(const wxString& indent) const
{
wxLogDebug("%svariable named '%s' of type '%s'",
- indent.c_str(), mName.c_str(), mType.c_str());
+ indent.c_str(), m_Name.c_str(), m_Type.c_str());
}
void spOperation::DumpThis(const wxString& indent) const
{
wxString protection;
- if ( !!mScope ) {
+ if ( !mScope.empty() ) {
switch ( mVisibility ) {
case SP_VIS_PUBLIC:
protection = "public";
protection = "global";
}
+ wxString constStr,virtualStr;
+ if(mIsConstant) constStr = _T("const ");
+ if(mIsVirtual) virtualStr = _T("virtual ");
+
wxLogDebug("%s%s%s%s function named '%s::%s' of type '%s'",
indent.c_str(),
- mIsConstant ? "const " : "",
- mIsVirtual ? "virtual " : "",
+ constStr.c_str(),
+ virtualStr.c_str(),
protection.c_str(),
- mScope.c_str(), mName.c_str(), mRetType.c_str());
+ mScope.c_str(), m_Name.c_str(), m_RetType.c_str());
}
void spPreprocessorLine::DumpThis(const wxString& indent) const
void spClass::DumpThis(const wxString& indent) const
{
wxString base;
- for ( StrListT::const_iterator i = mSuperClassNames.begin();
- i != mSuperClassNames.end();
+ for ( StrListT::const_iterator i = m_SuperClassNames.begin();
+ i != m_SuperClassNames.end();
i++ ) {
- if ( !!base )
+ if ( !base.empty() )
base += ", ";
base += *i;
}
wxLogDebug("%s%s named '%s' (base classes: %s)",
indent.c_str(), kind.c_str(),
- mName.c_str(), base.c_str());
+ m_Name.c_str(), base.c_str());
}
void spEnumeration::DumpThis(const wxString& indent) const
{
wxLogDebug("%senum named '%s'",
- indent.c_str(), mName.c_str());
+ indent.c_str(), m_Name.c_str());
}
void spTypeDef::DumpThis(const wxString& indent) const
{
wxLogDebug("%stypedef %s = %s",
- indent.c_str(), mName.c_str(), mOriginalType.c_str());
+ indent.c_str(), m_Name.c_str(), m_OriginalType.c_str());
}
void spFile::DumpThis(const wxString& indent) const
{
wxLogDebug("%sfile '%s'",
- indent.c_str(), mFileName.c_str());
+ indent.c_str(), m_FileName.c_str());
}
#endif // __WXDEBUG__
projects / wxWidgets.git / blobdiff