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>

1 files changed, 12 insertions, 0 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