From: Joel E. Denny <jdenny@clemson.edu>
Date: Sat, 22 Aug 2009 00:09:54 +0000 (-0400)
Subject: Use locale when quoting.
X-Git-Tag: v2.5_rc1~184
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/890ab17c84437fcfc56195e72484110c5c231a46

Use locale when quoting.

* src/scan-gram.l (SC_ESCAPED_STRING, SC_ESCAPED_CHARACTER): Use
quote rather than implementing quoting here.
(cherry picked from commit e6c849d82a95be8a595c254cc3046cfae725f064)
---

diff --git a/ChangeLog b/ChangeLog
index 0b7631bd..853777a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-21  Joel E. Denny  <jdenny@clemson.edu>
+
+	Use locale when quoting.
+	* src/scan-gram.l (SC_ESCAPED_STRING, SC_ESCAPED_CHARACTER): Use
+	quote rather than implementing quoting here.
+
 2009-08-20  Eric Blake  <ebb9@byu.net>
 
 	Make previous patch more robust.
diff --git a/src/scan-gram.l b/src/scan-gram.l
index 9aec298e..f0f8c279 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -560,12 +560,9 @@ splice	 (\\[ \f\t\v]*\n)*
   }
   \\(.|\n)	{
     char const *p = yytext + 1;
-    char quoted_ws[] = "` '";
+    /* Quote only if escaping won't make the character visible.  */
     if (isspace (*p) && isprint (*p))
-      {
-        quoted_ws[1] = *p;
-        p = quoted_ws;
-      }
+      p = quote (p);
     else
       p = quotearg_style_mem (escape_quoting_style, p, 1);
     complain_at (*loc, _("invalid character after \\-escape: %s"), p);