From 6af512e9162f0c6e7551bc1320c48f4d3dfe892d Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sun, 16 Mar 2008 11:58:13 +0000 Subject: [PATCH] Small fix in parsing of time-bounded untils. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@664 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/parser/PrismParser.java | 4 ++-- prism/src/parser/PrismParser.jj | 4 ++-- prism/src/parser/PrismParserTokenManager.java | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index a23955cd..224811fa 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -2189,7 +2189,7 @@ public class PrismParser implements PrismParserConstants { actualOperand2.setPosition(((ExpressionFunc)tb.uBound).getOperand(0)); PathExpressionExpr pe2 = new PathExpressionExpr(actualOperand2); pe2.setPosition(actualOperand2); - pe.setOperand2(new PathExpressionExpr(((ExpressionFunc)tb.uBound).getOperand(0))); + pe.setOperand2(pe2); pe.setPosition(begin, getToken(0)); {if (true) return pe;} } @@ -2205,7 +2205,7 @@ public class PrismParser implements PrismParserConstants { actualOperand2.setPosition(((ExpressionFunc)tb.uBound).getOperand(0)); PathExpressionExpr pe2 = new PathExpressionExpr(actualOperand2); pe2.setPosition(actualOperand2); - pe.setOperand2(new PathExpressionExpr(((ExpressionFunc)tb.lBound).getOperand(0))); + pe.setOperand2(pe2); pe.setPosition(begin, getToken(0)); {if (true) return pe;} } diff --git a/prism/src/parser/PrismParser.jj b/prism/src/parser/PrismParser.jj index 85f05f89..70d4a3cc 100644 --- a/prism/src/parser/PrismParser.jj +++ b/prism/src/parser/PrismParser.jj @@ -1376,7 +1376,7 @@ PathExpression PathExpressionTemporal() : actualOperand2.setPosition(((ExpressionFunc)tb.uBound).getOperand(0)); PathExpressionExpr pe2 = new PathExpressionExpr(actualOperand2); pe2.setPosition(actualOperand2); - pe.setOperand2(new PathExpressionExpr(((ExpressionFunc)tb.uBound).getOperand(0))); + pe.setOperand2(pe2); pe.setPosition(begin, getToken(0)); return pe; } @@ -1392,7 +1392,7 @@ PathExpression PathExpressionTemporal() : actualOperand2.setPosition(((ExpressionFunc)tb.uBound).getOperand(0)); PathExpressionExpr pe2 = new PathExpressionExpr(actualOperand2); pe2.setPosition(actualOperand2); - pe.setOperand2(new PathExpressionExpr(((ExpressionFunc)tb.lBound).getOperand(0))); + pe.setOperand2(pe2); pe.setPosition(begin, getToken(0)); return pe; } diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java index 4b25ec0d..36da6d75 100644 --- a/prism/src/parser/PrismParserTokenManager.java +++ b/prism/src/parser/PrismParserTokenManager.java @@ -1,5 +1,9 @@ /* Generated By:JavaCC: Do not edit this line. PrismParserTokenManager.java */ package parser; +import java.io.*; +import java.util.ArrayList; +import parser.ast.*; +import prism.PrismLangException; public class PrismParserTokenManager implements PrismParserConstants {