Mercurial > octave
changeset 25640:7aaf091d39fc
one more fix for parser change... Doh!
* oct-tex-parser.yy, oct-parse.yy: Define api.prefix without spaces
inside braces.
* oct-parse.yy: Restore api.push-pull declaration.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 18 Jul 2018 15:35:51 -0400 |
| parents | 7644e7f1721f |
| children | 3b214399f323 |
| files | libinterp/corefcn/oct-tex-parser.yy libinterp/parse-tree/oct-parse.yy |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-tex-parser.yy Wed Jul 18 20:54:05 2018 +0200 +++ b/libinterp/corefcn/oct-tex-parser.yy Wed Jul 18 15:35:51 2018 -0400 @@ -49,7 +49,8 @@ %} %define api.pure -%define api.prefix { octave_tex_ } +// No spaces inside the braces for the prefix definition! +%define api.prefix {octave_tex_} %parse-param { text_parser_tex& parser } %lex-param { void *scanner }
--- a/libinterp/parse-tree/oct-parse.yy Wed Jul 18 20:54:05 2018 +0200 +++ b/libinterp/parse-tree/oct-parse.yy Wed Jul 18 15:35:51 2018 -0400 @@ -126,7 +126,9 @@ // object) relevant global values before and after the nested call. %define api.pure -%define api.prefix { octave_ } +// No spaces inside the braces for the prefix and push-pull definitions! +%define api.prefix {octave_} +%define api.push-pull {both} %parse-param { octave::base_parser& parser } %lex-param { void *lexer.scanner }