diff options
| author | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 11:43:02 +0100 |
|---|---|---|
| committer | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 13:38:43 +0100 |
| commit | f3ead217b8636f623399e66bd937b1c51774d4af (patch) | |
| tree | 074e97d4d5adbc914e312dbdb84c642d995355c4 /src/flex-scanner.h | |
| parent | d6dc4d36d1db744b060029254eaabaaa525a1c19 (diff) | |
| parent | 9960a6ae75842aa7836f39b59e82eef0319338bc (diff) | |
| download | bison-f3ead217b8636f623399e66bd937b1c51774d4af.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
misc: pacify the Tiny C Compiler
cpp: make the check of Flex version portable
misc: require getline
c++: support wide strings for file names
doc: document carets
tests: enhance existing tests with carets
errors: show carets
getargs: add support for --flags/-f
Conflicts:
doc/bison.texi
m4/.gitignore
src/complain.c
src/flex-scanner.h
src/getargs.c
src/getargs.h
src/gram.c
src/main.c
tests/headers.at
Diffstat (limited to 'src/flex-scanner.h')
| -rw-r--r-- | src/flex-scanner.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/flex-scanner.h b/src/flex-scanner.h index c1e07eae..9b80744d 100644 --- a/src/flex-scanner.h +++ b/src/flex-scanner.h @@ -23,18 +23,18 @@ /* Whether this version of Flex is (strictly) greater than Major.Minor.Subminor. */ -#define FLEX_VERSION_GT(Major, Minor, Subminor) \ - (defined YY_FLEX_MAJOR_VERSION \ - && (Major < YY_FLEX_MAJOR_VERSION \ - || (Major == YY_FLEX_MAJOR_VERSION \ - && (defined YY_FLEX_MINOR_VERSION \ - && (Minor < YY_FLEX_MINOR_VERSION \ - || (Minor == YY_FLEX_MINOR_VERSION \ - && defined YY_FLEX_SUBMINOR_VERSION \ - && Subminor < YY_FLEX_SUBMINOR_VERSION)))))) - +#ifdef YY_FLEX_SUBMINOR_VERSION +# define FLEX_VERSION \ + (YY_FLEX_MAJOR_VERSION) * 1000000 \ ++ (YY_FLEX_MINOR_VERSION) * 1000 \ ++ (YY_FLEX_SUBMINOR_VERSION) +#else +# define FLEX_VERSION \ + (YY_FLEX_MAJOR_VERSION) * 1000000 \ ++ (YY_FLEX_MINOR_VERSION) * 1000 +#endif /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */ -#if ! FLEX_VERSION_GT (2, 5, 31) +# if FLEX_VERSION <= 2005031 int FLEX_PREFIX (get_lineno) (void); FILE *FLEX_PREFIX (get_in) (void); FILE *FLEX_PREFIX (get_out) (void); @@ -65,7 +65,7 @@ int FLEX_PREFIX (lex_destroy) (void); versions according to the Flex manual) leak memory if yylex_destroy is not invoked. However, yylex_destroy is not defined before Flex 2.5.9, so give an implementation here that at least appears to work with Flex 2.5.4. */ -#if ! FLEX_VERSION_GT (2, 5, 9) +#if FLEX_VERSION <= 2005009 # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER) #endif |