From bbdddf35e5fc2c80d08f2f22f06eabb083c756e2 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 22 Jul 2007 02:21:04 +0000 Subject: [PATCH] fix nasty bug in numerical comparison in Interpreter darcs-hash:20070722022104-5007d-25cf7310db98413e214a8915479e98d237f11a16.gz --- src/org/ibex/js/Interpreter.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/org/ibex/js/Interpreter.java b/src/org/ibex/js/Interpreter.java index 8ebbde0..2b4e888 100644 --- a/src/org/ibex/js/Interpreter.java +++ b/src/org/ibex/js/Interpreter.java @@ -468,14 +468,21 @@ class Interpreter implements ByteCodes, Tokens, Pausable { case RSH: stack.push(JSU.N(JSU.toLong(left) >> JSU.toLong(right))); break; case URSH: stack.push(JSU.N(JSU.toLong(left) >>> JSU.toLong(right))); break; - //#repeat />= LT/LE/GT/GE - case LT: { + case LT: case LE: case GT: case GE: { + int cmp = 0; if(left instanceof JSString && right instanceof JSString) - stack.push(JSU.B(JSU.toString(left).compareTo(JSU.toString(right)) < 0)); + cmp = JSU.toString(left).compareTo(JSU.toString(right)); else - stack.push(JSU.B(JSU.toDouble(left) < JSU.toDouble(right))); + cmp = (int)(100 * (JSU.toDouble(left) - JSU.toDouble(right))); + switch(op) { + case LE: stack.push(JSU.B(cmp <= 0)); break; + case LT: stack.push(JSU.B(cmp < 0)); break; + case GE: stack.push(JSU.B(cmp >= 0)); break; + case GT: stack.push(JSU.B(cmp > 0)); break; + default: throw new RuntimeException("impossible"); + } + break; } - //#end case EQ: case NE: { -- 1.7.10.4