diff options
author | Matthias Maennich <matthias@maennich.net> | 2017-08-24 21:48:48 (GMT) |
---|---|---|
committer | Matthias Maennich <matthias@maennich.net> | 2017-08-28 22:31:15 (GMT) |
commit | 80c08c7c0ad14bbc7c004fff4c0363b7369927e0 (patch) | |
tree | 692aa22c41710fa67767e8e611e59ae6b09464fe /Source/LexerParser/cmExprLexer.in.l | |
parent | 59f78dcb2369aaab3db7fa5de9f48b25d801003d (diff) | |
download | CMake-80c08c7c0ad14bbc7c004fff4c0363b7369927e0.zip CMake-80c08c7c0ad14bbc7c004fff4c0363b7369927e0.tar.gz CMake-80c08c7c0ad14bbc7c004fff4c0363b7369927e0.tar.bz2 |
cmExprLexer: regenerate with flex 2.6.4 (previously 2.6.1)
flex 2.6.3 introduces symbol remapping through macro definitions. hence the
change appears bigger than one would expect from a minor version upgrade.
In addition some manual cleanup that had to be done previously is now
obsolete. namely:
- the size_t cast of _yybytes_len in yy_scan_bytes
(i is now also defined int and not size_t anymore)
- the redefinition of yyl within yy_find_action
(yyl is now already defined as int)
Line number preprocessor directives (#line) were previously generated into
the c source file. This actually breaks debugging as debuggers have a hard
time finding the original cmExprLexer.in.l and mapping the current
instruction to a meaningful location within that file.
The prefix "cmExpr_yy" can already be set as %option directly.
For convenience also provide a sed command for all the manual steps that
need to be done after generating.
Signed-off-by: Matthias Maennich <matthias@maennich.net>
Diffstat (limited to 'Source/LexerParser/cmExprLexer.in.l')
-rw-r--r-- | Source/LexerParser/cmExprLexer.in.l | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/LexerParser/cmExprLexer.in.l b/Source/LexerParser/cmExprLexer.in.l index 25ddba4..e5f177a 100644 --- a/Source/LexerParser/cmExprLexer.in.l +++ b/Source/LexerParser/cmExprLexer.in.l @@ -7,13 +7,12 @@ This file must be translated to C++ and modified to build everywhere. Run flex >= 2.6 like this: - flex --nounistd -DFLEXINT_H --prefix=cmExpr_yy --header-file=cmExprLexer.h -ocmExprLexer.cxx cmExprLexer.in.l + flex --nounistd -DFLEXINT_H --noline --header-file=cmExprLexer.h -ocmExprLexer.cxx cmExprLexer.in.l Modify cmExprLexer.cxx: - - remove trailing whitespace: sed -i 's/\s*$//' cmExprLexer.h cmExprLexer.cxx - - remove blank lines at end of file - - #include "cmStandardLexer.h" at the top - - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t + - remove trailing whitespace: sed -i 's/\s*$//' cmExprLexer.h cmExprLexer.cxx + - remove blank lines at end of file: sed -i '${/^$/d;}' cmExprLexer.h cmExprLexer.cxx + - #include "cmStandardLexer.h" at the top: sed -i '1i#include "cmStandardLexer.h"' cmExprLexer.cxx */ @@ -32,6 +31,8 @@ Modify cmExprLexer.cxx: /*--------------------------------------------------------------------------*/ %} +%option prefix="cmExpr_yy" + %option reentrant %option noyywrap %pointer |