Update.

[bison.git] / src / vcg.c

diff --git a/src/vcg.c b/src/vcg.c
index 7bac7876f53fe718e662a148451747a0bd49b640..a5a5a303663c8d0adc2c88e87dd69bb25ca8db78 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -1,5 +1,5 @@
 /* VCG description handler for Bison.
 /* VCG description handler for Bison.

-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.

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


@@ -23,12 +23,14 @@
 #include "vcg_defaults.h"
 #include "quotearg.h"
 
 #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)
 {
 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);

 }
 
 
 }
 
 


@@ -242,7 +244,8 @@ get_color_str (enum color_e c)
     case orchid:       return "orchid";
     case black:                return "black";
     default:
     case orchid:       return "orchid";
     case black:                return "black";
     default:

-      assert (!"Not a default color.");
+#define A_known_default_color 0
+      assert (A_known_default_color);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -256,7 +259,8 @@ get_textmode_str (enum textmode_e t)
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
     default:
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
     default:

-      assert (!"Not a text mode.");
+#define A_known_text_mode 0
+      assert (A_known_text_mode);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -271,7 +275,8 @@ get_shape_str (enum shape_e s)
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
     default:
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
     default:

-      assert (!"Not a shape.");
+#define A_known_shape 0
+      assert (A_known_shape);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -296,7 +301,8 @@ get_layoutalgorithm_str (enum layoutalgorithm_e l)
     case dfs:          return "dfs";
     case tree:         return "tree";
     default:
     case dfs:          return "dfs";
     case tree:         return "tree";
     default:

-      assert (!"Not a layout algorithm.");
+#define A_known_layout_algorithm 0
+      assert (A_known_layout_algorithm);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -309,7 +315,8 @@ get_decision_str (enum decision_e d)
     case no:   return "no";
     case yes:  return "yes";
     default:
     case no:   return "no";
     case yes:  return "yes";
     default:

-      assert (!"Either yes nor no.");
+#define Either_yes_nor_no 0
+      assert (Either_yes_nor_no);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -324,7 +331,8 @@ get_orientation_str (enum orientation_e o)
     case left_to_right: return "left_to_right";
     case right_to_left: return "right_to_left";
     default:
     case left_to_right: return "left_to_right";
     case right_to_left: return "right_to_left";
     default:

-      assert (!"Not an orientation.");
+#define A_knownn_orientation 0
+      assert (A_knownn_orientation);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -338,7 +346,8 @@ get_node_alignement_str (enum alignement_e a)
     case top:          return "top";
     case bottom:       return "bottom";
     default:
     case top:          return "top";
     case bottom:       return "bottom";
     default:

-      assert (!"Not an alignement.");
+#define A_known_alignement 0
+      assert (A_known_alignement);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -351,7 +360,8 @@ get_arrow_mode_str (enum arrow_mode_e a)
     case fixed:                return "fixed";
     case free_a:       return "free";
     default:
     case fixed:                return "fixed";
     case free_a:       return "free";
     default:

-      assert (!"Not an arrow mode.");
+#define A_known_arrow_mode 0
+      assert (A_known_arrow_mode);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -366,7 +376,8 @@ get_crossing_type_str (enum crossing_type_e c)
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
     default:
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
     default:

-      assert (!"Not a crossing type.");
+#define A_known_crossing_type 0
+      assert (A_known_crossing_type);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -382,7 +393,8 @@ get_view_str (enum view_e v)
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
     default:
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
     default:

-      assert (!"Not a view.");
+#define A_known_view 0
+      assert (A_known_view);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -397,7 +409,8 @@ get_linestyle_str (enum linestyle_e l)
     case dotted:       return "dotted";
     case invisible:    return "invisible";
     default:
     case dotted:       return "dotted";
     case invisible:    return "invisible";
     default:

-      assert (!"Not a line style.");
+#define A_known_line_style 0
+      assert (A_known_line_style);

     }
   return NULL;
 }
     }
   return NULL;
 }


@@ -411,7 +424,8 @@ get_arrowstyle_str (enum arrowstyle_e a)
     case line: return "line";
     case none: return "none";
     default:
     case line: return "line";
     case none: return "none";
     default:

-      assert (!"Not an arrow style.");
+#define A_known_arrow_style 0
+      assert (A_known_arrow_style);

     }
   return NULL;
 }
     }
   return NULL;
 }