1 files changed, 25 insertions, 20 deletions

diff --git a/debug.c b/debug.c
index b2961db7..a0830621 100644
--- a/debug.c
+++ b/debug.c
@@ -1736,6 +1736,8 @@ watchpoint_triggered(struct list_item *w)
 		/* new != NULL */
 		if (t2->type == Node_val)
 			w->cur_value = dupnode(t2);
+		else if (t2->type == Node_typedregex)
+			w->cur_value = dupnode(t2);
 		else {
 			w->flags |= CUR_IS_ARRAY;
 			w->cur_size = (t2->type == Node_var_array) ? assoc_length(t2) : 0;
@@ -1748,6 +1750,7 @@ watchpoint_triggered(struct list_item *w)
 			w->flags |= CUR_IS_ARRAY;
 			w->cur_size = assoc_length(t2);
 		} else
+			/* works for Node_typedregex too */
 			w->cur_value = dupnode(t2);
 	}
 
@@ -1790,6 +1793,8 @@ initialize_watch_item(struct list_item *w)
 		} else if (symbol->type == Node_var_array) {
 			w->flags |= CUR_IS_ARRAY;
 			w->cur_size = assoc_length(symbol);
+		} else if (symbol->type == Node_typedregex) {
+			w->cur_value = dupnode(symbol);
 		} /* else
 			can't happen */
 	}
@@ -3699,22 +3704,14 @@ print_memory(NODE *m, NODE *func, Func_print print_func, FILE *fp)
 				print_func(fp, "%g", m->numbr);
 		} else if ((m->flags & STRING) != 0)
 			pp_string_fp(print_func, fp, m->stptr, m->stlen, '"', false);
-		else if ((m->flags & NUMCUR) != 0) {
-#ifdef HAVE_MPFR
-			if ((m->flags & MPFN) != 0)
-				print_func(fp, "%s", mpg_fmt("%R*g", ROUND_MODE, m->mpg_numbr));
-			else if ((m->flags & MPZN) != 0)
-				print_func(fp, "%s", mpg_fmt("%Zd", m->mpg_i));
-			else
-#endif
-				print_func(fp, "%g", m->numbr);
-		} else if ((m->flags & STRCUR) != 0)
-			pp_string_fp(print_func, fp, m->stptr, m->stlen, '"', false);
 		else
 			print_func(fp, "-?-");
 		print_func(fp, " [%s]", flags2str(m->flags));
 		break;
 
+	case Node_typedregex:
+		print_func(fp, "@");
+		/* fall through */
 	case Node_regex:
 		pp_string_fp(print_func, fp, m->re_exp->stptr, m->re_exp->stlen, '/', false);
 		break;
@@ -4024,10 +4021,18 @@ print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump)
 		print_func(fp, " [do_reference = %s]\n",
 		                pc->do_reference ? "true" : "false");
 		break;
-				
+
+	case Op_comment:
+		print_memory(pc->memory, func, print_func, fp);
+		fprintf(fp, " [comment_type = %s]\n",
+			pc->memory->comment_type == EOL_COMMENT ?
+						"EOL" : "FULL");
+		break;
+
 	case Op_push_i:
 	case Op_push:
 	case Op_push_arg:
+	case Op_push_arg_untyped:
 	case Op_push_param:
 	case Op_push_array:
 	case Op_push_re:
@@ -4250,10 +4255,10 @@ gprintf(FILE *fp, const char *format, ...)
 #define GPRINTF_BUFSIZ 512
 	if (buf == NULL) {
 		buflen = GPRINTF_BUFSIZ;
-		emalloc(buf, char *, (buflen + 2) * sizeof(char), "gprintf");
+		emalloc(buf, char *, buflen * sizeof(char), "gprintf");
 	} else if (buflen - bl < GPRINTF_BUFSIZ/2) {
 		buflen += GPRINTF_BUFSIZ;
-		erealloc(buf, char *, (buflen + 2) * sizeof(char), "gprintf");
+		erealloc(buf, char *, buflen * sizeof(char), "gprintf");
 	}	 
 #undef GPRINTF_BUFSIZ
 	
@@ -4272,7 +4277,7 @@ gprintf(FILE *fp, const char *format, ...)
 
 		/* enlarge buffer, and try again */ 
 		buflen *= 2;
-		erealloc(buf, char *, (buflen + 2) * sizeof(char), "gprintf");
+		erealloc(buf, char *, buflen * sizeof(char), "gprintf");
 	}
 
 	bl = 0;
@@ -4312,7 +4317,7 @@ gprintf(FILE *fp, const char *format, ...)
 static int
 serialize_subscript(char *buf, int buflen, struct list_item *item)
 {
-	int bl = 0, nchar, i;
+	int bl, nchar, i;
 	NODE *sub;
 
 	nchar = snprintf(buf, buflen, "%d%c%d%c%s%c%d%c",
@@ -4322,7 +4327,7 @@ serialize_subscript(char *buf, int buflen, struct list_item *item)
 		return 0;
 	else if (nchar >= buflen)	/* need larger buffer */
 		return nchar;
- 	bl += nchar;
+ 	bl = nchar;
 	for (i = 0; i < item->num_subs; i++) {
 		sub = item->subs[i];
 		nchar = snprintf(buf + bl, buflen - bl, "%lu%c%s%c",
@@ -4401,7 +4406,7 @@ serialize(int type)
 
 	if (buf == NULL) {	/* first time */
 		buflen = SERIALIZE_BUFSIZ;
-		emalloc(buf, char *, buflen + 2, "serialize");
+		emalloc(buf, char *, buflen + 1, "serialize");
 	}
 	bl = 0;
 
@@ -4410,7 +4415,7 @@ serialize(int type)
 		if (buflen - bl < SERIALIZE_BUFSIZ/2) {
 enlarge_buffer:
 			buflen *= 2;
-			erealloc(buf, char *, buflen + 2, "serialize");
+			erealloc(buf, char *, buflen + 1, "serialize");
 		}
 
 #undef SERIALIZE_BUFSIZ
@@ -4511,7 +4516,7 @@ enlarge_buffer:
 			}
 
 			if (nchar > 0) {	/* non-empty commands list */
-				nchar += (strlen("commands ") + 20 + strlen("end") + 2); /* 20 for cnum (an int) */
+				nchar += (strlen("commands ") + 20 + strlen("end") + 1); /* 20 for cnum (an int) */
 				if (nchar > buflen - bl) {
 					buflen = bl + nchar;
 					erealloc(buf, char *, buflen + 3, "serialize");