From: David Kastrup <dak@gnu.org>
Date: Wed, 1 Jan 2014 20:19:42 +0000 (+0100)
Subject: Issue 3770: Use value->lily-string for -ddebug-parser
X-Git-Tag: release/2.19.1-1~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc1b858539d92d2d08ac7c7c5be2d708222495d9;p=lilypond.git

Issue 3770: Use value->lily-string for -ddebug-parser
---

diff --git a/lily/parser.yy b/lily/parser.yy
index c08442d75f..ee499ac15c 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -37,17 +37,17 @@
 #define YYLLOC_DEFAULT(Current,Rhs,N) \
 	((Current).set_location ((Rhs)[1], (Rhs)[N]))
 
-#define YYPRINT(file, type, value)                                      \
-        do {                                                            \
-                if (scm_is_eq (value, SCM_UNSPECIFIED))                 \
-                        break;                                          \
-                char *p = scm_to_locale_string                          \
-                        (scm_simple_format (SCM_BOOL_F,                 \
-                                            scm_from_locale_string ("~S"), \
-                                            scm_list_1 (value)));       \
-                fputs (p, file);                                        \
-                free (p);                                               \
-        } while (0)
+#define YYPRINT(file, type, value)					\
+	do {								\
+		if (scm_is_eq (value, SCM_UNSPECIFIED))			\
+			break;						\
+		SCM s = scm_call_2 (ly_lily_module_constant ("value->lily-string"), \
+				    value,				\
+				    parser->self_scm ());		\
+		char *p = scm_to_locale_string (s);			\
+		fputs (p, file);					\
+		free (p);						\
+	} while (0)
 
 %}