ignore preprocessor lines which #define a symbol to 'nothing'

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/ifacecheck/src/ifacecheck.cpp b/utils/ifacecheck/src/ifacecheck.cpp
index 72ecc5226a1cf148a051d3fa5fe61a6562eb3dbb..48d5690b6e02047afe811bc6fc891e00877df756 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck.cpp
+++ b/utils/ifacecheck/src/ifacecheck.cpp
@@ -537,24 +537,34 @@ bool IfaceCheckApp::ParsePreprocessorOutput(const wxString& filename)
 
         // the format of this line should be:
         //    #define DEFNAME DEFVALUE
 
         // the format of this line should be:
         //    #define DEFNAME DEFVALUE

-        if (!line.StartsWith("#define ") || !defnameval.Contains(" ")) {
-            LogError("unexpected content in '%s' at line %d.", filename, i);
+        if (!line.StartsWith("#define ")) {
+            LogError("unexpected content in '%s' at line %d.", filename, i+1);

             return false;
         }
 
             return false;
         }
 

-        // get DEFNAME
-        wxString defname = defnameval.BeforeFirst(' ');
-        if (defname.Contains("("))
-            continue;       // this is a macro, skip it!
-
-        // get DEFVAL
-        wxString defval = defnameval.AfterFirst(' ').Strip(wxString::both);
-        if (defval.StartsWith("(") && defval.EndsWith(")"))
-            defval = defval.Mid(1, defval.Len()-2);
-
-        // store this pair in the doxygen interface, where it can be useful
-        m_doxyInterface.AddPreprocessorValue(defname, defval);
-        useful++;
+        if (defnameval.Contains(" "))
+        {
+            // get DEFNAME
+            wxString defname = defnameval.BeforeFirst(' ');
+            if (defname.Contains("("))
+                continue;       // this is a macro, skip it!
+
+            // get DEFVAL
+            wxString defval = defnameval.AfterFirst(' ').Strip(wxString::both);
+            if (defval.StartsWith("(") && defval.EndsWith(")"))
+                defval = defval.Mid(1, defval.Len()-2);
+
+            // store this pair in the doxygen interface, where it can be useful
+            m_doxyInterface.AddPreprocessorValue(defname, defval);
+            useful++;
+        }
+        else
+        {
+            // it looks like the format of this line is:
+            //    #define DEFNAME
+            // we are not interested to symbols #defined to nothing,
+            // so we just ignore this line.
+        }

     }
 
     LogMessage("Parsed %d preprocessor #defines from '%s' which will be used later...",
     }
 
     LogMessage("Parsed %d preprocessor #defines from '%s' which will be used later...",