X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1a31ed21b1013f6bf6bbbb4aac07c4249764371f..55b929cab2b5e53480807a0c0c8614d7381ae7c6:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index 9686475b..ee82858f 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -30,6 +30,7 @@ %{ #include "system.h" +#include "complain.h" #include "muscle_tab.h" #include "files.h" #include "getargs.h" @@ -63,11 +64,11 @@ do { \ correctly typed access to it. */ #define yycontrol ((gram_control_t *) gram_control) -/* Request detailed parse error messages, and pass them to - GRAM_ERROR. */ +/* Request detailed parse error messages, and pass them to GRAM_ERROR. + FIXME: depends on the undocumented availability of YYLLOC.t */ #undef yyerror #define yyerror(Msg) \ - gram_error (yycontrol, &yylloc, Msg) + gram_error (&yylloc, Msg) #define YYPRINT(File, Type, Value) \ yyprint (File, Type, &Value) @@ -77,7 +78,7 @@ symbol_class current_class = unknown_sym; char *current_type = 0; symbol_t *current_lhs; location_t current_lhs_location; -associativity current_assoc; +assoc_t current_assoc; int current_prec = 0; braced_code_t current_braced_code = action_braced_code; %} @@ -90,13 +91,14 @@ braced_code_t current_braced_code = action_braced_code; symbol_list_t *list; int integer; char *string; - associativity assoc; + assoc_t assoc; }; -/* Define the tokens together with there human representation. */ -%token GRAM_EOF 0 "end of string" -%token STRING CHARACTER -%token INT +/* Define the tokens together with their human representation. */ +%token GRAM_EOF 0 "end of file" +%token STRING "string" +%token CHARACTER "character" +%token INT "integer" %token PERCENT_TOKEN "%token" %token PERCENT_NTERM "%nterm" @@ -111,38 +113,49 @@ braced_code_t current_braced_code = action_braced_code; %token PERCENT_RIGHT "%right" %token PERCENT_NONASSOC "%nonassoc" -%token PERCENT_EXPECT "%expect" -%token PERCENT_START "%start" -%token PERCENT_PREC "%prec" -%token PERCENT_VERBOSE "%verbose" -%token PERCENT_ERROR_VERBOSE "%error-verbose" - -%token PERCENT_OUTPUT "%output" -%token PERCENT_FILE_PREFIX "%file-prefix" -%token PERCENT_NAME_PREFIX "%name-prefix" - -%token PERCENT_DEFINE "%define" -%token PERCENT_PURE_PARSER "%pure-parser" - -%token PERCENT_DEFINES "%defines" - -%token PERCENT_YACC "%yacc" - -%token PERCENT_DEBUG "%debug" -%token PERCENT_LOCATIONS "%locations" -%token PERCENT_NO_LINES "%no-lines" -%token PERCENT_SKELETON "%skeleton" -%token PERCENT_TOKEN_TABLE "%token-table" +%token PERCENT_PREC "%prec" +%token PERCENT_DPREC "%dprec" +%token PERCENT_MERGE "%merge" + + +/*----------------------. +| Global Declarations. | +`----------------------*/ + +%token + PERCENT_DEBUG "%debug" + PERCENT_DEFINE "%define" + PERCENT_DEFINES "%defines" + PERCENT_ERROR_VERBOSE "%error-verbose" + PERCENT_EXPECT "%expect" + PERCENT_FILE_PREFIX "%file-prefix" + PERCENT_GLR_PARSER "%glr-parser" + 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_PURE_PARSER "%pure-parser" + PERCENT_SKELETON "%skeleton" + PERCENT_START "%start" + PERCENT_TOKEN_TABLE "%token-table" + PERCENT_VERBOSE "%verbose" + PERCENT_YACC "%yacc" +; -%token TYPE -%token EQUAL "=" -%token SEMICOLON ";" -%token COLON ":" -%token PIPE "|" -%token ID "identifier" +%token TYPE "type" +%token EQUAL "=" +%token SEMICOLON ";" +%token COLON ":" +%token COMMA "," +%token PIPE "|" +%token ID "identifier" %token PERCENT_PERCENT "%%" -%token PROLOGUE EPILOGUE -%token BRACED_CODE +%token PROLOGUE "%{...%}" +%token EPILOGUE "epilogue" +%token BRACED_CODE "{...}" + %type CHARACTER TYPE STRING string_content BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action @@ -179,10 +192,15 @@ declaration: | "%error-verbose" { error_verbose = 1; } | "%expect" INT { expected_conflicts = $2; } | "%file-prefix" "=" string_content { spec_file_prefix = $3; } +| "%glr-parser" { glr_parser = 1; } +| "%lex-param" string_content "," string_content + { muscle_pair_list_grow ("lex_param", $2, $4); } | "%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" string_content "," string_content + { muscle_pair_list_grow ("parse_param", $2, $4); } | "%pure-parser" { pure_parser = 1; } | "%skeleton" string_content { skeleton = $2; } | "%token-table" { token_table_flag = 1; } @@ -299,14 +317,14 @@ symbol_def: { symbol_class_set ($1, current_class, @1); symbol_type_set ($1, current_type, @1); - symbol_make_alias ($1, $2); + symbol_make_alias ($1, $2, @$); } | ID INT string_as_id { symbol_class_set ($1, current_class, @1); symbol_type_set ($1, current_type, @1); symbol_user_token_number_set ($1, $2, @2); - symbol_make_alias ($1, $3); + symbol_make_alias ($1, $3, @$); } ; @@ -334,6 +352,14 @@ grammar: rules_or_grammar_declaration: rules | grammar_declaration ";" + { + if (yacc_flag) + complain_at (@$, _("POSIX forbids declarations in the grammar")); + } +| error ";" + { + yyerrok; + } ; rules: @@ -355,12 +381,16 @@ rhs: { grammar_current_rule_action_append ($2, @2); } | rhs "%prec" symbol { grammar_current_rule_prec_set ($3, @3); } +| rhs "%dprec" INT + { grammar_current_rule_dprec_set ($3, @3); } +| rhs "%merge" TYPE + { grammar_current_rule_merge_set ($3, @3); } ; symbol: ID { $$ = $1; } | string_as_id { $$ = $1; } -| CHARACTER { $$ = getsym ($1, @1); } +| CHARACTER { $$ = symbol_get ($1, @1); } ; action: @@ -372,7 +402,7 @@ action: string_as_id: STRING { - $$ = getsym ($1, @1); + $$ = symbol_get ($1, @1); symbol_class_set ($$, token_sym, @1); } ; @@ -442,9 +472,7 @@ yyprint (FILE *file, } void -gram_error (gram_control_t *control ATTRIBUTE_UNUSED, - location_t *yylloc, const char *msg) +gram_error (location_t *yylloc, const char *msg) { - LOCATION_PRINT (stderr, *yylloc); - fprintf (stderr, ": %s\n", msg); + complain_at (*yylloc, "%s", msg); }