Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24543/src/net/sourceforge/bprocessor/model/evaluator
Modified Files:
Primitive.java
Log Message:
Fixed problems in Space.insert()
Index: Primitive.java
===================================================================
RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Primitive.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Primitive.java 11 Oct 2006 11:23:26 -0000 1.7
--- Primitive.java 16 Oct 2006 06:49:18 -0000 1.8
***************
*** 57,63 ****
switch(opcode) {
case ADD: {
! Double op1 = (Double) stack.pop();
! Double op2 = (Double) stack.pop();
! stack.push(new Double(op1.doubleValue() + op2.doubleValue()));
break;
}
--- 57,69 ----
switch(opcode) {
case ADD: {
! Object op1 = stack.pop();
! Object op2 = stack.pop();
! if (op2 instanceof Double) {
! Double d1 = (Double) op1;
! Double d2 = (Double) op2;
! stack.push(new Double(d1.doubleValue() + d2.doubleValue()));
! } else {
! stack.push(op2.toString() + op1.toString());
! }
break;
}
|