X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f9a85a156a90b65ea36d7093ec059985a3afe34f..b25d88f6d2e2f4b59927aacecdc0a9e44a34b5d9:/src/parse-gram.y?ds=sidebyside diff --git a/src/parse-gram.y b/src/parse-gram.y index 6e9faa74..8af3e885 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -40,7 +40,7 @@ #include "reader.h" #include "conflicts.h" -/* Produce verbose parse errors. */ +/* Produce verbose syntax errors. */ #define YYERROR_VERBOSE 1 #define YYLLOC_DEFAULT(Current, Rhs, N) \ do { \ @@ -64,7 +64,7 @@ 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 syntax error messages, and pass them to GRAM_ERROR. FIXME: depends on the undocumented availability of YYLLOC.t */ #undef yyerror #define yyerror(Msg) \ @@ -75,7 +75,7 @@ do { \ static void yyprint (FILE *file, int type, const yystype *value); symbol_class current_class = unknown_sym; -char *current_type = 0; +struniq_t current_type = 0; symbol_t *current_lhs; location_t current_lhs_location; assoc_t current_assoc; @@ -92,12 +92,13 @@ braced_code_t current_braced_code = action_braced_code; int integer; char *string; assoc_t assoc; + struniq_t struniq; }; /* Define the tokens together with their human representation. */ -%token GRAM_EOF 0 "end of string" -%token STRING CHARACTER -%token INT +%token GRAM_EOF 0 "end of file" +%token STRING "string" +%token INT "integer" %token PERCENT_TOKEN "%token" %token PERCENT_NTERM "%nterm" @@ -112,44 +113,54 @@ 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_DPREC "%dprec" -%token PERCENT_MERGE "%merge" -%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_GLR_PARSER "%glr-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 TYPE -%token EQUAL "=" -%token SEMICOLON ";" -%token COLON ":" -%token PIPE "|" -%token ID "identifier" +%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 "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 +%type STRING string_content + BRACED_CODE code_content action + PROLOGUE EPILOGUE +%type TYPE %type INT %type ID symbol string_as_id %type precedence_declarator @@ -160,7 +171,6 @@ input: declarations "%%" grammar epilogue.opt { yycontrol->errcode = 0; - epilogue_set ($4, @4); } ; @@ -183,12 +193,22 @@ 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" code_content "," code_content + { + muscle_pair_list_grow ("lex_param", $2, $4); + scanner_last_string_free (); + } | "%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 "," code_content + { + muscle_pair_list_grow ("parse_param", $2, $4); + scanner_last_string_free (); + } | "%pure-parser" { pure_parser = 1; } -| "%glr-parser" { glr_parser = 1; } | "%skeleton" string_content { skeleton = $2; } | "%token-table" { token_table_flag = 1; } | "%verbose" { report_flag = 1; } @@ -272,7 +292,7 @@ precedence_declarator: ; type.opt: - /* Nothing. */ { current_type = NULL;} + /* Nothing. */ { current_type = NULL; } | TYPE { current_type = $1; } ; @@ -377,7 +397,6 @@ rhs: symbol: ID { $$ = $1; } | string_as_id { $$ = $1; } -| CHARACTER { $$ = symbol_get ($1, @1); } ; action: @@ -403,14 +422,21 @@ string_content: }; +/* A BRACED_CODE used for its contents. Strip the braces. */ +code_content: + BRACED_CODE + { + $$ = $1 + 1; + $$[strlen ($$) - 1] = '\0'; + }; + + epilogue.opt: /* Nothing. */ - { - $$ = xstrdup (""); - } | "%%" EPILOGUE { - $$ = $2; + epilogue_augment ($2, @2); + scanner_last_string_free (); } ; @@ -430,10 +456,6 @@ yyprint (FILE *file, fputc (' ', file); switch (type) { - case CHARACTER: - fprintf (file, " = '%s'", value->string); - break; - case ID: fprintf (file, " = %s", value->symbol->tag); break; @@ -447,7 +469,7 @@ yyprint (FILE *file, break; case TYPE: - fprintf (file, " = <%s>", value->string); + fprintf (file, " = <%s>", value->struniq); break; case BRACED_CODE: @@ -455,6 +477,10 @@ yyprint (FILE *file, case EPILOGUE: fprintf (file, " = {{ %s }}", value->string); break; + + default: + fprintf (file, "unknown token type"); + break; } }