X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e9071366c3104e4e4a2490c16d53e7eeef670f45..2e7944cbb21e10c130192f733abc1af5cd8b6eb7:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index a0c708b3..ba0ef6f9 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -23,6 +23,8 @@ #include #include "system.h" +#include + #include "complain.h" #include "conflicts.h" #include "files.h" @@ -34,7 +36,6 @@ #include "symlist.h" #include "scan-gram.h" #include "scan-code.h" -#include "strverscmp.h" #define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) static YYLTYPE lloc_default (YYLTYPE const *, int); @@ -51,26 +52,27 @@ static void version_check (location const *loc, char const *version); gram_error (&yylloc, Msg) static void gram_error (location const *, char const *); -static void add_param (char const *, char *, location); +static char const *char_name (char); + +/** Add a lex-param or a parse-param. + * + * \param type \a lex_param or \a parse_param + * \param decl the formal argument + * \param loc the location in the source. + */ +static void add_param (char const *type, char *decl, location loc); + static symbol_class current_class = unknown_sym; -static uniqstr current_type = 0; +static uniqstr current_type = NULL; static symbol *current_lhs; static location current_lhs_location; static int current_prec = 0; -#ifdef UINT_FAST8_MAX -# define YYTYPE_UINT8 uint_fast8_t -#endif -#ifdef INT_FAST8_MAX -# define YYTYPE_INT8 int_fast8_t -#endif -#ifdef UINT_FAST16_MAX -# define YYTYPE_UINT16 uint_fast16_t -#endif -#ifdef INT_FAST16_MAX -# define YYTYPE_INT16 int_fast16_t -#endif +#define YYTYPE_INT16 int_fast16_t +#define YYTYPE_INT8 int_fast8_t +#define YYTYPE_UINT16 uint_fast16_t +#define YYTYPE_UINT8 uint_fast8_t %} %debug @@ -81,24 +83,26 @@ static int current_prec = 0; %error-verbose %defines %name-prefix="gram_" +%expect 0 %initial-action { /* Bison's grammar can initial empty locations, hence a default location is needed. */ - boundary_set (&@$.start, current_file, 1, 0); - boundary_set (&@$.end, current_file, 1, 0); + boundary_set (&@$.start, current_file, 1, 1); + boundary_set (&@$.end, current_file, 1, 1); } -/* Only NUMBERS have a value. */ %union { symbol *symbol; symbol_list *list; int integer; - char *chars; + char const *chars; + char *code; assoc assoc; uniqstr uniqstr; + unsigned char character; }; /* Define the tokens together with their human representation. */ @@ -113,8 +117,6 @@ static int current_prec = 0; %token PERCENT_DESTRUCTOR "%destructor" %token PERCENT_PRINTER "%printer" -%token PERCENT_UNION "%union {...}" - %token PERCENT_LEFT "%left" %token PERCENT_RIGHT "%right" %token PERCENT_NONASSOC "%nonassoc" @@ -129,6 +131,8 @@ static int current_prec = 0; `----------------------*/ %token + PERCENT_CODE "%code" + PERCENT_CODE_TOP "%code-top" PERCENT_DEBUG "%debug" PERCENT_DEFAULT_PREC "%default-prec" PERCENT_DEFINE "%define" @@ -139,6 +143,7 @@ static int current_prec = 0; PERCENT_FILE_PREFIX "%file-prefix" PERCENT_GLR_PARSER "%glr-parser" PERCENT_INITIAL_ACTION "%initial-action" + PERCENT_LANGUAGE "%language" PERCENT_LEX_PARAM "%lex-param" PERCENT_LOCATIONS "%locations" PERCENT_NAME_PREFIX "%name-prefix" @@ -148,8 +153,11 @@ static int current_prec = 0; "%nondeterministic-parser" PERCENT_OUTPUT "%output" PERCENT_PARSE_PARAM "%parse-param" + PERCENT_PROVIDES "%provides" PERCENT_PURE_PARSER "%pure-parser" + PERCENT_PUSH_PARSER "%push-parser" PERCENT_REQUIRE "%require" + PERCENT_REQUIRES "%requires" PERCENT_SKELETON "%skeleton" PERCENT_START "%start" PERCENT_TOKEN_TABLE "%token-table" @@ -157,41 +165,50 @@ static int current_prec = 0; PERCENT_YACC "%yacc" ; -%token TYPE "type" +%token BRACED_CODE "{...}" +%token CHAR "char" +%token EPILOGUE "epilogue" %token EQUAL "=" -%token SEMICOLON ";" -%token PIPE "|" %token ID "identifier" %token ID_COLON "identifier:" %token PERCENT_PERCENT "%%" +%token PIPE "|" %token PROLOGUE "%{...%}" -%token EPILOGUE "epilogue" -%token BRACED_CODE "{...}" - -%type STRING string_content - "{...}" - "%union {...}" - PROLOGUE EPILOGUE -%printer { fprintf (stderr, "\"%s\"", $$); } - STRING string_content +%token SEMICOLON ";" +%token TYPE "type" +%token TYPE_TAG_ANY "<*>" +%token TYPE_TAG_NONE "<>" + +%type CHAR +%printer { fputs (char_name ($$), stderr); } CHAR + +/* braceless is not to be used for rule or symbol actions, as it + calls translate_code. */ +%type STRING "%{...%}" EPILOGUE braceless content content.opt +%type "{...}" +%printer { fputs (quotearg_style (c_quoting_style, $$), stderr); } + STRING %printer { fprintf (stderr, "{\n%s\n}", $$); } - "{...}" - "%union {...}" - PROLOGUE EPILOGUE -%type TYPE + braceless content content.opt "{...}" "%{...%}" EPILOGUE + +%type TYPE ID ID_COLON %printer { fprintf (stderr, "<%s>", $$); } TYPE +%printer { fputs ($$, stderr); } ID +%printer { fprintf (stderr, "%s:", $$); } ID_COLON + %type INT %printer { fprintf (stderr, "%d", $$); } INT -%type ID symbol string_as_id -%printer { fprintf (stderr, "%s", $$->tag); } ID symbol string_as_id -%type ID_COLON -%printer { fprintf (stderr, "%s:", $$->tag); } ID_COLON + +%type id id_colon symbol 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 +%type symbols.1 generic_symlist generic_symlist_item %% input: - declarations "%%" grammar epilogue.opt + prologue_declarations "%%" grammar epilogue.opt ; @@ -199,27 +216,27 @@ input: | Declarations: before the first %%. | `------------------------------------*/ -declarations: +prologue_declarations: /* Nothing */ -| declarations declaration +| prologue_declarations prologue_declaration ; -declaration: +prologue_declaration: grammar_declaration -| PROLOGUE { prologue_augment (translate_code ($1, @1), - @1); } -| "%debug" { debug_flag = true; } -| "%define" string_content +| "%{...%}" { prologue_augment (translate_code ($1, @1), @1, union_seen); } +| "%debug" { debug_flag = true; } +| "%define" STRING content.opt { muscle_insert ($2, $3); } +| "%defines" { defines_flag = true; } +| "%defines" STRING { - static char one[] = "1"; - muscle_insert ($2, one); + defines_flag = true; + spec_defines_file = xstrdup ($2); } -| "%define" string_content string_content { muscle_insert ($2, $3); } -| "%defines" { defines_flag = true; } -| "%error-verbose" { error_verbose = true; } -| "%expect" INT { expected_sr_conflicts = $2; } -| "%expect-rr" INT { expected_rr_conflicts = $2; } -| "%file-prefix" "=" string_content { spec_file_prefix = $3; } +| "%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; } +| "%file-prefix" "=" STRING { spec_file_prefix = $3; } /* deprecated */ | "%glr-parser" { nondeterministic_parser = true; @@ -229,19 +246,23 @@ declaration: { muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2); } -| "%lex-param" "{...}" { add_param ("lex_param", $2, @2); } -| "%locations" { locations_flag = true; } -| "%name-prefix" "=" string_content { spec_name_prefix = $3; } -| "%no-lines" { no_lines_flag = true; } -| "%nondeterministic-parser" { nondeterministic_parser = true; } -| "%output" "=" string_content { spec_outfile = $3; } -| "%parse-param" "{...}" { add_param ("parse_param", $2, @2); } -| "%pure-parser" { pure_parser = true; } -| "%require" string_content { version_check (&@2, $2); } -| "%skeleton" string_content { skeleton = $2; } -| "%token-table" { token_table_flag = true; } -| "%verbose" { report_flag = report_states; } -| "%yacc" { yacc_flag = true; } +| "%language" STRING { language_argmatch ($2, 1, &@1); } +| "%lex-param" "{...}" { add_param ("lex_param", $2, @2); } +| "%locations" { locations_flag = true; } +| "%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 */ +| "%parse-param" "{...}" { add_param ("parse_param", $2, @2); } +| "%pure-parser" { pure_parser = true; } +| "%push-parser" { push_parser = true; } +| "%require" STRING { version_check (&@2, $2); } +| "%skeleton" STRING { skeleton_arg ($2, 1, &@1); } +| "%token-table" { token_table_flag = true; } +| "%verbose" { report_flag = report_states; } +| "%yacc" { yacc_flag = true; } | /*FIXME: Err? What is this horror doing here? */ ";" ; @@ -252,36 +273,20 @@ grammar_declaration: { grammar_start_symbol_set ($2, @2); } -| "%union {...}" - { - char const *body = $1; - - if (typed) - { - /* Concatenate the union bodies, turning the first one's - trailing '}' into '\n', and omitting the second one's '{'. */ - char *code = muscle_find ("stype"); - code[strlen (code) - 1] = '\n'; - body++; - } - - typed = true; - muscle_code_grow ("stype", body, @1); - } -| "%destructor" "{...}" symbols.1 +| "%destructor" "{...}" generic_symlist { symbol_list *list; const char *action = translate_symbol_action ($2, @2); for (list = $3; list; list = list->next) - symbol_destructor_set (list->sym, action, @2); + symbol_list_destructor_set (list, action, @2); symbol_list_free ($3); } -| "%printer" "{...}" symbols.1 +| "%printer" "{...}" generic_symlist { symbol_list *list; const char *action = translate_symbol_action ($2, @2); for (list = $3; list; list = list->next) - symbol_printer_set (list->sym, action, @2); + symbol_list_printer_set (list, action, @2); symbol_list_free ($3); } | "%default-prec" @@ -292,8 +297,52 @@ grammar_declaration: { default_prec = false; } +| "%code" braceless { prologue_augment ($2, @2, true); } +| "%code-top" braceless { prologue_augment ($2, @2, false); } +| "%provides" braceless { muscle_code_grow ("provides", $2, @2); } +| "%requires" braceless { muscle_code_grow ("requires", $2, @2); } +; + + +/*----------* + | %union. | + *----------*/ + +%token PERCENT_UNION "%union"; + +union_name: + /* Nothing. */ {} +| ID { muscle_code_grow ("union_name", $1, @1); } +; + +grammar_declaration: + "%union" union_name "{...}" + { + 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); + } ; + + + symbol_declaration: "%nterm" { current_class = nterm_sym; } symbol_defs.1 { @@ -308,8 +357,9 @@ symbol_declaration: | "%type" TYPE symbols.1 { symbol_list *list; + tag_seen = true; for (list = $3; list; list = list->next) - symbol_type_set (list->sym, $2, @2); + symbol_type_set (list->content.sym, $2, @2); symbol_list_free ($3); } ; @@ -321,8 +371,8 @@ precedence_declaration: ++current_prec; for (list = $3; list; list = list->next) { - symbol_type_set (list->sym, current_type, @2); - symbol_precedence_set (list->sym, current_prec, $1, @1); + symbol_type_set (list->content.sym, current_type, @2); + symbol_precedence_set (list->content.sym, current_prec, $1, @1); } symbol_list_free ($3); current_type = NULL; @@ -337,13 +387,27 @@ precedence_declarator: type.opt: /* Nothing. */ { current_type = NULL; } -| TYPE { current_type = $1; } +| TYPE { current_type = $1; tag_seen = true; } ; -/* One or more nonterminals to be %typed. */ +/* One or more symbols to be %typed. */ symbols.1: - symbol { $$ = symbol_list_new ($1, @1); } -| symbols.1 symbol { $$ = symbol_list_prepend ($1, $2, @2); } + symbol + { $$ = symbol_list_sym_new ($1, @1); } +| symbols.1 symbol + { $$ = symbol_list_prepend ($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_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); } ; /* One token definition. */ @@ -351,25 +415,26 @@ symbol_def: TYPE { current_type = $1; + tag_seen = true; } -| ID +| id { symbol_class_set ($1, current_class, @1, true); symbol_type_set ($1, current_type, @1); } -| ID INT +| id INT { symbol_class_set ($1, current_class, @1, true); symbol_type_set ($1, current_type, @1); symbol_user_token_number_set ($1, $2, @2); } -| ID string_as_id +| id string_as_id { symbol_class_set ($1, current_class, @1, true); symbol_type_set ($1, current_type, @1); symbol_make_alias ($1, $2, @$); } -| ID INT string_as_id +| id INT string_as_id { symbol_class_set ($1, current_class, @1, true); symbol_type_set ($1, current_type, @1); @@ -406,7 +471,7 @@ rules_or_grammar_declaration: ; rules: - ID_COLON { current_lhs = $1; current_lhs_location = @1; } rhses.1 + id_colon { current_lhs = $1; current_lhs_location = @1; } rhses.1 ; rhses.1: @@ -421,8 +486,7 @@ rhs: | rhs symbol { grammar_current_rule_symbol_append ($2, @2); } | rhs "{...}" - { grammar_current_rule_action_append (gram_last_string, - gram_last_braced_code_loc); } + { grammar_current_rule_action_append ($2, @2); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } | rhs "%dprec" INT @@ -431,9 +495,62 @@ rhs: { grammar_current_rule_merge_set ($3, @3); } ; + +/*-----------* + | content. | + *-----------*/ + +content: + STRING +| braceless +; + +/* Some content or "1" by default. */ +content.opt: + /* Nothing. */ + { + static char one[] = "1"; + $$ = one; + } +| content +; + + +braceless: + "{...}" + { + $1[strlen ($1) - 1] = '\n'; + $$ = translate_code ($1 + 1, @1); + } +; + + +/*---------------* + | Identifiers. | + *---------------*/ + +/* Identifiers are returned as uniqstr values by the scanner. + Depending on their use, we may need to make them genuine symbols. */ + +id: + ID + { $$ = symbol_from_uniqstr ($1, @1); } +| CHAR + { + $$ = symbol_get (char_name ($1), @1); + symbol_class_set ($$, token_sym, @1, false); + symbol_user_token_number_set ($$, $1, @1); + } +; + +id_colon: + ID_COLON { $$ = symbol_from_uniqstr ($1, @1); } +; + + symbol: - ID { $$ = $1; } -| string_as_id { $$ = $1; } + id +| string_as_id ; /* A string used as an ID: quote it. */ @@ -445,13 +562,6 @@ string_as_id: } ; -/* A string used for its contents. Don't quote it. */ -string_content: - STRING - { $$ = $1; } -; - - epilogue.opt: /* Nothing. */ | "%%" EPILOGUE @@ -545,6 +655,7 @@ add_param (char const *type, char *decl, location loc) gram_scanner_last_string_free (); } + static void version_check (location const *loc, char const *version) { @@ -567,3 +678,16 @@ token_name (int type) { return yytname[YYTRANSLATE (type)]; } + +static char const * +char_name (char c) +{ + if (c == '\'') + return "'\\''"; + else + { + char buf[4]; + buf[0] = '\''; buf[1] = c; buf[2] = '\''; buf[3] = '\0'; + return quotearg_style (escape_quoting_style, buf); + } +}