Fixes and first test for macro expansion.

diff --git a/lib/macros.c b/lib/macros.c
index 6257c92548da0f9eedb85c2b4657380a7900b83b..d5786a0dcd2e0aebd7b067a3fb2e0d39ffdd2811 100644 (file)
--- a/lib/macros.c
+++ b/lib/macros.c
@@ -559,7 +559,7 @@ int mx_expand_file(const char *path,
  */
 static const struct mx_node *mx__rewrite(const struct mx_node *m,
                                          hash *h) {
  */
 static const struct mx_node *mx__rewrite(const struct mx_node *m,
                                          hash *h) {

-  const struct mx_node *head = 0, **tailp = &head, *arg, *mm;
+  const struct mx_node *head = 0, **tailp = &head, *argvalue, *mm;

   struct mx_node *nm;
   int n;
   
   struct mx_node *nm;
   int n;
   


@@ -574,7 +574,7 @@ static const struct mx_node *mx__rewrite(const struct mx_node *m,
       break;
     case MX_EXPANSION:
       if(m->nargs == 0
       break;
     case MX_EXPANSION:
       if(m->nargs == 0

-         && (arg = hash_find(h, m->name))) {
+         && (argvalue = *(const struct mx_node **)hash_find(h, m->name))) {

         /* This expansion has no arguments and its name matches one of the
          * macro arguments.  (Even if it's a valid expansion name we override
          * it.)  We insert its value at this point.  We do NOT recursively
         /* This expansion has no arguments and its name matches one of the
          * macro arguments.  (Even if it's a valid expansion name we override
          * it.)  We insert its value at this point.  We do NOT recursively


@@ -584,7 +584,7 @@ static const struct mx_node *mx__rewrite(const struct mx_node *m,
          * We need to recreate the list structure but a shallow copy will
          * suffice here.
          */
          * We need to recreate the list structure but a shallow copy will
          * suffice here.
          */

-        for(mm = arg; mm; mm = mm->next) {
+        for(mm = argvalue; mm; mm = mm->next) {

           nm = xmalloc(sizeof *nm);
           *nm = *mm;
           nm->next = 0;
           nm = xmalloc(sizeof *nm);
           *nm = *mm;
           nm->next = 0;


@@ -595,7 +595,7 @@ static const struct mx_node *mx__rewrite(const struct mx_node *m,
         /* This is some other expansion.  We recursively rewrite its argument
          * values according to h. */
         nm = xmalloc(sizeof *nm);
         /* This is some other expansion.  We recursively rewrite its argument
          * values according to h. */
         nm = xmalloc(sizeof *nm);

-        *nm = *mm;
+        *nm = *m;

         for(n = 0; n < nm->nargs; ++n)
           nm->args[n] = mx__rewrite(m->args[n], h);
         nm->next = 0;
         for(n = 0; n < nm->nargs; ++n)
           nm->args[n] = mx__rewrite(m->args[n], h);
         nm->next = 0;


@@ -629,7 +629,7 @@ static int mx__expand_macro(const struct expansion *e,
    * duplicate argument names (and this would be the wrong place for it
    * anyway); if you do that you just lose in some undefined way. */
   for(n = 0; n < m->nargs; ++n)
    * duplicate argument names (and this would be the wrong place for it
    * anyway); if you do that you just lose in some undefined way. */
   for(n = 0; n < m->nargs; ++n)

-    hash_add(h, e->args[n], m->args[n], HASH_INSERT);
+    hash_add(h, e->args[n], &m->args[n], HASH_INSERT);

   /* Generate a rewritten parse tree */
   m = mx__rewrite(e->definition, h);
   /* Expand the result */
   /* Generate a rewritten parse tree */
   m = mx__rewrite(e->definition, h);
   /* Expand the result */

diff --git a/lib/t-macros.c b/lib/t-macros.c
index 3330d36e0dba63c29ed117a97037e9950f2edfae..c246ee5f27b6fb8075d4b55d85b3d77b3ea7b51e 100644 (file)
--- a/lib/t-macros.c
+++ b/lib/t-macros.c
@@ -248,14 +248,18 @@ static void test_macros(void) {
 
   check_macro("sh1", "@shell{true}", "");
   check_macro("sh2", "@shell{echo spong}", "spong\n");
 
   check_macro("sh1", "@shell{true}", "");
   check_macro("sh2", "@shell{echo spong}", "spong\n");

-  fprintf(stderr, "expxect error message from macro expander:\n");
+  fprintf(stderr, "expect error message from macro expander:\n");

   check_macro("sh3", "@shell{echo spong;exit 3}", "spong\n");
 
   check_macro("url1", "@urlquote{unreserved}", "unreserved");
   check_macro("url2", "@urlquote{has space}", "has%20space");
   check_macro("url3", "@urlquote{\xc0\xc1}", "%c0%c1");
 
   check_macro("sh3", "@shell{echo spong;exit 3}", "spong\n");
 
   check_macro("url1", "@urlquote{unreserved}", "unreserved");
   check_macro("url2", "@urlquote{has space}", "has%20space");
   check_macro("url3", "@urlquote{\xc0\xc1}", "%c0%c1");
 

-  
+  /* Macro definitions ------------------------------------------------------ */
+
+  check_macro("macro1", "@define{m}{a b c}{@c@ @b@ @a@}@"
+              "@m{1}{2}{3}",
+              "3 2 1");

 }
 
 TEST(macros);
 }
 
 TEST(macros);