/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
%{
#include "system.h"
+
#include "complain.h"
-#include "muscle_tab.h"
+#include "conflicts.h"
#include "files.h"
#include "getargs.h"
-#include "output.h"
-#include "symlist.h"
#include "gram.h"
+#include "muscle_tab.h"
+#include "output.h"
#include "reader.h"
-#include "conflicts.h"
+#include "symlist.h"
/* Produce verbose syntax errors. */
#define YYERROR_VERBOSE 1
#undef yyerror
#define yyerror(Msg) \
gram_error (&yylloc, Msg)
-static void gram_error (location_t const *, char const *);
+static void gram_error (location const *, char const *);
#define YYPRINT(File, Type, Value) \
print_token_value (File, Type, &Value)
static void print_token_value (FILE *, int, YYSTYPE const *);
-static void add_param (char const *, char const *, location_t);
+static void add_param (char const *, char *, location);
symbol_class current_class = unknown_sym;
-struniq_t current_type = 0;
-symbol_t *current_lhs;
-location_t current_lhs_location;
-assoc_t current_assoc;
+uniqstr current_type = 0;
+symbol *current_lhs;
+location current_lhs_location;
+assoc current_assoc;
int current_prec = 0;
-braced_code_t current_braced_code = action_braced_code;
%}
/* Only NUMBERS have a value. */
%union
{
- symbol_t *symbol;
- symbol_list_t *list;
+ symbol *symbol;
+ symbol_list *list;
int integer;
- char *string;
- assoc_t assoc;
- struniq_t struniq;
+ char *chars;
+ assoc assoc;
+ uniqstr uniqstr;
};
/* Define the tokens together with their human representation. */
%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"
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"
%token BRACED_CODE "{...}"
-%type <string> STRING string_content
- BRACED_CODE code_content action
- PROLOGUE EPILOGUE
-%type <struniq> TYPE
+%type <chars> STRING string_content
+ "%destructor {...}"
+ "%lex-param {...}"
+ "%parse-param {...}"
+ "%printer {...}"
+ "%union {...}"
+ BRACED_CODE action
+ PROLOGUE EPILOGUE
+%type <uniqstr> TYPE
%type <integer> INT
%type <symbol> ID ID_COLON symbol string_as_id
%type <assoc> precedence_declarator
| "%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; }
| ";"
;
{
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_t *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;
+ symbol_list *list;
+ 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_t *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;
+ symbol_list *list;
+ for (list = $2; list; list = list->next)
+ symbol_printer_set (list->sym, $1, list->location);
+ symbol_list_free ($2);
}
;
}
| "%type" TYPE symbols.1
{
- symbol_list_t *list;
+ symbol_list *list;
for (list = $3; list; list = list->next)
symbol_type_set (list->sym, $2, @2);
symbol_list_free ($3);
precedence_declaration:
precedence_declarator type.opt symbols.1
{
- symbol_list_t *list;
+ symbol_list *list;
++current_prec;
for (list = $3; list; list = list->next)
{
};
-/* A BRACED_CODE used for its contents. Strip the braces. */
-code_content:
- BRACED_CODE
- {
- $$ = $1 + 1;
- $$[strlen ($$) - 1] = '\0';
- };
-
-
epilogue.opt:
/* Nothing. */
| "%%" EPILOGUE
lloc_default (YYLTYPE const *rhs, int n)
{
int i;
- int j;
- YYLTYPE r;
- r.start = r.end = rhs[n].end;
+ YYLTYPE loc;
+ loc.start = loc.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;
-
+ loc.start = rhs[i].start;
break;
}
- return r;
+ return loc;
}
declaration DECL and location LOC. */
static void
-add_param (char const *type, char const *decl, location_t loc)
+add_param (char const *type, char *decl, location loc)
{
static char const alphanum[] =
"0123456789"
"_";
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
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)
break;
case STRING:
- fprintf (file, " = \"%s\"", value->string);
+ fprintf (file, " = \"%s\"", value->chars);
break;
case TYPE:
- fprintf (file, " = <%s>", value->struniq);
+ fprintf (file, " = <%s>", value->uniqstr);
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->string);
+ fprintf (file, " = {{ %s }}", value->chars);
break;
default:
}
static void
-gram_error (location_t const *loc, char const *msg)
+gram_error (location const *loc, char const *msg)
{
complain_at (*loc, "%s", msg);
}
+
+char const *
+token_name (int type)
+{
+ return yytname[type];
+}
projects / bison.git / blobdiff