X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a7867f53b3d63c94a5f73ffd48629069919ab3d4..697c912fa481306891adb2d0737def95b8545097:/src/parse-gram.y
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 8fd0bf5f..72771056 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, 2009 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,16 +16,11 @@
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"
@@ -120,6 +115,7 @@ static int current_prec = 0;
%token PERCENT_LEFT "%left"
%token PERCENT_RIGHT "%right"
%token PERCENT_NONASSOC "%nonassoc"
+%token PERCENT_PRECEDENCE "%precedence"
%token PERCENT_PREC "%prec"
%token PERCENT_DPREC "%dprec"
@@ -132,13 +128,12 @@ static int current_prec = 0;
%token
PERCENT_CODE "%code"
- PERCENT_DEBUG "%debug"
PERCENT_DEFAULT_PREC "%default-prec"
PERCENT_DEFINE "%define"
PERCENT_DEFINES "%defines"
- PERCENT_ERROR_VERBOSE "%error-verbose"
PERCENT_EXPECT "%expect"
PERCENT_EXPECT_RR "%expect-rr"
+ PERCENT_FLAG "%"
PERCENT_FILE_PREFIX "%file-prefix"
PERCENT_GLR_PARSER "%glr-parser"
PERCENT_INITIAL_ACTION "%initial-action"
@@ -152,10 +147,6 @@ static int current_prec = 0;
"%nondeterministic-parser"
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"
@@ -174,9 +165,9 @@ static int current_prec = 0;
%token PIPE "|"
%token PROLOGUE "%{...%}"
%token SEMICOLON ";"
-%token TYPE "type"
-%token TYPE_TAG_ANY "<*>"
-%token TYPE_TAG_NONE "<>"
+%token TAG ""
+%token TAG_ANY "<*>"
+%token TAG_NONE "<>"
%type CHAR
%printer { fputs (char_name ($$), stderr); } CHAR
@@ -190,20 +181,21 @@ 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
+%type TAG ID ID_COLON PERCENT_FLAG variable
%printer { fputs ($$, stderr); } ID variable
%printer { fprintf (stderr, "%s:", $$); } ID_COLON
+%printer { fprintf (stderr, "%%%s", $$); } PERCENT_FLAG
+%printer { fprintf (stderr, "<%s>", $$); } TAG
%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:
@@ -232,20 +224,13 @@ prologue_declaration:
plain_code.code, @1);
code_scanner_last_string_free ();
}
-| "%debug" { debug_flag = true; }
+| "%"
+ {
+ muscle_percent_define_ensure ($1, @1, true);
+ }
| "%define" variable content.opt
{
- char const name_prefix[] = "percent_define(";
- size_t length = strlen ($2);
- char *name = xmalloc (sizeof name_prefix + length + 1);
- strcpy (name, name_prefix);
- strcpy (name + sizeof name_prefix - 1, $2);
- strcpy (name + sizeof name_prefix - 1 + length, ")");
- 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 ("percent_define_user_variables", $2, @2);
+ muscle_percent_define_insert ($2, @2, $3);
}
| "%defines" { defines_flag = true; }
| "%defines" STRING
@@ -253,7 +238,6 @@ prologue_declaration:
defines_flag = true;
spec_defines_file = xstrdup ($2);
}
-| "%error-verbose" { error_verbose = true; }
| "%expect" INT { expected_sr_conflicts = $2; }
| "%expect-rr" INT { expected_rr_conflicts = $2; }
| "%file-prefix" STRING { spec_file_prefix = $2; }
@@ -272,7 +256,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; }
@@ -282,9 +266,6 @@ 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; }
| "%require" STRING { version_check (&@2, $2); }
| "%skeleton" STRING
{
@@ -308,10 +289,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? */ ";"
;
@@ -347,28 +328,22 @@ grammar_declaration:
}
| "%code" braceless
{
- muscle_code_grow ("percent_code_unqualified", $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(";
- size_t length = strlen ($2);
- char *name = xmalloc (sizeof name_prefix + length + 1);
- strcpy (name, name_prefix);
- strcpy (name + sizeof name_prefix - 1, $2);
- strcpy (name + sizeof name_prefix - 1 + length, ")");
- 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 ("percent_code_user_qualifiers", $2, @2);
}
;
-/*----------*
- | %union. |
- *----------*/
+/*---------.
+| %union. |
+`---------*/
%token PERCENT_UNION "%union";
@@ -400,7 +375,7 @@ symbol_declaration:
current_class = unknown_sym;
current_type = NULL;
}
-| "%type" TYPE symbols.1
+| "%type" TAG symbols.1
{
symbol_list *list;
tag_seen = true;
@@ -411,7 +386,7 @@ symbol_declaration:
;
precedence_declaration:
- precedence_declarator type.opt symbols.1
+ precedence_declarator tag.opt symbols.prec
{
symbol_list *list;
++current_prec;
@@ -426,16 +401,30 @@ precedence_declaration:
;
precedence_declarator:
- "%left" { $$ = left_assoc; }
-| "%right" { $$ = right_assoc; }
-| "%nonassoc" { $$ = non_assoc; }
+ "%left" { $$ = left_assoc; }
+| "%right" { $$ = right_assoc; }
+| "%nonassoc" { $$ = non_assoc; }
+| "%precedence" { $$ = precedence_assoc; }
;
-type.opt:
+tag.opt:
/* Nothing. */ { current_type = NULL; }
-| TYPE { current_type = $1; tag_seen = true; }
+| TAG { 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
@@ -450,15 +439,15 @@ generic_symlist:
;
generic_symlist_item:
- symbol { $$ = symbol_list_sym_new ($1, @1); }
-| TYPE { $$ = symbol_list_type_new ($1, @1); }
-| "<*>" { $$ = symbol_list_default_tagged_new (@1); }
-| "<>" { $$ = symbol_list_default_tagless_new (@1); }
+ symbol { $$ = symbol_list_sym_new ($1, @1); }
+| TAG { $$ = symbol_list_type_new ($1, @1); }
+| "<*>" { $$ = symbol_list_default_tagged_new (@1); }
+| "<>" { $$ = symbol_list_default_tagless_new (@1); }
;
/* One token definition. */
symbol_def:
- TYPE
+ TAG
{
current_type = $1;
tag_seen = true;
@@ -537,34 +526,33 @@ rhs:
{ grammar_current_rule_prec_set ($3, @3); }
| rhs "%dprec" INT
{ grammar_current_rule_dprec_set ($3, @3); }
-| rhs "%merge" TYPE
+| rhs "%merge" TAG
{ grammar_current_rule_merge_set ($3, @3); }
;
-/*----------------------------*
- | variable and content.opt. |
- *---------------------------*/
+/*---------------------------.
+| variable and content.opt. |
+`---------------------------*/
variable:
ID
- | STRING { $$ = uniqstr_new ($1); } /* deprecated and not M4-friendly */
- ;
+| 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
;
-/*-------------*
- | braceless. |
- *-------------*/
+/*------------.
+| braceless. |
+`------------*/
braceless:
"{...}"
@@ -579,9 +567,9 @@ braceless:
;
-/*---------------*
- | Identifiers. |
- *---------------*/
+/*--------------.
+| Identifiers. |
+`--------------*/
/* Identifiers are returned as uniqstr values by the scanner.
Depending on their use, we may need to make them genuine symbols. */