Mercurial > octave-nkf
comparison libinterp/corefcn/module.mk @ 19809:a941a65c7cb8
handle bison syntax changes in TeX parser
* oct-tex-parser.in.yy: Rename from oct-tex-parser.yy.
Substitute %API_PREFIX_DECL%.
* build-aux/common.mk (subst-bison-api-decls): New macro.
* libinterp/parse-tree/module.mk (oct-parse.yy): Use it.
* libinterp/corefcn/module.mk (oct-tex-parser.yy): New rule.
* libinterp/Makefile.am: Ensure that oct-tex-parser.yy is built early.
Search for tests in generated .yy file, not .in.yy file.
* oct-tex-lexer.in.ll: Define YYSTPE if needed.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 19 Feb 2015 18:05:07 -0500 |
parents | 56157a7505ed |
children | 4f6ae6b94abe |
comparison
equal
deleted
inserted
replaced
19808:904912f18357 | 19809:a941a65c7cb8 |
---|---|
3 corefcn/defaults.in.h \ | 3 corefcn/defaults.in.h \ |
4 corefcn/graphics.in.h \ | 4 corefcn/graphics.in.h \ |
5 corefcn/mxarray.in.h \ | 5 corefcn/mxarray.in.h \ |
6 corefcn/oct-errno.in.cc \ | 6 corefcn/oct-errno.in.cc \ |
7 corefcn/oct-tex-lexer.in.ll \ | 7 corefcn/oct-tex-lexer.in.ll \ |
8 corefcn/oct-tex-parser.in.yy \ | |
8 corefcn/oct-tex-symbols.in | 9 corefcn/oct-tex-symbols.in |
9 | 10 |
10 ## Options functions for Fortran packages like LSODE, DASPK. | 11 ## Options functions for Fortran packages like LSODE, DASPK. |
11 ## These are generated automagically by configure and Perl. | 12 ## These are generated automagically by configure and Perl. |
12 OPT_HANDLERS = \ | 13 OPT_HANDLERS = \ |
328 | 329 |
329 corefcn/txt-eng.cc: corefcn/oct-tex-symbols.cc | 330 corefcn/txt-eng.cc: corefcn/oct-tex-symbols.cc |
330 corefcn/oct-tex-lexer.cc: LEX_OUTPUT_ROOT := lex.octave_tex_ | 331 corefcn/oct-tex-lexer.cc: LEX_OUTPUT_ROOT := lex.octave_tex_ |
331 corefcn/oct-tex-parser.h: corefcn/oct-tex-parser.yy | 332 corefcn/oct-tex-parser.h: corefcn/oct-tex-parser.yy |
332 | 333 |
334 corefcn/oct-tex-parser.yy: corefcn/oct-tex-parser.in.yy | |
335 $(call subst-bison-api-decls,octave_tex_) | |
333 | 336 |
334 noinst_LTLIBRARIES += \ | 337 noinst_LTLIBRARIES += \ |
335 corefcn/libcorefcn.la \ | 338 corefcn/libcorefcn.la \ |
336 corefcn/libtex_parser.la | 339 corefcn/libtex_parser.la |
337 | 340 |