02-fyi-cleanups.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * tests/generate.awk: Remove debugging code.
        (fatal): Specify the current location.
        
        * m4/debug.c, m4/macro.c, m4/utility.c, modules/format.c,
        * modules/gnu.c, modules/m4.c: Use M4ARG.
        
Index: m4/debug.c
--- m4/debug.c Sat, 22 Sep 2001 12:59:08 +0200 akim
+++ m4/debug.c Sat, 29 Sep 2001 18:31:41 +0200 akim
@@ -346,7 +346,7 @@
          switch (M4_SYMBOL_TYPE (argv[i]))
            {
            case M4_TOKEN_TEXT:
-             m4_trace_format ("%l%S%r", M4_SYMBOL_TEXT (argv[i]));
+             m4_trace_format ("%l%S%r", M4ARG (i));
              break;
 
            case M4_TOKEN_FUNC:
Index: m4/macro.c
--- m4/macro.c Sat, 22 Sep 2001 12:59:08 +0200 akim
+++ m4/macro.c Sat, 29 Sep 2001 18:32:27 +0200 akim
@@ -344,7 +344,7 @@ ERROR: Recursion limit of %d exceeded, u
              text = endp;
            }
          if (i < argc)
-           m4_shipout_string (obs, M4_SYMBOL_TEXT (argv[i]), 0, FALSE);
+           m4_shipout_string (obs, M4ARG (i), 0, FALSE);
          break;
 
        case '#':               /* number of arguments */
Index: m4/utility.c
--- m4/utility.c Sat, 22 Sep 2001 12:59:08 +0200 akim
+++ m4/utility.c Sun, 23 Sep 2001 20:11:27 +0200 akim
@@ -168,7 +168,7 @@
       if (i > 1)
        obstack_grow (obs, sep, len);
 
-      m4_shipout_string (obs, M4_SYMBOL_TEXT (argv[i]), 0, quoted);
+      m4_shipout_string (obs, M4ARG (i), 0, quoted);
     }
 }
 
@@ -259,9 +259,9 @@
 
       for (i = 1; i < argc; i++)
        {
-         symbol = m4_symbol_lookup (M4_SYMBOL_TEXT (argv[i]));
+         symbol = m4_symbol_lookup (M4ARG (i));
          if (symbol != NULL && M4_SYMBOL_TYPE (symbol) != M4_TOKEN_VOID)
-           m4_dump_symbol (M4_SYMBOL_TEXT (argv[i]), symbol, data);
+           m4_dump_symbol (M4ARG (i), symbol, data);
          else if (complain)
            M4WARN ((warning_status, 0,
                     _("Warning: %s: undefined name: %s"),
Index: modules/format.c
--- modules/format.c Sat, 22 Sep 2001 12:59:08 +0200 akim
+++ modules/format.c Sat, 29 Sep 2001 18:32:51 +0200 akim
@@ -24,27 +24,27 @@
 
 #define ARG_INT(argc, argv) \
        ((argc == 0) ? 0 : \
-        (--argc, argv++, atoi (M4_SYMBOL_TEXT (argv[-1]))))
+        (--argc, argv++, atoi (M4ARG (-1))))
 
 #define ARG_UINT(argc, argv) \
        ((argc == 0) ? 0 : \
-        (--argc, argv++, (unsigned int) atoi (M4_SYMBOL_TEXT (argv[-1]))))
+        (--argc, argv++, (unsigned int) atoi (M4ARG (-1))))
 
 #define ARG_LONG(argc, argv) \
        ((argc == 0) ? 0 : \
-        (--argc, argv++, atol (M4_SYMBOL_TEXT (argv[-1]))))
+        (--argc, argv++, atol (M4ARG (-1))))
 
 #define ARG_ULONG(argc, argv) \
        ((argc == 0) ? 0 : \
-        (--argc, argv++, (unsigned long) atol (M4_SYMBOL_TEXT (argv[-1]))))
+        (--argc, argv++, (unsigned long) atol (M4ARG (-1))))
 
 #define ARG_STR(argc, argv) \
        ((argc == 0) ? "" : \
-        (--argc, argv++, M4_SYMBOL_TEXT (argv[-1])))
+        (--argc, argv++, M4ARG (-1)))
 
 #define ARG_DOUBLE(argc, argv) \
        ((argc == 0) ? 0 : \
-        (--argc, argv++, atof (M4_SYMBOL_TEXT (argv[-1]))))
+        (--argc, argv++, atof (M4ARG (-1))))
 
 
 /* The main formatting function.  Output is placed on the obstack OBS, the
Index: modules/gnu.c
--- modules/gnu.c Sun, 23 Sep 2001 20:09:51 +0200 akim
+++ modules/gnu.c Sat, 29 Sep 2001 18:30:53 +0200 akim
@@ -185,8 +185,8 @@
 
   for (i = 1; i < argc; i++)
     {
-      m4_set_syntax (*M4_SYMBOL_TEXT (argv[i]),
-                    m4_expand_ranges (M4_SYMBOL_TEXT (argv[i])+1, obs));
+      m4_set_syntax (*M4ARG (i),
+                    m4_expand_ranges (M4ARG (i)+1, obs));
     }
 }
 
@@ -461,15 +461,13 @@
   if (M4_SYMBOL_TYPE (argv[1]) != M4_TOKEN_TEXT)
     return;
 
-  if (M4_SYMBOL_TEXT(argv[1])[0] == '0'
-      || M4_SYMBOL_TEXT(argv[1])[0] == 'n'
-      || (M4_SYMBOL_TEXT(argv[1])[0] == 'o'
-         && M4_SYMBOL_TEXT(argv[1])[1] == 'f'))
+  if (   M4ARG (1)[0] == '0'
+      || M4ARG (1)[0] == 'n'
+      || (M4ARG (1)[0] == 'o' && M4ARG (1)[1] == 'f'))
     sync_output = 0;
-  else if (M4_SYMBOL_TEXT(argv[1])[0] == '1'
-          || M4_SYMBOL_TEXT(argv[1])[0] == 'y'
-          || (M4_SYMBOL_TEXT(argv[1])[0] == 'o'
-              && M4_SYMBOL_TEXT(argv[1])[1] == 'n'))
+  else if (   M4ARG (1)[0] == '1'
+          || M4ARG (1)[0] == 'y'
+          || (M4ARG (1)[0] == 'o' && M4ARG (1)[1] == 'n'))
     sync_output = 1;
 }
 
Index: modules/m4.c
--- modules/m4.c Sat, 22 Sep 2001 12:59:08 +0200 akim
+++ modules/m4.c Sat, 29 Sep 2001 18:31:20 +0200 akim
@@ -535,8 +535,8 @@
   if (m4_bad_argc (argv[0], argc, 1, 3))
     return;
 
-  m4_set_quotes ((argc >= 2) ? M4_SYMBOL_TEXT (argv[1]) : NULL,
-            (argc >= 3) ? M4_SYMBOL_TEXT (argv[2]) : NULL);
+  m4_set_quotes ((argc >= 2) ? M4ARG (1) : NULL,
+                (argc >= 3) ? M4ARG (2) : NULL);
 }
 
 /* Change the current comment delimiters.  The function set_comment ()
@@ -549,8 +549,7 @@
   if (argc == 1)
     m4_set_comment ("", "");   /* disable comments */
   else
-    m4_set_comment (M4_SYMBOL_TEXT (argv[1]),
-                   (argc >= 3) ? M4_SYMBOL_TEXT (argv[2]) : NULL);
+    m4_set_comment (M4ARG (1), (argc >= 3) ? M4ARG (2) : NULL);
 }
 
 
Index: tests/Makefile.am
--- tests/Makefile.am Tue, 18 Sep 2001 22:54:14 +0200 akim
+++ tests/Makefile.am Sat, 29 Sep 2001 18:44:51 +0200 akim
@@ -16,13 +16,13 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
-# The next line is needed by `others.at:esyscmd'
+# The next line is needed by `generated.at:esyscmd'
 #  Ty Coon, President of Vice
 
 EXTRA_DIST = generate.awk atlocal.in m4 \
        $(OTHER_FILES) $(TESTSUITE_AT) $(TESTSUITE)
 
-DISTCLEANFILES       = atconfig atlocal
+DISTCLEANFILES       = atconfig atlocal package.m4
 MAINTAINERCLEANFILES = Makefile.in generated.at $(TESTSUITE)
 
 OTHER_FILES = \
@@ -47,16 +47,9 @@ clean-local:
 # FIXME: Autom4te is not complete yet, and lacks a means to find
 # the lib files.
 AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
-       {                                       \
-         echo '# Signature of the current package.'; \
-         echo 'm4_define([PACKAGE_NAME],      address@hidden@])'; \
-         echo 'm4_define([PACKAGE_TARNAME],   address@hidden@])'; \
-         echo 'm4_define([PACKAGE_VERSION],   address@hidden@])'; \
-         echo 'm4_define([PACKAGE_STRING],    address@hidden@])'; \
-         echo 'm4_define([PACKAGE_BUGREPORT], address@hidden@])'; \
-       } >package.m4
-       $(AUTOM4TE) --language=autotest -I $(srcdir) testsuite.at -o 
address@hidden
+       $(AUTOTEST) -I $(srcdir) testsuite.at -o address@hidden
        mv address@hidden $@
 
 # Run the test suite on the *installed* tree.
Index: tests/generate.awk
--- tests/generate.awk Mon, 03 Sep 2001 16:25:35 +0200 akim
+++ tests/generate.awk Sat, 29 Sep 2001 11:22:45 +0200 akim
@@ -76,12 +76,10 @@
            if (output || error)
              {
                fatal("while getting file " file      \
-                     " found output = " output ","  \
-                     " found error = " error);
-
+                    " found output = " output ","  \
+                    " found error = " error);
              }
            input = normalize(input);
-           printf ("# FOO: %s\n", file);
            printf ("AT_DATA([[%s]],\n[[%s]])\n\n", file, input);
         }
       else
@@ -165,6 +163,6 @@
 }
 
 function fatal(msg) {
-  print "generate.awk: " msg > "/dev/stderr"
+  print "generate.awk: " FILENAME ":" NR ": " msg > "/dev/stderr"
   exit 1
 }