#define YY_USER_ACTION location_compute (loc, &loc->end, yytext, yyleng);
+static char *fetch_type_name (char *cp, char const **type_name,
+ location dollar_loc);
+
static void handle_action_dollar (symbol_list *rule, char *cp,
location dollar_loc);
static void handle_action_at (symbol_list *rule, char *cp, location at_loc);
int braces_level = 0;
/* Whether a semicolon is probably needed.
- The heuristic is that a semicolon is not needed after '{', '}', ';',
- or a C preprocessor directive, and that whitespaces and comments
- do not affect this flag.
- Note that '{' does not need a semicolon because of '{}'.
- A semicolon may be needed before a cpp direcive, but don't bother. */
+
+ The heuristic is that a semicolon is not needed after '{', '}',
+ ';', or a C preprocessor directive, and that whitespaces and
+ comments do not affect this flag. Note that '{' does not need a
+ semicolon because of '{}'. A semicolon may be needed before a
+ cpp directive, but don't bother.
+
+ While it is maintained in several start-conditions (factoring
+ opportunities), it is meaningful only for SC_RULE_ACTION. */
bool need_semicolon = false;
/* Whether in a C preprocessor directive. Don't use a start condition
}
-<SC_RULE_ACTION,SC_SYMBOL_ACTION>{
+<SC_RULE_ACTION,SC_SYMBOL_ACTION>
+{
"'" {
STRING_GROW;
BEGIN SC_CHARACTER;
STRING_GROW;
BEGIN SC_LINE_COMMENT;
}
+ [$@] {
+ warn_at (*loc, _("stray '%s'"), yytext);
+ obstack_escape (&obstack_for_string, yytext);
+ need_semicolon = true;
+ }
+ [\[\]] {
+ obstack_escape (&obstack_for_string, yytext);
+ need_semicolon = true;
+ }
}
<SC_RULE_ACTION>
obstack_sgrow (&obstack_for_string, ref_tail_fields);
need_semicolon = true;
}
- "$" {
- warn_at (*loc, _("stray '$'"));
- obstack_sgrow (&obstack_for_string, "$][");
- need_semicolon = true;
- }
- "@" {
- warn_at (*loc, _("stray '@'"));
- obstack_sgrow (&obstack_for_string, "@@");
- need_semicolon = true;
- }
- "[" {
- obstack_sgrow (&obstack_for_string, "@{");
- need_semicolon = true;
- }
- "]" {
- obstack_sgrow (&obstack_for_string, "@}");
- need_semicolon = true;
- }
";" STRING_GROW; need_semicolon = false;
"{" STRING_GROW; ++braces_level; need_semicolon = false;
<SC_SYMBOL_ACTION>
{
- "$$" {
- obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar[");
+ "$"("<"{tag}">")?"$" {
+ const char *type_name = NULL;
+ fetch_type_name (yytext + 1, &type_name, *loc)[-1] = 0;
+ obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar(");
+ obstack_quote (&obstack_for_string, type_name);
+ obstack_sgrow (&obstack_for_string, ")[");
self->is_value_used = true;
}
"@$" {
}
- /*-----------------------------------------.
- | Escape M4 quoting characters in C code. |
- `-----------------------------------------*/
-
<*>
{
- \$ obstack_sgrow (&obstack_for_string, "$][");
- \@ obstack_sgrow (&obstack_for_string, "@@");
- \[ obstack_sgrow (&obstack_for_string, "@{");
- \] obstack_sgrow (&obstack_for_string, "@}");
-}
+ /* Escape M4 quoting characters in C code. */
+ [$@\[\]] obstack_escape (&obstack_for_string, yytext);
- /*-----------------------------------------------------.
- | By default, grow the string obstack with the input. |
- `-----------------------------------------------------*/
+ /* By default, grow the string obstack with the input. */
+ .|\n STRING_GROW;
-<*>.|\n STRING_GROW;
-
- /* End of processing. */
-<*><<EOF>> {
- STRING_FINISH;
- return last_string;
- }
+ /* End of processing. */
+ <<EOF>> STRING_FINISH; return last_string;
+}
%%
/* Create the explanation message. */
obstack_init (&msg_buf);
- obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at);
+ obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
if (contains_dot_or_dash (id))
- obstack_fgrow1 (&msg_buf, "[%s]", id);
+ obstack_printf (&msg_buf, "[%s]", id);
else
obstack_sgrow (&msg_buf, id);
obstack_sgrow (&msg_buf, tail);
if (var->err & VARIANT_HIDDEN)
{
- obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at);
+ obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
if (contains_dot_or_dash (var->id))
- obstack_fgrow1 (&msg_buf, "[%s]", var->id);
+ obstack_printf (&msg_buf, "[%s]", var->id);
else
obstack_sgrow (&msg_buf, var->id);
obstack_sgrow (&msg_buf, tail);
}
- obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec);
+ obstack_printf (&msg_buf, _(" at %s"), at_spec);
if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
{
const char *format =
_(", cannot be accessed from mid-rule action at $%d");
- obstack_fgrow1 (&msg_buf, format, midrule_rhs_index);
+ obstack_printf (&msg_buf, format, midrule_rhs_index);
}
obstack_1grow (&msg_buf, '\0');
int max_left_semantic_context = 0;
+/* If CP points to a typename (i.e., <.*?>), set TYPE_NAME to its
+ beginning (i.e., after the opening "<", and return the pointer
+ immediately after it. */
+
+static
+char *
+fetch_type_name (char *cp, char const **type_name,
+ location dollar_loc)
+{
+ if (*cp == '<')
+ {
+ *type_name = ++cp;
+ while (*cp != '>')
+ ++cp;
+
+ /* The '>' symbol will be later replaced by '\0'. Original
+ 'text' is needed for error messages. */
+ ++cp;
+ if (untyped_var_seen)
+ complain_at (dollar_loc, _("explicit type given in untyped grammar"));
+ tag_seen = true;
+ }
+ return cp;
+}
+
/*------------------------------------------------------------------.
| TEXT is pointing to a wannabee semantic value (i.e., a '$'). |
| |
{
char const *type_name = NULL;
char *cp = text + 1;
- char *gt_ptr = 0;
symbol_list *effective_rule;
int effective_rule_length;
int n;
}
/* Get the type name if explicit. */
- if (*cp == '<')
- {
- type_name = ++cp;
- while (*cp != '>')
- ++cp;
-
- /* The '>' symbol will be later replaced by '\0'. Original
- 'text' is needed for error messages. */
- gt_ptr = cp;
- ++cp;
- if (untyped_var_seen)
- complain_at (dollar_loc, _("explicit type given in untyped grammar"));
- tag_seen = true;
- }
+ cp = fetch_type_name (cp, &type_name, dollar_loc);
n = parse_ref (cp, effective_rule, effective_rule_length,
rule->midrule_parent_rhs_index, text, dollar_loc, '$');
- if (gt_ptr)
- *gt_ptr = '\0';
+ /* End type_name. */
+ if (type_name)
+ cp[-1] = '\0';
switch (n)
{
untyped_var_seen = true;
}
- obstack_fgrow1 (&obstack_for_string,
- "]b4_lhs_value([%s])[", type_name);
+ obstack_sgrow (&obstack_for_string, "]b4_lhs_value(");
+ obstack_quote (&obstack_for_string, type_name);
+ obstack_sgrow (&obstack_for_string, ")[");
rule->action_props.is_value_used = true;
break;
untyped_var_seen = true;
}
- obstack_fgrow3 (&obstack_for_string,
- "]b4_rhs_value(%d, %d, [%s])[",
- effective_rule_length, n, type_name);
+ obstack_printf (&obstack_for_string,
+ "]b4_rhs_value(%d, %d, ", effective_rule_length, n);
+ obstack_quote (&obstack_for_string, type_name);
+ obstack_sgrow (&obstack_for_string, ")[");
if (n > 0)
symbol_list_n_get (effective_rule, n)->action_props.is_value_used =
true;
break;
default:
- obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[",
+ obstack_printf (&obstack_for_string, "]b4_rhs_location(%d, %d)[",
effective_rule_length, n);
break;
}
projects / bison.git / blobdiff