* cp-demangle.c (d_encoding): When DMGL_PARAMS is not set, strip

[pf3gnuchains/gcc-fork.git] / libiberty / testsuite / test-demangle.c

diff --git a/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c
index ed28229..6e00d14 100644 (file)
--- a/libiberty/testsuite/test-demangle.c
+++ b/libiberty/testsuite/test-demangle.c
@@ -1,5 +1,5 @@
 /* Demangler test program,
 /* Demangler test program,

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.

    Written by Zack Weinberg <zack@codesourcery.com
 
    This file is part of GNU libiberty.
    Written by Zack Weinberg <zack@codesourcery.com
 
    This file is part of GNU libiberty.


@@ -80,16 +80,39 @@ getline(buf)
   buf->alloced = alloc;
 }
 
   buf->alloced = alloc;
 }
 

-/* The tester operates on a data file consisting of triples of lines:
-   format switch
+static void
+fail (lineno, opts, in, out, exp)
+     int lineno;
+     const char *opts;
+     const char *in;
+     const char *out;
+     const char *exp;
+{
+  printf ("\
+FAIL at line %d, options %s:\n\
+in:  %s\n\
+out: %s\n\
+exp: %s\n",
+         lineno, opts, in, out != NULL ? out : "(null)", exp);
+}
+
+/* The tester operates on a data file consisting of groups of lines:
+   options

    input to be demangled
    expected output
 
    input to be demangled
    expected output
 

-   The format switch is expected to be either the empty string, a
-   line of the form --format=<name>, or just <name> by itself.  */
+   Supported options:
+     --format=<name>     Sets the demangling style.
+     --no-params         There are two lines of expected output; the first
+                         is with DMGL_PARAMS, the second is without it.
+     --is-v3-ctor        Calls is_gnu_v3_mangled_ctor on input; expected
+                         output is an integer representing ctor_kind.
+     --is-v3-dtor        Likewise, but for dtors.

 
 

-#define FORMATS "--format="
-#define FORMATL (sizeof FORMATS - 1)
+   For compatibility, just in case it matters, the options line may be
+   empty, to mean --format=auto.  If it doesn't start with --, then it
+   may contain only a format name.
+*/

 
 int
 main(argc, argv)
 
 int
 main(argc, argv)


@@ -97,10 +120,12 @@ main(argc, argv)
      char **argv;
 {
   enum demangling_styles style;
      char **argv;
 {
   enum demangling_styles style;

+  int no_params;
+  int is_v3_ctor;
+  int is_v3_dtor;

   struct line format;
   struct line input;
   struct line expect;
   struct line format;
   struct line input;
   struct line expect;

-  char *fstyle;

   char *result;
   int failures = 0;
   int tests = 0;
   char *result;
   int failures = 0;
   int tests = 0;


@@ -126,20 +151,98 @@ main(argc, argv)
 
       tests++;
 
 
       tests++;
 

-      fstyle = format.data;
-      if (!strncmp (fstyle, FORMATS, FORMATL))
-       fstyle += FORMATL;
-
-      if (fstyle[0] == '\0')
+      no_params = 0;
+      is_v3_ctor = 0;
+      is_v3_dtor = 0;
+      if (format.data[0] == '\0')

        style = auto_demangling;
        style = auto_demangling;

+      else if (format.data[0] != '-')
+       {
+         style = cplus_demangle_name_to_style (format.data);
+         if (style == unknown_demangling)
+           {
+             printf ("FAIL at line %d: unknown demangling style %s\n",
+                     lineno, format.data);
+             failures++;
+             continue;
+           }
+       }

       else
       else

-       style = cplus_demangle_name_to_style (fstyle);
+       {
+         char *p;
+         char *opt;

 
 

-      if (style == unknown_demangling)
+         p = format.data;
+         while (*p != '\0')
+           {
+             char c;
+
+             opt = p;
+             p += strcspn (p, " \t=");
+             c = *p;
+             *p = '\0';
+             if (strcmp (opt, "--format") == 0 && c == '=')
+               {
+                 char *fstyle;
+
+                 *p = c;
+                 ++p;
+                 fstyle = p;
+                 p += strcspn (p, " \t");
+                 c = *p;
+                 *p = '\0';
+                 style = cplus_demangle_name_to_style (fstyle);
+                 if (style == unknown_demangling)
+                   {
+                     printf ("FAIL at line %d: unknown demangling style %s\n",
+                             lineno, fstyle);
+                     failures++;
+                     continue;
+                   }
+               }
+             else if (strcmp (opt, "--no-params") == 0)
+               no_params = 1;
+             else if (strcmp (opt, "--is-v3-ctor") == 0)
+               is_v3_ctor = 1;
+             else if (strcmp (opt, "--is-v3-dtor") == 0)
+               is_v3_dtor = 1;
+             else
+               {
+                 printf ("FAIL at line %d: unrecognized option %s\n",
+                         lineno, opt);
+                 failures++;
+                 continue;
+               }
+             *p = c;
+             p += strspn (p, " \t");
+           }
+       }
+
+      if (is_v3_ctor || is_v3_dtor)

        {
        {

-         printf ("FAIL at line %d: unknown demangling style %s\n",
-                 lineno, fstyle);
-         failures++;
+         char buf[20];
+
+         if (is_v3_ctor)
+           {
+             enum gnu_v3_ctor_kinds kc;
+
+             kc = is_gnu_v3_mangled_ctor (input.data);
+             sprintf (buf, "%d", (int) kc);
+           }
+         else
+           {
+             enum gnu_v3_dtor_kinds kd;
+
+             kd = is_gnu_v3_mangled_dtor (input.data);
+             sprintf (buf, "%d", (int) kd);
+           }
+
+         if (strcmp (buf, expect.data) != 0)
+           {
+             fail (lineno, format.data, input.data, buf, expect.data);
+             failures++;
+           }
+

          continue;
        }
 
          continue;
        }
 


@@ -152,18 +255,25 @@ main(argc, argv)
          ? strcmp (result, expect.data)
          : strcmp (input.data, expect.data))
        {
          ? strcmp (result, expect.data)
          : strcmp (input.data, expect.data))
        {

-         printf ("\
-FAIL at line %d, style %s:\n\
-in:  %s\n\
-out: %s\n\
-exp: %s\n",
-                  lineno, fstyle,
-                  input.data,
-                  result,
-                  expect.data);
+         fail (lineno, format.data, input.data, result, expect.data);

          failures++;
        }
       free (result);
          failures++;
        }
       free (result);

+
+      if (no_params)
+       {
+         getline (&expect);
+         result = cplus_demangle (input.data, DMGL_ANSI|DMGL_TYPES);
+
+         if (result
+             ? strcmp (result, expect.data)
+             : strcmp (input.data, expect.data))
+           {
+             fail (lineno, format.data, input.data, result, expect.data);
+             failures++;
+           }
+         free (result);
+       }

     }
 
   free (format.data);
     }
 
   free (format.data);