Add field reference changes. Currently breaks sortglos test.

1 files changed, 20 insertions, 4 deletions

diff --git a/interpret.h b/interpret.h
index 74f56c73..83ccbfc5 100644
--- a/interpret.h
+++ b/interpret.h
@@ -340,7 +340,12 @@ uninitialized_scalar:
 			lhs = r_get_field(t1, (Func_ptr *) 0, true);
 			decr_sp();
 			DEREF(t1);
-			r = dupnode(*lhs);     /* can't use UPREF here */
+			/* only for $0, up ref count */
+			if (*lhs == fields_arr[0]) {
+				r = *lhs;
+				UPREF(r);
+			} else
+				r = dupnode(*lhs);
 			PUSH(r);
 			break;
 
@@ -649,11 +654,22 @@ mod:
 			lhs = get_lhs(pc->memory, false);
 			unref(*lhs);
 			r = pc->initval;	/* constant initializer */
-			if (r == NULL)
-				*lhs = POP_SCALAR();
-			else {
+			if (r != NULL) {
 				UPREF(r);
 				*lhs = r;
+			} else {
+				r = POP_SCALAR();
+
+				/* if was a field, turn it into a var */
+				if ((r->flags & FIELD) == 0) {
+					*lhs = r;
+				} else if (r->valref == 1) {
+					r->flags &= ~FIELD;
+					*lhs = r;
+				} else {
+					*lhs = dupnode(r);
+					DEREF(r);
+				}
 			}
 			break;