[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] muscle: factor the handling of used variables
From: |
Akim Demaille |
Subject: |
[PATCH 4/9] muscle: factor the handling of used variables |
Date: |
Mon, 15 Apr 2013 10:58:23 +0200 |
* src/muscle-tab.c (muscle_percent_define_use): New, corresponding
to b4_percent_define_use.
Use it where appropriate.
---
src/muscle-tab.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index d666824..bd75a7d 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -550,16 +550,21 @@ muscle_percent_define_ensure (char const *variable,
location loc,
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
+/* Mark %define VARIABLE as used. */
+static void
+muscle_percent_define_use (char const *variable)
+{
+ muscle_insert (muscle_name (variable, "bison_variables"), "");
+}
+
char *
muscle_percent_define_get (char const *variable)
{
uniqstr name = muscle_name (variable, NULL);
- uniqstr usage_name = muscle_name (variable, "bison_variables");
char *value = string_decode (name);
if (!value)
value = xstrdup ("");
-
- muscle_insert (usage_name, "");
+ muscle_percent_define_use (variable);
return value;
}
@@ -587,15 +592,13 @@ muscle_percent_define_get_syncline (char const *variable)
bool
muscle_percent_define_ifdef (char const *variable)
{
- char const *value = muscle_find_const (muscle_name (variable, NULL));
- if (value)
+ if (muscle_find_const (muscle_name (variable, NULL)))
{
- uniqstr usage_name = muscle_name (variable, "bison_variables");
- muscle_insert (usage_name, "");
+ muscle_percent_define_use (variable);
return true;
}
-
- return false;
+ else
+ return false;
}
bool
--
1.8.2
- [PATCH 0/9] {master} check the kind of %define variable values, Akim Demaille, 2013/04/15
- [PATCH 4/9] muscle: factor the handling of used variables,
Akim Demaille <=
- [PATCH 1/9] muscle: factor conditionals on defined %define variables, Akim Demaille, 2013/04/15
- [PATCH 7/9] muscle: minor refactoring, Akim Demaille, 2013/04/15
- [PATCH 5/9] muscle: factor the field retrieval, Akim Demaille, 2013/04/15
- [PATCH 8/9] muscle: let -D/-F support the three kinds of %define variable values, Akim Demaille, 2013/04/15
- [PATCH 2/9] muscle: factor the kind check in M4, Akim Demaille, 2013/04/15
- [PATCH 6/9] muscle: minor simplification which uncovers a missing warning, Akim Demaille, 2013/04/15
- [PATCH 9/9] muscle: enforce definition syntax for keyword variables, Akim Demaille, 2013/04/15
- [PATCH 3/9] muscle: factor the computation of variable names, Akim Demaille, 2013/04/15