* tests/regression.at, tests/torture.at, tests/calc.at: Adjust to

[bison.git] / src / vcg.h

diff --git a/src/vcg.h b/src/vcg.h
index 2df5e4e443b90066e6e62908535c7551126e7912..8935cc1b10080f8f018a40298b17b3c809abf3e7 100644 (file)
--- a/src/vcg.h
+++ b/src/vcg.h
@@ -89,7 +89,7 @@ struct colorentry_s
 struct classname_s
 {
   int no; /* Class number */
 struct classname_s
 {
   int no; /* Class number */

-  char *name; /* Name associated to the class no. */
+  const char *name; /* Name associated to the class no. */

   struct classname_s *next; /* next name class association. */
 };
 
   struct classname_s *next; /* next name class association. */
 };
 


@@ -97,7 +97,7 @@ struct classname_s
 struct infoname_s
 {
   int integer;
 struct infoname_s
 {
   int integer;

-  char *string;
+  const char *string;

   struct infoname_s *next;
 };
 
   struct infoname_s *next;
 };
 


@@ -179,13 +179,13 @@ struct node_s
 {
   /* Title the unique string identifying the node. This attribute is
      mandatory. */
 {
   /* Title the unique string identifying the node. This attribute is
      mandatory. */

-  char *title;
+  const char *title;

 
   /* Label the text displayed inside the node. If no label is specified
      then the title of the node will be used. Note that this text may
      contain control characters like NEWLINE that influences the size of
      the node. */
 
   /* Label the text displayed inside the node. If no label is specified
      then the title of the node will be used. Note that this text may
      contain control characters like NEWLINE that influences the size of
      the node. */

-  char *label;
+  const char *label;

 
   /* loc is the location as x, y position relatively to the system of
      coordinates of the graph. Locations are specified in the form
 
   /* loc is the location as x, y position relatively to the system of
      coordinates of the graph. Locations are specified in the form


@@ -295,7 +295,7 @@ struct node_s
   /* info2, info3 can be selected from the menu. The corresponding text
      labels can be shown by mouse clicks on nodes.\f
      Default are null strings. */
   /* info2, info3 can be selected from the menu. The corresponding text
      labels can be shown by mouse clicks on nodes.\f
      Default are null strings. */

-  char *infos[3];
+  const char *infos[3];

 
   /* Node border color.
      Default is textcolor. */
 
   /* Node border color.
      Default is textcolor. */


@@ -501,19 +501,19 @@ struct    graph_s
      index 2, green has index 3, etc.
      Default is white for background and white or transparent for summary
      nodes. */
      index 2, green has index 3, etc.
      Default is white for background and white or transparent for summary
      nodes. */

-  unsigned char color;
+  enum color_e color;

 
   /* Textcolor.
      need explainations ???
      defalut is black for summary nodes. */
 
   /* Textcolor.
      need explainations ???
      defalut is black for summary nodes. */

-  unsigned char textcolor;
+  enum color_e textcolor;

 
   /* Bordercolor is the color of the summary node's border. Default color
      is the textcolor. width, height are width and height of the
      displayed part of the window of the outermost graph in pixels, or
      width and height of the summary node of inner subgraphs.
      Default is the defalut of the textcolor. */
 
   /* Bordercolor is the color of the summary node's border. Default color
      is the textcolor. width, height are width and height of the
      displayed part of the window of the outermost graph in pixels, or
      width and height of the summary node of inner subgraphs.
      Default is the defalut of the textcolor. */

-  unsigned char bordercolor;
+  enum color_e bordercolor;

 
   /* Width, height are width and height of the displayed part of the
      window of the outermost graph in pixels, or width and height of the
 
   /* Width, height are width and height of the displayed part of the
      window of the outermost graph in pixels, or width and height of the


@@ -999,16 +999,21 @@ void new_edge PARAMS ((edge_t *edge));
 void add_node PARAMS ((graph_t *graph, node_t *node));
 void add_edge PARAMS ((graph_t *graph, edge_t *edge));
 
 void add_node PARAMS ((graph_t *graph, node_t *node));
 void add_edge PARAMS ((graph_t *graph, edge_t *edge));
 

-void open_node PARAMS ((struct obstack *os));
-void output_node PARAMS ((node_t *node, struct obstack *os));
-void close_node PARAMS ((struct obstack *os));
+void add_colorentry PARAMS ((graph_t *g, int color_idx, int red_cp, 
+                            int green_cp, int blue_cp));
+void add_classname PARAMS ((graph_t *g, int val, const char *name));
+void add_infoname PARAMS ((graph_t *g, int val, const char *name));
+
+void open_node PARAMS ((FILE *fout));
+void output_node PARAMS ((node_t *node, FILE *fout));
+void close_node PARAMS ((FILE *fout));

 
 

-void open_edge PARAMS ((edge_t *edge, struct obstack *os));
-void output_edge PARAMS ((edge_t *edge, struct obstack *os));
-void close_edge PARAMS ((struct obstack *os));
+void open_edge PARAMS ((edge_t *edge, FILE *fout));
+void output_edge PARAMS ((edge_t *edge, FILE *fout));
+void close_edge PARAMS ((FILE *fout));

 
 

-void open_graph PARAMS ((struct obstack *os));
-void output_graph PARAMS ((graph_t *graph, struct obstack *os));
-void close_graph PARAMS ((graph_t *graph, struct obstack *os));
+void open_graph PARAMS ((FILE *fout));
+void output_graph PARAMS ((graph_t *graph, FILE *fout));
+void close_graph PARAMS ((graph_t *graph, FILE *fout));

 
 #endif /* VCG_H_ */
 
 #endif /* VCG_H_ */