comparison libinterp/parse-tree/lex.ll @ 18976:dcb260e7a648

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Aug 2014 12:10:05 -0400
parents 4ae67c0553ae c59745865c7f
children
comparison
equal deleted inserted replaced
18972:19cb2530c16b 18976:dcb260e7a648
95 #include "toplev.h" 95 #include "toplev.h"
96 #include "utils.h" 96 #include "utils.h"
97 #include "variables.h" 97 #include "variables.h"
98 #include <oct-parse.h> 98 #include <oct-parse.h>
99 #include <oct-gperf.h> 99 #include <oct-gperf.h>
100
101 // FIXME: with bison 3.x, OCTAVE_STYPE appears in the generated
102 // oct-parse.h file, but there is no definition for YYSTYPE, which is
103 // needed by the code that is generated by flex. I can't seem to find a
104 // way to tell flex to use OCTAVE_STYPE instead of YYSTYPE in the code
105 // it generates, or to tell bison to provide the definition of YYSTYPE
106 // in the generated oct-parse.h file.
107
108 #if defined (OCTAVE_STYPE_IS_DECLARED) && ! defined YYSTYPE
109 #define YYSTYPE OCTAVE_STYPE
110 #endif
100 111
101 #if defined (GNULIB_NAMESPACE) 112 #if defined (GNULIB_NAMESPACE)
102 // Calls to the following functions appear in the generated output from 113 // Calls to the following functions appear in the generated output from
103 // flex without the namespace tag. Redefine them so we will use them 114 // flex without the namespace tag. Redefine them so we will use them
104 // via the gnulib namespace. 115 // via the gnulib namespace.