From 2797cc7ae1710b35db4f9c61987a2d82436afac2 Mon Sep 17 00:00:00 2001
From: Steve Bennett <steveb@workware.net.au>
Date: Sun, 12 Jan 2014 19:50:19 +1000
Subject: jim.c: replace 'dict merge' with a C version

Signed-off-by: Steve Bennett <steveb@workware.net.au>
---
 jim.c      | 40 +++++++++++++++++++++++++++++++++++-----
 stdlib.tcl | 13 -------------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/jim.c b/jim.c
index 9dc2502..28984d0 100644
--- a/jim.c
+++ b/jim.c
@@ -7247,8 +7247,10 @@ int Jim_DictKey(Jim_Interp *interp, Jim_Obj *dictPtr, Jim_Obj *keyPtr,
         }
         return JIM_ERR;
     }
-    *objPtrPtr = he->u.val;
-    return JIM_OK;
+    else {
+        *objPtrPtr = Jim_GetHashEntryVal(he);
+        return JIM_OK;
+    }
 }
 
 /* Return an allocated array of key/value pairs for the dictionary. Stores the length in *len */
@@ -14329,6 +14331,33 @@ int Jim_DictSize(Jim_Interp *interp, Jim_Obj *objPtr)
     return ((Jim_HashTable *)objPtr->internalRep.ptr)->used;
 }
 
+/**
+ * Must be called with at least one object.
+ * Returns the new dictionary, or NULL on error.
+ */
+Jim_Obj *Jim_DictMerge(Jim_Interp *interp, int objc, Jim_Obj *const *objv)
+{
+    Jim_Obj *objPtr = Jim_NewDictObj(interp, NULL, 0);
+    int i;
+
+    for (i = 0; i < objc; i++) {
+        Jim_HashTable *ht;
+        Jim_HashTableIterator htiter;
+        Jim_HashEntry *he;
+
+        if (SetDictFromAny(interp, objv[i]) != JIM_OK) {
+            Jim_FreeNewObj(interp, objPtr);
+            return NULL;
+        }
+        ht = objv[i]->internalRep.ptr;
+        JimInitHashTableIterator(ht, &htiter);
+        while ((he = Jim_NextHashEntry(&htiter)) != NULL) {
+            Jim_ReplaceHashEntry(objPtr->internalRep.ptr, Jim_GetHashEntryKey(he), Jim_GetHashEntryVal(he));
+        }
+    }
+    return objPtr;
+}
+
 int Jim_DictInfo(Jim_Interp *interp, Jim_Obj *objPtr)
 {
     Jim_HashTable *ht;
@@ -14461,11 +14490,12 @@ static int Jim_DictCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
             if (argc == 2) {
                 return JIM_OK;
             }
-            if (Jim_DictSize(interp, argv[2]) < 0) {
+            objPtr = Jim_DictMerge(interp, argc - 2, argv + 2);
+            if (objPtr == NULL) {
                 return JIM_ERR;
             }
-            /* Handle as ensemble */
-            break;
+            Jim_SetResult(interp, objPtr);
+            return JIM_OK;
 
         case OPT_UPDATE:
             if (argc < 6 || argc % 2) {
diff --git a/stdlib.tcl b/stdlib.tcl
index 08cb217..917b0b6 100644
--- a/stdlib.tcl
+++ b/stdlib.tcl
@@ -130,19 +130,6 @@ proc {dict update} {&varName args script} {
 	return {*}$opts $msg
 }
 
-# Script-based implementation of 'dict merge'
-# This won't get called in the trivial case of no args
-proc {dict merge} {dict args} {
-	foreach d $args {
-		# Check for a valid dict
-		dict size $d
-		foreach {k v} $d {
-			dict set dict $k $v
-		}
-	}
-	return $dict
-}
-
 proc {dict replace} {dictionary {args {key value}}} {
 	if {[llength ${key value}] % 2} {
 		tailcall {dict replace}
-- 
cgit v1.1