sqlcode.l: generate a reentrant scanner

 * put the global variables in struct sqlcodeYY_state.

 * globally define yyscanner and sqlcode_extra. these two should be per-thread.

 * add a new yyscan_t function parameter when these functions are referenced:
    - yyin, yyout, yyextra, yyleng, yytext, yylineno, yycolumn, and yy_flex_debug.
    - the macros BEGIN, YY_START, YYSTATE, yymore, unput, and yyless
    - the functions that deal with input buffers: yyrestart
    - others: yy_switch_to_buffer, yy_create_buffer, yy_delete_buffer,
                yy_flush_buffer, yypush_buffer_state, yypop_buffer_state,
                yy_scan_buffer, yy_scan_string, and yy_scan_bytes

 * add a new yyscan_t function parameter when globals are referenced,
   to get the yyextra out of the yyscanner.

1 files changed, 250 insertions, 225 deletions

diff --git a/src/sqlcode.l b/src/sqlcode.l
index 33579b0..59de849 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -15,6 +15,10 @@
 
 %option never-interactive
 %option prefix="sqlcodeYY"
+%option noyywrap
+%option nounput
+%option reentrant
+%option extra-type="struct sqlcodeYY_state *"
 
 %{
 
@@ -36,128 +40,255 @@
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
 
-static CodeOutputInterface * g_code;
-static QCString      g_curClassName;
-static QCString      g_parmType;
-static QCString      g_parmName;
-static const char *  g_inputString;     //!< the code fragment as text
-static int           g_inputPosition;   //!< read offset during parsing 
-static int           g_inputLines;      //!< number of line in the code fragment
-static int           g_yyLineNr;        //!< current line number
-static bool          g_needsTermination;
-static const Definition   *g_searchCtx;
-
-static bool          g_exampleBlock;
-static QCString      g_exampleName;
-static QCString      g_exampleFile;
-
-static QCString      g_type;
-static QCString      g_name;
-static QCString      g_args;
-static QCString      g_classScope;
-   
-static QCString      g_CurrScope;
-   
-static FileDef *     g_sourceFileDef;
-static Definition *  g_currentDefinition;
-static MemberDef *   g_currentMemberDef;
-static bool          g_includeCodeFragment;
-static const char *  g_currentFontClass;
-
-static void codify(const char* text) 
+struct sqlcodeYY_state
+{
+     CodeOutputInterface * code;
+     const char   *inputString;     //!< the code fragment as text
+     int           inputPosition;   //!< read offset during parsing
+     int           inputLines;      //!< number of line in the code fragment
+     int           yyLineNr;        //!< current line number
+     bool          needsTermination;
+     const Definition   *searchCtx;
+
+     bool          exampleBlock;
+     QCString      exampleName;
+     QCString      classScope;
+
+     FileDef      *sourceFileDef;
+     Definition   *currentDefinition;
+     MemberDef    *currentMemberDef;
+     bool          includeCodeFragment;
+     const char   *currentFontClass;
+};
+
+static void codify(const char* text);
+static void setCurrentDoc(const QCString &anchor,yyscan_t yyscanner);
+static void startCodeLine(yyscan_t yyscanner);
+static void endFontClass(yyscan_t yyscanner);
+static void endCodeLine(yyscan_t yyscanner);
+static void nextCodeLine(yyscan_t yyscanner);
+static void codifyLines(char *text,yyscan_t yyscanner);
+static void startFontClass(const char *s,yyscan_t yyscanner);
+static int countLines(yyscan_t yyscanner);
+static int yyread(char *buf,int max_size,yyscan_t yyscanner);
+
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size,yyscanner);
+
+%}
+
+nl              (\r\n|\r|\n)
+ws              [ \t]+
+idchar          [A-Za-z0-9\-_]+
+keywords1       ("ADD"|"ALL"|"ALLOCATE"|"ALTER"|"AND"|"ANY"|"ARE"|"AS"|"ASENSITIVE"|"ASYMMETRIC"|"AT"|"ATOMIC"|"AUTHORIZATION"|"BETWEEN"|"BOTH"|"BY"|"CALL"|"CALLED"|"CASCADED"|"CAST")
+keywords2       ("CHECK"|"CLOSE"|"COLLATE"|"COLUMN"|"COMMIT"|"CONNECT"|"CONSTRAINT"|"CONTINUE"|"CORRESPONDING"|"CREATE"|"CROSS"|"CUBE"|"CURRENT"|"CURRENT_DATE"|"CURRENT_DEFAULT_TRANSFORM_GROUP")
+keywords3       ("CURRENT_PATH"|"CURRENT_ROLE"|"CURRENT_TIME"|"CURRENT_TIMESTAMP"|"CURRENT_TRANSFORM_GROUP_FOR_TYPE"|"CURRENT_USER")
+keywords4       ("CURSOR"|"CYCLE"|"DAY"|"DEALLOCATE"|"DECLARE"|"DEFAULT"|"DELETE"|"DEREF"|"DESCRIBE"|"DETERMINISTIC"|"DISCONNECT"|"DISTINCT"|"DROP"|"DYNAMIC")
+keywords5       ("EACH"|"ELEMENT"|"END-EXEC"|"ESCAPE"|"EXCEPT"|"EXEC"|"EXECUTE"|"EXISTS"|"EXTERNAL"|"FETCH"|"FILTER"|"FOR"|"FOREIGN"|"FREE"|"FROM"|"FULL"|"FUNCTION")
+keywords6       ("GET"|"GLOBAL"|"GRANT"|"GROUP"|"GROUPING"|"HAVING"|"HOLD"|"HOUR"|"IDENTITY"|"IMMEDIATE"|"IN"|"INDICATOR"|"INNER"|"INOUT"|"INPUT"|"INSENSITIVE"|"INSERT"|"INTERSECT")
+keywords7       ("INTERVAL"|"INTO"|"IS"|"ISOLATION"|"JOIN"|"LANGUAGE"|"LARGE"|"LATERAL"|"LEADING"|"LEFT"|"LIKE"|"LOCAL"|"LOCALTIME"|"LOCALTIMESTAMP"|"MATCH"|"MEMBER"|"MERGE"|"METHOD"|"MINUTE")
+keywords8       ("MODIFIES"|"MODULE"|"MONTH"|"MULTISET"|"NATIONAL"|"NATURAL"|"NEW"|"NO"|"NONE"|"NOT"|"OF"|"OLD"|"ON"|"ONLY"|"OPEN"|"OR"|"ORDER"|"OUT"|"OUTER"|"OUTPUT")
+keywords9       ("OVER"|"OVERLAPS"|"PARAMETER"|"PARTITION"|"PRECISION"|"PREPARE"|"PRIMARY"|"PROCEDURE"|"RANGE"|"READS"|"RECURSIVE"|"REF"|"REFERENCES"|"REFERENCING"|"REGR_AVGX"|"REGR_AVGY")
+keywords10      ("REGR_COUNT"|"REGR_INTERCEPT"|"REGR_R2"|"REGR_SLOPE"|"REGR_SXX"|"REGR_SXY"|"REGR_SYY"|"RELEASE"|"RESULT"|"RETURN"|"RETURNS"|"REVOKE"|"RIGHT"|"ROLLBACK"|"ROLLUP"|"ROW"|"ROWS"|"SAVEPOINT")
+keywords11      ("SCROLL"|"SEARCH"|"SECOND"|"SELECT"|"SENSITIVE"|"SESSION_USER"|"SET"|"SIMILAR"|"SOME"|"SPECIFIC"|"SPECIFICTYPE"|"SQL"|"SQLEXCEPTION"|"SQLSTATE"|"SQLWARNING"|"START"|"STATIC")
+keywords12      ("SUBMULTISET"|"SYMMETRIC"|"SYSTEM"|"SYSTEM_USER"|"TABLE"|"THEN"|"TIMEZONE_HOUR"|"TIMEZONE_MINUTE"|"TO"|"TRAILING"|"TRANSLATION"|"TREAT"|"TRIGGER"|"UESCAPE"|"UNION")
+keywords13      ("UNIQUE"|"UNNEST"|"UPDATE"|"UPPER"|"USER"|"USING"|"VALUE"|"VALUES"|"VAR_POP"|"VAR_SAMP"|"VARYING"|"WHEN"|"WHENEVER"|"WHERE"|"WIDTH_BUCKET"|"WINDOW"|"WITH"|"WITHIN"|"WITHOUT"|"YEAR")
+
+/* Need multiple keyword definitions due to max length */
+keyword         (?i:{keywords1}|{keywords2}|{keywords3}|{keywords4}|{keywords5}|{keywords6}|{keywords7}|{keywords8}|{keywords9}|{keywords10}|{keywords11}|{keywords12}|{keywords13})
+
+typekeyword     (?i:"ARRAY"|"BIGINT"|"BINARY"|"BLOB"|"BOOLEAN"|"CHAR"|"CHARACTER"|"CLOB"|"DATE"|"DEC"|"DECIMAL"|"DOUBLE"|"FLOAT"|"INT"|"INTEGER"|"NCHAR"|"NCLOB"|"NUMERIC"|"NVARCHAR"|"REAL"|"SMALLINT"|"TIME"|"TIMESTAMP"|"VARCHAR")
+
+flowkeyword     (?i:"CASE"|"IF"|"ELSE"|"BEGIN"|"END"|"WHILE")
+
+literalkeyword  (?i:"FALSE"|"TRUE"|"NULL"|"UNKNOWN")
+stringliteral   (\"[^"]*\")|('[^']*')
+number          [0-9]+
+literals        ({literalkeyword}|{stringliteral}|{number})
+
+variable        @{idchar}+
+
+simplecomment   --.*
+commentopen     "/\*"
+commentclose    "\*/"
+
+%x COMMENT
+
+%%
+
+{literals}          {
+                        startFontClass("stringliteral",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+                
+
+{keyword}           {
+                        startFontClass("keyword",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+
+{flowkeyword}       {
+                        startFontClass("keywordflow",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+
+{typekeyword}       {
+                        startFontClass("keywordtype",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+
+{variable}          {
+                        startFontClass("preprocessor",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+
+{simplecomment}     {
+                        startFontClass("comment",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                    }
+
+{commentopen}       {
+                        startFontClass("comment",yyscanner);
+                        codifyLines(yytext,yyscanner);
+                        BEGIN(COMMENT);
+                    }
+
+<COMMENT>.          {
+                        codifyLines(yytext,yyscanner);
+ 
+                    }
+<COMMENT>{nl}       {
+                        codifyLines(yytext,yyscanner);
+                    }
+
+<COMMENT>{commentclose} {
+                        codifyLines(yytext,yyscanner);
+                        endFontClass(yyscanner);
+                        BEGIN(INITIAL);
+                    }
+                    
+{idchar}            {
+                        codifyLines(yytext,yyscanner);
+                    }
+
+{nl}                {
+                        codifyLines(yytext,yyscanner);
+                    }
+
+.                   {
+                        codifyLines(yytext,yyscanner);
+                    }
+
+%%
+
+
+static void codify(const char* text, yyscan_t yyscanner)
 { 
-  g_code->codify(text);
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->code->codify(text);
 }
 
-static void setCurrentDoc(const QCString &anchor)
+static void setCurrentDoc(const QCString &anchor, yyscan_t yyscanner)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (Doxygen::searchIndex)
   {
-    if (g_searchCtx)
+    if (yyextra->searchCtx)
     {
-      Doxygen::searchIndex->setCurrentDoc(g_searchCtx,g_searchCtx->anchor(),FALSE);
+      Doxygen::searchIndex->setCurrentDoc(yyextra->searchCtx,yyextra->searchCtx->anchor(),FALSE);
     }
     else
     {
-      Doxygen::searchIndex->setCurrentDoc(g_sourceFileDef,anchor,TRUE);
+      Doxygen::searchIndex->setCurrentDoc(yyextra->sourceFileDef,anchor,TRUE);
     }
   }
 }
 
-/*! start a new line of code, inserting a line number if g_sourceFileDef
+/*! start a new line of code, inserting a line number if yyextra->sourceFileDef
  * is TRUE. If a definition starts at the current line, then the line
  * number is linked to the documentation of that definition.
  */
-static void startCodeLine()
+static void startCodeLine(yyscan_t yyscanner)
 {
-  if (g_sourceFileDef)
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->sourceFileDef)
   {   
-    Definition *d   = g_sourceFileDef->getSourceDefinition(g_yyLineNr);
+    Definition *d   = yyextra->sourceFileDef->getSourceDefinition(yyextra->yyLineNr);
     
-    if (!g_includeCodeFragment && d && d->isLinkableInProject())
+    if (!yyextra->includeCodeFragment && d && d->isLinkableInProject())
     {
-      g_currentDefinition = d;
-      g_currentMemberDef = g_sourceFileDef->getSourceMember(g_yyLineNr);
-      g_classScope = d->name().copy();
+      yyextra->currentDefinition = d;
+      yyextra->currentMemberDef = yyextra->sourceFileDef->getSourceMember(yyextra->yyLineNr);
+      yyextra->classScope = d->name().copy();
       QCString lineAnchor;
-      lineAnchor.sprintf("l%05d",g_yyLineNr);
-      if (g_currentMemberDef)
+      lineAnchor.sprintf("l%05d",yyextra->yyLineNr);
+      if (yyextra->currentMemberDef)
       {
-        g_code->writeLineNumber(g_currentMemberDef->getReference(),
-                            g_currentMemberDef->getOutputFileBase(),
-                            g_currentMemberDef->anchor(),g_yyLineNr);
-        setCurrentDoc(lineAnchor);
+        yyextra->code->writeLineNumber(yyextra->currentMemberDef->getReference(),
+                            yyextra->currentMemberDef->getOutputFileBase(),
+                            yyextra->currentMemberDef->anchor(),yyextra->yyLineNr);
+        setCurrentDoc(lineAnchor,yyscanner);
       }
       else
       {
-        g_code->writeLineNumber(d->getReference(),
+        yyextra->code->writeLineNumber(d->getReference(),
                             d->getOutputFileBase(),
-                            0,g_yyLineNr);
-        setCurrentDoc(lineAnchor);
+                            0,yyextra->yyLineNr);
+        setCurrentDoc(lineAnchor,yyscanner);
       }
     }
     else
     {
-      g_code->writeLineNumber(0,0,0,g_yyLineNr);
+      yyextra->code->writeLineNumber(0,0,0,yyextra->yyLineNr);
     }
   }
   
-  g_code->startCodeLine(g_sourceFileDef);
+  yyextra->code->startCodeLine(yyextra->sourceFileDef);
   
-  if (g_currentFontClass)
+  if (yyextra->currentFontClass)
   {
-    g_code->startFontClass(g_currentFontClass);
+    yyextra->code->startFontClass(yyextra->currentFontClass);
   }
 }
 
-static void endFontClass()
+static void endFontClass(yyscan_t yyscanner)
 {
-  if (g_currentFontClass)
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->currentFontClass)
   {
-    g_code->endFontClass();
-    g_currentFontClass=0;
+    yyextra->code->endFontClass();
+    yyextra->currentFontClass=0;
   }
 }
 
-static void endCodeLine()
+static void endCodeLine(yyscan_t yyscanner)
 {
-  endFontClass();
-  g_code->endCodeLine();
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  endFontClass(yyscanner);
+  yyextra->code->endCodeLine();
 }
 
-static void nextCodeLine()
+static void nextCodeLine(yyscan_t yyscanner)
 {
-  const char *fc = g_currentFontClass;
-  endCodeLine();
-  if (g_yyLineNr<g_inputLines) 
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const char *fc = yyextra->currentFontClass;
+  endCodeLine(yyscanner);
+  if (yyextra->yyLineNr<yyextra->inputLines) 
   {
-    g_currentFontClass = fc;
-    startCodeLine();
+    yyextra->currentFontClass = fc;
+    startCodeLine(yyscanner);
   }
 }
 
-static void codifyLines(char *text)
+static void codifyLines(char *text,yyscan_t yyscanner)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   char *p=text,*sp=p;
   char c;
   bool done=FALSE;
@@ -170,30 +301,32 @@ static void codifyLines(char *text)
     
     if (c=='\n')
     {
-      g_yyLineNr++;
+      yyextra->yyLineNr++;
       *(p-1)='\0';
-      g_code->codify(sp);
-      nextCodeLine();
+      yyextra->code->codify(sp);
+      nextCodeLine(yyscanner);
     }
     else
     {
-      g_code->codify(sp);
+      yyextra->code->codify(sp);
       done=TRUE;
     }
   }
 }
 
-static void startFontClass(const char *s)
+static void startFontClass(const char *s,yyscan_t yyscanner)
 {
-  endFontClass();
-  g_code->startFontClass(s);
-  g_currentFontClass=s;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  endFontClass(yyscanner);
+  yyextra->code->startFontClass(s);
+  yyextra->currentFontClass=s;
 }
 
 /*! counts the number of lines in the input */
-static int countLines()
+static int countLines(yyscan_t yyscanner)
 {
-  const char *p=g_inputString;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const char *p=yyextra->inputString;
   char c;
   int count=1;
   while ((c=*p)) 
@@ -201,142 +334,31 @@ static int countLines()
     p++ ; 
     if (c=='\n') count++;  
   }
-  if (p>g_inputString && *(p-1)!='\n') 
+  if (p>yyextra->inputString && *(p-1)!='\n') 
   { // last line does not end with a \n, so we add an extra
     // line and explicitly terminate the line after parsing.
     count++, 
-    g_needsTermination=TRUE; 
+    yyextra->needsTermination=TRUE; 
   } 
   return count;
 }
 
-#undef YY_INPUT
-#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
-
-static int yyread(char *buf,int max_size)
+static int yyread(char *buf,int max_size,yyscan_t yyscanner)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   int c=0;
-  while( c < max_size && g_inputString[g_inputPosition] )
+  while( c < max_size && yyextra->inputString[yyextra->inputPosition] )
   {
-    *buf = g_inputString[g_inputPosition++] ;
+    *buf = yyextra->inputString[yyextra->inputPosition++] ;
     c++; buf++;
   }
   return c;
 }
 
-%}
-
-nl              (\r\n|\r|\n)
-ws              [ \t]+
-idchar          [A-Za-z0-9\-_]+
-keywords1       ("ADD"|"ALL"|"ALLOCATE"|"ALTER"|"AND"|"ANY"|"ARE"|"AS"|"ASENSITIVE"|"ASYMMETRIC"|"AT"|"ATOMIC"|"AUTHORIZATION"|"BETWEEN"|"BOTH"|"BY"|"CALL"|"CALLED"|"CASCADED"|"CAST")
-keywords2       ("CHECK"|"CLOSE"|"COLLATE"|"COLUMN"|"COMMIT"|"CONNECT"|"CONSTRAINT"|"CONTINUE"|"CORRESPONDING"|"CREATE"|"CROSS"|"CUBE"|"CURRENT"|"CURRENT_DATE"|"CURRENT_DEFAULT_TRANSFORM_GROUP")
-keywords3       ("CURRENT_PATH"|"CURRENT_ROLE"|"CURRENT_TIME"|"CURRENT_TIMESTAMP"|"CURRENT_TRANSFORM_GROUP_FOR_TYPE"|"CURRENT_USER")
-keywords4       ("CURSOR"|"CYCLE"|"DAY"|"DEALLOCATE"|"DECLARE"|"DEFAULT"|"DELETE"|"DEREF"|"DESCRIBE"|"DETERMINISTIC"|"DISCONNECT"|"DISTINCT"|"DROP"|"DYNAMIC")
-keywords5       ("EACH"|"ELEMENT"|"END-EXEC"|"ESCAPE"|"EXCEPT"|"EXEC"|"EXECUTE"|"EXISTS"|"EXTERNAL"|"FETCH"|"FILTER"|"FOR"|"FOREIGN"|"FREE"|"FROM"|"FULL"|"FUNCTION")
-keywords6       ("GET"|"GLOBAL"|"GRANT"|"GROUP"|"GROUPING"|"HAVING"|"HOLD"|"HOUR"|"IDENTITY"|"IMMEDIATE"|"IN"|"INDICATOR"|"INNER"|"INOUT"|"INPUT"|"INSENSITIVE"|"INSERT"|"INTERSECT")
-keywords7       ("INTERVAL"|"INTO"|"IS"|"ISOLATION"|"JOIN"|"LANGUAGE"|"LARGE"|"LATERAL"|"LEADING"|"LEFT"|"LIKE"|"LOCAL"|"LOCALTIME"|"LOCALTIMESTAMP"|"MATCH"|"MEMBER"|"MERGE"|"METHOD"|"MINUTE")
-keywords8       ("MODIFIES"|"MODULE"|"MONTH"|"MULTISET"|"NATIONAL"|"NATURAL"|"NEW"|"NO"|"NONE"|"NOT"|"OF"|"OLD"|"ON"|"ONLY"|"OPEN"|"OR"|"ORDER"|"OUT"|"OUTER"|"OUTPUT")
-keywords9       ("OVER"|"OVERLAPS"|"PARAMETER"|"PARTITION"|"PRECISION"|"PREPARE"|"PRIMARY"|"PROCEDURE"|"RANGE"|"READS"|"RECURSIVE"|"REF"|"REFERENCES"|"REFERENCING"|"REGR_AVGX"|"REGR_AVGY")
-keywords10      ("REGR_COUNT"|"REGR_INTERCEPT"|"REGR_R2"|"REGR_SLOPE"|"REGR_SXX"|"REGR_SXY"|"REGR_SYY"|"RELEASE"|"RESULT"|"RETURN"|"RETURNS"|"REVOKE"|"RIGHT"|"ROLLBACK"|"ROLLUP"|"ROW"|"ROWS"|"SAVEPOINT")
-keywords11      ("SCROLL"|"SEARCH"|"SECOND"|"SELECT"|"SENSITIVE"|"SESSION_USER"|"SET"|"SIMILAR"|"SOME"|"SPECIFIC"|"SPECIFICTYPE"|"SQL"|"SQLEXCEPTION"|"SQLSTATE"|"SQLWARNING"|"START"|"STATIC")
-keywords12      ("SUBMULTISET"|"SYMMETRIC"|"SYSTEM"|"SYSTEM_USER"|"TABLE"|"THEN"|"TIMEZONE_HOUR"|"TIMEZONE_MINUTE"|"TO"|"TRAILING"|"TRANSLATION"|"TREAT"|"TRIGGER"|"UESCAPE"|"UNION")
-keywords13      ("UNIQUE"|"UNNEST"|"UPDATE"|"UPPER"|"USER"|"USING"|"VALUE"|"VALUES"|"VAR_POP"|"VAR_SAMP"|"VARYING"|"WHEN"|"WHENEVER"|"WHERE"|"WIDTH_BUCKET"|"WINDOW"|"WITH"|"WITHIN"|"WITHOUT"|"YEAR")
-
-/* Need multiple keyword definitions due to max length */
-keyword         (?i:{keywords1}|{keywords2}|{keywords3}|{keywords4}|{keywords5}|{keywords6}|{keywords7}|{keywords8}|{keywords9}|{keywords10}|{keywords11}|{keywords12}|{keywords13})
-
-typekeyword     (?i:"ARRAY"|"BIGINT"|"BINARY"|"BLOB"|"BOOLEAN"|"CHAR"|"CHARACTER"|"CLOB"|"DATE"|"DEC"|"DECIMAL"|"DOUBLE"|"FLOAT"|"INT"|"INTEGER"|"NCHAR"|"NCLOB"|"NUMERIC"|"NVARCHAR"|"REAL"|"SMALLINT"|"TIME"|"TIMESTAMP"|"VARCHAR")
-
-flowkeyword     (?i:"CASE"|"IF"|"ELSE"|"BEGIN"|"END"|"WHILE")
-
-literalkeyword  (?i:"FALSE"|"TRUE"|"NULL"|"UNKNOWN")
-stringliteral   (\"[^"]*\")|('[^']*')
-number          [0-9]+
-literals        ({literalkeyword}|{stringliteral}|{number})
-
-variable        @{idchar}+
-
-simplecomment   --.*
-commentopen     "/\*"
-commentclose    "\*/"
- 
-%option noyywrap
-%option nounput
-
-%x COMMENT
 
-%%
-
-{literals}          {
-                        startFontClass("stringliteral");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-                
-
-{keyword}           {
-                        startFontClass("keyword");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-
-{flowkeyword}       {
-                        startFontClass("keywordflow");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-
-{typekeyword}       {
-                        startFontClass("keywordtype");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-
-{variable}          {
-                        startFontClass("preprocessor");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-
-{simplecomment}     {
-                        startFontClass("comment");
-                        codifyLines(yytext);
-                        endFontClass();
-                    }
-
-{commentopen}       {
-                        startFontClass("comment");
-                        codifyLines(yytext);
-                        BEGIN(COMMENT);
-                    }
-
-<COMMENT>.          {
-                        codifyLines(yytext);
-                    }
-<COMMENT>{nl}       {
-                        codifyLines(yytext);
-                    }
-
-<COMMENT>{commentclose} {
-                        codifyLines(yytext);
-                        endFontClass();
-                        BEGIN(INITIAL);
-                    }
-                    
-{idchar}            {
-                        codifyLines(yytext);
-                    }
-
-{nl}                {
-                        codifyLines(yytext);
-                    }
-
-.                   {
-                        codifyLines(yytext);
-                    }
-
-%%
+// public interface -----------------------------------------------------------
+static yyscan_t yyscanner;
+static struct sqlcodeYY_state sqlcode_extra;
 
 void parseSqlCode(
     CodeOutputInterface &od,
@@ -353,60 +375,62 @@ void parseSqlCode(
     bool /*collectXRefs*/
     ) 
 {  
+  sqlcodeYYlex_init_extra(&sqlcode_extra, &yyscanner);
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (s.isEmpty()) return;
   
-  g_code = &od;
-  g_inputString   = s;
-  g_inputPosition = 0;
-  g_currentFontClass = 0;
-  g_needsTermination = FALSE;
-  g_searchCtx=searchCtx;
+  yyextra->code = &od;
+  yyextra->inputString   = s;
+  yyextra->inputPosition = 0;
+  yyextra->currentFontClass = 0;
+  yyextra->needsTermination = FALSE;
+  yyextra->searchCtx=searchCtx;
   
   if (startLine!=-1)
-    g_yyLineNr    = startLine;
+    yyextra->yyLineNr    = startLine;
   else
-    g_yyLineNr    = 1;
+    yyextra->yyLineNr    = 1;
   
   if (endLine!=-1)
-    g_inputLines  = endLine+1;
+    yyextra->inputLines  = endLine+1;
   else
-    g_inputLines  = g_yyLineNr + countLines() - 1;
+    yyextra->inputLines  = yyextra->yyLineNr + countLines(yyscanner) - 1;
   
-  g_exampleBlock  = exBlock; 
-  g_exampleName   = exName;
-  g_sourceFileDef = fd;
+  yyextra->exampleBlock  = exBlock; 
+  yyextra->exampleName   = exName;
+  yyextra->sourceFileDef = fd;
 
   bool cleanupSourceDef = FALSE;
   
   if (exBlock && fd==0)
   {
     // create a dummy filedef for the example
-    g_sourceFileDef = createFileDef("",(exName?exName:"generated"));
+    yyextra->sourceFileDef = createFileDef("",(exName?exName:"generated"));
     cleanupSourceDef = TRUE;
   }
   
-  if (g_sourceFileDef) 
+  if (yyextra->sourceFileDef) 
   {
-    setCurrentDoc("l00001");
+    setCurrentDoc("l00001",yyscanner);
   }
 
-  g_includeCodeFragment = inlineFragment;
+  yyextra->includeCodeFragment = inlineFragment;
   // Starts line 1 on the output  
-  startCodeLine();
+  startCodeLine(yyscanner);
 
-  sqlcodeYYrestart( sqlcodeYYin );
+  sqlcodeYYrestart( yyin,yyscanner );
 
-  sqlcodeYYlex();
+  sqlcodeYYlex(yyscanner);
 
-  if (g_needsTermination)
+  if (yyextra->needsTermination)
   {
-    endCodeLine();
+    endCodeLine(yyscanner);
   }
   if (cleanupSourceDef)
   {
     // delete the temporary file definition used for this example
-    delete g_sourceFileDef;
-    g_sourceFileDef=0;
+    delete yyextra->sourceFileDef;
+    yyextra->sourceFileDef=0;
   }
   
   return;
@@ -414,8 +438,9 @@ void parseSqlCode(
 
 void resetSqlCodeParserState() 
 {
-  g_currentDefinition = 0;
-  g_currentMemberDef = 0;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->currentDefinition = 0;
+  yyextra->currentMemberDef = 0;
 }
 
 #if !defined(YY_FLEX_SUBMINOR_VERSION)