[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] muscle: let -D/-F support the three kinds of %define variabl
From: |
Akim Demaille |
Subject: |
[PATCH 8/9] muscle: let -D/-F support the three kinds of %define variable values |
Date: |
Mon, 15 Apr 2013 10:58:27 +0200 |
See http://lists.gnu.org/archive/html/bison-patches/2013-04/msg00012.html
* src/getargs.c (getargs): Recognize {value} and "value" for -D and -F.
---
src/getargs.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/getargs.c b/src/getargs.c
index e6f9d76..df310ad 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -574,16 +574,31 @@ getargs (int argc, char *argv[])
/* Certain long options cause getopt_long to return 0. */
break;
- case 'D': /* -DNAME[=VALUE]. */
- case 'F': /* -FNAME[=VALUE]. */
+ case 'D': /* -DNAME[=(VALUE|"VALUE"|{VALUE})]. */
+ case 'F': /* -FNAME[=(VALUE|"VALUE"|{VALUE})]. */
{
- char* name = optarg;
- char* value = strchr (optarg, '=');
+ char *name = optarg;
+ char *value = strchr (optarg, '=');
+ muscle_kind kind = muscle_keyword;
if (value)
- *value++ = 0;
+ {
+ char *end = value + strlen (value) - 1;
+ *value++ = 0;
+ if (*value == '{' && *end == '}')
+ {
+ kind = muscle_code;
+ ++value;
+ *end = 0;
+ }
+ else if (*value == '"' && *end == '"')
+ {
+ kind = muscle_string;
+ ++value;
+ *end = 0;
+ }
+ }
muscle_percent_define_insert (name, command_line_location (),
- muscle_string,
- value ? value : "",
+ kind, value ? value : "",
c == 'D' ? MUSCLE_PERCENT_DEFINE_D
: MUSCLE_PERCENT_DEFINE_F);
}
--
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, 2013/04/15
- [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 <=
- [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