X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ce4d5ce009fe91e1da3740abd9c5941521a1cd07..f8e8262e7011a26ef57d3186d33a8e68859832d4:/src/vcg_defaults.h

diff --git a/src/vcg_defaults.h b/src/vcg_defaults.h
index c2c2d944..36d49bbb 100644
--- 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 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,11 +23,11 @@
 # 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
@@ -42,13 +43,16 @@
 # define G_FOLDING		0
 
 # define G_SHRINK		1
-# define G_STRETCH		1
+# define G_EXPAND		1
 
 # 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
@@ -61,9 +65,12 @@
 # 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,20 +105,19 @@
 
 # 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			INT_MAX
 # 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 */
@@ -123,7 +129,7 @@
 # define N_HEIGHT		-1	/* also. */
 
 # define N_SHRINK		1
-# define N_STRETCH		1
+# define N_EXPAND		1
 
 # define N_FOLDING		-1	/* no explicit default value. */
 
@@ -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
@@ -170,6 +176,6 @@
 
 # define E_HORIZONTAL_ORDER	-1
 
-# define E_NEXT			0
+# define E_NEXT			NULL
 
 #endif /* not VCG_DEFAULTS_H_ */