As usual while waiting for the next release - don't forget to check the nightly builds in the forum.
Index: src/plugins/codecompletion/parser/parserthread.cpp===================================================================--- src/plugins/codecompletion/parser/parserthread.cpp (revision 6193)+++ src/plugins/codecompletion/parser/parserthread.cpp (working copy)@@ -21,12 +21,18 @@ #define PARSERTHREAD_DEBUG_OUTPUT 0 +#ifdef PARSER_TEST+ extern void ParserTrace(const wxChar* format, ...);+ #define TRACE(format, args...)\+ ParserTrace(format , ## args)+#else #if PARSERTHREAD_DEBUG_OUTPUT #define TRACE(format, args...)\ Manager::Get()->GetLogManager()->DebugLog(F( format , ## args)) #else #define TRACE(format, args...) #endif+#endif int THREAD_START = wxNewId(); int THREAD_END = wxNewId();@@ -1183,11 +1189,13 @@ while (!token.IsEmpty() && token != ParserConsts::kw_endif) token = m_Tokenizer.GetToken(); --m_PreprocessorIfCount;-#if PARSERTHREAD_DEBUG_OUTPUT+#if PARSERTHREAD_DEBUG_OUTPUT || defined PARSER_TEST int l = m_Tokenizer.GetNestingLevel(); #endif m_Tokenizer.RestoreNestingLevel();+#if PARSERTHREAD_DEBUG_OUTPUT || defined PARSER_TEST TRACE(_T("HandlePreprocessorBlocks() : Restoring nesting level: %d (was %d)"), m_Tokenizer.GetNestingLevel(), l);+#endif } else if (preproc==ParserConsts::kw_endif) // #endif --m_PreprocessorIfCount;Index: src/plugins/codecompletion/parser/tokenizer.cpp===================================================================--- src/plugins/codecompletion/parser/tokenizer.cpp (revision 6193)+++ src/plugins/codecompletion/parser/tokenizer.cpp (working copy)@@ -15,15 +15,22 @@ #include "manager.h" #include <cctype> #include <globals.h>+#include "logmanager.h" #define TOKENIZER_DEBUG_OUTPUT 0 +#ifdef PARSER_TEST+ extern void ParserTrace(const wxChar* format, ...);+ #define TRACE(format, args...)\+ ParserTrace(format , ## args)+#else #if TOKENIZER_DEBUG_OUTPUT #define TRACE(format, args...)\ Manager::Get()->GetLogManager()->DebugLog(F( format , ## args)) #else #define TRACE(format, args...) #endif+#endif namespace TokenizerConsts {