* bootstrap: Comment out the AM_CPPFLAGS line, since we don't use

[bison.git] / src / vcg.c

diff --git a/src/vcg.c b/src/vcg.c
index e76d49b2674e93dd8b1c9f7d5a5fe0edd852cfc7..25fbb64ec8e7253d3148cc422552b0c10be4a3de 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -1,6 +1,7 @@
 /* VCG description handler for Bison.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -16,9 +17,10 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
+#include <config.h>
 #include "system.h"
 
 #include <quotearg.h>
@@ -203,7 +205,7 @@ new_edge (edge *e)
 }
 
 /*----------------------------------------------.
-| Get functions.                                       |
+| Get functions.                               |
 | Return string corresponding to an enum value. |
 `----------------------------------------------*/
 
@@ -212,6 +214,7 @@ get_color_str (enum color color)
 {
   switch (color)
     {
+    default:           abort ();
     case white:                return "white";
     case blue:         return "blue";
     case red:          return "red";
@@ -244,7 +247,6 @@ get_color_str (enum color color)
     case orange:       return "orange";
     case orchid:       return "orchid";
     case black:                return "black";
-    default:           abort (); return NULL;
     }
 }
 
@@ -253,10 +255,10 @@ get_textmode_str (enum textmode textmode)
 {
   switch (textmode)
     {
+    default:           abort ();
     case centered:     return "center";
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
-    default:           abort (); return NULL;
     }
 }
 
@@ -265,11 +267,11 @@ get_shape_str (enum shape shape)
 {
   switch (shape)
     {
+    default:           abort ();
     case box:          return "box";
     case rhomb:                return "rhomb";
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
-    default:           abort (); return NULL;
     }
 }
 
@@ -278,9 +280,9 @@ get_decision_str (enum decision decision)
 {
   switch (decision)
     {
+    default:   abort ();
     case no:   return "no";
     case yes:  return "yes";
-    default:   abort (); return NULL;
     }
 }
 
@@ -289,11 +291,11 @@ get_orientation_str (enum orientation orientation)
 {
   switch (orientation)
     {
+    default:           abort ();
     case top_to_bottom:        return "top_to_bottom";
     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:           abort (); return NULL;
     }
 }
 
@@ -302,10 +304,10 @@ get_node_alignment_str (enum alignment alignment)
 {
   switch (alignment)
     {
+    default:           abort ();
     case center:       return "center";
     case top:          return "top";
     case bottom:       return "bottom";
-    default:           abort (); return NULL;
     }
 }
 
@@ -314,9 +316,9 @@ get_arrow_mode_str (enum arrow_mode arrow_mode)
 {
   switch (arrow_mode)
     {
+    default:           abort ();
     case fixed:                return "fixed";
     case free_a:       return "free";
-    default:           abort (); return NULL;
     }
 }
 
@@ -325,11 +327,11 @@ get_crossing_type_str (enum crossing_type crossing_type)
 {
   switch (crossing_type)
     {
+    default:           abort ();
     case bary:         return "bary";
     case median:       return "median";
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
-    default:           abort (); return NULL;
     }
 }
 
@@ -340,11 +342,11 @@ get_view_str (enum view view)
      so it is an error here if view == normal_view.  */
   switch (view)
     {
+    default:           abort ();
     case cfish:                return "cfish";
     case pfish:                return "pfish";
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
-    default:           abort (); return NULL;
     }
 }
 
@@ -353,11 +355,11 @@ get_linestyle_str (enum linestyle linestyle)
 {
   switch (linestyle)
     {
+    default:           abort ();
     case continuous:   return "continuous";
     case dashed:       return "dashed";
     case dotted:       return "dotted";
     case invisible:    return "invisible";
-    default:           abort (); return NULL;
     }
 }
 
@@ -366,15 +368,15 @@ get_arrowstyle_str (enum arrowstyle arrowstyle)
 {
   switch (arrowstyle)
     {
+    default:   abort ();
     case solid:        return "solid";
     case line: return "line";
     case none: return "none";
-    default:   abort (); return NULL;
     }
 }
 
 /*------------------------------.
-| Add functions.                       |
+| Add functions.               |
 | Edge and nodes into a graph.  |
 `------------------------------*/
 
@@ -584,8 +586,7 @@ output_edge (edge *e, FILE *fout)
     fprintf (fout, "\t\tlabel:\t%s\n", quote (e->label));
 
   if (e->linestyle != E_LINESTYLE)
-    fprintf (fout, "\t\tlinestyle:\t%s\n",
-            quote (get_linestyle_str (e->linestyle)));
+    fprintf (fout, "\t\tlinestyle:\t%s\n", get_linestyle_str (e->linestyle));
 
   if (e->thickness != E_THICKNESS)
     fprintf (fout, "\t\tthickness:\t%d\n", e->thickness);
@@ -809,7 +810,7 @@ output_graph (graph *g, FILE *fout)
     fprintf (fout, "\tcrossing_optimization:\t%s\n",
             get_decision_str (g->crossing_optimization));
 
-  if (g->view != G_VIEW)
+  if (g->view != normal_view)
     fprintf (fout, "\tview:\t%s\n", get_view_str (g->view));
 
   if (g->edges != G_EDGES)