X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6b7022680ea084a5d63e73614e40647f2d0dcce9..5a2baae7b396f0926116967ca9492f74aae77fc7:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index 68789828..aea77e1f 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -29,10 +29,11 @@ #include "getargs.h" #include "gram.h" #include "muscle_tab.h" -#include "output.h" #include "quotearg.h" #include "reader.h" #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) @@ -85,9 +86,8 @@ static int current_prec = 0; { /* Bison's grammar can initial empty locations, hence a default location is needed. */ - @$.start.file = @$.end.file = current_file; - @$.start.line = @$.end.line = 1; - @$.start.column = @$.end.column = 0; + boundary_set (&@$.start, current_file, 1, 0); + boundary_set (&@$.end, current_file, 1, 0); } /* Only NUMBERS have a value. */ @@ -99,6 +99,7 @@ static int current_prec = 0; char *chars; assoc assoc; uniqstr uniqstr; + unsigned char character; }; /* Define the tokens together with their human representation. */ @@ -110,10 +111,8 @@ static int current_prec = 0; %token PERCENT_NTERM "%nterm" %token PERCENT_TYPE "%type" -%token PERCENT_DESTRUCTOR "%destructor {...}" -%token PERCENT_PRINTER "%printer {...}" - -%token PERCENT_UNION "%union {...}" +%token PERCENT_DESTRUCTOR "%destructor" +%token PERCENT_PRINTER "%printer" %token PERCENT_LEFT "%left" %token PERCENT_RIGHT "%right" @@ -138,8 +137,8 @@ static int current_prec = 0; PERCENT_EXPECT_RR "%expect-rr" PERCENT_FILE_PREFIX "%file-prefix" PERCENT_GLR_PARSER "%glr-parser" - PERCENT_INITIAL_ACTION "%initial-action {...}" - PERCENT_LEX_PARAM "%lex-param {...}" + PERCENT_INITIAL_ACTION "%initial-action" + PERCENT_LEX_PARAM "%lex-param" PERCENT_LOCATIONS "%locations" PERCENT_NAME_PREFIX "%name-prefix" PERCENT_NO_DEFAULT_PREC "%no-default-prec" @@ -147,7 +146,7 @@ static int current_prec = 0; PERCENT_NONDETERMINISTIC_PARSER "%nondeterministic-parser" PERCENT_OUTPUT "%output" - PERCENT_PARSE_PARAM "%parse-param {...}" + PERCENT_PARSE_PARAM "%parse-param" PERCENT_PURE_PARSER "%pure-parser" PERCENT_REQUIRE "%require" PERCENT_SKELETON "%skeleton" @@ -157,44 +156,37 @@ 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 "{...}" +%token SEMICOLON ";" +%token TYPE "type" +%type CHAR +%printer { fprintf (stderr, "'%c' (%d)", $$, $$); } CHAR -%type STRING string_content - "%destructor {...}" - "%initial-action {...}" - "%lex-param {...}" - "%parse-param {...}" - "%printer {...}" - "%union {...}" - PROLOGUE EPILOGUE -%printer { fprintf (stderr, "\"%s\"", $$); } - STRING string_content -%printer { fprintf (stderr, "{\n%s\n}", $$); } - "%destructor {...}" - "%initial-action {...}" - "%lex-param {...}" - "%parse-param {...}" - "%printer {...}" - "%union {...}" - PROLOGUE EPILOGUE -%type TYPE +%type STRING string_content "{...}" PROLOGUE EPILOGUE +%printer { fprintf (stderr, "\"%s\"", $$); } STRING string_content +%printer { fprintf (stderr, "{\n%s\n}", $$); } "{...}" PROLOGUE EPILOGUE + +%type TYPE ID ID_COLON %printer { fprintf (stderr, "<%s>", $$); } TYPE +%printer { fprintf (stderr, "%s", $$); } 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 %% @@ -215,7 +207,8 @@ declarations: declaration: grammar_declaration -| PROLOGUE { prologue_augment ($1, @1); } +| PROLOGUE { prologue_augment (translate_code ($1, @1), + @1); } | "%debug" { debug_flag = true; } | "%define" string_content { @@ -233,17 +226,17 @@ declaration: nondeterministic_parser = true; glr_parser = true; } -| "%initial-action {...}" +| "%initial-action" "{...}" { - muscle_code_grow ("initial_action", $1, @1); + muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2); } -| "%lex-param {...}" { add_param ("lex_param", $1, @1); } +| "%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", $1, @1); } +| "%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; } @@ -260,35 +253,21 @@ 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" "{...}" symbols.1 { symbol_list *list; - for (list = $2; list; list = list->next) - symbol_destructor_set (list->sym, $1, @1); - symbol_list_free ($2); + const char *action = translate_symbol_action ($2, @2); + for (list = $3; list; list = list->next) + symbol_destructor_set (list->sym, action, @2); + symbol_list_free ($3); } -| "%printer {...}" symbols.1 +| "%printer" "{...}" symbols.1 { symbol_list *list; - for (list = $2; list; list = list->next) - symbol_printer_set (list->sym, $1, list->location); - symbol_list_free ($2); + const char *action = translate_symbol_action ($2, @2); + for (list = $3; list; list = list->next) + symbol_printer_set (list->sym, action, @2); + symbol_list_free ($3); } | "%default-prec" { @@ -300,6 +279,40 @@ grammar_declaration: } ; + +/*----------* + | %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; + + 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); + } +; + + + + symbol_declaration: "%nterm" { current_class = nterm_sym; } symbol_defs.1 { @@ -347,7 +360,6 @@ type.opt: ; /* One or more nonterminals to be %typed. */ - symbols.1: symbol { $$ = symbol_list_new ($1, @1); } | symbols.1 symbol { $$ = symbol_list_prepend ($1, $2, @2); } @@ -359,24 +371,24 @@ symbol_def: { current_type = $1; } -| 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); @@ -413,7 +425,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: @@ -427,7 +439,9 @@ rhs: { grammar_current_rule_begin (current_lhs, current_lhs_location); } | rhs symbol { grammar_current_rule_symbol_append ($2, @2); } -| rhs action +| rhs "{...}" + { grammar_current_rule_action_append (gram_last_string, + gram_last_braced_code_loc); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } | rhs "%dprec" INT @@ -436,26 +450,32 @@ rhs: { grammar_current_rule_merge_set ($3, @3); } ; -symbol: - ID { $$ = $1; } -| string_as_id { $$ = $1; } + +/*---------------* + | Identifiers. | + *---------------*/ + +/* Identifiers are return as uniqstr by the scanner. Depending on + their use, we may need to make them genuine symbols. */ + +id: + ID { $$ = symbol_get ($1, @1); } +| CHAR { char cp[4] = { '\'', $1, '\'', 0 }; + $$ = symbol_get (quotearg_style (escape_quoting_style, cp), + @1); + symbol_class_set ($$, token_sym, @1, false); + symbol_user_token_number_set ($$, $1, @1); + } ; -/* Handle the semantics of an action specially, with a mid-rule - action, so that grammar_current_rule_action_append is invoked - immediately after the braced code is read by the scanner. - - This implementation relies on the LALR(1) parsing algorithm. - If grammar_current_rule_action_append were executed in a normal - action for this rule, then when the input grammar contains two - successive actions, the scanner would have to read both actions - before reducing this rule. That wouldn't work, since the scanner - relies on all preceding input actions being processed by - grammar_current_rule_action_append before it scans the next - action. */ -action: - { grammar_current_rule_action_append (last_string, last_braced_code_loc); } - BRACED_CODE +id_colon: + ID_COLON { $$ = symbol_get ($1, @1); } +; + + +symbol: + id +| string_as_id ; /* A string used as an ID: quote it. */ @@ -478,8 +498,8 @@ epilogue.opt: /* Nothing. */ | "%%" EPILOGUE { - muscle_code_grow ("epilogue", $2, @2); - scanner_last_string_free (); + muscle_code_grow ("epilogue", translate_code ($2, @2), @2); + gram_scanner_last_string_free (); } ; @@ -564,7 +584,7 @@ add_param (char const *type, char *decl, location loc) free (name); } - scanner_last_string_free (); + gram_scanner_last_string_free (); } static void