|
|
@ -310,6 +310,7 @@ public class Preprocessor |
|
|
// parse expression, do some checks |
|
|
// parse expression, do some checks |
|
|
expr = prism.parseSingleExpressionString(s); |
|
|
expr = prism.parseSingleExpressionString(s); |
|
|
expr = (Expression)expr.findAllVars(varNames, varTypes); |
|
|
expr = (Expression)expr.findAllVars(varNames, varTypes); |
|
|
|
|
|
expr.typeCheck(); |
|
|
expr.semanticCheck(); |
|
|
expr.semanticCheck(); |
|
|
} |
|
|
} |
|
|
// set up new variable in interpreter |
|
|
// set up new variable in interpreter |
|
|
@ -449,6 +450,7 @@ public class Preprocessor |
|
|
// parse expression, do some checks |
|
|
// parse expression, do some checks |
|
|
expr = prism.parseSingleExpressionString(s); |
|
|
expr = prism.parseSingleExpressionString(s); |
|
|
expr = (Expression)expr.findAllVars(varNames, varTypes); |
|
|
expr = (Expression)expr.findAllVars(varNames, varTypes); |
|
|
|
|
|
expr.typeCheck(); |
|
|
expr.semanticCheck(); |
|
|
expr.semanticCheck(); |
|
|
// add |
|
|
// add |
|
|
output += "" + expr.evaluate(null, values); |
|
|
output += "" + expr.evaluate(null, values); |
|
|
|