]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3770: Use value->lily-string for -ddebug-parser
authorDavid Kastrup <dak@gnu.org>
Wed, 1 Jan 2014 20:19:42 +0000 (21:19 +0100)
committerCarl Sorensen <carl.d.sorensen@gmail.com>
Sun, 12 Jan 2014 02:00:53 +0000 (19:00 -0700)
lily/parser.yy

index c08442d75faa23a381ad8e2b619c55a4d49d8094..ee499ac15c7db5b0cdedc1828bf02f6bc196d90d 100644 (file)
 #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)
 
 %}