Bug fix to flag values.

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 7aa2e738..9c4836d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 	* dfa.c (lex): Sync with GNU grep. Handle multibyte \s and \S.
 
+	Unrelated:
+
+	* awk.h [ARRAY_MAXED]: Fix value of this and subsequent flags
+	after addition of NULL_FIELD.
+	* eval.c (flags2str): Add NULL_FIELD. Duh.
+
 2013-10-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awkgram.y (mk_assignment): Rework switch to handle Op_assign,
diff --git a/awk.h b/awk.h
index f57e62e9..e2744e53 100644
--- a/awk.h
+++ b/awk.h
@@ -437,10 +437,10 @@ typedef struct exp_node {
 #		define	NULL_FIELD 0x4000    /* this is the null field */
 
 /* type = Node_var_array */
-#		define	ARRAYMAXED	0x4000       /* array is at max size */
-#		define	HALFHAT		0x8000       /* half-capacity Hashed Array Tree;
+#		define	ARRAYMAXED	0x8000       /* array is at max size */
+#		define	HALFHAT		0x10000       /* half-capacity Hashed Array Tree;
 		                                      * See cint_array.c */
-#		define	XARRAY		0x10000
+#		define	XARRAY		0x20000
 } NODE;
 
 #define vname sub.nodep.name
diff --git a/eval.c b/eval.c
index 789832d0..3ae43a8a 100644
--- a/eval.c
+++ b/eval.c
@@ -440,6 +440,7 @@ flags2str(int flagval)
 		{ WSTRCUR, "WSTRCUR" },
 		{ MPFN,	"MPFN" },
 		{ MPZN,	"MPZN" },
+		{ NULL_FIELD, "NULL_FIELD" },
 		{ ARRAYMAXED, "ARRAYMAXED" },
 		{ HALFHAT, "HALFHAT" },
 		{ XARRAY, "XARRAY" },