X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2ce4ed68c9b156fd353ada1a986bb61dfa42f60a..2e7944cbb21e10c130192f733abc1af5cd8b6eb7:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index c346b88b..ba0ef6f9 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -83,6 +83,7 @@ static int current_prec = 0; %error-verbose %defines %name-prefix="gram_" +%expect 0 %initial-action { @@ -92,13 +93,13 @@ static int current_prec = 0; 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; @@ -130,19 +131,19 @@ static int current_prec = 0; `----------------------*/ %token - PERCENT_AFTER_HEADER "%after-header" - PERCENT_BEFORE_HEADER "%before-header" + PERCENT_CODE "%code" + PERCENT_CODE_TOP "%code-top" PERCENT_DEBUG "%debug" PERCENT_DEFAULT_PREC "%default-prec" PERCENT_DEFINE "%define" PERCENT_DEFINES "%defines" - PERCENT_END_HEADER "%end-header" PERCENT_ERROR_VERBOSE "%error-verbose" PERCENT_EXPECT "%expect" PERCENT_EXPECT_RR "%expect-rr" 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" @@ -152,11 +153,13 @@ 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_START_HEADER "%start-header" PERCENT_TOKEN_TABLE "%token-table" PERCENT_VERBOSE "%verbose" PERCENT_YACC "%yacc" @@ -173,17 +176,20 @@ static int current_prec = 0; %token PROLOGUE "%{...%}" %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 STRING "%{...%}" EPILOGUE braceless content content.opt +%type "{...}" %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); } - STRING + STRING %printer { fprintf (stderr, "{\n%s\n}", $$); } - braceless content content.opt "{...}" "%{...%}" EPILOGUE + braceless content content.opt "{...}" "%{...%}" EPILOGUE %type TYPE ID ID_COLON %printer { fprintf (stderr, "<%s>", $$); } TYPE @@ -198,7 +204,7 @@ static int current_prec = 0; %printer { fprintf (stderr, "%s:", $$->tag); } id_colon %type precedence_declarator -%type symbols.1 +%type symbols.1 generic_symlist generic_symlist_item %% input: @@ -218,16 +224,19 @@ prologue_declarations: prologue_declaration: grammar_declaration | "%{...%}" { prologue_augment (translate_code ($1, @1), @1, union_seen); } -| "%after-header" braceless { prologue_augment ($2, @2, true); } -| "%before-header" braceless { prologue_augment ($2, @2, false); } | "%debug" { debug_flag = true; } | "%define" STRING content.opt { muscle_insert ($2, $3); } | "%defines" { defines_flag = true; } -| "%end-header" braceless { muscle_code_grow ("end_header", $2, @2); } +| "%defines" STRING + { + 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 = $3; } +| "%file-prefix" STRING { spec_file_prefix = $2; } +| "%file-prefix" "=" STRING { spec_file_prefix = $3; } /* deprecated */ | "%glr-parser" { nondeterministic_parser = true; @@ -237,17 +246,20 @@ prologue_declaration: { muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2); } +| "%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 = $3; } +| "%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 = $3; } +| "%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 = $2; } -| "%start-header" braceless { muscle_code_grow ("start_header", $2, @2); } +| "%skeleton" STRING { skeleton_arg ($2, 1, &@1); } | "%token-table" { token_table_flag = true; } | "%verbose" { report_flag = report_states; } | "%yacc" { yacc_flag = true; } @@ -261,20 +273,20 @@ grammar_declaration: { grammar_start_symbol_set ($2, @2); } -| "%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" @@ -285,6 +297,10 @@ 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); } ; @@ -304,14 +320,20 @@ grammar_declaration: { char const *body = $3; - if (union_seen) + /* 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 { - /* 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++; } + body++; union_seen = true; muscle_code_grow ("stype", body, @3); @@ -334,10 +356,10 @@ symbol_declaration: } | "%type" TYPE symbols.1 { - tag_seen = true; 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); } ; @@ -349,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; @@ -368,10 +390,24 @@ type.opt: | 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. */