Merge branch 'master' into feature/fix-ns-memleak

1 files changed, 15 insertions, 0 deletions

diff --git a/awk.h b/awk.h
index a18cf522..3ba5f1fc 100644
--- a/awk.h
+++ b/awk.h
@@ -1362,6 +1362,7 @@ extern int fatal_tag_valid;
 /* assoc_remove --- remove an index from symbol[] */
 #define assoc_remove(a, s) ((a)->aremove(a, s) != NULL)
 
+
 /* ------------- Function prototypes or defs (as appropriate) ------------- */
 /* array.c */
 typedef enum { SORTED_IN = 1, ASORT, ASORTI } sort_context_t;
@@ -2024,6 +2025,20 @@ make_number_node(unsigned int flags)
 	return r;
 }
 
+/* assoc_set -- set an element in an array. Does unref(sub)! */
+
+static inline void
+assoc_set(NODE *array, NODE *sub, NODE *value)
+{
+
+	NODE **lhs = assoc_lookup(array, sub);
+	unref(*lhs);
+	*lhs = value;
+	if (array->astore != NULL)
+		(*array->astore)(array, sub);
+	unref(sub);
+}
+
 /*
  * str_terminate_f, str_terminate, str_restore: function and macros to
  * reduce chances of typos when terminating and restoring strings.