* src/vcg.h (graph_s): color, textcolor, bordercolor are now

enum color_e.
* src/print_graph.c (print_graph): Initalize graph.layoutalgorithm
to `normal'.
* src/reader.c (parse_token_decl): Initialize token with tok_eof.
* src/lex.h: Adjust prototype.
(token_t): Add `tok_undef'.
* src/lex.c (struct percent_table_struct): Retval is now a token_t.
(parse_percent_token): Now returns token_t.
Add default statement in switch.
(lex): Separate `c' as an input variable, from the token_t result
part.
(unlexed): Is a token_t.

diff --git a/ChangeLog b/ChangeLog
index 7ab7f0b3348194c27534ac127f210743f95e7377..51e6db5bb00450f14542a01ffa810a7efd67f7a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-09-10  Marc Autret   <autret_m@epita.fr>, Akim Demaille  <akim@epita.fr>
+
+       * src/vcg.h (graph_s): color, textcolor, bordercolor are now
+       enum color_e.
+       * src/print_graph.c (print_graph): Initalize graph.layoutalgorithm
+       to `normal'.
+       * src/reader.c (parse_token_decl): Initialize token with tok_eof.
+       * src/lex.h: Adjust prototype.
+       (token_t): Add `tok_undef'.
+       * src/lex.c (struct percent_table_struct): Retval is now a token_t.
+       (parse_percent_token): Now returns token_t.
+       Add default statement in switch.
+       (lex): Separate `c' as an input variable, from the token_t result
+       part.
+       (unlexed): Is a token_t.
+
 2001-09-10  Akim Demaille  <akim@epita.fr>
 
        * configure.in: Bump to 1.29a.

diff --git a/src/lex.c b/src/lex.c
index c3ca98d33290746312cc4261eb041dc0caddd35f..b8846ba9cf45dbfa506265acd89cfa82f919d763 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -36,15 +36,17 @@ const char *token_buffer = NULL;
 bucket *symval;
 int numval;
 
-static int unlexed;            /* these two describe a token to be reread */
-static bucket *unlexed_symval; /* by the next call to lex */
+/* these two describe a token to be reread */
+static token_t unlexed = tok_undef;
+/* by the next call to lex */
+static bucket *unlexed_symval = NULL;
 
 
 void
 init_lex (void)
 {
   obstack_init (&token_obstack);
-  unlexed = -1;
+  unlexed = tok_undef;
 }
 
 
@@ -356,12 +358,12 @@ lex (void)
   /* Just to make sure. */
   token_buffer = NULL;
 
-  if (unlexed >= 0)
+  if (unlexed != tok_undef)
     {
+      token_t res = unlexed;
       symval = unlexed_symval;
-      c = unlexed;
-      unlexed = -1;
-      return c;
+      unlexed = tok_undef;
+      return res;
     }
 
   c = skip_white_space ();
@@ -516,7 +518,7 @@ struct percent_table_struct
 {
   const char *name;
   void *set_flag;
-  int retval;
+  token_t retval;
 };
 
 struct percent_table_struct percent_table[] =
@@ -566,13 +568,12 @@ struct percent_table_struct percent_table[] =
 /* Parse a token which starts with %.
    Assumes the % has already been read and discarded.  */
 
-int
+token_t
 parse_percent_token (void)
 {
-  int c;
   struct percent_table_struct *tx;
 
-  c = getc (finput);
+  int c = getc (finput);
 
   switch (c)
     {
@@ -635,6 +636,10 @@ parse_percent_token (void)
     case tok_obsolete:
       fatal (_("`%s' is no longer supported"), token_buffer);
       break;
+
+    default:
+      /* Other cases do not apply here. */
+      break;
     }
 
   return tx->retval;

diff --git a/src/lex.h b/src/lex.h
index c63309635da6e60eb1eaac9f37bdc96b038646b0..9ded58dee69076af1b7c670f8fcb9669cea4dea1 100644 (file)
--- a/src/lex.h
+++ b/src/lex.h
@@ -24,6 +24,7 @@
 /* Token-type codes. */
 typedef enum token_e
   {
+    tok_undef, /* Not defined.  Used to initial token_t vars. */
     tok_eof,
     tok_identifier,
     tok_comma,
@@ -71,6 +72,6 @@ void read_type_name PARAMS ((FILE *fin));
 
 token_t lex PARAMS ((void));
 
-int parse_percent_token PARAMS ((void));
+token_t parse_percent_token PARAMS ((void));
 
 #endif /* !LEX_H_ */

diff --git a/src/print_graph.c b/src/print_graph.c
index d5fc18359603575771963445a3cd1901cf0b2b69..a021a7c7e1e53c820d5aa6170cbf17c0dfca00a3 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -273,7 +273,7 @@ print_graph (void)
 #endif
 
   graph.display_edge_labels = yes;
-  graph.layoutalgorithm = 0;
+  graph.layoutalgorithm = normal;
 
   graph.port_sharing = no;
   graph.finetuning = yes;

diff --git a/src/reader.c b/src/reader.c
index 93e59de3f40e91d2742d1919934227076593ef29..b4dcea070bb24af24494536c0707400ae79defbc 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -462,8 +462,8 @@ copy_definition (void)
 static void
 parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 {
-  token_t token = 0;
-  char *typename = 0;
+  token_t token = tok_undef;
+  char *typename = NULL;
 
   /* The symbol being defined.  */
   struct bucket *symbol = NULL;
@@ -884,7 +884,7 @@ parse_dquoted_param (const char *from)
   char buff[32];
   int c;
   int i;
-  
+
   c = skip_white_space ();
 
   if (c != '"')
@@ -893,7 +893,7 @@ parse_dquoted_param (const char *from)
       complain (_("invalid %s declaration"), from);
       return NULL;
     }
-  
+
   c = getc (finput);
   for (i = 0; (c >= '!') && (c <= '~'); i++)
     {
@@ -906,12 +906,12 @@ parse_dquoted_param (const char *from)
          if ((c < '!') && (c > '~'))
            break;
        }
-      
+
       buff[i] = c;
       c = getc (finput);
     }
   buff[i] = '\0';
-  
+
   if (c != '"')
     {
       ungetc (c, finput);
@@ -938,7 +938,7 @@ parse_source_extension_decl (void)
 {
   if (src_extension)
     complain (_("multiple %%source_extension declarations"));
-  
+
   src_extension = parse_dquoted_param ("%source_extension");
 }
 

diff --git a/src/vcg.h b/src/vcg.h
index 14ba8625e81df92a8ec10e49a356f1c13fccd882..8c404df7ce2cd318cf89842290240744b7f8c995 100644 (file)
--- a/src/vcg.h
+++ b/src/vcg.h
@@ -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. */
-  unsigned char color;
+  enum color_e color;
 
   /* 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. */
-  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