Merge branch 'gawk-4.1-stable'

3 files changed, 16 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index be06d36e..1450e475 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-06-26         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Repair change of 2015-08-25 to handling of MAYBE_NUM.
+	* mpfr.c (mpg_force_number): Just clear MAYBE_NUM.
+	* node.c (r_force_number): Clear STRING separately after
+	setting NUMBER.
+
+	Thanks to Andrew Schorr for reporting the problem.
+	A test case will eventually be merged into master.
+
 2016-06-16         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* awk.h: Add comment headers for several functions.
diff --git a/mpfr.c b/mpfr.c
index 35d1ac62..f3905cd2 100644
--- a/mpfr.c
+++ b/mpfr.c
@@ -347,7 +347,7 @@ mpg_force_number(NODE *n)
 		return n;
 
 	if ((n->flags & MAYBE_NUM) != 0) {
-		n->flags &= ~(MAYBE_NUM|STRING);
+		n->flags &= ~MAYBE_NUM;
 		newflags = NUMBER;
 	}
 
diff --git a/node.c b/node.c
index 93823270..49d053d4 100644
--- a/node.c
+++ b/node.c
@@ -90,8 +90,9 @@ r_force_number(NODE *n)
 			return n;
 		} else if (n->stlen == 4 && is_ieee_magic_val(n->stptr)) {
 			if ((n->flags & MAYBE_NUM) != 0)
-				n->flags &= ~(MAYBE_NUM|STRING);
+				n->flags &= ~MAYBE_NUM;
 			n->flags |= NUMBER|NUMCUR;
+			n->flags &= ~STRING;
 			n->numbr = get_ieee_magic_val(n->stptr);
 
 			return n;
@@ -116,7 +117,7 @@ r_force_number(NODE *n)
 
 	if ((n->flags & MAYBE_NUM) != 0) {
 		newflags = NUMBER;
-		n->flags &= ~(MAYBE_NUM|STRING);
+		n->flags &= ~MAYBE_NUM;
 	} else
 		newflags = 0;
 
@@ -125,6 +126,7 @@ r_force_number(NODE *n)
 			n->numbr = (AWKNUM)(*cp - '0');
 			n->flags |= newflags;
 			n->flags |= NUMCUR;
+			n->flags &= ~STRING;
 			if (cp == n->stptr)		/* no leading spaces */
 				n->flags |= NUMINT;
 		}
@@ -136,6 +138,7 @@ r_force_number(NODE *n)
 		if (! do_traditional && get_numbase(cp, true) != 10) {
 			n->numbr = nondec2awknum(cp, cpend - cp);
 			n->flags |= NUMCUR;
+			n->flags &= ~STRING;
 			ptr = cpend;
 			goto finish;
 		}