X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/381ecb068724f3ae161d7de6bdc8b3ebd402cdb4..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index ae9eb535..df92d642 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -1,6 +1,7 @@ %{/* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, + Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -23,6 +24,8 @@ #include #include "system.h" +#include + #include "complain.h" #include "conflicts.h" #include "files.h" @@ -34,7 +37,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); @@ -53,26 +55,25 @@ static void gram_error (location const *, char const *); static char const *char_name (char); -static void add_param (char const *, char *, location); +/** 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 +82,24 @@ static int current_prec = 0; %locations %pure-parser %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; @@ -130,19 +131,18 @@ static int current_prec = 0; `----------------------*/ %token - PERCENT_AFTER_HEADER "%after-header" - PERCENT_BEFORE_HEADER "%before-header" + PERCENT_CODE "%code" 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" @@ -153,10 +153,12 @@ 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" - PERCENT_START_HEADER "%start-header" PERCENT_TOKEN_TABLE "%token-table" PERCENT_VERBOSE "%verbose" PERCENT_YACC "%yacc" @@ -173,18 +175,24 @@ 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 -%type STRING string_content "{...}" PROLOGUE EPILOGUE +/* braceless is not to be used for rule or symbol actions, as it + calls code_props_plain_init. */ +%type STRING "%{...%}" EPILOGUE braceless content.opt +%type "{...}" %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); } - STRING string_content -%printer { fprintf (stderr, "{\n%s\n}", $$); } "{...}" PROLOGUE EPILOGUE + STRING +%printer { fprintf (stderr, "{\n%s\n}", $$); } + braceless content.opt "{...}" "%{...%}" EPILOGUE -%type TYPE ID ID_COLON +%type TYPE ID ID_COLON variable %printer { fprintf (stderr, "<%s>", $$); } TYPE -%printer { fputs ($$, stderr); } ID +%printer { fputs ($$, stderr); } ID variable %printer { fprintf (stderr, "%s:", $$); } ID_COLON %type INT @@ -195,11 +203,11 @@ 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: - declarations "%%" grammar epilogue.opt + prologue_declarations "%%" grammar epilogue.opt ; @@ -207,47 +215,39 @@ 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, typed); - } -| "%after-header" "{...}" - { - /* Remove the '{', and replace the '}' with '\n'. */ - $2[strlen ($2) - 1] = '\n'; - prologue_augment (translate_code ($2+1, @2), @2, true); - } -| "%before-header" "{...}" - { - /* Remove the '{', and replace the '}' with '\n'. */ - $2[strlen ($2) - 1] = '\n'; - prologue_augment (translate_code ($2+1, @2), @2, false); + code_props plain_code; + code_props_plain_init (&plain_code, $1, @1); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue", + plain_code.code, @1); + code_scanner_last_string_free (); } -| "%debug" { debug_flag = true; } -| "%define" string_content +| "%debug" { debug_flag = true; } +| "%define" variable content.opt { - static char one[] = "1"; - muscle_insert ($2, one); + muscle_percent_define_insert ($2, @2, $3); } -| "%define" string_content string_content { muscle_insert ($2, $3); } -| "%defines" { defines_flag = true; } -| "%end-header" "{...}" +| "%defines" { defines_flag = true; } +| "%defines" STRING { - /* Remove the '{', and replace the '}' with '\n'. */ - $2[strlen ($2) - 1] = '\n'; - muscle_code_grow ("end_header", translate_code ($2+1, @2), @2); + 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_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; @@ -255,27 +255,54 @@ declaration: } | "%initial-action" "{...}" { - muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2); + code_props action; + code_props_symbol_action_init (&action, $2, @2); + code_props_translate_code (&action); + gram_scanner_last_string_free (); + muscle_code_grow ("initial_action", action.code, @2); + code_scanner_last_string_free (); } -| "%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; } -| "%start-header" "{...}" +| "%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; pull_parser = false; } +| "%push-pull-parser" { push_parser = true; pull_parser = true; } +| "%require" STRING { version_check (&@2, $2); } +| "%skeleton" STRING { - /* Remove the '{', and replace the '}' with '\n'. */ - $2[strlen ($2) - 1] = '\n'; - muscle_code_grow ("start_header", translate_code ($2+1, @2), @2); + char const *skeleton_user = $2; + if (strchr (skeleton_user, '/')) + { + size_t dir_length = strlen (current_file); + char *skeleton_build; + while (dir_length && current_file[dir_length - 1] != '/') + --dir_length; + while (dir_length && current_file[dir_length - 1] == '/') + --dir_length; + skeleton_build = + xmalloc (dir_length + 1 + strlen (skeleton_user) + 1); + if (dir_length > 0) + { + strncpy (skeleton_build, current_file, dir_length); + skeleton_build[dir_length++] = '/'; + } + strcpy (skeleton_build + dir_length, skeleton_user); + skeleton_user = uniqstr_new (skeleton_build); + free (skeleton_build); + } + skeleton_arg (skeleton_user, 1, &@1); } -| "%token-table" { token_table_flag = true; } -| "%verbose" { report_flag = report_states; } -| "%yacc" { yacc_flag = true; } +| "%token-table" { token_table_flag = true; } +| "%verbose" { report_flag = report_states; } +| "%yacc" { yacc_flag = true; } | /*FIXME: Err? What is this horror doing here? */ ";" ; @@ -286,20 +313,18 @@ 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, $2, @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, $2, @2); symbol_list_free ($3); } | "%default-prec" @@ -310,6 +335,18 @@ grammar_declaration: { default_prec = false; } +| "%code" braceless + { + /* 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 + { + muscle_percent_code_grow ($2, @2, $3, @3); + code_scanner_last_string_free (); + } ; @@ -325,21 +362,11 @@ union_name: ; grammar_declaration: - "%union" union_name "{...}" + "%union" union_name braceless { - char const *body = $3; - - 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, @3); + union_seen = true; + muscle_code_grow ("stype", $3, @3); + code_scanner_last_string_free (); } ; @@ -360,8 +387,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); } ; @@ -373,8 +401,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; @@ -389,13 +417,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. */ @@ -403,6 +445,7 @@ symbol_def: TYPE { current_type = $1; + tag_seen = true; } | id { @@ -483,6 +526,42 @@ rhs: ; +/*----------------------------* + | variable and content.opt. | + *---------------------------*/ + +variable: + ID + | STRING { $$ = uniqstr_new ($1); } /* deprecated and not M4-friendly */ + ; + +/* Some content or empty by default. */ +content.opt: + /* Nothing. */ + { + $$ = ""; + } +| STRING +; + + +/*-------------* + | braceless. | + *-------------*/ + +braceless: + "{...}" + { + code_props plain_code; + $1[strlen ($1) - 1] = '\n'; + code_props_plain_init (&plain_code, $1+1, @1); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + $$ = plain_code.code; + } +; + + /*---------------* | Identifiers. | *---------------*/ @@ -520,19 +599,16 @@ string_as_id: } ; -/* A string used for its contents. Don't quote it. */ -string_content: - STRING - { $$ = $1; } -; - - epilogue.opt: /* Nothing. */ | "%%" EPILOGUE { - muscle_code_grow ("epilogue", translate_code ($2, @2), @2); + code_props plain_code; + code_props_plain_init (&plain_code, $2, @2); + code_props_translate_code (&plain_code); gram_scanner_last_string_free (); + muscle_code_grow ("epilogue", plain_code.code, @2); + code_scanner_last_string_free (); } ; @@ -620,6 +696,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) {