Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More warning and error fixes (work in progress with Tinderbox).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-30 15:04:17 +00:00
parent 619be6d0eb
commit 41964404be
3 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/HelpGen/src/cjparser.cpp
View File

@@ -386,13 +386,13 @@ static inline bool get_next_token( char*& cur )
return true;
}
static inline void skip_preprocessor_dir( char*& cur )
static inline void skip_preprocessor_dir( wxChar*& cur )
{
do
{
skip_to_eol(cur);
if ( *(cur-1) != '\\' )
if ( *(cur-1) != _T('\\') )
break;
if ( cur < _gSrcEnd )
@@ -2196,10 +2196,10 @@ void CJSourceParser::AddClassNode( char*& cur )
clear_commets_queue();
}
void CJSourceParser::AddEnumNode( char*& cur )
void CJSourceParser::AddEnumNode( wxChar*& cur )
{
// now the cursor is at "enum" keyword
char* start = cur;
wxChar* start = cur;
spEnumeration* pEnum = new spEnumeration();
mpCurCtx->AddMember( pEnum );
@@ -2233,13 +2233,13 @@ void CJSourceParser::AddEnumNode( char*& cur )
clear_commets_queue();
}
void CJSourceParser::AddTypeDefNode( char*& cur )
void CJSourceParser::AddTypeDefNode( wxChar*& cur )
{
// now the cursor at the token next to "typedef" keyword
if ( !get_next_token(cur) ) return;
char* start = cur;
wxChar* start = cur;
spTypeDef* pTDef = new spTypeDef();
mpCurCtx->AddMember( pTDef );
@@ -2253,18 +2253,18 @@ void CJSourceParser::AddTypeDefNode( char*& cur )
int tmpLnNo;
store_line_no( tmpLnNo );
char* tok = cur-1;
wxChar* tok = cur-1;
skip_next_token_back( tok );
char* nameEnd = tok;
wxChar* nameEnd = tok;
skip_token_back( tok );
char* nameStart = tok;
wxChar* nameStart = tok;
skip_next_token_back( tok );
char* typeEnd = tok;
wxChar* typeEnd = tok;
// check if it's function prototype
if ( *nameStart == ')' )

24
utils/HelpGen/src/docripper.cpp
View File

@@ -257,13 +257,13 @@ ScriptTemplate* RipperDocGen::GetRefTemplFor( spContext& ctx )
return &mDeadRefTempl;
}
string RipperDocGen::GetScopedName( spContext& ofCtx )
wxString RipperDocGen::GetScopedName( spContext& ofCtx )
{
if ( ofCtx.IsInFile() )
return ofCtx.GetName();
else
return ofCtx.GetOutterContext()->GetName() +
"::" + ofCtx.GetName();
_T("::") + ofCtx.GetName();
}
void RipperDocGen::AddToCurrentClass( ScriptSection* pSection, spContext& ctx,
@@ -371,14 +371,14 @@ void RipperDocGen::VisitEnumeration( spEnumeration& en )
if ( CheckIfUncommented( en, *mpEnumIdx ) )
return;
string body;
wxString body;
body += mTags[TAG_BOLD].start;
AppendMulitilineStr( body, en.m_EnumContent );
body += mTags[TAG_BOLD].end;
string line;
wxString line;
AppendHighlightedSource( line, body );
AppendComments( en, line );
@@ -394,7 +394,7 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
if ( CheckIfUncommented( td, *mpTypeDefIdx ) )
return;
string body;
wxString body;
body += mTags[TAG_BOLD].start;
body += "typdef ";
body += mTags[TAG_BOLD].end;
@@ -407,7 +407,7 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
body += td.GetName();
body += mTags[TAG_BOLD].end;
string line;
wxString line;
AppendHighlightedSource( line, body );
AppendComments( td, line );
@@ -426,10 +426,10 @@ void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
if ( CheckIfUncommented( pd, *mpMacroIdx ) )
return;
string body;
wxString body;
body += mTags[TAG_FIXED_FONT].start;
string coloredLine = pd.m_Line;
wxString coloredLine = pd.m_Line;
AppendHighlightedSource( coloredLine, pd.m_Line );
AppendMulitilineStr( body, coloredLine );
@@ -456,7 +456,7 @@ void RipperDocGen::VisitClass( spClass& cl )
return;
}
string body;
wxString body;
AppendComments( cl, body );
mpCurClassSect =
@@ -491,7 +491,7 @@ void RipperDocGen::VisitClass( spClass& cl )
void RipperDocGen::VisitAttribute( spAttribute& attr )
{
string body;
wxString body;
body += mTags[TAG_BOLD].start;
body += attr.m_Type;
body += mTags[TAG_BOLD].end;
@@ -501,7 +501,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
body += attr.GetName();
body += mTags[TAG_ITALIC].end;
string line;
wxString line;
AppendHighlightedSource( line, body );
AppendComments( attr, line );
@@ -525,7 +525,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
void RipperDocGen::VisitOperation( spOperation& op )
{
string body;
wxString body;
AppendHighlightedSource( body, op.GetFullName(mTags) );

182
utils/HelpGen/src/docripper.h
View File

@@ -6,7 +6,7 @@
// Created: 22/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleskandars Gluchovas
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DOCRIPPER_G__
@@ -17,140 +17,140 @@
#include "sourcepainter.h"
#if defined( wxUSE_TEMPLATE_STL )
#include <vector>
typedef vector<ScriptTemplate*> STemplateListT;
#include <vector>
typedef vector<ScriptTemplate*> STemplateListT;
#else
#include "wxstlvec.h"
#include "wxstlvec.h"
typedef ScriptTemplate* ScriptTemplatePtrT;
typedef WXSTL_VECTOR_SHALLOW_COPY(ScriptTemplatePtrT) STemplateListT;
typedef ScriptTemplate* ScriptTemplatePtrT;
typedef WXSTL_VECTOR_SHALLOW_COPY(ScriptTemplatePtrT) STemplateListT;
#endif
// specific DocGenerator class for "Ripper",
// specific DocGenerator class for "Ripper",
// also acts as source code visitor
class RipperDocGen : public DocGeneratorBase, public spVisitor
{
protected:
// templates for various sections
ScriptTemplate mTopTempl;
ScriptTemplate mContentIdxTempl;
ScriptTemplate mSuperContentTempl;
ScriptTemplate mSubContentTempl;
ScriptTemplate mOutLineTempl;
ScriptTemplate mOutLine1Templ;
// templates for various sections
ScriptTemplate mTopTempl;
ScriptTemplate mContentIdxTempl;
ScriptTemplate mSuperContentTempl;
ScriptTemplate mSubContentTempl;
ScriptTemplate mOutLineTempl;
ScriptTemplate mOutLine1Templ;
// template used for corss-references
ScriptTemplate mRefTempl;
// template used for corss-references
ScriptTemplate mRefTempl;
// template used to show not-existing sections
ScriptTemplate mDeadRefTempl;
// template used to show not-existing sections
ScriptTemplate mDeadRefTempl;
// template collection for generation of class-tree
STemplateListT mTreeTemplates;
// template collection for generation of class-tree
STemplateListT mTreeTemplates;
// pointers to all major index sections
ScriptSection* mpTopIdx;
ScriptSection* mpClassIdx;
ScriptSection* mpEnumIdx;
ScriptSection* mpTypeDefIdx;
ScriptSection* mpMacroIdx;
ScriptSection* mpGlobalVarsIdx;
ScriptSection* mpGlobalFuncIdx;
ScriptSection* mpConstIdx;
// pointers to all major index sections
ScriptSection* mpTopIdx;
ScriptSection* mpClassIdx;
ScriptSection* mpEnumIdx;
ScriptSection* mpTypeDefIdx;
ScriptSection* mpMacroIdx;
ScriptSection* mpGlobalVarsIdx;
ScriptSection* mpGlobalFuncIdx;
ScriptSection* mpConstIdx;
// parser set up from user-code for sepcific language
SourceParserBase* mpParser;
// parser set up from user-code for sepcific language
SourceParserBase* mpParser;
// class section, which is currently being
// assembled
ScriptSection* mpCurClassSect;
// source syntax heighlighter object
SourcePainter mSrcPainter;
// class section, which is currently being
// assembled
ScriptSection* mpCurClassSect;
// context, to which all file contexts
// are assembled
spContext* mpFileBinderCtx;
// source syntax heighlighter object
SourcePainter mSrcPainter;
// script tags set up from usesr code
MarkupTagsT mTags;
// context, to which all file contexts
// are assembled
spContext* mpFileBinderCtx;
// script tags set up from usesr code
MarkupTagsT mTags;
protected:
// helpers
void AppendComments( spContext& fromContext, string& str );
// helpers
void AppendComments( spContext& fromContext, string& str );
void AppendMulitilineStr( string& st, string& mlStr );
void AppendMulitilineStr( string& st, string& mlStr );
void AppendHighlightedSource( string& st, string source );
void AppendHighlightedSource( string& st, string source );
// returns TRUE, if no comments found in the context,
// plus, creates dummy(empty) section, and puts a
// reference woth "dead-link" template to it in the
// given index-section "toSect"
// returns true, if no comments found in the context,
// plus, creates dummy(empty) section, and puts a
// reference woth "dead-link" template to it in the
// given index-section "toSect"
bool CheckIfUncommented( spContext& ctx, ScriptSection& toSect );
bool CheckIfUncommented( spContext& ctx, ScriptSection& toSect );
// checks if context has any comments, then returns
// template of normal reference, otherwise of dead reference
// checks if context has any comments, then returns
// template of normal reference, otherwise of dead reference
ScriptTemplate* GetRefTemplFor( spContext& ctx );
ScriptTemplate* GetRefTemplFor( spContext& ctx );
// adds "someClass::" perfix to the context name,
// if it's not in the file scope (i.e. if it's not global)
// adds "someClass::" perfix to the context name,
// if it's not in the file scope (i.e. if it's not global)
string GetScopedName( spContext& ofCtx );
wxString GetScopedName( spContext& ofCtx );
// adds section to currently assembled class section
// and places references to it from "public", "protected"
// or "private" indexing-subsections of the class, depending
// on the visibility of the context
// adds section to currently assembled class section
// and places references to it from "public", "protected"
// or "private" indexing-subsections of the class, depending
// on the visibility of the context
void AddToCurrentClass( ScriptSection* pSection, spContext& ctx,
const char* subSectionName );
void AddToCurrentClass( ScriptSection* pSection, spContext& ctx,
const char* subSectionName );
// called, after all files are processed, to
// resolve possible super/derived class relations,
// and put cross references to them - where resolution was
// successful
void LinkSuperClassRefs();
// called, after all files are processed, to
// resolve possible super/derived class relations,
// and put cross references to them - where resolution was
// successful
void LinkSuperClassRefs();
// implementations of "visiting procedures", declared in spVisitor
// implementations of "visiting procedures", declared in spVisitor
virtual void VisitClass( spClass& cl );
virtual void VisitEnumeration( spEnumeration& en );
virtual void VisitTypeDef( spTypeDef& td );
virtual void VisitPreprocessorLine( spPreprocessorLine& pd );
virtual void VisitAttribute( spAttribute& attr );
virtual void VisitOperation( spOperation& op );
virtual void VisitClass( spClass& cl );
virtual void VisitEnumeration( spEnumeration& en );
virtual void VisitTypeDef( spTypeDef& td );
virtual void VisitPreprocessorLine( spPreprocessorLine& pd );
virtual void VisitAttribute( spAttribute& attr );
virtual void VisitOperation( spOperation& op );
// overriden member of DocGernatorBase
// overriden member of DocGernatorBase
virtual bool OnSaveDocument( ScriptStream& stm );
virtual bool OnSaveDocument( ScriptStream& stm );
virtual ScriptSection* GetTopSection()
{ return mpTopIdx; }
virtual ScriptSection* GetTopSection()
{ return mpTopIdx; }
public:
RipperDocGen();
~RipperDocGen();
RipperDocGen();
~RipperDocGen();
// should be called onece to set user-code provided,
// parser for specific source code language
// (NOTE:: it's the user-code's responsibility to
// relseas memory of pParser)
// should be called onece to set user-code provided,
// parser for specific source code language
// (NOTE:: it's the user-code's responsibility to
// relseas memory of pParser)
void Init( SourceParserBase* pParser );
// should be called on each file
void ProcessFile( const char* sourceFile );
void Init( SourceParserBase* pParser );
// should be called on each file
void ProcessFile( const char* sourceFile );
};