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

fix the automatic modify mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-24 00:51:22 +00:00
parent 1f81aa3692
commit 919ccb4c44
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
utils/ifacecheck/src/ifacecheck.cpp
View File

@@ -37,10 +37,10 @@ bool g_verbose = false;
#define API_DUMP_FILE "dump.api.txt" #define API_DUMP_FILE "dump.api.txt"
#define INTERFACE_DUMP_FILE "dump.interface.txt" #define INTERFACE_DUMP_FILE "dump.interface.txt"
#define MODIFY_SWITCH "m" #define MODIFY_SWITCH "m"
#define DUMP_SWITCH "dump" #define DUMP_SWITCH "dump"
#define HELP_SWITCH "h" #define HELP_SWITCH "h"
#define VERBOSE_SWITCH "v" #define VERBOSE_SWITCH "v"
static const wxCmdLineEntryDesc g_cmdLineDesc[] = static const wxCmdLineEntryDesc g_cmdLineDesc[] =
{ {
@@ -199,7 +199,7 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClassPtrArray& a
for (unsigned int i=0; i<iface->GetMethodCount(); i++) for (unsigned int i=0; i<iface->GetMethodCount(); i++)
{ {
const wxMethod& m = iface->GetMethod(i); const wxMethod& m = iface->GetMethod(i);
wxString tofind = m.GetAsString(); const wxString& tofind = m.GetAsString();
int matches = 0; int matches = 0;
// search in the methods of the api classes provided // search in the methods of the api classes provided
@@ -271,35 +271,47 @@ void IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
return; return;
} }
#if 0
// fix iface signature to match that of "api" method:
file.RemoveLine(iface->GetLocation());
file.InsertLine(api->GetAsString(), iface->GetLocation());
#else
// GetLocation() returns the line where the last part of the prototype is placed: // GetLocation() returns the line where the last part of the prototype is placed:
int end = iface->GetLocation()-1; int end = iface->GetLocation()-1;
if (end <= 0 || end >= (int)file.GetLineCount()) {
LogWarning("invalid location info for method '%s': %d.",
iface->GetAsString(), iface->GetLocation());
return;
}
// find the start point of this prototype declaration: // find the start point of this prototype declaration:
int start = end; int start = end;
while (!file.GetLine(start).Contains(";") && !file.GetLine(start).Contains("*/")) while (start > 0 &&
{ !file.GetLine(start).Contains(";") &&
!file.GetLine(start).Contains("*/"))
start--; start--;
if (start <= 0)
{ if (start <= 0)
LogError("can't find the beginning of the declaration of '%s' method in '%s' header", {
iface->GetAsString(), header); LogError("can't find the beginning of the declaration of '%s' method in '%s' header",
return; iface->GetAsString(), header);
} return;
} }
// remove the old prototype // remove the old prototype
for (int i=start; i<=end; i++) for (int i=start; i<=end; i++)
file.RemoveLine(i); file.RemoveLine(start); // remove (end-start)-nth times the start-th line
#define INDENTATION_STR wxString(" ")
// if possible, add also the @deprecated tag in the doxygen comment
if (file.GetLine(start-1).Contains("*/") && api->IsDeprecated())
{
file.RemoveLine(start-1);
file.InsertLine(INDENTATION_STR + INDENTATION_STR +
"@deprecated @todo provide deprecation description", start-1);
file.InsertLine(INDENTATION_STR + "*/", start++);
}
// insert the new one // insert the new one
file.InsertLine(" " + api->GetAsString(), start); file.InsertLine(INDENTATION_STR + api->GetAsString() + ";", start);
#endif
// now save the modification
if (!file.Write()) { if (!file.Write()) {
LogError("can't save the '%s' header file.", header); LogError("can't save the '%s' header file.", header);
return; return;