safety commit

lang/m2/comp/node.H

@@ -11,24 +11,16 @@ struct node {
 #define Oper	2		/* binary operator */
 #define Uoper	3		/* unary operator */
 #define Call	4		/* cast or procedure - or function call */
-#define Name	5		/* a qualident */
+#define Name	5		/* an identifier */
 #define Set	6		/* a set constant */
 #define Xset	7		/* a set */
 #define Def	8		/* an identified name */
+#define Stat	9		/* a statement */
 #define Link	11
 	struct type *nd_type;	/* type of this node */
-	union {
-		struct token ndu_token;	/* (Value, Oper, Uoper, Call, Name,
-					    Link)
-					*/
-		arith *ndu_set;		/* pointer to a set constant (Set) */
-		struct def *ndu_def;	/* pointer to definition structure for
-					   identified name (Def)
-					*/
-	} nd_val;
-#define nd_token	nd_val.ndu_token
-#define nd_set		nd_val.ndu_set
-#define nd_def		nd_val.ndu_def
+	struct token nd_token;
+#define nd_set		nd_token.tk_data.tk_set
+#define nd_def		nd_token.tk_data.tk_def
 #define nd_symb		nd_token.tk_symb
 #define nd_lineno	nd_token.tk_lineno
 #define nd_filename	nd_token.tk_filename