@q expansion

diff --git a/lib/macros-builtin.c b/lib/macros-builtin.c
index c96506fa71e50f1cbd4317e2a0e68bcba1f3f097..6675dec518f1018d2e2f3c87db5de5229a826940 100644 (file)
--- a/lib/macros-builtin.c
+++ b/lib/macros-builtin.c
@@ -418,6 +418,17 @@ static int exp_dirname(int attribute((unused)) nargs,
   return sink_writes(output, d_dirname(args[0])) < 0 ? -1 : 0;
 }
 
   return sink_writes(output, d_dirname(args[0])) < 0 ? -1 : 0;
 }
 

+/* @q{STRING}
+ *
+ * Expands to STRING.
+ */
+static int exp_q(int attribute((unused)) nargs,
+                 char **args,
+                 struct sink attribute((unused)) *output,
+                 void attribute((unused)) *u) {
+  return sink_writes(output, args[0]) < 0 ? -1 : 0;
+}
+

 /** @brief Register built-in expansions */
 void mx_register_builtin(void) {
   mx_register("basename", 1, 1, exp_basename);
 /** @brief Register built-in expansions */
 void mx_register_builtin(void) {
   mx_register("basename", 1, 1, exp_basename);


@@ -429,6 +440,7 @@ void mx_register_builtin(void) {
   mx_register("not", 1, 1, exp_not);
   mx_register("shell", 1, 1, exp_shell);
   mx_register("urlquote", 1, 1, exp_urlquote);
   mx_register("not", 1, 1, exp_not);
   mx_register("shell", 1, 1, exp_shell);
   mx_register("urlquote", 1, 1, exp_urlquote);

+  mx_register("q", 1, 1, exp_q);

   mx_register_magic("#", 0, INT_MAX, exp_comment);
   mx_register_magic("and", 0, INT_MAX, exp_and);
   mx_register_magic("define", 3, 3, exp_define);
   mx_register_magic("#", 0, INT_MAX, exp_comment);
   mx_register_magic("and", 0, INT_MAX, exp_and);
   mx_register_magic("define", 3, 3, exp_define);

diff --git a/lib/t-macros.c b/lib/t-macros.c
index 2bf747f80406b3eae2fe196754f030a3364f8782..a1dc0e07a6e9650eb4f1fbf9883b3b3f2e54e83d 100644 (file)
--- a/lib/t-macros.c
+++ b/lib/t-macros.c
@@ -219,6 +219,9 @@ static void test_macros(void) {
               "foo & something", 0);
   check_macro("basename1", "@basename{xyzzy/plugh}", "plugh", 0);
   check_macro("basename2", "@basename{xyzzy/a<b}", "a<b", 0);
               "foo & something", 0);
   check_macro("basename1", "@basename{xyzzy/plugh}", "plugh", 0);
   check_macro("basename2", "@basename{xyzzy/a<b}", "a<b", 0);

+
+  check_macro("q1", "@q{wibble}", "wibble", 0);
+  check_macro("q2", "@q{wibble}wobble", "wibblewobble", 0);

   
   /* Macro definitions ------------------------------------------------------ */
 
   
   /* Macro definitions ------------------------------------------------------ */