(struct goto_list): Renamed from struct goto_list_s.

[bison.git] / src / vcg.c

diff --git a/src/vcg.c b/src/vcg.c
index 7bac7876f53fe718e662a148451747a0bd49b640..c9b98b8f16527d725ca3582982803aa483a3dec3 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -1,5 +1,5 @@
 /* VCG description handler for Bison.
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -23,12 +23,14 @@
 #include "vcg_defaults.h"
 #include "quotearg.h"
 
-/* Return an unambiguous printable representated, allocated in slot 0,
-   for NAME, suitable for C strings.  */
+/* Return an unambiguous printable representated, for NAME, suitable
+   for C strings.  Use slot 2 since the user may use slots 0 and 1.
+   */
+
 static char const *
 quote (char const *name)
 {
-  return quotearg_n_style (0, c_quoting_style, name);
+  return quotearg_n_style (2, c_quoting_style, name);
 }
 
 
@@ -241,10 +243,8 @@ get_color_str (enum color_e c)
     case orange:       return "orange";
     case orchid:       return "orchid";
     case black:                return "black";
-    default:
-      assert (!"Not a default color.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -255,10 +255,8 @@ get_textmode_str (enum textmode_e t)
     case centered:     return "center";
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
-    default:
-      assert (!"Not a text mode.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -270,10 +268,8 @@ get_shape_str (enum shape_e s)
     case rhomb:                return "rhomb";
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
-    default:
-      assert (!"Not a shape.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -295,10 +291,8 @@ get_layoutalgorithm_str (enum layoutalgorithm_e l)
     case minbackward:  return "minbackward";
     case dfs:          return "dfs";
     case tree:         return "tree";
-    default:
-      assert (!"Not a layout algorithm.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -308,10 +302,8 @@ get_decision_str (enum decision_e d)
     {
     case no:   return "no";
     case yes:  return "yes";
-    default:
-      assert (!"Either yes nor no.");
+    default:   abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -323,10 +315,8 @@ get_orientation_str (enum orientation_e o)
     case bottom_to_top: return "bottom_to_top";
     case left_to_right: return "left_to_right";
     case right_to_left: return "right_to_left";
-    default:
-      assert (!"Not an orientation.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -337,10 +327,8 @@ get_node_alignement_str (enum alignement_e a)
     case center:       return "center";
     case top:          return "top";
     case bottom:       return "bottom";
-    default:
-      assert (!"Not an alignement.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -350,10 +338,8 @@ get_arrow_mode_str (enum arrow_mode_e a)
     {
     case fixed:                return "fixed";
     case free_a:       return "free";
-    default:
-      assert (!"Not an arrow mode.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -365,10 +351,8 @@ get_crossing_type_str (enum crossing_type_e c)
     case median:       return "median";
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
-    default:
-      assert (!"Not a crossing type.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -381,10 +365,8 @@ get_view_str (enum view_e v)
     case pfish:                return "pfish";
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
-    default:
-      assert (!"Not a view.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -396,10 +378,8 @@ get_linestyle_str (enum linestyle_e l)
     case dashed:       return "dashed";
     case dotted:       return "dotted";
     case invisible:    return "invisible";
-    default:
-      assert (!"Not a line style.");
+    default:           abort (); return NULL;
     }
-  return NULL;
 }
 
 static const char *
@@ -410,10 +390,8 @@ get_arrowstyle_str (enum arrowstyle_e a)
     case solid:        return "solid";
     case line: return "line";
     case none: return "none";
-    default:
-      assert (!"Not an arrow style.");
+    default:   abort (); return NULL;
     }
-  return NULL;
 }
 
 /*----------------------------.