From 0e021770cc023c6a2e7ae132a3aab55bc7cbc058 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 19 Dec 2006 00:34:37 +0000 Subject: * src/getargs.c (skeleton_arg): Last arg is now location const *. Rewrite to simplify the logic. (language_argmatch): Likewise. * doc/bison.texinfo (Decl Summary, Bison Options): Don't claim Java is supported. * src/complain.c (program_name): Remove decl; no longer needed. * src/main.c (program_name): Remove; now belongs to getargs. 2006-12-18 Paolo Bonzini * NEWS: Document %language. * data/Makefile.am (dist_pkgdata_DATA): Add c-skel.m4, c++-skel.m4. * data/c-skel.m4, data/c++-skel.m4: New files. * data/glr.c: Complain on push parsers. * doc/bison.texinfo (C++ Parser Interface): Prefer %language over %skeleton. (Directives): Document %language and %skeleton. (Command line): Document -L. * examples/extexi: Rewrite %require directive. * examples/calc++/Makefile.am: Pass VERSION to extexi. * src/files.c (compute_exts_from_gc): Look in language structure for .y extension. (compute_file_name_parts): Check whether .tab should be added. * src/getargs.c (valid_languages, skeleton_prio, language_prio): (language, skeleton_arg, language_argmatch): New. (long_options): Add --language. (getargs): Use skeleton_arg, add -L/--language. * src/getargs.h: Include location.h. (struct bison_language, language, skeleton_arg, language_argmatch): New. * src/output.c (prepare): Pick default skeleton from struct language. Don't dispatch C skeletons here. * src/parse-gram.y (PERCENT_LANGUAGE): New. (prologue_declaration): Add "%language" rule, use skeleton_arg. * src/scan-gram.l ("%language"): New rule. * tests/calc.at: Test %skeleton and %language. * tests/local.at (AT_SKEL_CC_IF): Look for %language. (AT_GLR_IF): Look for %skeleton "glr.cc". (AT_LALR1_CC_IF, AT_GLR_CC_IF): Rewrite. (AT_YACC_IF): Reject %language. 2006-12-18 Paul Eggert --- examples/extexi | 1 + 1 file changed, 1 insertion(+) (limited to 'examples/extexi') diff --git a/examples/extexi b/examples/extexi index 56a50c87..a004b1af 100644 --- a/examples/extexi +++ b/examples/extexi @@ -111,6 +111,7 @@ function normalize(contents, i, lines, n, line, res) { else line = ""; + gsub (/^%require "[^"]*"$/, "%require \"" VERSION "\"", line); gsub (/^@result\{\}/, "", line); gsub (/^@error\{\}/, "", line); gsub ("@[{]", "{", line); -- cgit v1.2.1