Mercurial > octave-dspies
diff libinterp/parse-tree/lex.ll @ 18975:c59745865c7f gui-release
maint: Periodic merge of stable to gui-release.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Aug 2014 09:06:21 -0400 |
parents | bd1fd4ed3d67 d8abf813c69f |
children | dcb260e7a648 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Wed Jul 30 07:02:41 2014 +0200 +++ b/libinterp/parse-tree/lex.ll Fri Aug 01 09:06:21 2014 -0400 @@ -96,6 +96,17 @@ #include <oct-parse.h> #include <oct-gperf.h> +// FIXME: with bison 3.x, OCTAVE_STYPE appears in the generated +// oct-parse.h file, but there is no definition for YYSTYPE, which is +// needed by the code that is generated by flex. I can't seem to find a +// way to tell flex to use OCTAVE_STYPE instead of YYSTYPE in the code +// it generates, or to tell bison to provide the definition of YYSTYPE +// in the generated oct-parse.h file. + +#if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE +#define YYSTYPE OCTAVE_STYPE +#endif + #if defined (GNULIB_NAMESPACE) // Calls to the following functions appear in the generated output from // flex without the namespace tag. Redefine them so we will use them