From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 22 Jul 2004 14:39:58 +0000 (+0000)
Subject: (symbol_destructors_output, symbol_printers_output):
X-Git-Tag: BISON-2_0~131
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ee42c6166b14ae855c6c1ffc100d5aead31175e2?ds=sidebyside

(symbol_destructors_output, symbol_printers_output):
Don't assume %union.
---

diff --git a/src/output.c b/src/output.c
index d004604e..a77546f1 100644
--- a/src/output.c
+++ b/src/output.c
@@ -402,16 +402,18 @@ symbol_destructors_output (FILE *out)
 
 	/* Filename, lineno,
 	   Symbol-name, Symbol-number,
-	   destructor, typename. */
+	   destructor, optional typename.  */
 	fprintf (out, "%s[", sep);
 	sep = ",\n";
 	escaped_file_name_output (out, sym->destructor_location.start.file);
-	fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
+	fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]]",
 		 sym->destructor_location.start.line,
 		 sym->tag,
 		 sym->number,
-		 sym->destructor,
-		 sym->type_name);
+		 sym->destructor);
+	if (sym->type_name)
+	  fprintf (out, ", [[%s]]", sym->type_name);
+	fputc (']', out);
       }
   fputs ("])\n\n", out);
 }
@@ -435,16 +437,18 @@ symbol_printers_output (FILE *out)
 
 	/* Filename, lineno,
 	   Symbol-name, Symbol-number,
-	   printer, typename. */
+	   printer, optional typename.  */
 	fprintf (out, "%s[", sep);
 	sep = ",\n";
 	escaped_file_name_output (out, sym->printer_location.start.file);
-	fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
+	fprintf (out, ", [[%d]], [[%s]], [[%d]], [[%s]]",
 		 sym->printer_location.start.line,
 		 sym->tag,
 		 sym->number,
-		 sym->printer,
-		 sym->type_name);
+		 sym->printer);
+	if (sym->type_name)
+	  fprintf (out, ", [[%s]]", sym->type_name);
+	fputc (']', out);
       }
   fputs ("])\n\n", out);
 }