X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/16dc6a9ebf3b936f5383c49d5f29738a53538395..0f664b89d4aa86146015acd87a770db878d7e5d4:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index 1fca61d3..72f5eefa 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -1,13 +1,13 @@ %{/* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, - Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,10 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ + along with this program. If not, see . */ #include #include "system.h" @@ -153,9 +150,6 @@ static int current_prec = 0; PERCENT_OUTPUT "%output" PERCENT_PARSE_PARAM "%parse-param" PERCENT_PURE_PARSER "%pure-parser" - PERCENT_PUSH_PARSER "%push-parser" - PERCENT_PUSH_PULL_PARSER - "%push-pull-parser" PERCENT_REQUIRE "%require" PERCENT_SKELETON "%skeleton" PERCENT_START "%start" @@ -198,12 +192,12 @@ static int current_prec = 0; %type INT %printer { fprintf (stderr, "%d", $$); } INT -%type id id_colon symbol string_as_id +%type id id_colon symbol symbol.prec string_as_id %printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id %printer { fprintf (stderr, "%s:", $$->tag); } id_colon %type precedence_declarator -%type symbols.1 generic_symlist generic_symlist_item +%type symbols.1 symbols.prec generic_symlist generic_symlist_item %% input: @@ -228,21 +222,14 @@ prologue_declaration: code_props_plain_init (&plain_code, $1, @1); code_props_translate_code (&plain_code); gram_scanner_last_string_free (); - prologue_augment (plain_code.code, @1, union_seen); + muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue", + plain_code.code, @1); code_scanner_last_string_free (); } | "%debug" { debug_flag = true; } | "%define" variable content.opt { - char const name_prefix[] = "percent_define_"; - char *name = xmalloc (sizeof name_prefix + strlen ($2)); - strcpy (name, name_prefix); - strcpy (name + sizeof name_prefix - 1, $2); - if (muscle_find_const (name)) - warn_at (@2, _("%s `%s' redefined"), "%define variable", $2); - MUSCLE_INSERT_STRING (uniqstr_new (name), $3); - free (name); - muscle_grow_user_name_list ("user_percent_define_variables", $2, @2); + muscle_percent_define_insert ($2, @2, $3); } | "%defines" { defines_flag = true; } | "%defines" STRING @@ -279,13 +266,46 @@ prologue_declaration: | "%output" STRING { spec_outfile = $2; } | "%output" "=" STRING { spec_outfile = $3; } /* deprecated */ | "%parse-param" "{...}" { add_param ("parse_param", $2, @2); } -| "%pure-parser" { pure_parser = true; } -| "%push-parser" { push_parser = true; pull_parser = false; } -| "%push-pull-parser" { push_parser = true; pull_parser = true; } +| "%pure-parser" + { + /* %pure-parser is deprecated in favor of `%define api.pure', so use + `%define api.pure' in a backward-compatible manner here. First, don't + complain if %pure-parser is specified multiple times. */ + if (!muscle_find_const ("percent_define(api.pure)")) + muscle_percent_define_insert ("api.pure", @1, ""); + /* In all cases, use api.pure now so that the backend doesn't complain if + the skeleton ignores api.pure, but do warn now if there's a previous + conflicting definition from an actual %define. */ + if (!muscle_percent_define_flag_if ("api.pure")) + muscle_percent_define_insert ("api.pure", @1, ""); + } | "%require" STRING { version_check (&@2, $2); } -| "%skeleton" STRING { skeleton_arg ($2, 1, &@1); } +| "%skeleton" STRING + { + char const *skeleton_user = $2; + if (strchr (skeleton_user, '/')) + { + size_t dir_length = strlen (current_file); + char *skeleton_build; + while (dir_length && current_file[dir_length - 1] != '/') + --dir_length; + while (dir_length && current_file[dir_length - 1] == '/') + --dir_length; + skeleton_build = + xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); + if (dir_length > 0) + { + strncpy (skeleton_build, current_file, dir_length); + skeleton_build[dir_length++] = '/'; + } + strcpy (skeleton_build + dir_length, skeleton_user); + skeleton_user = uniqstr_new (skeleton_build); + free (skeleton_build); + } + skeleton_arg (skeleton_user, 1, &@1); + } | "%token-table" { token_table_flag = true; } -| "%verbose" { report_flag = report_states; } +| "%verbose" { report_flag |= report_states; } | "%yacc" { yacc_flag = true; } | /*FIXME: Err? What is this horror doing here? */ ";" ; @@ -321,19 +341,15 @@ grammar_declaration: } | "%code" braceless { - muscle_code_grow ("percent_code", $2, @2); + /* Do not invoke muscle_percent_code_grow here since it invokes + muscle_user_name_list_grow. */ + muscle_code_grow ("percent_code()", $2, @2); code_scanner_last_string_free (); } | "%code" ID braceless { - char const name_prefix[] = "percent_code_"; - char *name = xmalloc (sizeof name_prefix + strlen ($2)); - strcpy (name, name_prefix); - strcpy (name + sizeof name_prefix - 1, $2); - muscle_code_grow (uniqstr_new (name), $3, @3); - free (name); + muscle_percent_code_grow ($2, @2, $3, @3); code_scanner_last_string_free (); - muscle_grow_user_name_list ("user_percent_code_qualifiers", $2, @2); } ; @@ -350,28 +366,11 @@ union_name: ; grammar_declaration: - "%union" union_name "{...}" + "%union" union_name braceless { - char const *body = $3; - - /* Concatenate the %union bodies. If this is the first %union, make sure - the synchronization line appears after the opening '{' so as not to - confuse Doxygen. Otherwise, turn the previous %union's trailing '}' - into '\n', and omit the new %union's leading '{'. */ - if (!union_seen) - { - muscle_grow ("stype", "{", ""); - } - else - { - char *code = muscle_find ("stype"); - code[strlen (code) - 1] = '\n'; - } - body++; - union_seen = true; - muscle_code_grow ("stype", body, @3); - gram_scanner_last_string_free (); + muscle_code_grow ("stype", $3, @3); + code_scanner_last_string_free (); } ; @@ -400,7 +399,7 @@ symbol_declaration: ; precedence_declaration: - precedence_declarator type.opt symbols.1 + precedence_declarator type.opt symbols.prec { symbol_list *list; ++current_prec; @@ -425,6 +424,19 @@ type.opt: | TYPE { current_type = $1; tag_seen = true; } ; +/* Just like symbols.1 but accept INT for the sake of POSIX. */ +symbols.prec: + symbol.prec + { $$ = symbol_list_sym_new ($1, @1); } +| symbols.prec symbol.prec + { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); } +; + +symbol.prec: + symbol { $$ = $1; } + | symbol INT { $$ = $1; symbol_user_token_number_set ($1, $2, @2); } + ; + /* One or more symbols to be %typed. */ symbols.1: symbol @@ -540,12 +552,11 @@ variable: | STRING { $$ = uniqstr_new ($1); } /* deprecated and not M4-friendly */ ; -/* Some content or "1" by default. */ +/* Some content or empty by default. */ content.opt: /* Nothing. */ { - static char one[] = "1"; - $$ = one; + $$ = ""; } | STRING ;