From 44494bf68403d6a566dc408bcfecaf99fc844b06 Mon Sep 17 00:00:00 2001
From: Akim Demaille <demaille@gostai.com>
Date: Thu, 27 Nov 2008 21:45:58 +0100
Subject: [PATCH] Avoid capturing variables too easily.

	* src/muscle_tab.h (MUSCLE_INSERT_BOOL, MUSCLE_OBSTACK_SGROW): Use
	v__ and p__ instead of v and p.
---
 ChangeLog        |  6 ++++++
 src/muscle_tab.h | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 457cfd76..9890b5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-12-01  Akim Demaille  <demaille@gostai.com>
 
+	Avoid capturing variables too easily.
+	* src/muscle_tab.h (MUSCLE_INSERT_BOOL, MUSCLE_OBSTACK_SGROW): Use
+	v__ and p__ instead of v and p.
+
+2008-12-01  Akim Demaille  <demaille@gostai.com>
+
 	Remove spurious empty line before syncline.
 	* data/bison.m4 (b4_syncline): Don't output an empty line before
 	the output.
diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 2f1e51e6..941c67e3 100644
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -33,8 +33,8 @@ extern struct obstack muscle_obstack;
 
 #define MUSCLE_INSERT_BOOL(Key, Value)				\
 do {								\
-  int v = Value;						\
-  MUSCLE_INSERT_INT (Key, v);					\
+  int v__ = Value;						\
+  MUSCLE_INSERT_INT (Key, v__);					\
 } while(0)
 
 #define MUSCLE_INSERT_INT(Key, Value)				\
@@ -67,18 +67,18 @@ do {								\
   muscle_insert (Key, obstack_finish (&muscle_obstack));	\
 } while(0)
 
-#define MUSCLE_OBSTACK_SGROW(Obstack, Value)			\
-do {								\
-  char const *p;						\
-  for (p = Value; *p; p++)					\
-    switch (*p)							\
-      {								\
-      case '$':	obstack_sgrow (Obstack, "$]["); break;		\
-      case '@':	obstack_sgrow (Obstack, "@@" ); break;		\
-      case '[':	obstack_sgrow (Obstack, "@{" ); break;		\
-      case ']':	obstack_sgrow (Obstack, "@}" ); break;		\
-      default: obstack_1grow (Obstack, *p); break;		\
-      }								\
+#define MUSCLE_OBSTACK_SGROW(Obstack, Value)            \
+do {                                                    \
+  char const *p__;                                      \
+  for (p__ = Value; *p__; p__++)                        \
+    switch (*p__)                                       \
+      {                                                 \
+      case '$':	obstack_sgrow (Obstack, "$]["); break;  \
+      case '@':	obstack_sgrow (Obstack, "@@" ); break;  \
+      case '[':	obstack_sgrow (Obstack, "@{" ); break;  \
+      case ']':	obstack_sgrow (Obstack, "@}" ); break;  \
+      default: obstack_1grow (Obstack, *p__); break;    \
+      }                                                 \
 } while(0)
 
 #define MUSCLE_INSERT_C_STRING(Key, Value)			\
-- 
2.11.4.GIT