2009-08-16 Steve Bennett <steveb@workware.net.au>

	* jim.c: Should be able to compare strings for order in expr

2 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 902a116..44d1a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-08-16 Steve Bennett <steveb@workware.net.au>
-
+	
+	* jim.c: Should be able to compare strings for order in expr
 	* jim.c:  'unset ::var' to unset a global var.
  	It was doing nothing.
 
diff --git a/jim.c b/jim.c
index 3c74aa2..a1c1f63 100644
--- a/jim.c
+++ b/jim.c
@@ -7030,10 +7030,7 @@ trydouble:
                     opcode = JIM_EXPROP_STREQ;
                     goto retry_as_string;
                 }
-                Jim_DecrRefCount(interp, A);
-                Jim_DecrRefCount(interp, B);
-                error = 1;
-                goto err;
+                goto retry_as_string;
             }
             Jim_DecrRefCount(interp, A);
             Jim_DecrRefCount(interp, B);
@@ -7095,6 +7092,14 @@ retry_as_string:
             sA = Jim_GetString(A, &Alen);
             sB = Jim_GetString(B, &Blen);
             switch(opcode) {
+            case JIM_EXPROP_LT:
+                wC = JimStringCompare(sA, Alen, sB, Blen, 0) < 0; break;
+            case JIM_EXPROP_GT:
+                wC = JimStringCompare(sA, Alen, sB, Blen, 0) > 0; break;
+            case JIM_EXPROP_LTE:
+                wC = JimStringCompare(sA, Alen, sB, Blen, 0) <= 0; break;
+            case JIM_EXPROP_GTE:
+                wC = JimStringCompare(sA, Alen, sB, Blen, 0) >= 0; break;
             case JIM_EXPROP_STREQ:
                 if (Alen == Blen && memcmp(sA, sB, Alen) ==0)
                     wC = 1;
@@ -7108,8 +7113,11 @@ retry_as_string:
                     wC = 0;
                 break;
             default:
-                wC = 0; /* avoid gcc warning */
-                break;
+                /* Not a valid string comparison */
+                Jim_DecrRefCount(interp, A);
+                Jim_DecrRefCount(interp, B);
+                error = 1;
+                goto err;
             }
             Jim_DecrRefCount(interp, A);
             Jim_DecrRefCount(interp, B);