X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/8fc93a3745553c2cbc8df2240877dd40f1569431..f5fdc06f8777fabca1225b989cd540520968ca9a:/lib/t-macros.c

diff --git a/lib/t-macros.c b/lib/t-macros.c
index c246ee5..19bc14a 100644
--- a/lib/t-macros.c
+++ b/lib/t-macros.c
@@ -26,6 +26,7 @@ static void test_macros(void) {
 #define L2 "plain text\n"
   static const char plain[] = L1 L2;
   char *s;
+  const char *cs;
 
   /* Plain text ------------------------------------------------------------- */
   
@@ -54,135 +55,68 @@ static void test_macros(void) {
   /* Simple macro parsing --------------------------------------------------- */
 
   /* The simplest possible expansion */
-  m = mx_parse("macro1", 1, "@macro@", NULL);
+  m = mx_parse("macro1", 1, "@macro", NULL);
   check_integer(m->type, MX_EXPANSION);
   check_string(m->filename, "macro1");
   check_integer(m->line, 1);
   check_string(m->name, "macro");
   check_integer(m->nargs, 0);
-  insist(m->args == 0);
   insist(m->next == 0);
-  check_string(mx_dump(m), "@macro@");
+  check_string(mx_dump(m), "@macro");
 
-  /* Spacing variants of the above */
-  m = mx_parse("macro2", 1, "@    macro@", NULL);
+  m = mx_parse("macro2", 1, "@macro    ", NULL);
   check_integer(m->type, MX_EXPANSION);
   check_string(m->filename, "macro2");
   check_integer(m->line, 1);
   check_string(m->name, "macro");
   check_integer(m->nargs, 0);
-  insist(m->args == 0);
-  insist(m->next == 0);
-  check_string(mx_dump(m), "@macro@");
-  m = mx_parse("macro3", 1, "@macro    @", NULL);
-  check_integer(m->type, MX_EXPANSION);
-  check_string(m->filename, "macro3");
-  check_integer(m->line, 1);
-  check_string(m->name, "macro");
-  check_integer(m->nargs, 0);
-  insist(m->args == 0);
-  insist(m->next == 0);
-  check_string(mx_dump(m), "@macro@");
-
-  /* Unterminated variants */
-  m = mx_parse("macro4", 1, "@macro", NULL);
-  check_integer(m->type, MX_EXPANSION);
-  check_string(m->filename, "macro4");
-  check_integer(m->line, 1);
-  check_string(m->name, "macro");
-  check_integer(m->nargs, 0);
-  insist(m->args == 0);
-  insist(m->next == 0);
-  check_string(mx_dump(m), "@macro@");
-  m = mx_parse("macro5", 1, "@macro   ", NULL);
-  check_integer(m->type, MX_EXPANSION);
-  check_string(m->filename, "macro5");
-  check_integer(m->line, 1);
-  check_string(m->name, "macro");
-  check_integer(m->nargs, 0);
-  insist(m->args == 0);
-  insist(m->next == 0);
-  check_string(mx_dump(m), "@macro@");
-
-  /* Macros with a :-separated argument */
-  m = mx_parse("macro5", 1, "@macro:arg@", NULL);
-  check_integer(m->type, MX_EXPANSION);
-  check_string(m->filename, "macro5");
-  check_integer(m->line, 1);
-  check_string(m->name, "macro");
-  check_integer(m->nargs, 1);
-  insist(m->next == 0);
-  
-  check_integer(m->args[0]->type, MX_TEXT);
-  check_string(m->args[0]->filename, "macro5");
-  check_integer(m->args[0]->line, 1);
-  check_string(m->args[0]->text, "arg");
-  insist(m->args[0]->next == 0);
-
-  check_string(mx_dump(m), "@macro{arg}@");
-
-  /* Multiple :-separated arguments, and spacing, and newlines */
-  m = mx_parse("macro6", 1, "@macro : \n arg1 : \n arg2@", NULL);
-  check_integer(m->type, MX_EXPANSION);
-  check_string(m->filename, "macro6");
-  check_integer(m->line, 1);
-  check_string(m->name, "macro");
-  check_integer(m->nargs, 2);
-  insist(m->next == 0);
-  
-  check_integer(m->args[0]->type, MX_TEXT);
-  check_string(m->args[0]->filename, "macro6");
-  check_integer(m->args[0]->line, 2);
-  check_string(m->args[0]->text, "arg1");
-  insist(m->args[0]->next == 0);
-  
-  check_integer(m->args[1]->type, MX_TEXT);
-  check_string(m->args[1]->filename, "macro6");
-  check_integer(m->args[1]->line, 3);
-  check_string(m->args[1]->text, "arg2");
-  insist(m->args[1]->next == 0);
-
-  check_string(mx_dump(m), "@macro{arg1}{arg2}@");
+  insist(m->next != 0);
+  check_integer(m->next->type, MX_TEXT);
+  check_string(mx_dump(m), "@macro    ");
 
   /* Multiple bracketed arguments */
-  m = mx_parse("macro7", 1, "@macro{arg1}{arg2}@", NULL);
-  check_string(mx_dump(m), "@macro{arg1}{arg2}@");
+  m = mx_parse("macro7", 1, "@macro{arg1}{arg2}", NULL);
+  check_string(mx_dump(m), "@macro{arg1}{arg2}");
 
-  m = mx_parse("macro8", 1, "@macro{\narg1}{\narg2}@", NULL);
-  check_string(mx_dump(m), "@macro{\narg1}{\narg2}@");
+  m = mx_parse("macro8", 1, "@macro{\narg1}{\narg2}", NULL);
+  check_string(mx_dump(m), "@macro{\narg1}{\narg2}");
   check_integer(m->args[0]->line, 1);
   check_integer(m->args[1]->line, 2);
   /* ...yes, lines 1 and 2: the first character of the first arg is
    * the \n at the end of line 1.  Compare with macro9: */
 
-  m = mx_parse("macro9", 1, "@macro\n{arg1}\n{arg2}@", NULL);
-  check_string(mx_dump(m), "@macro{arg1}{arg2}@");
+  m = mx_parse("macro9", 1, "@macro\n{arg1}\n{arg2}", NULL);
+  check_string(mx_dump(m), "@macro{arg1}{arg2}");
   check_integer(m->args[0]->line, 2);
   check_integer(m->args[1]->line, 3);
 
   /* Arguments that themselves contain expansions */
-  m = mx_parse("macro10", 1, "@macro{@macro2{arg1}{arg2}@}@", NULL);
-  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}@}@");
+  m = mx_parse("macro10", 1, "@macro{@macro2{arg1}{arg2}}", NULL);
+  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}}");
 
   /* ...and with omitted trailing @ */
   m = mx_parse("macro11", 1, "@macro{@macro2{arg1}{arg2}}", NULL);
-  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}@}@");
+  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}}");
 
   /* Similarly but with more whitespace; NB that the whitespace is
    * preserved. */
   m = mx_parse("macro12", 1, "@macro {@macro2 {arg1} {arg2}  }\n", NULL);
-  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}@  }@\n");
+  check_string(mx_dump(m), "@macro{@macro2{arg1}{arg2}  }\n");
 
   /* Simple expansions ------------------------------------------------------ */
 
   mx_register_builtin();
+  mx_search_path(".");
+  mx_search_path("lib");
+  if((cs = getenv("srcdir")))
+    mx_search_path(cs);
   
-#define check_macro(NAME, INPUT, OUTPUT) do {                   \
+#define check_macro(NAME, INPUT, OUTPUT, RET) do {              \
   m = mx_parse(NAME, 1, INPUT, NULL);                           \
-  check_integer(mx_expandstr(m, &s, 0/*u*/, NAME), 0);          \
+  check_integer(mx_expandstr(m, &s, 0/*u*/, NAME), (RET));      \
   if(s && strcmp(s, OUTPUT)) {                                  \
     fprintf(stderr, "%s:%d: test %s\n"                          \
-            "     INPUT: %s\n"                                  \
+            "     INPUT:\n%s\n"                                 \
             "  EXPECTED: '%s'\n"                                \
             "       GOT: '%s'\n",                               \
             __FILE__, __LINE__, NAME, INPUT, OUTPUT, s);        \
@@ -190,76 +124,116 @@ static void test_macros(void) {
   }                                                             \
 } while(0)
 
-  check_macro("empty", "", "");
-  check_macro("plain", plain, plain);
-
-  check_macro("if1", "@if{true}{yes}{no}", "yes");
-  check_macro("if2", "@if{true}{yes}", "yes");
-  check_macro("if3", "@if{false}{yes}{no}", "no");
-  check_macro("if4", "@if{false}{yes}", "");
-  check_macro("if5", "@if{ true}{yes}", "");
-
-  check_macro("and1", "@and", "true");
-  check_macro("and2", "@and{true}", "true");
-  check_macro("and3", "@and{false}", "false");
-  check_macro("and4", "@and{true}{true}", "true");
-  check_macro("and5", "@and{false}{true}", "false");
-  check_macro("and6", "@and{true}{false}", "false");
-  check_macro("and7", "@and{false}{false}", "false");
-
-  check_macro("or1", "@or", "false");
-  check_macro("or2", "@or{true}", "true");
-  check_macro("or2", "@or{false}", "false");
-  check_macro("or3", "@or{true}{true}", "true");
-  check_macro("or4", "@or{false}{true}", "true");
-  check_macro("or5", "@or{true}{false}", "true");
-  check_macro("or7", "@or{false}{false}", "false");
-
-  check_macro("not1", "@not{true}", "false");
-  check_macro("not2", "@not{false}", "true");
-  check_macro("not3", "@not{wibble}", "true");
-
-  check_macro("comment1", "@#{wibble}", "");
-  check_macro("comment2", "@#{comment with a\nnewline in}", "");
-
-  check_macro("discard1", "@discard{wibble}", "");
-  check_macro("discard2", "@discard{comment with a\nnewline in}", "");
-
-  check_macro("eq1", "@eq", "true");
-  check_macro("eq2", "@eq{}", "true");
-  check_macro("eq3", "@eq{a}", "true");
-  check_macro("eq4", "@eq{a}{a}", "true");
-  check_macro("eq5", "@eq{a}{a}{a}", "true");
-  check_macro("eq7", "@eq{a}{b}", "false");
-  check_macro("eq8", "@eq{a}{b}{a}", "false");
-  check_macro("eq9", "@eq{a}{a}{b}", "false");
-  check_macro("eq10", "@eq{b}{a}{a}", "false");
-
-  check_macro("ne1", "@ne", "true");
-  check_macro("ne2", "@ne{}", "true");
-  check_macro("ne3", "@ne{a}", "true");
-  check_macro("ne4", "@ne{a}{a}", "false");
-  check_macro("ne5", "@ne{a}{a}{a}", "false");
-  check_macro("ne7", "@ne{a}{b}", "true");
-  check_macro("ne8", "@ne{a}{b}{a}", "false");
-  check_macro("ne9", "@ne{a}{a}{b}", "false");
-  check_macro("ne10", "@ne{b}{a}{a}", "false");
-  check_macro("ne11", "@ne{a}{b}{c}", "true");
-
-  check_macro("sh1", "@shell{true}", "");
-  check_macro("sh2", "@shell{echo spong}", "spong\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("empty", "", "", 0);
+  check_macro("plain", plain, plain, 0);
+  check_macro("quote1", "@@", "@", 0);
+  check_macro("quote2", "@@@@", "@@", 0);
+  check_macro("nothing1", "@_", "", 0);
+  check_macro("nothing2", "<@_>", "<>", 0);
+
+  check_macro("if1", "@if{true}{yes}{no}", "yes", 0);
+  check_macro("if2", "@if{true}{yes}", "yes", 0);
+  check_macro("if3", "@if{false}{yes}{no}", "no", 0);
+  check_macro("if4", "@if{false}{yes}", "", 0);
+  check_macro("if5", "@if{ true}{yes}", "", 0);
+  check_macro("if6", "@if{true}{yes}@_{wible}t", "yes{wible}t", 0);
+
+  check_macro("br1", "@if(true)(yes)(no)", "yes", 0);
+  check_macro("br1", "@if[true][yes]{no}", "yes{no}", 0);
+  
+  check_macro("and1", "@and", "true", 0);
+  check_macro("and2", "@and{true}", "true", 0);
+  check_macro("and3", "@and{false}", "false", 0);
+  check_macro("and4", "@and{true}{true}", "true", 0);
+  check_macro("and5", "@and{false}{true}", "false", 0);
+  check_macro("and6", "@and{true}{false}", "false", 0);
+  check_macro("and7", "@and{false}{false}", "false", 0);
+
+  check_macro("or1", "@or", "false", 0);
+  check_macro("or2", "@or{true}", "true", 0);
+  check_macro("or2", "@or{false}", "false", 0);
+  check_macro("or3", "@or{true}{true}", "true", 0);
+  check_macro("or4", "@or{false}{true}", "true", 0);
+  check_macro("or5", "@or{true}{false}", "true", 0);
+  check_macro("or7", "@or{false}{false}", "false", 0);
+
+  check_macro("not1", "@not{true}", "false", 0);
+  check_macro("not2", "@not{false}", "true", 0);
+  check_macro("not3", "@not{wibble}", "true", 0);
+
+  check_macro("comment1", "@# wibble\n", "", 0);
+  check_macro("comment2", "@# comment\nplus a line", "plus a line", 0);
+
+  check_macro("discard1", "@discard{wibble}", "", 0);
+  check_macro("discard2", "@discard{comment with a\nnewline in}", "", 0);
+
+  check_macro("eq1", "@eq", "true", 0);
+  check_macro("eq2", "@eq{}", "true", 0);
+  check_macro("eq3", "@eq{a}", "true", 0);
+  check_macro("eq4", "@eq{a}{a}", "true", 0);
+  check_macro("eq5", "@eq{a}{a}{a}", "true", 0);
+  check_macro("eq7", "@eq{a}{b}", "false", 0);
+  check_macro("eq8", "@eq{a}{b}{a}", "false", 0);
+  check_macro("eq9", "@eq{a}{a}{b}", "false", 0);
+  check_macro("eq10", "@eq{b}{a}{a}", "false", 0);
+
+  check_macro("ne1", "@ne", "true", 0);
+  check_macro("ne2", "@ne{}", "true", 0);
+  check_macro("ne3", "@ne{a}", "true", 0);
+  check_macro("ne4", "@ne{a}{a}", "false", 0);
+  check_macro("ne5", "@ne{a}{a}{a}", "false", 0);
+  check_macro("ne7", "@ne{a}{b}", "true", 0);
+  check_macro("ne8", "@ne{a}{b}{a}", "false", 0);
+  check_macro("ne9", "@ne{a}{a}{b}", "false", 0);
+  check_macro("ne10", "@ne{b}{a}{a}", "false", 0);
+  check_macro("ne11", "@ne{a}{b}{c}", "true", 0);
+
+  check_macro("sh1", "@shell{true}", "", 0);
+  check_macro("sh2", "@shell{echo spong}", "spong\n", 0);
+  fprintf(stderr, ">>> expect error message about shell command:\n");
+  check_macro("sh3", "@shell{echo spong;exit 3}", "spong\n", 0);
+
+  check_macro("url1", "@urlquote{unreserved}", "unreserved", 0);
+  check_macro("url2", "@urlquote{has space}", "has%20space", 0);
+  check_macro("url3", "@urlquote{\xc0\xc1}", "%c0%c1", 0);
+
+  check_macro("include1", "@include{t-macros-1.tmpl}",
+              "yes\n", 0);
+  check_macro("include2", "@include{t-macros-2}",
+              "wibble\n", 0);
+  fprintf(stderr, ">>> expect error message about t-macros-nonesuch:\n");
+  check_macro("include3", "<@include{t-macros-nonesuch}>",
+              "<[[cannot find 't-macros-nonesuch']]>", 0);
+  fprintf(stderr, ">>> expect error message about 'wibble':\n");
+  check_macro("badex1", "<@wibble>",
+              "<[['wibble' unknown]]>", 0);
+  fprintf(stderr, ">>> expect error message about 'if':\n");
+  check_macro("badex2", "<@if>",
+              "<[['if' too few args]]>", 0);
+  fprintf(stderr, ">>> expect error message about 'if':\n");
+  check_macro("badex3", "<@if{1}{2}{3}{4}{5}>",
+              "<[['if' too many args]]>", 0);
+  
   /* Macro definitions ------------------------------------------------------ */
 
-  check_macro("macro1", "@define{m}{a b c}{@c@ @b@ @a@}@"
+  check_macro("macro1", "@define{m}{a b c}{@c @b @a}@#\n"
               "@m{1}{2}{3}",
-              "3 2 1");
+              "3 2 1", 0);
+  check_macro("macro2", "@m{b}{c}{a}",
+              "a c b", 0);
+  check_macro("macro3", "@m{@eq{z}{z}}{p}{q}",
+              "q p true", 0);
+  check_macro("macro4",
+              "@discard{\n"
+              "  @define{n}{a b c}\n"
+              "    {@if{@eq{@a}{@b}} {@c} {no}}\n"
+              "}@#\n"
+              "@n{x}{y}{z}",
+              "no", 0);
+  check_macro("macro5",
+              "@n{x}{x}{z}",
+              "z", 0);
+
 }
 
 TEST(macros);