dict with: return script result

Previously dict with returned the new dict value.
Also fix an issue in the case where a dict element
mirrors the name of the dictionary.

Fixes: #241

Signed-off-by: Steve Bennett <steveb@workware.net.au>

2 files changed, 19 insertions, 2 deletions

diff --git a/tests/dict.test b/tests/dict.test
index f77d95e..0c2c395 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -114,6 +114,18 @@ test dict-5.2 {Dict with} {
 	}
 	dictsort [a]
 } {a B}
+test dict-5.3 {Dict with return value} {
+	proc a {} {
+		set x [dict create a b c d]
+		dict with x {
+			set a B
+			unset c
+			# dict with should return the script return value
+			set retvalue ok
+		}
+	}
+	a
+} {ok}
 
 test dict-22.1 {dict with command} {
     list [catch {dict with} msg] $msg
diff --git a/tests/dict2.test b/tests/dict2.test
index 99cf605..573d17a 100644
--- a/tests/dict2.test
+++ b/tests/dict2.test
@@ -1272,8 +1272,13 @@ test dict-23.4 {dict with usage} -body {
 } -returnCodes error -result {wrong # args: should be "dict with dictVar ?key ...? script"}
 
 test dict-23.5 {dict with badvar} -constraints jim -body {
-	dict with dictnulls {lsort [info locals]}
-} -returnCodes ok -result [list ab\0c de\0f \0ghi kl\0m]
+    proc a {dict} {
+	dict with dict {
+	    lsort [info locals]
+	}
+    }
+    a $dictnulls
+} -returnCodes ok -result [list \0ghi ab\0c dict]
 
 test dict-23.6 {dict with baddict} -body {
 	dict with dictbad {}