Browse Source

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
master
Dave Parker 18 years ago
parent
commit
6af512e916
  1. 4
      prism/src/parser/PrismParser.java
  2. 4
      prism/src/parser/PrismParser.jj
  3. 4
      prism/src/parser/PrismParserTokenManager.java

4
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;}
}

4
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;
}

4
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
{

Loading…
Cancel
Save