X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9611cfa20bf95cf06b79c598ae5e69979ea1ff8e..e34e97bcd736ab3193bfd3abd4162db3b159836d:/src/parse-gram.y
diff --git a/src/parse-gram.y b/src/parse-gram.y
index df92d642..33b802ed 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,13 +1,12 @@
%{/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
- Inc.
+ Copyright (C) 2002-2012 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,22 +15,18 @@
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"
-#include
-
#include "complain.h"
#include "conflicts.h"
#include "files.h"
#include "getargs.h"
#include "gram.h"
-#include "muscle_tab.h"
+#include "muscle-tab.h"
+#include "named-ref.h"
#include "quotearg.h"
#include "reader.h"
#include "symlist.h"
@@ -66,10 +61,30 @@ static void add_param (char const *type, char *decl, location loc);
static symbol_class current_class = unknown_sym;
static uniqstr current_type = NULL;
-static symbol *current_lhs;
+static symbol *current_lhs_symbol;
static location current_lhs_location;
+static named_ref *current_lhs_named_ref;
static int current_prec = 0;
+/** Set the new current left-hand side symbol, possibly common
+ * to several right-hand side parts of rule.
+ */
+static
+void
+current_lhs(symbol *sym, location loc, named_ref *ref)
+{
+ current_lhs_symbol = sym;
+ current_lhs_location = loc;
+ /* In order to simplify memory management, named references for lhs
+ are always assigned by deep copy into the current symbol_list
+ node. This is because a single named-ref in the grammar may
+ result in several uses when the user factors lhs between several
+ rules using "|". Therefore free the parser's original copy. */
+ free (current_lhs_named_ref);
+ current_lhs_named_ref = ref;
+}
+
+
#define YYTYPE_INT16 int_fast16_t
#define YYTYPE_INT8 int_fast8_t
#define YYTYPE_UINT16 uint_fast16_t
@@ -82,6 +97,7 @@ static int current_prec = 0;
%locations
%pure-parser
%error-verbose
+%define parse.lac full
%name-prefix="gram_"
%expect 0
@@ -103,6 +119,7 @@ static int current_prec = 0;
assoc assoc;
uniqstr uniqstr;
unsigned char character;
+ named_ref *named_ref;
};
/* Define the tokens together with their human representation. */
@@ -153,9 +170,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"
@@ -165,6 +179,7 @@ static int current_prec = 0;
;
%token BRACED_CODE "{...}"
+%token BRACKETED_ID "[identifier]"
%token CHAR "char"
%token EPILOGUE "epilogue"
%token EQUAL "="
@@ -190,20 +205,23 @@ static int current_prec = 0;
%printer { fprintf (stderr, "{\n%s\n}", $$); }
braceless content.opt "{...}" "%{...%}" EPILOGUE
-%type TYPE ID ID_COLON variable
-%printer { fprintf (stderr, "<%s>", $$); } TYPE
-%printer { fputs ($$, stderr); } ID variable
+%type BRACKETED_ID ID ID_COLON TYPE variable
+%printer { fputs ($$, stderr); }
+%printer { fprintf (stderr, "[%s]", $$); } BRACKETED_ID
%printer { fprintf (stderr, "%s:", $$); } ID_COLON
+%printer { fprintf (stderr, "<%s>", $$); } TYPE
%type INT
-%printer { fprintf (stderr, "%d", $$); } INT
+%printer { fprintf (stderr, "%d", $$); }
-%type id id_colon symbol string_as_id
-%printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id
+%type id id_colon string_as_id symbol symbol.prec
+%printer { fprintf (stderr, "%s", $$->tag); }
%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
+%type named_ref.opt
+
%%
input:
@@ -235,7 +253,8 @@ prologue_declaration:
| "%debug" { debug_flag = true; }
| "%define" variable content.opt
{
- muscle_percent_define_insert ($2, @2, $3);
+ muscle_percent_define_insert ($2, @2, $3,
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
| "%defines" { defines_flag = true; }
| "%defines" STRING
@@ -262,7 +281,7 @@ prologue_declaration:
muscle_code_grow ("initial_action", action.code, @2);
code_scanner_last_string_free ();
}
-| "%language" STRING { language_argmatch ($2, 1, &@1); }
+| "%language" STRING { language_argmatch ($2, grammar_prio, @1); }
| "%lex-param" "{...}" { add_param ("lex_param", $2, @2); }
| "%locations" { locations_flag = true; }
| "%name-prefix" STRING { spec_name_prefix = $2; }
@@ -272,14 +291,26 @@ 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, "",
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+ /* 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, "",
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+ }
| "%require" STRING { version_check (&@2, $2); }
| "%skeleton" STRING
{
char const *skeleton_user = $2;
- if (strchr (skeleton_user, '/'))
+ if (mbschr (skeleton_user, '/'))
{
size_t dir_length = strlen (current_file);
char *skeleton_build;
@@ -298,10 +329,10 @@ prologue_declaration:
skeleton_user = uniqstr_new (skeleton_build);
free (skeleton_build);
}
- skeleton_arg (skeleton_user, 1, &@1);
+ skeleton_arg (skeleton_user, grammar_prio, @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? */ ";"
;
@@ -395,7 +426,7 @@ symbol_declaration:
;
precedence_declaration:
- precedence_declarator type.opt symbols.1
+ precedence_declarator type.opt symbols.prec
{
symbol_list *list;
++current_prec;
@@ -420,6 +451,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
@@ -501,7 +545,11 @@ rules_or_grammar_declaration:
;
rules:
- id_colon { current_lhs = $1; current_lhs_location = @1; } rhses.1
+ id_colon named_ref.opt { current_lhs ($1, @1, $2); } rhses.1
+ {
+ /* Free the current lhs. */
+ current_lhs (0, @1, 0);
+ }
;
rhses.1:
@@ -512,11 +560,12 @@ rhses.1:
rhs:
/* Nothing. */
- { grammar_current_rule_begin (current_lhs, current_lhs_location); }
-| rhs symbol
- { grammar_current_rule_symbol_append ($2, @2); }
-| rhs "{...}"
- { grammar_current_rule_action_append ($2, @2); }
+ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
+ current_lhs_named_ref); }
+| rhs symbol named_ref.opt
+ { grammar_current_rule_symbol_append ($2, @2, $3); }
+| rhs "{...}" named_ref.opt
+ { grammar_current_rule_action_append ($2, @2, $3); }
| rhs "%prec" symbol
{ grammar_current_rule_prec_set ($3, @3); }
| rhs "%dprec" INT
@@ -525,22 +574,28 @@ rhs:
{ grammar_current_rule_merge_set ($3, @3); }
;
+named_ref.opt:
+ /* Nothing. */ { $$ = 0; }
+|
+ BRACKETED_ID { $$ = named_ref_new($1, @1); }
+;
+
/*----------------------------*
| variable and content.opt. |
*---------------------------*/
+/* The STRING form of variable is deprecated and is not M4-friendly.
+ For example, M4 fails for `%define "[" "value"'. */
variable:
ID
- | STRING { $$ = uniqstr_new ($1); } /* deprecated and not M4-friendly */
- ;
+| STRING { $$ = uniqstr_new ($1); }
+;
/* Some content or empty by default. */
content.opt:
- /* Nothing. */
- {
- $$ = "";
- }
+ /* Nothing. */ { $$ = ""; }
+| ID { $$ = $1; }
| STRING
;
@@ -631,7 +686,7 @@ lloc_default (YYLTYPE const *rhs, int n)
loc.start = rhs[n].end;
loc.end = rhs[n].end;
- /* Ignore empty nonterminals the start of the the right-hand side.
+ /* Ignore empty nonterminals the start of the right-hand side.
Do not bother to ignore them at the end of the right-hand side,
since empty nonterminals have the same end as their predecessors. */
for (i = 1; i <= n; i++)
@@ -703,8 +758,8 @@ version_check (location const *loc, char const *version)
if (strverscmp (version, PACKAGE_VERSION) > 0)
{
complain_at (*loc, "require bison %s, but have %s",
- version, PACKAGE_VERSION);
- exit (63);
+ version, PACKAGE_VERSION);
+ exit (EX_MISMATCH);
}
}