Browse Source

Bug fix in test mode comparisons where expected result is an expression comprising a single constant.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11792 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 9 years ago
parent
commit
4f491f9e07
  1. 6
      prism/src/parser/ast/Property.java

6
prism/src/parser/ast/Property.java

@ -321,7 +321,7 @@ public class Property extends ASTElement
Expression expectedExpr = null;
try {
expectedExpr = Prism.parseSingleExpressionString(strExpected);
expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr = (Expression) expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr.typeCheck();
boolExp = expectedExpr.evaluateBoolean(constValues);
simple = false; // complex expression
@ -350,7 +350,7 @@ public class Property extends ASTElement
Expression expectedExpr = null;
try {
expectedExpr = Prism.parseSingleExpressionString(strExpected);
expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr = (Expression) expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr.typeCheck();
intExp = expectedExpr.evaluateInt(constValues);
simple = false; // complex expression
@ -393,7 +393,7 @@ public class Property extends ASTElement
Expression expectedExpr = null;
try {
expectedExpr = Prism.parseSingleExpressionString(strExpected);
expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr = (Expression) expectedExpr.findAllConstants(new ConstantList(constValues));
expectedExpr.typeCheck();
doubleExp = expectedExpr.evaluateDouble(constValues);
simple = false; // complex expression

Loading…
Cancel
Save