From 4f491f9e07afd6fe3c4628bbeff8e3fb728f6692 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 8 Sep 2016 22:25:17 +0000 Subject: [PATCH] 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 --- prism/src/parser/ast/Property.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prism/src/parser/ast/Property.java b/prism/src/parser/ast/Property.java index 06d247e2..5033fa42 100644 --- a/prism/src/parser/ast/Property.java +++ b/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