Merge remote-tracking branch 'origin/maint'

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index c64c7aa0b3a98a8edb0c32fbd63517cb3af7b507..b543cbab97192754a6be7a18667249335e58c79e 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.
 
 /* Output the generated parsing program for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software

    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -90,7 +90,7 @@ Name (char const *name,                                                 \
                                                                         \
   lmin = min;                                                           \
   lmax = max;                                                           \
                                                                         \
   lmin = min;                                                           \
   lmax = max;                                                           \

-  /* Build `NAME_min' and `NAME_max' in the obstack. */                 \
+  /* Build 'NAME_min' and 'NAME_max' in the obstack. */                 \

   obstack_printf (&format_obstack, "%s_min", name);                     \
   MUSCLE_INSERT_LONG_INT (obstack_finish0 (&format_obstack), lmin);     \
   obstack_printf (&format_obstack, "%s_max", name);                     \
   obstack_printf (&format_obstack, "%s_min", name);                     \
   MUSCLE_INSERT_LONG_INT (obstack_finish0 (&format_obstack), lmin);     \
   obstack_printf (&format_obstack, "%s_max", name);                     \


@@ -284,10 +284,10 @@ prepare_states (void)
 static int
 symbol_type_name_cmp (const symbol **lhs, const symbol **rhs)
 {
 static int
 symbol_type_name_cmp (const symbol **lhs, const symbol **rhs)
 {

-  int res = UNIQSTR_CMP((*lhs)->type_name, (*rhs)->type_name);
-  if (res)
-    return res;
-  return (*lhs)->number - (*rhs)->number;
+  int res = uniqstr_cmp ((*lhs)->type_name, (*rhs)->type_name);
+  if (!res)
+    res = (*lhs)->number - (*rhs)->number;
+  return res;

 }
 
 
 }
 
 


@@ -318,7 +318,7 @@ type_names_output (FILE *out)
   fputs ("m4_define([b4_type_names],\n[", out);
   for (i = 0; i < nsyms; /* nothing */)
     {
   fputs ("m4_define([b4_type_names],\n[", out);
   for (i = 0; i < nsyms; /* nothing */)
     {

-      // The index of the first symbol of the current type-name.
+      /* The index of the first symbol of the current type-name.  */

       int i0 = i;
       fputs (i ? ",\n[" : "[", out);
       for (; i < nsyms && syms[i]->type_name == syms[i0]->type_name; ++i)
       int i0 = i;
       fputs (i ? ",\n[" : "[", out);
       for (; i < nsyms && syms[i]->type_name == syms[i0]->type_name; ++i)


@@ -415,16 +415,16 @@ prepare_symbol_definitions (void)
                       i, Entry, Suffix);                        \
       key = obstack_finish0 (&format_obstack);
 
                       i, Entry, Suffix);                        \
       key = obstack_finish0 (&format_obstack);
 

-      // Whether the symbol has an identifier.
+      /* Whether the symbol has an identifier.  */

       value = symbol_id_get (sym);
       SET_KEY("has_id");
       MUSCLE_INSERT_INT (key, !!value);
 
       value = symbol_id_get (sym);
       SET_KEY("has_id");
       MUSCLE_INSERT_INT (key, !!value);
 

-      // Its identifier.
+      /* Its identifier.  */

       SET_KEY("id");
       MUSCLE_INSERT_STRING (key, value ? value : "");
 
       SET_KEY("id");
       MUSCLE_INSERT_STRING (key, value ? value : "");
 

-      // Its tag.  Typically for documentation purpose.
+      /* Its tag.  Typically for documentation purpose.  */

       SET_KEY("tag");
       MUSCLE_INSERT_STRING (key, sym->tag);
 
       SET_KEY("tag");
       MUSCLE_INSERT_STRING (key, sym->tag);
 


@@ -533,7 +533,7 @@ muscles_output (FILE *out)
   symbol_numbers_output (out);
   type_names_output (out);
   user_actions_output (out);
   symbol_numbers_output (out);
   type_names_output (out);
   user_actions_output (out);

-  // Must be last.
+  /* Must be last.  */

   muscles_m4_output (out);
 }
 \f
   muscles_m4_output (out);
 }
 \f