2008-11-05 Steve Bennett <steveb@workware.net.au>

	* jim.c: fix lazy expression evaluation with unary not

4 files changed, 29 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d1d4870..c5d8cb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-05 Steve Bennett <steveb@workware.net.au>
+
+	* jim.c: fix lazy expression evaluation with unary not
+
 2008-11-04 Steve Bennett <steveb@workware.net.au>
 
 	* jim.c: fix problems with "puts [list ${a}]". Resulted in syntax
diff --git a/ecos/language/tcl/jim/current/src/jim.c b/ecos/language/tcl/jim/current/src/jim.c
index 3425561..79f846c 100644
--- a/ecos/language/tcl/jim/current/src/jim.c
+++ b/ecos/language/tcl/jim/current/src/jim.c
@@ -6618,7 +6618,7 @@ static void ExprMakeLazy(Jim_Interp *interp, ExprByteCode *expr)
             case JIM_EXPROP_STRING:

                 break;

             default:

-                op = JimExprOperatorInfoByOpcode(expr->opcode[i]);

+                op = JimExprOperatorInfoByOpcode(expr->opcode[leftindex]);

                 if (op == NULL) {

                     Jim_Panic(interp,"Default reached in ExprMakeLazy()");

                 }

diff --git a/jim.c b/jim.c
index 47b686c..40e2d6b 100644
--- a/jim.c
+++ b/jim.c
@@ -6618,7 +6618,7 @@ static void ExprMakeLazy(Jim_Interp *interp, ExprByteCode *expr)
             case JIM_EXPROP_STRING:
                 break;
             default:
-                op = JimExprOperatorInfoByOpcode(expr->opcode[i]);
+                op = JimExprOperatorInfoByOpcode(expr->opcode[leftindex]);
                 if (op == NULL) {
                     Jim_Panic(interp,"Default reached in ExprMakeLazy()");
                 }
diff --git a/regtest.tcl b/regtest.tcl
index a013e3e..8aba0b8 100644
--- a/regtest.tcl
+++ b/regtest.tcl
@@ -45,6 +45,29 @@ if {[catch {set thisvardoesnotexists}] == 0} {
 }
 puts "TEST 6 PASSED"
 
+# REGTEST 7
+# 04Nov2008 - variable parsing does not eat last brace
+set a 1
+list ${a}
+puts "TEST 7 PASSED"
+
+# REGTEST 8
+# 04Nov2008 - string toupper/tolower do not convert to string rep
+string tolower [list a]
+string toupper [list a]
+puts "TEST 8 PASSED"
+
+# REGTEST 9
+# 04Nov2008 - crash on exit when replacing Tcl proc with C command. Requires the aio extension
+proc aio.open {args} {}
+catch {package require aio}
+# Note, crash on exit, so don't say we passed!
+
+# REGTEST 10
+# 05Nov2008 - incorrect lazy expression evaluation with unary not
+expr {1 || !0}
+puts "TEST 10 PASSED"
+
 # TAKE THE FOLLOWING puts AS LAST LINE
 
 puts "--- ALL TESTS PASSED ---"