X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9874f80b2e813a8ad8e5562dbbaa30ecafd5e7d8..041308d0c03783c51ef362f888c957cd2a0e129a:/src/scan-code.l

diff --git a/src/scan-code.l b/src/scan-code.l
index b81f7103..5bcb5686 100644
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -243,7 +243,7 @@ ref      -?[0-9]+|{id}|"["{id}"]"|"$"
   "#"       STRING_GROW; in_cpp = true;
 
   {splice}  STRING_GROW;
-  [\n\r]    STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false; 
+  [\n\r]    STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false;
   [ \t\f]   STRING_GROW;
 
   /* YYFAIL is undocumented and was formally deprecated in Bison
@@ -754,13 +754,13 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
             {
               if (rule->midrule_parent_rule)
                 complain_at (dollar_loc,
-                             _("$$ for the midrule at $%d of '%s'"
+                             _("$$ for the midrule at $%d of %s"
                                " has no declared type"),
                              rule->midrule_parent_rhs_index,
-                             effective_rule->content.sym->tag);
+                             quote (effective_rule->content.sym->tag));
               else
-                complain_at (dollar_loc, _("$$ of '%s' has no declared type"),
-                             rule->content.sym->tag);
+                complain_at (dollar_loc, _("$$ of %s has no declared type"),
+                             quote (rule->content.sym->tag));
             }
           else
             untyped_var_seen = true;
@@ -781,8 +781,8 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
       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);
+            complain_at (dollar_loc, _("$%s of %s has no declared type"),
+                         cp, quote (effective_rule->content.sym->tag));
           else
             untyped_var_seen = true;
           type_name = "";