From 26f6f1aec1be0361eac7c6ebc4de93904bf42a98 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Mon, 18 Nov 2019 20:37:37 +0100 Subject: Remove bogus flex code --- src/code.l | 10 ---------- src/commentcnv.l | 5 ----- src/commentscan.l | 9 --------- src/declinfo.l | 11 ----------- src/defargs.l | 6 ------ src/doctokenizer.l | 5 ----- src/fortrancode.l | 12 ------------ src/fortranscanner.l | 7 ------- src/pre.l | 6 ------ src/pycode.l | 9 --------- src/pyscanner.l | 7 ------- src/scanner.l | 7 ------- src/sqlcode.l | 8 -------- src/tclscanner.l | 7 ------- src/vhdlcode.l | 8 -------- src/xmlcode.l | 8 -------- 16 files changed, 125 deletions(-) diff --git a/src/code.l b/src/code.l index 7c159ec..4998421 100644 --- a/src/code.l +++ b/src/code.l @@ -3877,14 +3877,4 @@ void codeFreeScanner() #endif } - - -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void codeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." -#endif - #include "code.l.h" diff --git a/src/commentcnv.l b/src/commentcnv.l index 14abb8f..940f1a5 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -1168,10 +1168,5 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) //---------------------------------------------------------------------------- -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void commentcnvYYdummy() { yy_flex_realloc(0,0); } -} -#endif #include "commentcnv.l.h" diff --git a/src/commentscan.l b/src/commentscan.l index a1ce096..2b10f87 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -3281,13 +3281,4 @@ static void handleGuard(const QCString &expr) } } - - -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void commentscanYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "commentscan.l.h" diff --git a/src/declinfo.l b/src/declinfo.l index c27af39..37d0449 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -347,11 +347,6 @@ void parseFuncDecl(const QCString &decl,const SrcLangExt lang,QCString &cl,QCStr return; } -//extern "C" { // some bogus code to keep the compiler happy -// int declinfoYYwrap() { return 1 ; } -// void declinfoYYdummy() { yy_flex_realloc(0,0); } -//} - #if 0 void dumpDecl(const char *s) { @@ -385,11 +380,5 @@ int main() } #endif -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void declinfoYYdummy() { yy_flex_realloc(0,0); } -} -#endif #include "declinfo.l.h" diff --git a/src/defargs.l b/src/defargs.l index a213688..eb454ce 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -635,10 +635,4 @@ void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extr printlex(yy_flex_debug, FALSE, __FILE__, NULL); } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void defargsYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "defargs.l.h" diff --git a/src/doctokenizer.l b/src/doctokenizer.l index f0a6a83..c079c04 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1611,10 +1611,5 @@ void doctokenizerYYendAutoList() // printlex(yy_flex_debug, FALSE, __FILE__, g_fileName); // return retval; //} -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void doctokenizerYYdummy() { yy_flex_realloc(0,0); } -} -#endif #include "doctokenizer.l.h" diff --git a/src/fortrancode.l b/src/fortrancode.l index 72feb3d..3bbecd8 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -1395,16 +1395,4 @@ void parseFortranCode(CodeOutputInterface &od,const char *,const QCString &s, return; } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void fortrancodeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" -#else -extern "C" { // some bogus code to keep the compiler happy - void fortrancodeYYdummy() { yy_top_state(); } -} -#endif - #include "fortrancode.l.h" diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 39c45e7..e0d6d63 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -2836,11 +2836,4 @@ static void scanner_abort() //---------------------------------------------------------------------------- -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void fortranscannernerYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "fortranscanner.l.h" diff --git a/src/pre.l b/src/pre.l index 8bde725..cf13764 100644 --- a/src/pre.l +++ b/src/pre.l @@ -3426,11 +3426,5 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output printlex(yy_flex_debug, FALSE, __FILE__, fileName); } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy -// int preYYwrap() { return 1 ; } - void preYYdummy() { yy_flex_realloc(0,0); } -} -#endif #include "pre.l.h" diff --git a/src/pycode.l b/src/pycode.l index 4ff4fc1..4e53a27 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -1638,13 +1638,4 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/, return; } - -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void pycodeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." -#endif - #include "pycode.l.h" diff --git a/src/pyscanner.l b/src/pyscanner.l index 63f11e3..5d6b303 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -1940,11 +1940,4 @@ void PythonLanguageScanner::resetCodeParserState() //---------------------------------------------------------------------------- -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void pyscannerYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "pyscanner.l.h" diff --git a/src/scanner.l b/src/scanner.l index 393d6d4..37fcb1c 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -7402,11 +7402,4 @@ void CLanguageScanner::parsePrototype(const char *text) //---------------------------------------------------------------------------- -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void scannerYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "scanner.l.h" diff --git a/src/sqlcode.l b/src/sqlcode.l index 2685c46..a9e88a7 100644 --- a/src/sqlcode.l +++ b/src/sqlcode.l @@ -454,12 +454,4 @@ void resetSqlCodeParserState() yyextra->currentMemberDef = 0; } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void sqlcodeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." -#endif - #include "sqlcode.l.h" diff --git a/src/tclscanner.l b/src/tclscanner.l index 37eef0d..d22c5d6 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -3138,11 +3138,4 @@ void tclDummy() yy_top_state(); } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -//---------------------------------------------------------------------------- -extern "C" { // some bogus code to keep the compiler happy - void tclscannerYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "tclscanner.l.h" diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 9f128ea..53e1ed8 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -1634,13 +1634,5 @@ void codeFreeVhdlScanner() #endif } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" -#endif - #include "vhdlcode.l.h" diff --git a/src/xmlcode.l b/src/xmlcode.l index bd6e8a8..2fedf2d 100644 --- a/src/xmlcode.l +++ b/src/xmlcode.l @@ -407,12 +407,4 @@ void resetXmlCodeParserState() g_currentMemberDef = 0; } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void xmlcodeYYdummy() { yy_flex_realloc(0,0); } -} -#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 -#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." -#endif - #include "xmlcode.l.h" -- cgit v0.12