From 0bdb01d4b6ced07750d8e449fd4ffab5554d8a24 Mon Sep 17 00:00:00 2001 From: Adrian Negreanu Date: Wed, 21 Sep 2016 13:08:41 +0300 Subject: flex: use %option instead of command line options. --- addon/doxywizard/CMakeLists.txt | 2 +- addon/doxywizard/config_doxyw.l | 1 + src/CMakeLists.txt | 34 +++++++++++++++++----------------- src/code.l | 2 ++ src/commentcnv.l | 2 ++ src/commentscan.l | 2 ++ src/configimpl.l | 2 ++ src/constexp.l | 2 ++ src/declinfo.l | 2 ++ src/defargs.l | 2 ++ src/doctokenizer.l | 2 ++ src/fortrancode.l | 3 +++ src/fortranscanner.l | 3 +++ src/pre.l | 2 ++ src/pycode.l | 2 ++ src/pyscanner.l | 2 ++ src/scanner.l | 2 ++ src/tclscanner.l | 3 +++ src/vhdlcode.l | 3 +++ src/xmlcode.l | 2 ++ 20 files changed, 57 insertions(+), 18 deletions(-) diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 973d2d1..8207971 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -76,7 +76,7 @@ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) -FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "${LEX_FLAGS} -Pconfig_doxywYY") +FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "${LEX_FLAGS}") qt_wrap_cpp(doxywizard_MOC doxywizard.h diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l index 90bd09e..7874a19 100644 --- a/addon/doxywizard/config_doxyw.l +++ b/addon/doxywizard/config_doxyw.l @@ -13,6 +13,7 @@ */ %option never-interactive +%option prefix="config_doxywYY" %{ /* diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c7edca..3661491 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,23 +100,23 @@ add_custom_command( set_source_files_properties(${GENERATED_SRC}/layout_default.xml.h PROPERTIES GENERATED 1) # Targets for flex/bison generated files -FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PscannerYY") -FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcodeYY") -FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpyscannerYY") -FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpycodeYY") -FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PfortranscannerYY -i") -FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PfortrancodeYY -i") -FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PvhdlcodeYY -i") -FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PtclscannerYY -i") -FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpreYY") -FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdeclinfoYY") -FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdefargsYY") -FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdoctokenizerYY") -FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcommentcnvYY") -FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcommentscanYY") -FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "${LEX_FLAGS} -PconstexpYY") -FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PxmlcodeYY") -FLEX_TARGET(configimpl configimpl.l ${GENERATED_SRC}/configimpl.cpp COMPILE_FLAGS "${LEX_FLAGS} -PconfigimplYY") +FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "${LEX_FLAGS}") +FLEX_TARGET(configimpl configimpl.l ${GENERATED_SRC}/configimpl.cpp COMPILE_FLAGS "${LEX_FLAGS}") BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "${YACC_FLAGS} -l -p vhdlscannerYY") BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "${YACC_FLAGS} -l -p constexpYY") diff --git a/src/code.l b/src/code.l index 27d1cff..c8eddae 100644 --- a/src/code.l +++ b/src/code.l @@ -15,6 +15,8 @@ * */ %option never-interactive +%option prefix="codeYY" + %{ /* diff --git a/src/commentcnv.l b/src/commentcnv.l index 6409b0b..6fea6c9 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -15,6 +15,8 @@ * */ %option never-interactive +%option prefix="commentcnvYY" + %{ diff --git a/src/commentscan.l b/src/commentscan.l index f31452a..fad09d9 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -14,6 +14,8 @@ */ %option never-interactive +%option prefix="commentscanYY" + %{ /* diff --git a/src/configimpl.l b/src/configimpl.l index 2cf698a..aa80a30 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -10,6 +10,8 @@ * */ %option never-interactive +%option prefix="configimplYY" + %{ /* diff --git a/src/constexp.l b/src/constexp.l index e3ff3f1..8a7db04 100644 --- a/src/constexp.l +++ b/src/constexp.l @@ -16,6 +16,8 @@ * */ %option never-interactive +%option prefix="constexpYY" + %{ #include "constexp.h" diff --git a/src/declinfo.l b/src/declinfo.l index 0f24d9e..a91f832 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -15,6 +15,8 @@ * */ %option never-interactive +%option prefix="declinfoYY" + %{ /* diff --git a/src/defargs.l b/src/defargs.l index 603f238..b0607d8 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -40,6 +40,8 @@ * further determine the correct separation. */ %option never-interactive +%option prefix="defargsYY" + %{ /* diff --git a/src/doctokenizer.l b/src/doctokenizer.l index de35d33..a89570e 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -17,6 +17,8 @@ */ %option never-interactive +%option prefix="doctokenizerYY" + %{ #include diff --git a/src/fortrancode.l b/src/fortrancode.l index 6abb676..e002b57 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -24,6 +24,9 @@ - references to variables **/ %option never-interactive +%option case-insensitive +%option prefix="fortrancodeYY" + %{ /* diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 0b59eb7..2f5567a 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -38,6 +38,9 @@ * - Must track yyLineNr when using REJECT, unput() or similar commands. */ %option never-interactive +%option case-insensitive +%option prefix="fortranscannerYY" + %{ #include diff --git a/src/pre.l b/src/pre.l index e89a61c..18cdbc9 100644 --- a/src/pre.l +++ b/src/pre.l @@ -15,6 +15,8 @@ * */ %option never-interactive +%option prefix="preYY" + %{ /* diff --git a/src/pycode.l b/src/pycode.l index a0de80b..fe1eef5 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -22,6 +22,8 @@ */ %option never-interactive +%option prefix="pycodeYY" + %{ #include diff --git a/src/pyscanner.l b/src/pyscanner.l index 3bebe0e..9c21d41 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -22,6 +22,8 @@ */ %option never-interactive +%option prefix="pyscannerYY" + %{ /* diff --git a/src/scanner.l b/src/scanner.l index 68eb8fc..9c32666 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -15,6 +15,8 @@ * */ %option never-interactive +%option prefix="scannerYY" + %{ /* diff --git a/src/tclscanner.l b/src/tclscanner.l index a29db5b..d0d8ca0 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -15,6 +15,9 @@ * */ %option never-interactive +%option case-insensitive +%option prefix="tclscannerYY" + %{ #include #include diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 27743e3..3e027d7 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -18,6 +18,9 @@ * supports VHDL-87/93/2008 ******************************************************************************/ %option never-interactive +%option case-insensitive +%option prefix="vhdlcodeYY" + %{ /* diff --git a/src/xmlcode.l b/src/xmlcode.l index efcac0e..c090531 100644 --- a/src/xmlcode.l +++ b/src/xmlcode.l @@ -18,6 +18,8 @@ ******************************************************************************/ %option never-interactive +%option prefix="xmlcodeYY" + %{ #include -- cgit v0.12