X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5320fffdd88676a57c42427f3db06d36d10d5a8c..8a9283494b32bb45797ccaf443337a4e4682da98:/src/parse-gram.y?ds=inline diff --git a/src/parse-gram.y b/src/parse-gram.y index 016963a8..f03069dc 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -1,6 +1,6 @@ %{/* Bison Grammar Parser -*- C -*- - Copyright (C) 2002-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -20,6 +20,7 @@ #include #include "system.h" +#include "c-ctype.h" #include "complain.h" #include "conflicts.h" #include "files.h" @@ -39,17 +40,13 @@ static YYLTYPE lloc_default (YYLTYPE const *, int); #define YY_LOCATION_PRINT(File, Loc) \ - location_print (File, Loc) + location_print (Loc, File) static void version_check (location const *loc, char const *version); -/* Request detailed syntax error messages, and pass them to GRAM_ERROR. - FIXME: depends on the undocumented availability of YYLLOC. */ -#undef yyerror -#define yyerror(Msg) \ - gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); +/* A string that describes a char (e.g., 'a' -> "'a'"). */ static char const *char_name (char); %} @@ -67,7 +64,7 @@ static char const *char_name (char); */ static void - current_lhs(symbol *sym, location loc, named_ref *ref) + current_lhs (symbol *sym, location loc, named_ref *ref) { current_lhs_symbol = sym; current_lhs_location = loc; @@ -86,15 +83,15 @@ static char const *char_name (char); #define YYTYPE_UINT8 uint_fast8_t } -%verbose -%defines +%define api.prefix "gram_" +%define api.pure full %define locations -%define api.pure %define parse.error verbose %define parse.lac full %define parse.trace -%name-prefix "gram_" +%defines %expect 0 +%verbose %initial-action { @@ -104,23 +101,9 @@ static char const *char_name (char); boundary_set (&@$.end, current_file, 1, 1); } -%union -{ - assoc assoc; - char *code; - char const *chars; - int integer; - named_ref *named_ref; - symbol *symbol; - symbol_list *list; - uniqstr uniqstr; - unsigned char character; -}; - /* Define the tokens together with their human representation. */ %token GRAM_EOF 0 "end of file" %token STRING "string" -%token INT "integer" %token PERCENT_TOKEN "%token" %token PERCENT_NTERM "%nterm" @@ -185,11 +168,17 @@ static char const *char_name (char); %token TAG_ANY "<*>" %token TAG_NONE "<>" +%union {unsigned char character;} %type CHAR %printer { fputs (char_name ($$), yyo); } CHAR /* braceless is not to be used for rule or symbol actions, as it calls code_props_plain_init. */ +%union +{ + char *code; + char const *chars; +}; %type STRING "%{...%}" EPILOGUE braceless content.opt %type "{...}" "%?{...}" %printer { fputs (quotearg_style (c_quoting_style, $$), yyo); } @@ -197,6 +186,7 @@ static char const *char_name (char); %printer { fprintf (yyo, "{\n%s\n}", $$); } braceless content.opt "{...}" "%{...%}" EPILOGUE +%union {uniqstr uniqstr;} %type BRACKETED_ID ID ID_COLON PERCENT_FLAG TAG tag variable %printer { fputs ($$, yyo); } %printer { fprintf (yyo, "[%s]", $$); } BRACKETED_ID @@ -204,15 +194,22 @@ static char const *char_name (char); %printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG %printer { fprintf (yyo, "<%s>", $$); } TAG tag -%type INT +%union {int integer;}; +%token INT "integer" %printer { fprintf (yyo, "%d", $$); } +%union {symbol *symbol;} %type id id_colon string_as_id symbol symbol.prec %printer { fprintf (yyo, "%s", $$->tag); } %printer { fprintf (yyo, "%s:", $$->tag); } id_colon +%union {assoc assoc;}; %type precedence_declarator + +%union {symbol_list *list;} %type symbols.1 symbols.prec generic_symlist generic_symlist_item + +%union {named_ref *named_ref;} %type named_ref.opt /*---------. @@ -220,8 +217,6 @@ static char const *char_name (char); `---------*/ %code requires { -# ifndef PARAM_TYPE -# define PARAM_TYPE typedef enum { param_none = 0, @@ -229,7 +224,6 @@ static char const *char_name (char); param_parse = 1 << 1, param_both = param_lex | param_parse } param_type; -# endif }; %code { @@ -242,20 +236,17 @@ static char const *char_name (char); static void add_param (param_type type, char *decl, location loc); static param_type current_param = param_none; }; -%union -{ - param_type param; -} +%union {param_type param;} %token PERCENT_PARAM "%param"; %printer { switch ($$) { #define CASE(In, Out) \ - case param_ ## In: fputs ("%" #Out, stderr); break - CASE(lex, lex-param); - CASE(parse, parse-param); - CASE(both, param); + case param_ ## In: fputs ("%" #Out, yyo); break + CASE (lex, lex-param); + CASE (parse, parse-param); + CASE (both, param); #undef CASE case param_none: aver (false); break; } @@ -277,7 +268,7 @@ input: `------------------------------------*/ prologue_declarations: - /* Nothing */ + %empty | prologue_declarations prologue_declaration ; @@ -316,7 +307,6 @@ prologue_declaration: | "%expect" INT { expected_sr_conflicts = $2; } | "%expect-rr" INT { expected_rr_conflicts = $2; } | "%file-prefix" STRING { spec_file_prefix = $2; } -| "%file-prefix" "=" STRING { spec_file_prefix = $3; } /* deprecated */ | "%glr-parser" { nondeterministic_parser = true; @@ -333,11 +323,9 @@ prologue_declaration: } | "%language" STRING { language_argmatch ($2, grammar_prio, @1); } | "%name-prefix" STRING { spec_name_prefix = $2; } -| "%name-prefix" "=" STRING { spec_name_prefix = $3; } /* deprecated */ | "%no-lines" { no_lines_flag = true; } | "%nondeterministic-parser" { nondeterministic_parser = true; } | "%output" STRING { spec_outfile = $2; } -| "%output" "=" STRING { spec_outfile = $3; } /* deprecated */ | "%param" { current_param = $1; } params { current_param = param_none; } | "%require" STRING { version_check (&@2, $2); } | "%skeleton" STRING @@ -436,15 +424,15 @@ code_props_type: %token PERCENT_UNION "%union"; union_name: - /* Nothing. */ {} -| ID { muscle_code_grow ("union_name", $1, @1); } + %empty {} +| ID { muscle_code_grow ("union_name", $1, @1); } ; grammar_declaration: "%union" union_name braceless { union_seen = true; - muscle_code_grow ("stype", $3, @3); + muscle_code_grow ("union_members", $3, @3); code_scanner_last_string_free (); } ; @@ -496,8 +484,8 @@ precedence_declarator: ; tag.opt: - /* Nothing. */ { current_type = NULL; } -| TAG { current_type = $1; tag_seen = true; } + %empty { current_type = NULL; } +| TAG { current_type = $1; tag_seen = true; } ; /* Just like symbols.1 but accept INT for the sake of POSIX. */ @@ -505,12 +493,21 @@ 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_list_append ($1, symbol_list_sym_new ($2, @2)); } ; symbol.prec: - symbol { $$ = $1; } -| symbol INT { $$ = $1; symbol_user_token_number_set ($1, $2, @2); } + symbol + { + $$ = $1; + symbol_class_set ($1, token_sym, @1, false); + } +| symbol INT + { + $$ = $1; + symbol_user_token_number_set ($1, $2, @2); + symbol_class_set ($1, token_sym, @1, false); + } ; /* One or more symbols to be %typed. */ @@ -518,12 +515,12 @@ symbols.1: symbol { $$ = symbol_list_sym_new ($1, @1); } | symbols.1 symbol - { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); } + { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); } ; generic_symlist: generic_symlist_item { $$ = $1; } -| generic_symlist generic_symlist_item { $$ = symbol_list_prepend ($1, $2); } +| generic_symlist generic_symlist_item { $$ = symbol_list_append ($1, $2); } ; generic_symlist_item: @@ -540,15 +537,15 @@ tag: /* One token definition. */ symbol_def: TAG - { - current_type = $1; - tag_seen = true; - } + { + current_type = $1; + tag_seen = true; + } | id - { - symbol_class_set ($1, current_class, @1, true); - symbol_type_set ($1, current_type, @1); - } + { + symbol_class_set ($1, current_class, @1, true); + symbol_type_set ($1, current_type, @1); + } | id INT { symbol_class_set ($1, current_class, @1, true); @@ -611,8 +608,9 @@ rhses.1: | rhses.1 ";" ; +%token PERCENT_EMPTY "%empty"; rhs: - /* Nothing. */ + %empty { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location, current_lhs_named_ref); } | rhs symbol named_ref.opt @@ -621,6 +619,8 @@ rhs: { grammar_current_rule_action_append ($2, @2, $3, false); } | rhs "%?{...}" { grammar_current_rule_action_append ($2, @2, NULL, true); } +| rhs "%empty" + { grammar_current_rule_empty_set (@2); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } | rhs "%dprec" INT @@ -630,9 +630,8 @@ rhs: ; named_ref.opt: - /* Nothing. */ { $$ = 0; } -| - BRACKETED_ID { $$ = named_ref_new($1, @1); } + %empty { $$ = 0; } +| BRACKETED_ID { $$ = named_ref_new($1, @1); } ; /*---------------------------. @@ -640,7 +639,7 @@ named_ref.opt: `---------------------------*/ /* The STRING form of variable is deprecated and is not M4-friendly. - For example, M4 fails for `%define "[" "value"'. */ + For example, M4 fails for '%define "[" "value"'. */ variable: ID | STRING { $$ = uniqstr_new ($1); } @@ -648,9 +647,9 @@ variable: /* Some content or empty by default. */ content.opt: - /* Nothing. */ { $$ = ""; } -| ID { $$ = $1; } -| STRING + %empty { $$ = ""; } +| ID { $$ = $1; } +| STRING { $$ = $1; } ; @@ -709,7 +708,7 @@ string_as_id: ; epilogue.opt: - /* Nothing. */ + %empty | "%%" EPILOGUE { code_props plain_code; @@ -723,7 +722,6 @@ epilogue.opt: %% - /* Return the location of the left-hand side of a rule whose right-hand side is RHS[1] ... RHS[N]. Ignore empty nonterminals in the right-hand side, and return an empty location equal to the end @@ -776,17 +774,16 @@ add_param (param_type type, char *decl, location loc) /* Strip the surrounding '{' and '}', and any blanks just inside the braces. */ --p; - while (isspace ((unsigned char) *p)) + while (c_isspace ((unsigned char) *p)) --p; p[1] = '\0'; ++decl; - while (isspace ((unsigned char) *decl)) + while (c_isspace ((unsigned char) *decl)) ++decl; } if (! name_start) - complain_at (loc, complaint, - _("missing identifier in parameter declaration")); + complain (&loc, complaint, _("missing identifier in parameter declaration")); else { char *name = xmemdup0 (name_start, strspn (name_start, alphanum)); @@ -806,8 +803,8 @@ version_check (location const *loc, char const *version) { if (strverscmp (version, PACKAGE_VERSION) > 0) { - complain_at (*loc, complaint, "require bison %s, but have %s", - version, PACKAGE_VERSION); + complain (loc, complaint, "require bison %s, but have %s", + version, PACKAGE_VERSION); exit (EX_MISMATCH); } } @@ -815,7 +812,7 @@ version_check (location const *loc, char const *version) static void gram_error (location const *loc, char const *msg) { - complain_at (*loc, complaint, "%s", msg); + complain (loc, complaint, "%s", msg); } char const *