%{/* Bison Grammar Parser -*- C -*-
- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
+ Inc.
This file is part of Bison, the GNU Compiler Compiler.
%locations
%pure-parser
%error-verbose
-%defines
%name-prefix="gram_"
%expect 0
%token
PERCENT_CODE "%code"
- PERCENT_CODE_TOP "%code-top"
PERCENT_DEBUG "%debug"
PERCENT_DEFAULT_PREC "%default-prec"
PERCENT_DEFINE "%define"
PERCENT_FILE_PREFIX "%file-prefix"
PERCENT_GLR_PARSER "%glr-parser"
PERCENT_INITIAL_ACTION "%initial-action"
+ PERCENT_LANGUAGE "%language"
PERCENT_LEX_PARAM "%lex-param"
PERCENT_LOCATIONS "%locations"
PERCENT_NAME_PREFIX "%name-prefix"
"%nondeterministic-parser"
PERCENT_OUTPUT "%output"
PERCENT_PARSE_PARAM "%parse-param"
- PERCENT_PROVIDES "%provides"
PERCENT_PURE_PARSER "%pure-parser"
PERCENT_PUSH_PARSER "%push-parser"
+ PERCENT_PUSH_PULL_PARSER
+ "%push-pull-parser"
PERCENT_REQUIRE "%require"
- PERCENT_REQUIRES "%requires"
PERCENT_SKELETON "%skeleton"
PERCENT_START "%start"
PERCENT_TOKEN_TABLE "%token-table"
%token SEMICOLON ";"
%token TYPE "type"
%token TYPE_TAG_ANY "<*>"
-%token TYPE_TAG_NONE "<!>"
+%token TYPE_TAG_NONE "<>"
%type <character> CHAR
%printer { fputs (char_name ($$), stderr); } CHAR
/* braceless is not to be used for rule or symbol actions, as it
- calls code_props_plain_init. */
-%type <chars> STRING "%{...%}" EPILOGUE braceless content content.opt
+ calls code_props_plain_init. */
+%type <chars> STRING "%{...%}" EPILOGUE braceless content.opt
%type <code> "{...}"
%printer { fputs (quotearg_style (c_quoting_style, $$), stderr); }
STRING
%printer { fprintf (stderr, "{\n%s\n}", $$); }
- braceless content content.opt "{...}" "%{...%}" EPILOGUE
+ braceless content.opt "{...}" "%{...%}" EPILOGUE
-%type <uniqstr> TYPE ID ID_COLON
+%type <uniqstr> TYPE ID ID_COLON variable
%printer { fprintf (stderr, "<%s>", $$); } TYPE
-%printer { fputs ($$, stderr); } ID
+%printer { fputs ($$, stderr); } ID variable
%printer { fprintf (stderr, "%s:", $$); } ID_COLON
%type <integer> INT
prologue_declaration:
grammar_declaration
-| "%{...%}" {
- code_props plain_code;
- code_props_plain_init (&plain_code, $1, @1);
- code_props_translate_code (&plain_code);
- gram_scanner_last_string_free ();
- prologue_augment (code_props_code_get (plain_code), @1, union_seen);
- code_scanner_last_string_free ();
-}
+| "%{...%}"
+ {
+ code_props plain_code;
+ code_props_plain_init (&plain_code, $1, @1);
+ code_props_translate_code (&plain_code);
+ gram_scanner_last_string_free ();
+ muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+ plain_code.code, @1);
+ code_scanner_last_string_free ();
+ }
| "%debug" { debug_flag = true; }
-| "%define" STRING content.opt { muscle_insert ($2, $3); }
+| "%define" variable content.opt
+ {
+ char const name_prefix[] = "percent_define(";
+ size_t length = strlen ($2);
+ char *name = xmalloc (sizeof name_prefix + length + 1);
+ strcpy (name, name_prefix);
+ strcpy (name + sizeof name_prefix - 1, $2);
+ strcpy (name + sizeof name_prefix - 1 + length, ")");
+ if (muscle_find_const (name))
+ warn_at (@2, _("%s `%s' redefined"), "%define variable", $2);
+ MUSCLE_INSERT_STRING (uniqstr_new (name), $3);
+ free (name);
+ muscle_grow_user_name_list ("percent_define_user_variables", $2, @2);
+ }
| "%defines" { defines_flag = true; }
+| "%defines" STRING
+ {
+ defines_flag = true;
+ spec_defines_file = xstrdup ($2);
+ }
| "%error-verbose" { error_verbose = true; }
| "%expect" INT { expected_sr_conflicts = $2; }
| "%expect-rr" INT { expected_rr_conflicts = $2; }
-| "%file-prefix" "=" STRING { spec_file_prefix = $3; }
+| "%file-prefix" STRING { spec_file_prefix = $2; }
+| "%file-prefix" "=" STRING { spec_file_prefix = $3; } /* deprecated */
| "%glr-parser"
{
nondeterministic_parser = true;
code_props_symbol_action_init (&action, $2, @2);
code_props_translate_code (&action);
gram_scanner_last_string_free ();
- muscle_code_grow ("initial_action", code_props_code_get (action), @2);
+ muscle_code_grow ("initial_action", action.code, @2);
code_scanner_last_string_free ();
}
+| "%language" STRING { language_argmatch ($2, 1, &@1); }
| "%lex-param" "{...}" { add_param ("lex_param", $2, @2); }
| "%locations" { locations_flag = true; }
-| "%name-prefix" "=" STRING { spec_name_prefix = $3; }
+| "%name-prefix" STRING { spec_name_prefix = $2; }
+| "%name-prefix" "=" STRING { spec_name_prefix = $3; } /* deprecated */
| "%no-lines" { no_lines_flag = true; }
| "%nondeterministic-parser" { nondeterministic_parser = true; }
-| "%output" "=" STRING { spec_outfile = $3; }
+| "%output" STRING { spec_outfile = $2; }
+| "%output" "=" STRING { spec_outfile = $3; } /* deprecated */
| "%parse-param" "{...}" { add_param ("parse_param", $2, @2); }
| "%pure-parser" { pure_parser = true; }
-| "%push-parser" { push_parser = true; }
+| "%push-parser" { push_parser = true; pull_parser = false; }
+| "%push-pull-parser" { push_parser = true; pull_parser = true; }
| "%require" STRING { version_check (&@2, $2); }
-| "%skeleton" STRING { skeleton = $2; }
+| "%skeleton" STRING { skeleton_arg ($2, 1, &@1); }
| "%token-table" { token_table_flag = true; }
| "%verbose" { report_flag = report_states; }
| "%yacc" { yacc_flag = true; }
{
default_prec = false;
}
-| "%code" braceless { prologue_augment ($2, @2, true); }
-| "%code-top" braceless { prologue_augment ($2, @2, false); }
-| "%provides" braceless { muscle_code_grow ("provides", $2, @2); }
-| "%requires" braceless { muscle_code_grow ("requires", $2, @2); }
+| "%code" braceless
+ {
+ muscle_code_grow ("percent_code_unqualified", $2, @2);
+ code_scanner_last_string_free ();
+ }
+| "%code" ID braceless
+ {
+ char const name_prefix[] = "percent_code(";
+ size_t length = strlen ($2);
+ char *name = xmalloc (sizeof name_prefix + length + 1);
+ strcpy (name, name_prefix);
+ strcpy (name + sizeof name_prefix - 1, $2);
+ strcpy (name + sizeof name_prefix - 1 + length, ")");
+ muscle_code_grow (uniqstr_new (name), $3, @3);
+ free (name);
+ code_scanner_last_string_free ();
+ muscle_grow_user_name_list ("percent_code_user_qualifiers", $2, @2);
+ }
;
;
grammar_declaration:
- "%union" union_name "{...}"
+ "%union" union_name braceless
{
- char const *body = $3;
-
- /* Concatenate the %union bodies. If this is the first %union, make sure
- the synchronization line appears after the opening '{' so as not to
- confuse Doxygen. Otherwise, turn the previous %union's trailing '}'
- into '\n', and omit the new %union's leading '{'. */
- if (!union_seen)
- {
- muscle_grow ("stype", "{", "");
- }
- else
- {
- char *code = muscle_find ("stype");
- code[strlen (code) - 1] = '\n';
- }
- body++;
-
union_seen = true;
- muscle_code_grow ("stype", body, @3);
- gram_scanner_last_string_free ();
+ muscle_code_grow ("stype", $3, @3);
+ code_scanner_last_string_free ();
}
;
symbol { $$ = symbol_list_sym_new ($1, @1); }
| TYPE { $$ = symbol_list_type_new ($1, @1); }
| "<*>" { $$ = symbol_list_default_tagged_new (@1); }
-| "<!>" { $$ = symbol_list_default_tagless_new (@1); }
+| "<>" { $$ = symbol_list_default_tagless_new (@1); }
;
/* One token definition. */
;
-/*-----------*
- | content. |
- *-----------*/
+/*----------------------------*
+ | variable and content.opt. |
+ *---------------------------*/
-content:
- STRING
-| braceless
-;
+variable:
+ ID
+ | STRING { $$ = uniqstr_new ($1); } /* deprecated and not M4-friendly */
+ ;
/* Some content or "1" by default. */
content.opt:
static char one[] = "1";
$$ = one;
}
-| content
+| STRING
;
+/*-------------*
+ | braceless. |
+ *-------------*/
+
braceless:
"{...}"
{
code_props_plain_init (&plain_code, $1+1, @1);
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
- $$ = code_props_code_get (plain_code);
+ $$ = plain_code.code;
}
;
STRING
{
$$ = symbol_get (quotearg_style (c_quoting_style, $1), @1);
- symbol_class_set ($$, token_sym, @1, false);
+ symbol_class_set ($$,
+ current_class == unknown_sym
+ ? token_sym : current_class, @1, false);
}
;
code_props_plain_init (&plain_code, $2, @2);
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
- muscle_code_grow ("epilogue", code_props_code_get (plain_code), @2);
+ muscle_code_grow ("epilogue", plain_code.code, @2);
code_scanner_last_string_free ();
}
;