Commit 73d94c38 authored by Albert's avatar Albert

Debug output for lexical analyzer

The previous commit (pull request) was missing the debug output possibility for config.l and partial for doctokinizer.l.
The later is called on different places by means of the generic definition doctokinizerYYlex, which is declared by means of YY_DECL.
To be able to add the debug output the YY_DECL had to be redefined to be a new function and the new function, with the debug output possibility, has to be called through the original function name.
parent 3c0a246b
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "version.h" #include "version.h"
#include "portable.h" #include "portable.h"
#include "util.h" #include "util.h"
#include "message.h"
#include "lang_cfg.h" #include "lang_cfg.h"
#include "configoptions.h" #include "configoptions.h"
...@@ -1686,8 +1687,12 @@ bool Config::parseString(const char *fn,const char *str) ...@@ -1686,8 +1687,12 @@ bool Config::parseString(const char *fn,const char *str)
bool Config::parse(const char *fn) bool Config::parse(const char *fn)
{ {
int retval;
encoding = "UTF-8"; encoding = "UTF-8";
return parseString(fn,configFileToString(fn)); printlex(yy_flex_debug, TRUE, __FILE__, fn);
retval = parseString(fn,configFileToString(fn));
printlex(yy_flex_debug, FALSE, __FILE__, fn);
return retval;
} }
extern "C" { // some bogus code to keep the compiler happy extern "C" { // some bogus code to keep the compiler happy
......
...@@ -320,6 +320,9 @@ static int yyread(char *buf,int max_size) ...@@ -320,6 +320,9 @@ static int yyread(char *buf,int max_size)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
#define REAL_YY_DECL int doctokenizerYYlex (void)
#define YY_DECL static int local_doctokinizer(void)
#define LOCAL_YY_DECL local_doctokinizer()
%} %}
...@@ -736,7 +739,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2} ...@@ -736,7 +739,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2}
} }
<St_CodeOpt>{BLANK}*"{"(".")?{LABELID}"}" { <St_CodeOpt>{BLANK}*"{"(".")?{LABELID}"}" {
g_token->name = yytext; g_token->name = yytext;
int i=g_token->name.find('{'); int i=g_token->name.find('{'); /* } to keep vi happy */
g_token->name = g_token->name.mid(i+1,g_token->name.length()-i-2); g_token->name = g_token->name.mid(i+1,g_token->name.length()-i-2);
BEGIN(St_Code); BEGIN(St_Code);
} }
...@@ -1387,6 +1390,13 @@ void doctokenizerYYendAutoList() ...@@ -1387,6 +1390,13 @@ void doctokenizerYYendAutoList()
g_autoListLevel--; g_autoListLevel--;
} }
REAL_YY_DECL
{
printlex(yy_flex_debug, TRUE, __FILE__, g_fileName);
int retval = LOCAL_YY_DECL;
printlex(yy_flex_debug, FALSE, __FILE__, g_fileName);
return retval;
}
#if !defined(YY_FLEX_SUBMINOR_VERSION) #if !defined(YY_FLEX_SUBMINOR_VERSION)
extern "C" { // some bogus code to keep the compiler happy extern "C" { // some bogus code to keep the compiler happy
void doctokenizerYYdummy() { yy_flex_realloc(0,0); } void doctokenizerYYdummy() { yy_flex_realloc(0,0); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment