* src/vcg.h: Comment fix.

* src/vcg_defaults.h: Parenthesize macro bodies to make them safe.
(G_CMAX): Change to -1 instead of INT_MAX.

diff --git a/ChangeLog b/ChangeLog
index 8105cb01283bad8d0af541c085d601d51a568841..ab800501a62678ea234119181855f662b5e19d1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * src/vcg.h: Comment fix.
+       * src/vcg_defaults.h: Parenthesize macro bodies to make them safe.
+       (G_CMAX): Change to -1 instead of INT_MAX.
+
+       * data/yacc.c (yyparse): Omit spaces before #line.
+       Problem reported by twlevo@xs4all.nl.
+

 2005-03-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/tables.c (state_number_to_vector_number): Put it inside an
 2005-03-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/tables.c (state_number_to_vector_number): Put it inside an

diff --git a/src/vcg.h b/src/vcg.h
index c50a290358aceecb6bd36b8e25bd413cd1a1a801..76964de4f1ddcd300af4a1747d1d2b00a2f31385 100644 (file)
--- a/src/vcg.h
+++ b/src/vcg.h
@@ -1,6 +1,6 @@
 /* VCG description handler for Bison.
 
 /* VCG description handler for Bison.
 

-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.

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


@@ -884,8 +884,8 @@ struct graph
   int cmin;
 
   /* Cmax set the maximal number of interactions for crossing reduction.
   int cmin;
 
   /* Cmax set the maximal number of interactions for crossing reduction.

-     This is helpful for speedup the layout process.
-     Default is infinite. */
+     This is helpful for speeding up the layout process.
+     Default is -1, which represents infinity.  */

   int cmax;
 
   /* Pmin set the minimal number of iterations that is done with the
   int cmax;
 
   /* Pmin set the minimal number of iterations that is done with the

diff --git a/src/vcg_defaults.h b/src/vcg_defaults.h
index a2d3a0ce2be42871483d5701ec055f92003a72aa..ee7bf4d5433ff9f21a431680c54f0410e61d3a21 100644 (file)
--- a/src/vcg_defaults.h
+++ b/src/vcg_defaults.h
@@ -1,6 +1,6 @@
 /* VCG description handler for Bison.
 
 /* VCG description handler for Bison.
 

-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.

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


@@ -59,13 +59,13 @@
 
 # define G_XSPACE              20
 # define G_YSPACE              70
 
 # define G_XSPACE              20
 # define G_YSPACE              70

-# define G_XLSPACE             G_XSPACE / 2    /* Not output */
+# define G_XLSPACE             (G_XSPACE / 2)  /* Not output */

 
 # define G_XRASTER             1
 # define G_YRASTER             1
 # define G_XLRASTER            1
 
 
 # define G_XRASTER             1
 # define G_YRASTER             1
 # define G_XLRASTER            1
 

-# define G_HIDDEN              -1      /* No default value. */
+# define G_HIDDEN              (-1)    /* No default value. */

 
 # define G_CLASSNAME           NULL    /* No class name association */
 # define G_INFONAME            NULL
 
 # define G_CLASSNAME           NULL    /* No class name association */
 # define G_INFONAME            NULL


@@ -105,7 +105,7 @@
 
 # define G_BMAX                        100
 # define G_CMIN                        0
 
 # define G_BMAX                        100
 # define G_CMIN                        0

-# define G_CMAX                        INT_MAX
+# define G_CMAX                        (-1)    /* Infinity */

 # define G_PMIN                        0
 # define G_PMAX                        100
 # define G_RMIN                        0
 # define G_PMIN                        0
 # define G_PMAX                        100
 # define G_RMIN                        0


@@ -119,19 +119,19 @@
 # define N_TITLE               NULL
 # define N_LABEL               NULL
 
 # define N_TITLE               NULL
 # define N_LABEL               NULL
 

-# define N_LOCX                        -1      /* Default unspcified */
-# define N_LOCY                        -1      /* Default unspcified */
+# define N_LOCX                        (-1)    /* Default unspcified */
+# define N_LOCY                        (-1)    /* Default unspcified */

 
 

-# define N_VERTICAL_ORDER      -1      /* Default unspcified */
-# define N_HORIZONTAL_ORDER    -1      /* Default unspcified */
+# define N_VERTICAL_ORDER      (-1)    /* Default unspcified */
+# define N_HORIZONTAL_ORDER    (-1)    /* Default unspcified */

 
 

-# define N_WIDTH               -1      /* We assume that we can't define it now. */
-# define N_HEIGHT              -1      /* also. */
+# define N_WIDTH               (-1)    /* We assume that we can't define it now. */
+# define N_HEIGHT              (-1)    /* also. */

 
 # define N_SHRINK              1
 # define N_STRETCH             1
 
 
 # define N_SHRINK              1
 # define N_STRETCH             1
 

-# define N_FOLDING             -1      /* no explicit default value. */
+# define N_FOLDING             (-1)    /* no explicit default value. */

 
 # define N_SHAPE               box
 # define N_TEXTMODE            centered
 
 # define N_SHAPE               box
 # define N_TEXTMODE            centered


@@ -172,9 +172,9 @@
 
 # define E_PRIORITY            1
 
 
 # define E_PRIORITY            1
 

-# define E_ANCHOR              -1
+# define E_ANCHOR              (-1)

 
 

-# define E_HORIZONTAL_ORDER    -1
+# define E_HORIZONTAL_ORDER    (-1)

 
 # define E_NEXT                        NULL
 
 
 # define E_NEXT                        NULL