From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 26 Jul 2012 09:49:42 +0000 (+0200)
Subject: muscles: shuffle responsabilities
X-Git-Tag: v2.6.1~24
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/eea7239a23c96a1b6a8c2811044c7379da2d6a5f

muscles: shuffle responsabilities

* src/muscle-tab.c (muscle_boundary_grow): Be in charge of quotation,
instead of leaving this to the caller.
---

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index b2dca77d..a498b15b 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -266,12 +266,14 @@ static void
 muscle_boundary_grow (char const *key, boundary bound)
 {
   char *extension;
+  obstack_sgrow  (&muscle_obstack, "[[");
   obstack_escape (&muscle_obstack, bound.file);
-  obstack_1grow (&muscle_obstack, ':');
+  obstack_1grow  (&muscle_obstack, ':');
   obstack_fgrow1 (&muscle_obstack, "%d", bound.line);
-  obstack_1grow (&muscle_obstack, '.');
+  obstack_1grow  (&muscle_obstack, '.');
   obstack_fgrow1 (&muscle_obstack, "%d", bound.column);
-  obstack_1grow (&muscle_obstack, '\0');
+  obstack_sgrow  (&muscle_obstack, "]]");
+  obstack_1grow  (&muscle_obstack, '\0');
   extension = obstack_finish (&muscle_obstack);
   muscle_grow (key, extension, "");
   obstack_free (&muscle_obstack, extension);
@@ -285,11 +287,9 @@ muscle_boundary_grow (char const *key, boundary bound)
 static void
 muscle_location_grow (char const *key, location loc)
 {
-  muscle_grow (key, "[[", "");
   muscle_boundary_grow (key, loc.start);
-  muscle_grow (key, "]], [[", "");
+  muscle_grow (key, "", ", ");
   muscle_boundary_grow (key, loc.end);
-  muscle_grow (key, "]]", "");
 }
 
 #define COMMON_DECODE(Value)                                    \