diff options
Diffstat (limited to 'src/scan-code.l')
| -rw-r--r-- | src/scan-code.l | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/scan-code.l b/src/scan-code.l index f1c97908..b81f7103 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -95,10 +95,10 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" int braces_level = 0; /* Whether a semicolon is probably needed. - The heuristic is that a semicolon is not needed after `{', `}', `;', + 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 `{}'. + Note that '{' does not need a semicolon because of '{}'. A semicolon may be needed before a cpp direcive, but don't bother. */ bool need_semicolon = false; @@ -117,7 +117,7 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" %} /*------------------------------------------------------------. - | Scanning a C comment. The initial `/ *' is already eaten. | + | Scanning a C comment. The initial '/ *' is already eaten. | `------------------------------------------------------------*/ <SC_COMMENT> @@ -127,7 +127,7 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" /*--------------------------------------------------------------. - | Scanning a line comment. The initial `//' is already eaten. | + | Scanning a line comment. The initial '//' is already eaten. | `--------------------------------------------------------------*/ <SC_LINE_COMMENT> @@ -197,12 +197,12 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" need_semicolon = true; } "$" { - warn_at (*loc, _("stray `$'")); + warn_at (*loc, _("stray '$'")); obstack_sgrow (&obstack_for_string, "$]["); need_semicolon = true; } "@" { - warn_at (*loc, _("stray `@'")); + warn_at (*loc, _("stray '@'")); obstack_sgrow (&obstack_for_string, "@@"); need_semicolon = true; } @@ -220,16 +220,16 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" "}" { bool outer_brace = --braces_level == 0; - /* As an undocumented Bison extension, append `;' before the last + /* As an undocumented Bison extension, append ';' before the last brace in braced code, so that the user code can omit trailing - `;'. But do not append `;' if emulating Yacc, since Yacc does + ';'. But do not append ';' if emulating Yacc, since Yacc does not append one. */ if (outer_brace && !yacc_flag && language_prio == default_prio && skeleton_prio == default_prio && need_semicolon && ! in_cpp) { - warn_at (*loc, _("a `;' might be needed at the end of action code")); - warn_at (*loc, _("future versions of Bison will not add the `;'")); - obstack_1grow (&obstack_for_string, ';'); + warn_at (*loc, _("a ';' might be needed at the end of action code")); + warn_at (*loc, _("future versions of Bison will not add the ';'")); + obstack_1grow (&obstack_for_string, ';'); } STRING_GROW; @@ -238,8 +238,8 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" /* Preprocessing directives should only be recognized at the beginning of lines, allowing whitespace including comments, but in C/C++, - `#' can only be the start of preprocessor directives or within - `#define' directives anyway, so don't bother with begin of line. */ + '#' can only be the start of preprocessor directives or within + '#define' directives anyway, so don't bother with begin of line. */ "#" STRING_GROW; in_cpp = true; {splice} STRING_GROW; @@ -626,8 +626,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, sym_loc.start.column += 1; sym_loc.end = sym_loc.start; const char *format = - _("syntax error after `%c', expecting integer, letter," - " `_', `[', or `$'"); + _("syntax error after '%c', expecting integer, letter," + " '_', '[', or '$'"); complain_at_indent (sym_loc, &indent, format, dollar_or_at); } else if (midrule_rhs_index) @@ -689,7 +689,7 @@ int max_left_semantic_context = 0; /*------------------------------------------------------------------. -| TEXT is pointing to a wannabee semantic value (i.e., a `$'). | +| TEXT is pointing to a wannabee semantic value (i.e., a '$'). | | | | Possible inputs: $[<TYPENAME>]($|integer) | | | @@ -749,23 +749,23 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0); if (!type_name) - { - if (union_seen | tag_seen) - { - if (rule->midrule_parent_rule) - complain_at (dollar_loc, - _("$$ for the midrule at $%d of `%s'" - " has no declared type"), - rule->midrule_parent_rhs_index, - effective_rule->content.sym->tag); - else - complain_at (dollar_loc, _("$$ of `%s' has no declared type"), - rule->content.sym->tag); - } - else - untyped_var_seen = true; - type_name = ""; - } + { + if (union_seen | tag_seen) + { + if (rule->midrule_parent_rule) + complain_at (dollar_loc, + _("$$ for the midrule at $%d of '%s'" + " has no declared type"), + rule->midrule_parent_rhs_index, + effective_rule->content.sym->tag); + else + complain_at (dollar_loc, _("$$ of '%s' has no declared type"), + rule->content.sym->tag); + } + else + untyped_var_seen = true; + type_name = ""; + } obstack_fgrow1 (&obstack_for_string, "]b4_lhs_value([%s])[", type_name); @@ -779,14 +779,14 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) type_name = symbol_list_n_type_name_get (effective_rule, dollar_loc, n); if (!type_name) - { - if (union_seen | tag_seen) - complain_at (dollar_loc, _("$%s of `%s' has no declared type"), - cp, effective_rule->content.sym->tag); - else - untyped_var_seen = true; - type_name = ""; - } + { + if (union_seen | tag_seen) + complain_at (dollar_loc, _("$%s of '%s' has no declared type"), + cp, effective_rule->content.sym->tag); + else + untyped_var_seen = true; + type_name = ""; + } obstack_fgrow3 (&obstack_for_string, "]b4_rhs_value(%d, %d, [%s])[", @@ -800,7 +800,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) /*------------------------------------------------------. -| TEXT is a location token (i.e., a `@...'). Output to | +| TEXT is a location token (i.e., a '@...'). Output to | | OBSTACK_FOR_STRING a reference to this location. | `------------------------------------------------------*/ |