// Created: 22/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleskandars Gluchovas
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "acell.h"
-#pragma interface
+# pragma implementation "acell.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
*cur != '/'
) ++cur;
- if ( cur == _gSrcEnd ) return FALSE;
+ if ( cur == _gSrcEnd ) return false;
if ( *cur == '/' )
{
if ( (*(cur+1) == '*') ||
- (*(cur+1) == '/') ) return TRUE;
+ (*(cur+1) == '/') ) return true;
else
{
++cur;
}
}
- return FALSE;
+ return false;
} while(1);
}
}
if ( cur >= _gSrcEnd )
-
- return FALSE;
+ return false;
else
- return TRUE;
+ return true;
}
static inline void skip_preprocessor_dir( char*& cur )
do
{
if ( *(tok1++) != *(tok2++) )
- return FALSE;
+ return false;
--len;
} while ( --len );
- return TRUE;
+ return true;
}
static inline bool cmp_tokens_fast( char* tok1, char* tok2, size_t len )
do
{
if ( *(tok1++) != *(tok2++) )
- return FALSE;
+ return false;
} while ( --len );
- return TRUE;
+ return true;
}
static inline void skip_tempalate_statement( char*& cur )
while( *cur != '{' && cur < _gSrcEnd )
{
skip_token( cur );
- if ( !get_next_token( cur ) ) return FALSE;
+ if ( !get_next_token( cur ) ) return false;
}
while( *cur != '}' && cur < _gSrcEnd )
{
skip_token( cur );
- if ( !get_next_token( cur ) ) return FALSE;
+ if ( !get_next_token( cur ) ) return false;
}
++cur;
- return TRUE;
+ return true;
}
static bool is_class_token( char*& cur )
return cmp_tokens_fast( cur, "union", 5 );
- return FALSE;
+ return false;
}
inline static bool is_forward_decl( char* cur )
{
switch( *cur )
{
- case ':' : return FALSE;
- case '{' : return FALSE;
- case '(' : return FALSE;
+ case ':' : return false;
+ case '{' : return false;
+ case '(' : return false;
- case ';' : return TRUE;
+ case ';' : return true;
default : break;
};
} while (cur < _gSrcEnd); // prevent running out of bounds
- return FALSE;
+ return false;
}
inline static bool is_function( char* cur, bool& isAMacro )
{
- isAMacro = FALSE;
+ isAMacro = false;
int tmpLnNo;
store_line_no( tmpLnNo );
if ( cur > eol )
{
- isAMacro = TRUE;
+ isAMacro = true;
restore_line_no( tmpLnNo );
- return TRUE;
+ return true;
}
// it's not a macro, go to the begining of arg. list
if ( *cur == '(' )
{
restore_line_no( tmpLnNo );
- return TRUE;
+ return true;
}
// end of statement found without any brackets in it
if ( *cur == ';' )
{
restore_line_no( tmpLnNo );
- return FALSE;
+ return false;
}
++cur;
isAMacro = 1;
restore_line_no( tmpLnNo );
- return FALSE;
+ return false;
}
// upon return the cursor is positioned after the
{
// TBD:: FIXME:: return value of operators !
- while ( identifier[0] == '*' ||
- identifier[0] == '&'
+ while ( identifier[0u] == '*' ||
+ identifier[0u] == '&'
)
{
- type += identifier[0];
+ type += identifier[0u];
identifier.erase(0,1);
if ( !identifier.length() ) return;
) == 0
)
{
- int o = 0;
- ++o;
+ // int o = 0;
+ // ++o;
}
switch (*cur)
continue;
}
- bool isAMacro = 0;
+ bool isAMacro = false;
if ( is_function( cur, isAMacro ) )
{
int tmpLnNo;
store_line_no( tmpLnNo );
+ wxUnusedVar( tmpLnNo );
- isAMacro = FALSE;
+ isAMacro = false;
if ( !ParseNameAndRetVal( cur, isAMacro ) )
{
if ( i == 0 )
- pComment->mStartsPar = TRUE;
+ pComment->mStartsPar = true;
else
if ( pComment->mIsMultiline )
- pComment->mStartsPar = TRUE;
+ pComment->mStartsPar = true;
else
{
// find out wheather there is a new-line
if ( prevLine >= prevComEnd )
- pComment->mStartsPar = TRUE;
+ pComment->mStartsPar = true;
else
- pComment->mStartsPar = FALSE;
+ pComment->mStartsPar = false;
}
prevComEnd = set_comment_text( pComment->mText, start );
get_next_token( tok );
- pPL->mName = get_token_str( tok );
+ pPL->m_Name = get_token_str( tok );
skip_token( tok );
get_next_token( tok);
bool CJSourceParser::ParseNameAndRetVal( char*& cur, bool& isAMacro )
{
- isAMacro = FALSE;
+ isAMacro = false;
// FOR NOW:: all functions in the global
// scope are ignored
isVirtual = true;
skip_token( cur );
- if ( !get_next_token( cur ) ) return FALSE;
+ if ( !get_next_token( cur ) ) return false;
}
char* bracketPos = cur;
mpPlugin->ParseContext( _gSrcStart, cur, _gSrcEnd, mpCurCtx );
- isAMacro = TRUE;
+ isAMacro = true;
- return FALSE;
+ return false;
}
}
pOp->mSrcOffset = int( start - _gSrcStart );
pOp->mHeaderLength = int( bracketPos - start );
if ( mpCurCtx->GetContextType() == SP_CTX_CLASS )
- pOp->mScope = mpCurCtx->mName;
+ pOp->mScope = mpCurCtx->m_Name;
mpCurCtx->AddMember( pOp );
pOp->mVisibility = mCurVis;
// go backwards to method name
skip_token_back( cur );
- pOp->mName = get_token_str( cur );
+ pOp->m_Name = get_token_str( cur );
// checker whether it's not an operator
- char chFirst = *pOp->mName.c_str();
+ char chFirst = *pOp->m_Name.c_str();
if ( !isalpha(chFirst) && chFirst != '_' && chFirst != '~' ) {
// skip 'operator'
skip_next_token_back( cur );
string lastToken = get_token_str( cur );
if ( lastToken == "operator" ) {
- lastToken += pOp->mName;
- pOp->mName = lastToken;
+ lastToken += pOp->m_Name;
+ pOp->m_Name = lastToken;
}
else {
// ok, it wasn't an operator after all
skip_token( cur );
}
}
- else if ( pOp->mName == "operator" ) {
+ else if ( pOp->m_Name == "operator" ) {
skip_token( cur );
get_next_token( cur );
string oper = get_token_str( cur );
- pOp->mName += oper;
+ pOp->m_Name += oper;
}
// go backwards to method return type
if ( cur >= start )
{
string rettype = string( start, size_t( cur-start ) );
- rettype.Replace("WXDLLEXPORT ", ""); // FIXME just for now...
+ // FIXME just for now...
+ string::size_type pos = 0;
+ string toerase("WXDLLEXPORT ");
+ while((pos = rettype.find(toerase, pos)) != string::npos)
+ rettype.erase(pos, toerase.length());
pOp->mRetType = rettype;
}
- arrange_indirection_tokens_between( pOp->mRetType, pOp->mName );
+ arrange_indirection_tokens_between( pOp->mRetType, pOp->m_Name );
cur = savedPos;
restore_line_no( tmpLnNo );
// now, enter operation context
mpCurCtx = pOp;
- return TRUE;
+ return true;
}
bool CJSourceParser::ParseArguments( char*& cur )
get_next_token( cur );
- bool first_blk = 1;
+ bool first_blk = true;
while( *cur != ')' && *cur != ',' )
{
// if only one block enclosed, than it's probably
// some macro, there should be at least two blocks,
// one for argument type and another for it's identifier
- return FALSE;
+ return false;
}
if ( blocksSkipped == 0 )
AttachComments( *pPar, blocks[nameBlock] );
// retrieve argument name
- pPar->mName = string( blocks[nameBlock], blockSizes[nameBlock] );
+ pPar->m_Name = string( blocks[nameBlock], blockSizes[nameBlock] );
// retreive argument type
pPar->mType = string( blocks[0], len );
- arrange_indirection_tokens_between( pPar->mType, pPar->mName );
+ arrange_indirection_tokens_between( pPar->mType, pPar->m_Name );
if ( *cur == ')' )
{
int tmpLnNo;
store_line_no( tmpLnNo );
+ bool result = true;
+
do
{
if ( *tok == '{' || *tok == ';' )
{
restore_line_no(tmpLnNo);
- return TRUE;
+ break;
}
// check for unexpected tokens
if ( *tok == '=' || *tok == '0' )
{
skip_token(tok);
- if ( !get_next_token(tok) ) return FALSE;
+ if ( !get_next_token(tok) ) return false;
continue;
}
- if ( *tok == '}' ) return FALSE;
+ if ( *tok == '}' ) return false;
// if initialization list found
if ( *tok == ':' )
{
restore_line_no(tmpLnNo);
- return TRUE;
+ break;
}
if ( cmp_tokens_fast( tok, "const", 5 ) )
((spOperation*)mpCurCtx)->mIsConstant = true;
skip_token(tok);
- if ( !get_next_token(tok) ) return FALSE;
+ if ( !get_next_token(tok) ) return false;
continue;
}
- if ( CheckVisibilty( tok ) ) return FALSE;
+ if ( CheckVisibilty( tok ) ) return false;
// if next context found
- if ( is_keyword( tok ) ) return FALSE;
+ if ( is_keyword( tok ) ) return false;
skip_token(tok);
- if ( !get_next_token(tok) ) return FALSE;
+ if ( !get_next_token(tok) ) return false;
} while(1);
- return TRUE;
+ return result;
}
void CJSourceParser::ParseMemberVar( char*& cur )
{
MMemberListT& members = mpCurCtx->GetMembers();
- bool firstMember = 1;
-
- size_t first = 0;
+ bool firstMember = true;
string type;
if ( firstMember )
{
firstMember = 0;
- first = members.size() - 1;;
}
skip_token_back( cur );
// attach comments about the attribute
AttachComments( *pAttr, cur );
- pAttr->mName = get_token_str( cur );
+ pAttr->m_Name = get_token_str( cur );
// guessing that this going to be variable type
skip_next_token_back( cur );
// yes, we've mistaken, it was not a identifier,
// but it's default value
pAttr->mInitVal =
- pAttr->mName;
+ pAttr->m_Name;
// skip default value and '=' symbol
skip_next_token_back( cur );
skip_token_back( cur );
- pAttr->mName = get_token_str( cur );
+ pAttr->m_Name = get_token_str( cur );
skip_next_token_back( cur );
skip_token_back( cur );
} while(1);
- first = 0;
+ size_t first = 0;
// set up types for all collected (same-type) attributes;
while ( first != members.size() - 1 )
if ( !pAttr )
continue;
- if ( !pAttr->mType )
+ if ( pAttr->mType.empty() )
pAttr->mType = type;
pAttr->mVisibility = mCurVis;
- if ( !!pAttr->mName )
- arrange_indirection_tokens_between( pAttr->mType, pAttr->mName );
+ if ( !pAttr->m_Name.empty() )
+ arrange_indirection_tokens_between( pAttr->mType, pAttr->m_Name );
}
cur = savedPos;
{
// FIXME:: check for comments and quoted stirngs here
- bool hasDefinition = FALSE;
+ bool hasDefinition = false;
while( *cur != '{' && *cur != ';' )
{
}
else
{
- hasDefinition = TRUE;
+ hasDefinition = true;
skip_scope_block( cur ); // skip the whole imp.
}
// separate scope resolution token from the name of operation
- for( size_t i = 0; i != op.mName.length(); ++i )
+ for( size_t i = 0; i != op.m_Name.length(); ++i )
{
- if ( op.mName[i] == ':' && op.mName[i+1] == ':' )
+ if ( op.m_Name[i] == ':' && op.m_Name[i+1] == ':' )
{
- string unscoped( op.mName, i+2, op.mName.length() - ( i + 2 ) );
+ string unscoped( op.m_Name, i+2, op.m_Name.length() - ( i + 2 ) );
- op.mScope = string( op.mName, 0, i );
+ op.mScope = string( op.m_Name, 0, i );
- op.mName = unscoped;
+ op.m_Name = unscoped;
break;
}
if ( cmp_tokens_fast( cur, "public:", len ) )
{
mCurVis = SP_VIS_PUBLIC;
- return TRUE;
+ return true;
}
if ( cmp_tokens_fast( cur, "protected:", len ) )
{
mCurVis = SP_VIS_PROTECTED;
- return TRUE;
+ return true;
}
if ( cmp_tokens_fast( cur, "private:", len ) )
{
mCurVis = SP_VIS_PRIVATE;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void CJSourceParser::AddClassNode( char*& cur )
pClass->mSrcOffset = int( ctxStart - _gSrcStart );
char* nameTok = cur;
- pClass->mName = get_token_str( cur );
+ pClass->m_Name = get_token_str( cur );
bool isDerived = 0;
if ( nameTok != tok )
{
- pClass->mName = get_token_str( tok );
+ pClass->m_Name = get_token_str( tok );
}
}
skip_next_token_back( tok );
skip_token_back( tok );
- pClass->mName = get_token_str( tok );
+ pClass->m_Name = get_token_str( tok );
restore_line_no( tmpLn );
}
// check if enumeration has got it's identifier
if ( *cur != '{' )
{
- pEnum->mName = get_token_str( cur );
+ pEnum->m_Name = get_token_str( cur );
}
if ( !skip_imp_block( cur ) ) return;
// check if the identifier if after the {...} block
if ( *cur != ';' )
- pEnum->mName = get_token_str( cur );
+ pEnum->m_Name = get_token_str( cur );
}
clear_commets_queue();
get_string_between( start, typeEnd, &pTDef->mOriginalType );
- get_string_between( nameStart, nameEnd, &pTDef->mName );
+ get_string_between( nameStart, nameEnd, &pTDef->m_Name );
clear_commets_queue();
projects / wxWidgets.git / blobdiff