[bison-1_29-branch] assert-vcg.patch

[marc-alexandre autret]

Change complain () to assert () in vcg.c.
The error message is destinated to the developper.




--- bison/src/vcg.c     Wed Aug 15 10:49:20 2001
+++ bison-modif/src/vcg.c       Thu Aug 16 00:47:33 2001
@@ -22,7 +22,6 @@
 #include "vcg.h"
 #include "vcg_defaults.h"
 #include "xalloc.h"
-#include "complain.h"
 
 /* Initialize a graph with the default values. */
 void
@@ -231,8 +230,7 @@
     case orchid:       return "orchid";
     case black:                return "black";
     default:
-      complain (_("vcg graph: no such color."));
-      return get_color_str(G_COLOR);
+      assert (!"Not a default color.");
     }
   return NULL;
 }
@@ -246,8 +244,7 @@
     case left_justify: return "left_justify";
     case right_justify:        return "right_justify";
     default:
-      complain (_("vcg graph: no such text mode"));
-      return get_textmode_str(G_TEXTMODE);
+      assert (!"Not a text mode.");
     }
   return NULL;
 }
@@ -262,8 +259,7 @@
     case ellipse:      return "ellipse";
     case triangle:     return "triangle";
     default:
-      complain (_("vcg graph: no such shape"));
-      return get_shape_str(G_SHAPE);
+      assert (!"Not a shape.");
     }
   return NULL;
 }
@@ -288,7 +284,7 @@
     case dfs:          return "dfs";
     case tree:         return "tree";
     default:
-      return "normal";
+      assert (!"Not a layout algorithm.");
     }
   return NULL;
 }
@@ -301,8 +297,7 @@
     case no:   return "no";
     case yes:  return "yes";
     default:
-      complain (_("vcg graph: no such decision"));
-      return get_decision_str(defaults, 0);
+      assert (!"Either yes nor no.");
     }
   return NULL;
 }
@@ -317,8 +312,7 @@
     case left_to_right: return "left_to_right";
     case right_to_left: return "right_to_left";
     default:
-      complain (_("vcg graph: no such an orientation"));
-      return get_orientation_str(G_ORIENTATION);
+      assert (!"Not an orientation.");
     }
   return NULL;
 }
@@ -332,8 +326,7 @@
     case top:          return "top";
     case bottom:       return "bottom";
     default:
-      complain (_("vcg graph: no such an alignement"));
-      return get_node_alignement_str(G_NODE_ALIGNEMENT);
+      assert (!"Not a alignement.");
     }
   return NULL;
 }
@@ -346,8 +339,7 @@
     case fixed:                return "fixed";
     case free_a:       return "free";
     default:
-      complain (_("vcg graph: no such an arrow mode"));
-      return get_arrow_mode_str(G_ARROW_MODE);
+      assert (!"Not an arrow mode.");
     }
   return NULL;
 }
@@ -362,8 +354,7 @@
     case barymedian:   return "barymedian";
     case medianbary:   return "medianbary";
     default:
-      complain (_("vcg graph: no such crossing_type"));
-      return get_crossing_type_str(G_CROSSING_WEIGHT);
+      assert (!"Not a crossing type.");
     }
   return NULL;
 }
@@ -379,8 +370,7 @@
     case fcfish:       return "fcfish";
     case fpfish:       return "fpfish";
     default:
-      complain (_("vcg graph: no such view"));
-      return get_view_str(G_VIEW);
+      assert (!"Not a view.");
     }
   return NULL;
 }
@@ -395,8 +385,7 @@
     case dotted:       return "dotted";
     case invisible:    return "invisible";
     default:
-      complain (_("vcg graph: no such linestyle"));
-      return get_linestyle_str(E_LINESTYLE);
+      assert (!"Not a line style.");
     }
   return NULL;
 }
@@ -410,8 +399,7 @@
     case line: return "line";
     case none: return "none";
     default:
-      complain (_("vcg graph: no such an arrowstyle"));
-      return get_arrowstyle_str(E_ARROWSTYLE);
+      assert (!"Not an arrow style.");
     }
   return NULL;
 }
--- bison/ChangeLog     Wed Aug 15 10:44:16 2001
+++ bison-modif/ChangeLog       Thu Aug 16 13:31:01 2001
@@ -1,3 +1,16 @@
+2001-08-16  Marc Autret  <address@hidden>
+
+       * src/vcg.c (get_xxxxx_str): Use assert () instead of complain ().
+
+
 2001-08-15  Akim Demaille  <address@hidden>
 
        Version 1.28c.


-- 
Autret Marc (address@hidden)
Eleve Ingenieur en Informatique