* src/symlist.c (symbol_list_length): Return int, not unsigned

[bison.git] / src / vcg.c

diff --git a/src/vcg.c b/src/vcg.c
index d5f88141224aecb5beb5a4a38d9b5eda0fb43426..25fbb64ec8e7253d3148cc422552b0c10be4a3de 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -1,6 +1,7 @@
 /* VCG description handler for Bison.
 
 /* VCG description handler for Bison.
 

-   Copyright (C) 2001, 2002, 2003 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.
 
 
    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
 
    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>
 #include "system.h"
 
 #include <quotearg.h>


@@ -59,7 +61,7 @@ new_graph (graph *g)
   g->y = G_Y;
   g->folding = G_FOLDING;
   g->shrink = G_SHRINK;
   g->y = G_Y;
   g->folding = G_FOLDING;
   g->shrink = G_SHRINK;

-  g->expand = G_EXPAND;
+  g->stretch = G_STRETCH;

 
   g->textmode = G_TEXTMODE;
   g->shape = G_SHAPE;
 
   g->textmode = G_TEXTMODE;
   g->shape = G_SHAPE;


@@ -85,7 +87,6 @@ new_graph (graph *g)
 
   g->classname = G_CLASSNAME; /* No class name association. */
 
 
   g->classname = G_CLASSNAME; /* No class name association. */
 

-  g->layoutalgorithm = G_LAYOUTALGORITHM;

   g->layout_downfactor = G_LAYOUT_DOWNFACTOR;
   g->layout_upfactor = G_LAYOUT_UPFACTOR;
   g->layout_nearfactor = G_LAYOUT_NEARFACTOR;
   g->layout_downfactor = G_LAYOUT_DOWNFACTOR;
   g->layout_upfactor = G_LAYOUT_UPFACTOR;
   g->layout_nearfactor = G_LAYOUT_NEARFACTOR;


@@ -149,7 +150,7 @@ new_node (node *n)
   n->height = N_HEIGHT; /* Also. */
 
   n->shrink = N_SHRINK;
   n->height = N_HEIGHT; /* Also. */
 
   n->shrink = N_SHRINK;

-  n->expand = N_EXPAND;
+  n->stretch = N_STRETCH;

 
   n->folding = N_FOLDING; /* No explicit default value. */
 
 
   n->folding = N_FOLDING; /* No explicit default value. */
 


@@ -204,7 +205,7 @@ new_edge (edge *e)
 }
 
 /*----------------------------------------------.
 }
 
 /*----------------------------------------------.

-| Get functions.                                       |
+| Get functions.                               |

 | Return string corresponding to an enum value. |
 `----------------------------------------------*/
 
 | Return string corresponding to an enum value. |
 `----------------------------------------------*/
 


@@ -213,6 +214,7 @@ get_color_str (enum color color)
 {
   switch (color)
     {
 {
   switch (color)
     {

+    default:           abort ();

     case white:                return "white";
     case blue:         return "blue";
     case red:          return "red";
     case white:                return "white";
     case blue:         return "blue";
     case red:          return "red";


@@ -245,7 +247,6 @@ get_color_str (enum color color)
     case orange:       return "orange";
     case orchid:       return "orchid";
     case black:                return "black";
     case orange:       return "orange";
     case orchid:       return "orchid";
     case black:                return "black";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -254,10 +255,10 @@ get_textmode_str (enum textmode textmode)
 {
   switch (textmode)
     {
 {
   switch (textmode)
     {

+    default:           abort ();

     case centered:     return "center";
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
     case centered:     return "center";
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -266,34 +267,11 @@ get_shape_str (enum shape shape)
 {
   switch (shape)
     {
 {
   switch (shape)
     {

+    default:           abort ();

     case box:          return "box";
     case rhomb:                return "rhomb";
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
     case box:          return "box";
     case rhomb:                return "rhomb";
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";

-    default:           abort (); return NULL;
-    }
-}
-
-static const char *
-get_layoutalgorithm_str (enum layoutalgorithm layoutalgorithm)
-{
-  switch (layoutalgorithm)
-    {
-    case normal:               return "normal";
-    case maxdepth:     return "maxdepth";
-    case mindepth:     return "mindepth";
-    case maxdepthslow: return "maxdepthslow";
-    case mindepthslow: return "mindepthslow";
-    case maxdegree:    return "maxdegree";
-    case mindegree:    return "mindegree";
-    case maxindegree:  return "maxindegree";
-    case minindegree:  return "minindegree";
-    case maxoutdegree: return "maxoutdegree";
-    case minoutdegree: return "minoutdegree";
-    case minbackward:  return "minbackward";
-    case dfs:          return "dfs";
-    case tree:         return "tree";
-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -302,9 +280,9 @@ get_decision_str (enum decision decision)
 {
   switch (decision)
     {
 {
   switch (decision)
     {

+    default:   abort ();

     case no:   return "no";
     case yes:  return "yes";
     case no:   return "no";
     case yes:  return "yes";

-    default:   abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -313,11 +291,11 @@ get_orientation_str (enum orientation orientation)
 {
   switch (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";
     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;

     }
 }
 
     }
 }
 


@@ -326,10 +304,10 @@ get_node_alignment_str (enum alignment alignment)
 {
   switch (alignment)
     {
 {
   switch (alignment)
     {

+    default:           abort ();

     case center:       return "center";
     case top:          return "top";
     case bottom:       return "bottom";
     case center:       return "center";
     case top:          return "top";
     case bottom:       return "bottom";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -338,9 +316,9 @@ get_arrow_mode_str (enum arrow_mode arrow_mode)
 {
   switch (arrow_mode)
     {
 {
   switch (arrow_mode)
     {

+    default:           abort ();

     case fixed:                return "fixed";
     case free_a:       return "free";
     case fixed:                return "fixed";
     case free_a:       return "free";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -349,25 +327,26 @@ get_crossing_type_str (enum crossing_type crossing_type)
 {
   switch (crossing_type)
     {
 {
   switch (crossing_type)
     {

+    default:           abort ();

     case bary:         return "bary";
     case median:       return "median";
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
     case bary:         return "bary";
     case median:       return "median";
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";

-    default:           abort (); return NULL;

     }
 }
 
 static const char *
 get_view_str (enum view view)
 {
     }
 }
 
 static const char *
 get_view_str (enum view view)
 {

+  /* There is no way with vcg 1.30 to specify a normal view explicitly,
+     so it is an error here if view == normal_view.  */

   switch (view)
     {
   switch (view)
     {

-    case normal_view:  return "normal_view";
+    default:           abort ();

     case cfish:                return "cfish";
     case pfish:                return "pfish";
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
     case cfish:                return "cfish";
     case pfish:                return "pfish";
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -376,11 +355,11 @@ get_linestyle_str (enum linestyle linestyle)
 {
   switch (linestyle)
     {
 {
   switch (linestyle)
     {

+    default:           abort ();

     case continuous:   return "continuous";
     case dashed:       return "dashed";
     case dotted:       return "dotted";
     case invisible:    return "invisible";
     case continuous:   return "continuous";
     case dashed:       return "dashed";
     case dotted:       return "dotted";
     case invisible:    return "invisible";

-    default:           abort (); return NULL;

     }
 }
 
     }
 }
 


@@ -389,15 +368,15 @@ get_arrowstyle_str (enum arrowstyle arrowstyle)
 {
   switch (arrowstyle)
     {
 {
   switch (arrowstyle)
     {

+    default:   abort ();

     case solid:        return "solid";
     case line: return "line";
     case none: return "none";
     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.  |
 `------------------------------*/
 
 | Edge and nodes into a graph.  |
 `------------------------------*/
 


@@ -559,8 +538,8 @@ output_node (node *n, FILE *fout)
 
   if (n->shrink != N_SHRINK)
     fprintf (fout, "\t\tshrink:\t%d\n", n->shrink);
 
   if (n->shrink != N_SHRINK)
     fprintf (fout, "\t\tshrink:\t%d\n", n->shrink);

-  if (n->expand != N_EXPAND)
-    fprintf (fout, "\t\texpand:\t%d\n", n->expand);
+  if (n->stretch != N_STRETCH)
+    fprintf (fout, "\t\tstretch:\t%d\n", n->stretch);

 
   if (n->folding != N_FOLDING)
     fprintf (fout, "\t\tfolding:\t%d\n", n->folding);
 
   if (n->folding != N_FOLDING)
     fprintf (fout, "\t\tfolding:\t%d\n", n->folding);


@@ -607,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\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);
 
   if (e->thickness != E_THICKNESS)
     fprintf (fout, "\t\tthickness:\t%d\n", e->thickness);


@@ -687,8 +665,8 @@ output_graph (graph *g, FILE *fout)
 
   if (g->shrink != G_SHRINK)
     fprintf (fout, "\tshrink:\t%d\n", g->shrink);
 
   if (g->shrink != G_SHRINK)
     fprintf (fout, "\tshrink:\t%d\n", g->shrink);

-  if (g->expand != G_EXPAND)
-    fprintf (fout, "\texpand:\t%d\n", g->expand);
+  if (g->stretch != G_STRETCH)
+    fprintf (fout, "\tstretch:\t%d\n", g->stretch);

 
   if (g->textmode != G_TEXTMODE)
     fprintf (fout, "\ttextmode:\t%s\n",
 
   if (g->textmode != G_TEXTMODE)
     fprintf (fout, "\ttextmode:\t%s\n",


@@ -761,10 +739,6 @@ output_graph (graph *g, FILE *fout)
        }
     }
 
        }
     }
 

-  if (g->layoutalgorithm != G_LAYOUTALGORITHM)
-    fprintf (fout, "\tlayoutalgorithm:\t%s\n",
-            get_layoutalgorithm_str (g->layoutalgorithm));
-

   if (g->layout_downfactor != G_LAYOUT_DOWNFACTOR)
     fprintf (fout, "\tlayout_downfactor:\t%d\n", g->layout_downfactor);
   if (g->layout_upfactor != G_LAYOUT_UPFACTOR)
   if (g->layout_downfactor != G_LAYOUT_DOWNFACTOR)
     fprintf (fout, "\tlayout_downfactor:\t%d\n", g->layout_downfactor);
   if (g->layout_upfactor != G_LAYOUT_UPFACTOR)


@@ -836,7 +810,7 @@ output_graph (graph *g, FILE *fout)
     fprintf (fout, "\tcrossing_optimization:\t%s\n",
             get_decision_str (g->crossing_optimization));
 
     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)
     fprintf (fout, "\tview:\t%s\n", get_view_str (g->view));
 
   if (g->edges != G_EDGES)