Clean up handling of %destructor for the end token (token 0).

[bison.git] / src / vcg_defaults.h

diff --git a/src/vcg_defaults.h b/src/vcg_defaults.h
index c2c2d944bd52c951690359da5fef842766b8e7dc..78e24b5c795e2ca8aa4b62ab6588c6426640d4ed 100644 (file)
--- a/src/vcg_defaults.h
+++ b/src/vcg_defaults.h
@@ -1,5 +1,6 @@
 /* VCG description handler for Bison.
-   Copyright 2001 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,18 +16,18 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef VCG_DEFAULTS_H_
 # define VCG_DEFAULTS_H_
 
 /* Graph defaults. */
-# define G_TITLE               0
-# define G_LABEL               0
-# define G_INFOS1              0
-# define G_INFOS2              0
-# define G_INFOS3              0
+# define G_TITLE               NULL
+# define G_LABEL               NULL
+# define G_INFOS1              NULL
+# define G_INFOS2              NULL
+# define G_INFOS3              NULL
 
 # define G_COLOR               white
 # define G_TEXTCOLOR           black
@@ -47,23 +48,29 @@
 # define G_TEXTMODE            centered
 # define G_SHAPE               box
 
-# define G_XMAX                        90              /* Not output */
-# define G_YMAX                        90              /* Not output */
+# define G_VERTICAL_ORDER      0       /* Unspecified for subgraphs.  */
+# define G_HORIZONTAL_ORDER    0       /* Unspecified for subgraphs.  */
+
+# define G_XMAX                        90      /* Not output.  */
+# define G_YMAX                        90      /* Not output.  */
 
 # define G_XBASE               5
 # define G_YBASE               5
 
 # 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_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_COLORENTRY          NULL
 
-# define G_CLASSNAME           0               /* No class name association */
 # define G_LAYOUTALGORITHM     normal
 # define G_LAYOUT_DOWNFACTOR   1
 # define G_LAYOUT_UPFACTOR     1
@@ -75,14 +82,14 @@
 # define G_DIRTY_EDGE_LABELS   no
 # define G_FINETUNING          yes
 # define G_IGNORE_SINGLES      no
-# define G_STRAIGHT_PHASE      no
+# define G_LONG_STRAIGHT_PHASE no
 # define G_PRIORITY_PHASE      no
 # define G_MANHATTAN_EDGES     no
 # define G_SMANHATTAN_EDGES    no
 # define G_NEAR_EDGES          yes
 
 # define G_ORIENTATION         top_to_bottom
-# define G_NODE_ALIGNEMENT     center
+# define G_NODE_ALIGNMENT      center
 # define G_PORT_SHARING                yes
 # define G_ARROW_MODE          fixed
 # define G_TREEFACTOR          0.5
@@ -98,34 +105,33 @@
 
 # define G_BMAX                        100
 # define G_CMIN                        0
-/* computes the max value of an int ... */
-# define G_CMAX                        ((unsigned) 1 << (sizeof(int) * 8 - 1)) - 1
+# define G_CMAX                        (-1)    /* Infinity */
 # define G_PMIN                        0
 # define G_PMAX                        100
 # define G_RMIN                        0
 # define G_RMAX                        100
 # define G_SMAX                        100
 
-# define G_NODE_LIST           0
-# define G_EDGE_LIST           0
+# define G_NODE_LIST           NULL
+# define G_EDGE_LIST           NULL
 
 /* Nodes defaults. */
-# define N_TITLE               0
-# define N_LABEL               0
+# 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_FOLDING             -1      /* no explicit default value. */
+# define N_FOLDING             (-1)    /* no explicit default value. */
 
 # define N_SHAPE               box
 # define N_TEXTMODE            centered
@@ -135,18 +141,18 @@
 # define N_TEXTCOLOR           black
 # define N_BORDERCOLOR         N_TEXTCOLOR
 
-# define N_INFOS1              0
-# define N_INFOS2              0
-# define N_INFOS3              0
+# define N_INFOS1              NULL
+# define N_INFOS2              NULL
+# define N_INFOS3              NULL
 
-# define N_NEXT                        0
+# define N_NEXT                        NULL
 
 /* Edge defaults. */
 # define E_EDGE_TYPE           normal_edge
 
-# define E_SOURCENAME          0       /* Mandatory. */
-# define E_TARGETNAME          0       /* Mandatory. */
-# define E_LABEL               0
+# define E_SOURCENAME          NULL    /* Mandatory. */
+# define E_TARGETNAME          NULL    /* Mandatory. */
+# define E_LABEL               NULL
 
 # define E_LINESTYLE           continuous
 # define E_THICKNESS           2
@@ -166,10 +172,10 @@
 
 # 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                        0
+# define E_NEXT                        NULL
 
 #endif /* not VCG_DEFAULTS_H_ */