Mercurial > octave-dspies
comparison libinterp/parse-tree/oct-parse.in.yy @ 18974:d8abf813c69f stable
handle changes in bison 3.x
* acinclude.m4 (OCTAVE_PROG_BISON): Also check for the proper way to
declare api.prefix.
* build-aux/common.mk (BISON_API_PREFIX_DECL_STYLE): New variable.
* lex.ll: Conditionally define YYSTYPE.
* oct-parse.in.yy (%API_PREFIX_DECL%): Allow for differences in the
way api.prefix is specified in different versions of bison.
* libinterp/parse-tree/module.mk (parse-tree/oct-parse.yy): Also
substitute %API_PREFIX_DECL% in lex.ll.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Aug 2014 08:09:02 -0400 |
parents | 04b4fb217b1a |
children | c59745865c7f |
comparison
equal
deleted
inserted
replaced
18973:625e3bb65885 | 18974:d8abf813c69f |
---|---|
127 // The grammar currently has 14 shift/reduce conflicts. Ensure that | 127 // The grammar currently has 14 shift/reduce conflicts. Ensure that |
128 // we notice if that number changes. | 128 // we notice if that number changes. |
129 | 129 |
130 %expect 14 | 130 %expect 14 |
131 | 131 |
132 // Don't add spaces around the = here; it causes some versions of | 132 %API_PREFIX_DECL% |
133 // bison to fail to properly recognize the directive. | |
134 | |
135 %name-prefix="octave_" | |
136 | 133 |
137 // We are using the pure parser interface and the reentrant lexer | 134 // We are using the pure parser interface and the reentrant lexer |
138 // interface but the Octave parser and lexer are NOT properly | 135 // interface but the Octave parser and lexer are NOT properly |
139 // reentrant because both still use many global variables. It should be | 136 // reentrant because both still use many global variables. It should be |
140 // safe to create a parser object and call it while anotehr parser | 137 // safe to create a parser object and call it while anotehr parser |