Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 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@34406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-30 09:26:42 +00:00
parent 62d1f48bac
commit e48f6880e7
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
utils/HelpGen/src/HelpGen.cpp
View File

@@ -915,7 +915,7 @@ void HelpGenVisitor::CloseClass()
} }
else else
{ {
membersections.Put(ms, & membersections); membersections.Put(ms.c_str(), & membersections);
} }
} }
@@ -1390,7 +1390,7 @@ wxString DocManager::ExtractStringBetweenBraces(const char **pp)
if ( !SkipSpaceUntil(pp, '{') ) { if ( !SkipSpaceUntil(pp, '{') ) {
wxLogWarning("file %s(%d): '{' expected after '\\param'", wxLogWarning("file %s(%d): '{' expected after '\\param'",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
} }
else { else {
@@ -1398,7 +1398,7 @@ wxString DocManager::ExtractStringBetweenBraces(const char **pp)
if ( !SkipUntil(pp, '}') ) { if ( !SkipUntil(pp, '}') ) {
wxLogWarning("file %s(%d): '}' expected after '\\param'", wxLogWarning("file %s(%d): '}' expected after '\\param'",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
} }
else { else {
result = wxString(startParam, (*pp)++ - startParam); result = wxString(startParam, (*pp)++ - startParam);
@@ -1496,7 +1496,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
if ( !SkipSpaceUntil(&current, '{') ) { if ( !SkipSpaceUntil(&current, '{') ) {
wxLogWarning("file %s(%d): '{' expected after \\func, " wxLogWarning("file %s(%d): '{' expected after \\func, "
"\\constfunc or \\membersection.", "\\constfunc or \\membersection.",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1508,7 +1508,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
const char *startClass = current; const char *startClass = current;
if ( !SkipUntil(&current, ':') || *(current + 1) != ':' ) { if ( !SkipUntil(&current, ':') || *(current + 1) != ':' ) {
wxLogWarning("file %s(%d): '::' expected after " wxLogWarning("file %s(%d): '::' expected after "
"\\membersection.", m_filename.c_str(), m_line); "\\membersection.", m_filename.c_str(), (int)m_line);
} }
else { else {
classname = wxString(startClass, current - startClass); classname = wxString(startClass, current - startClass);
@@ -1523,7 +1523,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
if ( !SkipUntil(&current, '}') ) { if ( !SkipUntil(&current, '}') ) {
wxLogWarning("file %s(%d): '}' expected after return type", wxLogWarning("file %s(%d): '}' expected after return type",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1534,7 +1534,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
current++; current++;
if ( !SkipSpaceUntil(&current, '{') ) { if ( !SkipSpaceUntil(&current, '{') ) {
wxLogWarning("file %s(%d): '{' expected after return type", wxLogWarning("file %s(%d): '{' expected after return type",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1543,7 +1543,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
const char *funcEnd = current; const char *funcEnd = current;
if ( !SkipUntil(&funcEnd, '}') ) { if ( !SkipUntil(&funcEnd, '}') ) {
wxLogWarning("file %s(%d): '}' expected after function name", wxLogWarning("file %s(%d): '}' expected after function name",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1572,7 +1572,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
size_t len = strlen("\\destruct{"); size_t len = strlen("\\destruct{");
if ( funcName(0, len) != "\\destruct{" ) { if ( funcName(0, len) != "\\destruct{" ) {
wxLogWarning("file %s(%d): \\destruct expected", wxLogWarning("file %s(%d): \\destruct expected",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1582,7 +1582,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
if ( !SkipSpaceUntil(&current, '}') ) { if ( !SkipSpaceUntil(&current, '}') ) {
wxLogWarning("file %s(%d): '}' expected after destructor", wxLogWarning("file %s(%d): '}' expected after destructor",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1597,7 +1597,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
if ( !SkipSpaceUntil(&current, '{') || if ( !SkipSpaceUntil(&current, '{') ||
(current++, !SkipSpaceUntil(&current, '\\')) ) { (current++, !SkipSpaceUntil(&current, '\\')) ) {
wxLogWarning("file %s(%d): '\\param' or '\\void' expected", wxLogWarning("file %s(%d): '\\param' or '\\void' expected",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1654,7 +1654,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
} }
else { else {
wxLogWarning("file %s(%d): ',' or '}' expected after " wxLogWarning("file %s(%d): ',' or '}' expected after "
"'\\param'", m_filename.c_str(), m_line); "'\\param'", m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1663,7 +1663,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
// if we got here there was no '\\void', so must have some params // if we got here there was no '\\void', so must have some params
if ( paramNames.IsEmpty() ) { if ( paramNames.IsEmpty() ) {
wxLogWarning("file %s(%d): '\\param' or '\\void' expected", wxLogWarning("file %s(%d): '\\param' or '\\void' expected",
m_filename.c_str(), m_line); m_filename.c_str(), (int)m_line);
continue; continue;
} }
@@ -1680,13 +1680,17 @@ bool DocManager::ParseTeXFile(const wxString& filename)
paramsAll << paramTypes[param] << ' ' << paramNames[param]; paramsAll << paramTypes[param] << ' ' << paramNames[param];
} }
wxString constStr;
if (foundCommand == ConstFunc)
constStr = _T(" const");
wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'", wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'",
m_filename.c_str(), m_line, m_filename.c_str(), m_line,
returnType.c_str(), returnType.c_str(),
classname.c_str(), classname.c_str(),
funcName.c_str(), funcName.c_str(),
paramsAll.c_str(), paramsAll.c_str(),
foundCommand == ConstFunc ? " const" : ""); constStr.c_str());
// store the info about the just found function // store the info about the just found function
ArrayMethodInfo *methods; ArrayMethodInfo *methods;
@@ -1849,7 +1853,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
"in the docs: should be %d instead of %d.", "in the docs: should be %d instead of %d.",
nameClass.c_str(), nameClass.c_str(),
nameMethod.c_str(), nameMethod.c_str(),
params.size(), method.GetParamCount()); (int)params.size(), (int)method.GetParamCount());
} }
else { else {
size_t nParam = 0; size_t nParam = 0;
@@ -1869,7 +1873,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
wxLogError("Parameter #%d of '%s::%s' should be " wxLogError("Parameter #%d of '%s::%s' should be "
"'%s' and not '%s'.", "'%s' and not '%s'.",
nParam + 1, (int)(nParam + 1),
nameClass.c_str(), nameClass.c_str(),
nameMethod.c_str(), nameMethod.c_str(),
ctxParam->m_Name.c_str(), ctxParam->m_Name.c_str(),
@@ -2192,6 +2196,9 @@ static const wxString GetVersionString()
/* /*
$Log$ $Log$
Revision 1.39 2005/05/30 09:26:42 ABX
More warning and error fixes (work in progress with Tinderbox).
Revision 1.38 2005/05/24 09:06:20 ABX Revision 1.38 2005/05/24 09:06:20 ABX
More fixes and wxWidgets coding standards. More fixes and wxWidgets coding standards.

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

@@ -42,7 +42,7 @@
// statics used by inline'ed C helper-functions // statics used by inline'ed C helper-functions
static char* _gSrcStart = 0; static char* _gSrcStart = 0;
static char* _gSrcEnd = 0; static char* _gSrcEnd = 0;
static char* _gLastSuppresedComment = 0; static wxChar* _gLastSuppresedComment = 0;
static int _gLineNo = 0; static int _gLineNo = 0;
// FOR NOW:: comments queue is static // FOR NOW:: comments queue is static
@@ -945,23 +945,23 @@ static inline void get_string_between( wxChar* start, wxChar* end,
*end = saved; *end = saved;
} }
static char* set_comment_text( string& text, char* start ) static wxChar* set_comment_text( wxString& text, wxChar* start )
{ {
char* end = start; wxChar* end = start;
// to avoid poluting the queue with this comment // to avoid poluting the queue with this comment
_gLastSuppresedComment = start; _gLastSuppresedComment = start;
skip_comments( end ); skip_comments( end );
if ( *(end-1) == '/' ) if ( *(end-1) == _T('/') )
end -= 2; end -= 2;
start += 2; start += 2;
// skip multiple leading '/''s or '*''s // skip multiple leading '/''s or '*''s
while( *start == '/' && start < end ) ++start; while( *start == _T('/') && start < end ) ++start;
while( *start == '*' && start < end ) ++start; while( *start == _T('*') && start < end ) ++start;
get_string_between( start, end, &text ); get_string_between( start, end, &text );