Mercurial > octave-antonio

diff libinterp/parse-tree/oct-parse.in.yy @ 18974:d8abf813c69f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 446c46af4b42
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.in.yy	Tue Jul 01 15:56:00 2014 -0400
+++ b/libinterp/parse-tree/oct-parse.in.yy	Fri Aug 01 08:09:02 2014 -0400
@@ -129,10 +129,7 @@
 
 %expect 14
 
-// Don't add spaces around the = here; it causes some versions of
-// bison to fail to properly recognize the directive.
-
-%name-prefix="octave_"
+%API_PREFIX_DECL%
 
 // We are using the pure parser interface and the reentrant lexer
 // interface but the Octave parser and lexer are NOT properly