Merge branch 'master' into feature/typed-regex

2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e862c7d..fa1ddbce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* eval.c (flags2str): Add NO_EXT_SET and NUMCONSTSTR.
+
 2016-10-31         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Fix valgrind issues.
diff --git a/eval.c b/eval.c
index e10bd3fc..00da9ee5 100644
--- a/eval.c
+++ b/eval.c
@@ -445,10 +445,12 @@ flags2str(int flagval)
 		{ WSTRCUR, "WSTRCUR" },
 		{ MPFN,	"MPFN" },
 		{ MPZN,	"MPZN" },
+		{ NO_EXT_SET, "NO_EXT_SET" },
 		{ NULL_FIELD, "NULL_FIELD" },
 		{ ARRAYMAXED, "ARRAYMAXED" },
 		{ HALFHAT, "HALFHAT" },
 		{ XARRAY, "XARRAY" },
+		{ NUMCONSTSTR, "NUMCONSTSTR" },
 		{ 0,	NULL },
 	};