X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3d2cbc2662b201248fa251ce760960201fb4f3a4..cce7a5f4230618ddc7e256e8b83b7f0d84ff5909:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index 3a6de2ff..c5d8024f 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -58,7 +58,7 @@ static void gram_error (location const *, char const *); print_token_value (File, Type, &Value) static void print_token_value (FILE *, int, YYSTYPE const *); -static void add_param (char const *, char const *, location); +static void add_param (char const *, char *, location); symbol_class current_class = unknown_sym; uniqstr current_type = 0; @@ -66,7 +66,6 @@ symbol *current_lhs; location current_lhs_location; assoc current_assoc; int current_prec = 0; -braced_code current_braced_code = action_braced_code; %} @@ -90,10 +89,10 @@ braced_code current_braced_code = action_braced_code; %token PERCENT_NTERM "%nterm" %token PERCENT_TYPE "%type" -%token PERCENT_DESTRUCTOR "%destructor" -%token PERCENT_PRINTER "%printer" +%token PERCENT_DESTRUCTOR "%destructor {...}" +%token PERCENT_PRINTER "%printer {...}" -%token PERCENT_UNION "%union" +%token PERCENT_UNION "%union {...}" %token PERCENT_LEFT "%left" %token PERCENT_RIGHT "%right" @@ -116,12 +115,12 @@ braced_code current_braced_code = action_braced_code; PERCENT_EXPECT "%expect" PERCENT_FILE_PREFIX "%file-prefix" PERCENT_GLR_PARSER "%glr-parser" - PERCENT_LEX_PARAM "%lex-param" + PERCENT_LEX_PARAM "%lex-param {...}" PERCENT_LOCATIONS "%locations" PERCENT_NAME_PREFIX "%name-prefix" PERCENT_NO_LINES "%no-lines" PERCENT_OUTPUT "%output" - PERCENT_PARSE_PARAM "%parse-param" + PERCENT_PARSE_PARAM "%parse-param {...}" PERCENT_PURE_PARSER "%pure-parser" PERCENT_SKELETON "%skeleton" PERCENT_START "%start" @@ -143,7 +142,12 @@ braced_code current_braced_code = action_braced_code; %type STRING string_content - BRACED_CODE code_content action + "%destructor {...}" + "%lex-param {...}" + "%parse-param {...}" + "%printer {...}" + "%union {...}" + BRACED_CODE action PROLOGUE EPILOGUE %type TYPE %type INT @@ -176,16 +180,16 @@ declaration: | "%expect" INT { expected_conflicts = $2; } | "%file-prefix" "=" string_content { spec_file_prefix = $3; } | "%glr-parser" { glr_parser = 1; } -| "%lex-param" code_content { add_param ("lex_param", $2, @2); } +| "%lex-param {...}" { add_param ("lex_param", $1, @1); } | "%locations" { locations_flag = 1; } | "%name-prefix" "=" string_content { spec_name_prefix = $3; } | "%no-lines" { no_lines_flag = 1; } | "%output" "=" string_content { spec_outfile = $3; } -| "%parse-param" code_content { add_param ("parse_param", $2, @2); } +| "%parse-param {...}" { add_param ("parse_param", $1, @1); } | "%pure-parser" { pure_parser = 1; } | "%skeleton" string_content { skeleton = $2; } | "%token-table" { token_table_flag = 1; } -| "%verbose" { report_flag = 1; } +| "%verbose" { report_flag = report_states; } | "%yacc" { yacc_flag = 1; } | ";" ; @@ -197,31 +201,25 @@ grammar_declaration: { grammar_start_symbol_set ($2, @2); } -| "%union" BRACED_CODE +| "%union {...}" { typed = 1; - MUSCLE_INSERT_INT ("stype_line", @2.start.line); - muscle_insert ("stype", $2); + MUSCLE_INSERT_INT ("stype_line", @1.start.line); + muscle_insert ("stype", $1); } -| "%destructor" - { current_braced_code = destructor_braced_code; } - BRACED_CODE symbols.1 +| "%destructor {...}" symbols.1 { symbol_list *list; - for (list = $4; list; list = list->next) - symbol_destructor_set (list->sym, $3, @3); - symbol_list_free ($4); - current_braced_code = action_braced_code; + for (list = $2; list; list = list->next) + symbol_destructor_set (list->sym, $1, @1); + symbol_list_free ($2); } -| "%printer" - { current_braced_code = printer_braced_code; } - BRACED_CODE symbols.1 +| "%printer {...}" symbols.1 { symbol_list *list; - for (list = $4; list; list = list->next) - symbol_printer_set (list->sym, $3, list->location); - symbol_list_free ($4); - current_braced_code = action_braced_code; + for (list = $2; list; list = list->next) + symbol_printer_set (list->sym, $1, list->location); + symbol_list_free ($2); } ; @@ -394,15 +392,6 @@ string_content: }; -/* A BRACED_CODE used for its contents. Strip the braces. */ -code_content: - BRACED_CODE - { - $$ = $1 + 1; - $$[strlen ($$) - 1] = '\0'; - }; - - epilogue.opt: /* Nothing. */ | "%%" EPILOGUE @@ -424,20 +413,16 @@ static YYLTYPE lloc_default (YYLTYPE const *rhs, int n) { int i; - int j; YYLTYPE r; r.start = r.end = rhs[n].end; + /* Ignore empty nonterminals the start of the the right-hand side. + Do not bother to ignore them at the end of the right-hand side, + since empty nonterminals have the same end as their predecessors. */ for (i = 1; i <= n; i++) if (! equal_boundaries (rhs[i].start, rhs[i].end)) { r.start = rhs[i].start; - - for (j = n; i < j; j--) - if (! equal_boundaries (rhs[j].start, rhs[j].end)) - break; - r.end = rhs[j].end; - break; } @@ -449,7 +434,7 @@ lloc_default (YYLTYPE const *rhs, int n) declaration DECL and location LOC. */ static void -add_param (char const *type, char const *decl, location loc) +add_param (char const *type, char *decl, location loc) { static char const alphanum[] = "0123456789" @@ -458,12 +443,16 @@ add_param (char const *type, char const *decl, location loc) "_"; char const *alpha = alphanum + 10; char const *name_start = NULL; - char const *p; + char *p; for (p = decl; *p; p++) if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) name_start = p; + /* Strip the surrounding '{' and '}'. */ + decl++; + p[-1] = '\0'; + if (! name_start) complain_at (loc, _("missing identifier in parameter declaration")); else @@ -486,9 +475,9 @@ add_param (char const *type, char const *decl, location loc) scanner_last_string_free (); } -/*------------------------------------------------------------------. -| When debugging the parser, display tokens' locations and values. | -`------------------------------------------------------------------*/ +/*----------------------------------------------------. +| When debugging the parser, display tokens' values. | +`----------------------------------------------------*/ static void print_token_value (FILE *file, int type, YYSTYPE const *value) @@ -513,6 +502,11 @@ print_token_value (FILE *file, int type, YYSTYPE const *value) break; case BRACED_CODE: + case PERCENT_DESTRUCTOR: + case PERCENT_LEX_PARAM: + case PERCENT_PARSE_PARAM: + case PERCENT_PRINTER: + case PERCENT_UNION: case PROLOGUE: case EPILOGUE: fprintf (file, " = {{ %s }}", value->chars); @@ -529,3 +523,9 @@ gram_error (location const *loc, char const *msg) { complain_at (*loc, "%s", msg); } + +char const * +token_name (int type) +{ + return yytname[type]; +}