#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 { \
- if (N) \
- { \
- Current.first_column = Rhs[1].first_column; \
- Current.first_line = Rhs[1].first_line; \
- Current.last_column = Rhs[N].last_column; \
- Current.last_line = Rhs[N].last_line; \
- } \
- else \
- { \
- Current = Rhs[0]; \
- } \
-} while (0)
-
-/* Pass the control structure to YYPARSE and YYLEX. */
-#define YYPARSE_PARAM gram_control
-#define YYLEX_PARAM gram_control
-/* YYPARSE receives GRAM_CONTROL as a void *. Provide a
- correctly typed access to it. */
-#define yycontrol ((gram_control_t *) gram_control)
-
-/* Request detailed parse error messages, and pass them to GRAM_ERROR.
- FIXME: depends on the undocumented availability of YYLLOC.t */
+
+#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N)
+static YYLTYPE lloc_default (YYLTYPE const *, int);
+
+/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
+ FIXME: depends on the undocumented availability of YYLLOC. */
#undef yyerror
#define yyerror(Msg) \
gram_error (&yylloc, Msg)
+static void gram_error (location_t const *, char const *);
#define YYPRINT(File, Type, Value) \
- yyprint (File, Type, &Value)
-static void yyprint (FILE *file, int type, const yystype *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);
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;
int integer;
char *string;
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 PIPE "|"
+%token ID "identifier"
+%token ID_COLON "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 <symbol> ID ID_COLON symbol string_as_id
%type <assoc> precedence_declarator
%type <list> symbols.1
%%
input:
declarations "%%" grammar epilogue.opt
- {
- yycontrol->errcode = 0;
- epilogue_set ($4, @4);
- }
;
declarations:
/* Nothing */
-| declarations declaration semi_colon.opt
+| declarations declaration
;
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 { add_param ("lex_param", $2, @2); }
| "%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); }
| "%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; }
| "%yacc" { yacc_flag = 1; }
+| ";"
;
grammar_declaration:
| "%union" BRACED_CODE
{
typed = 1;
- MUSCLE_INSERT_INT ("stype_line", @2.first_line);
+ MUSCLE_INSERT_INT ("stype_line", @2.start.line);
muscle_insert ("stype", $2);
}
| "%destructor"
;
type.opt:
- /* Nothing. */ { current_type = NULL;}
+ /* Nothing. */ { current_type = NULL; }
| TYPE { current_type = $1; }
;
/* One or more symbol definitions. */
symbol_defs.1:
symbol_def
- {;}
| symbol_defs.1 symbol_def
- {;}
;
;
/* As a Bison extension, one can use the grammar declarations in the
- body of the grammar. But to remain LALR(1), they must be ended
- with a semi-colon. */
+ body of the grammar. */
rules_or_grammar_declaration:
rules
-| grammar_declaration ";"
+| grammar_declaration
{
if (yacc_flag)
complain_at (@$, _("POSIX forbids declarations in the grammar"));
{
yyerrok;
}
+| ";"
;
rules:
- ID ":" { current_lhs = $1; current_lhs_location = @1; } rhses.1 ";"
- {;}
+ ID_COLON { current_lhs = $1; current_lhs_location = @1; } rhses.1
;
rhses.1:
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 ();
}
;
-semi_colon.opt:
- /* Nothing. */
-| ";"
-;
%%
+
+
+/* Return the location of the left-hand side of a rule whose
+ right-hand side is RHS[1] ... RHS[N]. Ignore empty nonterminals in
+ the right-hand side, and return an empty location equal to the end
+ boundary of RHS[0] if the right-hand side is empty. */
+
+static YYLTYPE
+lloc_default (YYLTYPE const *rhs, int n)
+{
+ int i;
+ int j;
+ YYLTYPE r;
+ r.start = r.end = rhs[n].end;
+
+ 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;
+
+ break;
+ }
+
+ return r;
+}
+
+
+/* Add a lex-param or a parse-param (depending on TYPE) with
+ declaration DECL and location LOC. */
+
+static void
+add_param (char const *type, char const *decl, location_t loc)
+{
+ static char const alphanum[] =
+ "0123456789"
+ "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "_";
+ char const *alpha = alphanum + 10;
+ char const *name_start = NULL;
+ char const *p;
+
+ for (p = decl; *p; p++)
+ if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0]))
+ name_start = p;
+
+ if (! name_start)
+ complain_at (loc, _("missing identifier in parameter declaration"));
+ else
+ {
+ char *name;
+ size_t name_len;
+
+ for (name_len = 1;
+ name_start[name_len] && strchr (alphanum, name_start[name_len]);
+ name_len++)
+ continue;
+
+ name = xmalloc (name_len + 1);
+ memcpy (name, name_start, name_len);
+ name[name_len] = '\0';
+ muscle_pair_list_grow (type, decl, name);
+ free (name);
+ }
+
+ scanner_last_string_free ();
+}
+
/*------------------------------------------------------------------.
| When debugging the parser, display tokens' locations and values. |
`------------------------------------------------------------------*/
static void
-yyprint (FILE *file,
- int type, const yystype *value)
+print_token_value (FILE *file, int type, YYSTYPE const *value)
{
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 (location_t *yylloc, const char *msg)
+static void
+gram_error (location_t const *loc, char const *msg)
{
- complain_at (*yylloc, "%s", msg);
+ complain_at (*loc, "%s", msg);
}
projects / bison.git / blobdiff