%{
#include "system.h"
+#include "complain.h"
#include "muscle_tab.h"
#include "files.h"
#include "getargs.h"
#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 { \
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) \
- gram_error (yycontrol, &yylloc, Msg)
+ gram_error (&yylloc, Msg)
#define YYPRINT(File, Type, Value) \
yyprint (File, Type, &Value)
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;
-associativity current_assoc;
+assoc_t current_assoc;
int current_prec = 0;
braced_code_t current_braced_code = action_braced_code;
%}
symbol_list_t *list;
int integer;
char *string;
- associativity assoc;
+ assoc_t assoc;
+ struniq_t struniq;
};
-/* 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 INT "integer"
%token PERCENT_TOKEN "%token"
%token PERCENT_NTERM "%nterm"
%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 <string> CHARACTER TYPE STRING string_content
- BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action
+%type <string> STRING string_content
+ BRACED_CODE code_content action
+ PROLOGUE EPILOGUE
+%type <struniq> TYPE
%type <integer> INT
%type <symbol> ID symbol string_as_id
%type <assoc> precedence_declarator
declarations "%%" grammar epilogue.opt
{
yycontrol->errcode = 0;
- epilogue_set ($4, @4);
}
;
| "%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; }
;
type.opt:
- /* Nothing. */ { current_type = NULL;}
+ /* Nothing. */ { current_type = NULL; }
| TYPE { current_type = $1; }
;
{
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, @$);
}
;
rules_or_grammar_declaration:
rules
| grammar_declaration ";"
+ {
+ if (yacc_flag)
+ complain_at (@$, _("POSIX forbids declarations in the grammar"));
+ }
+| error ";"
+ {
+ yyerrok;
+ }
;
rules:
symbol:
ID { $$ = $1; }
| string_as_id { $$ = $1; }
-| CHARACTER { $$ = symbol_get ($1, @1); }
;
action:
};
+/* 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 ();
}
;
fputc (' ', file);
switch (type)
{
- case CHARACTER:
- fprintf (file, " = '%s'", value->string);
- break;
-
case ID:
fprintf (file, " = %s", value->symbol->tag);
break;
break;
case TYPE:
- fprintf (file, " = <%s>", value->string);
+ fprintf (file, " = <%s>", value->struniq);
break;
case BRACED_CODE:
case EPILOGUE:
fprintf (file, " = {{ %s }}", value->string);
break;
+
+ default:
+ fprintf (file, "unknown token type");
+ break;
}
}
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);
}
projects / bison.git / blobdiff