|
|
|
@ -360,7 +360,6 @@ TOKEN : |
|
|
|
| < ENDSYSTEM: "endsystem" > |
|
|
|
| < FALSE: "false" > |
|
|
|
| < FORMULA: "formula" > |
|
|
|
| < FILTER: "filter" > |
|
|
|
| < FUNC: "func" > |
|
|
|
| < F: "F" > |
|
|
|
| < GLOBAL: "global" > |
|
|
|
@ -1272,8 +1271,6 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) : |
|
|
|
ret = ExpressionForAll(prop, pathprop) |
|
|
|
| |
|
|
|
ret = ExpressionLabel(prop, pathprop) |
|
|
|
| |
|
|
|
ret = ExpressionFilter(prop, pathprop) |
|
|
|
) |
|
|
|
{ return ret; } |
|
|
|
} |
|
|
|
@ -1594,23 +1591,6 @@ Expression ExpressionLabel(boolean prop, boolean pathprop) : |
|
|
|
{ ret = new ExpressionLabel(s); ret.setPosition(begin, getToken(0)); return ret; } |
|
|
|
} |
|
|
|
|
|
|
|
// (Property) expression: filter (using "filter" keyword) |
|
|
|
|
|
|
|
Expression ExpressionFilter(boolean prop, boolean pathprop) : |
|
|
|
{ |
|
|
|
String s = null; |
|
|
|
ExpressionFunc func = null; |
|
|
|
Token begin = null; |
|
|
|
} |
|
|
|
{ |
|
|
|
// This production is only allowed in expressions if the "prop" parameter is true |
|
|
|
{ if (!prop) throw generateParseException(); } |
|
|
|
|
|
|
|
( begin = <FILTER> { s = "min"; } | begin = <MAX> { s = "max"; } ) |
|
|
|
{ func = new ExpressionFunc(s); } <LPARENTH> ExpressionFuncArgs(prop, pathprop, func) <RPARENTH> |
|
|
|
{ func.setPosition(begin, getToken(0)); return func; } |
|
|
|
} |
|
|
|
|
|
|
|
//----------------------------------------------------------------------------------- |
|
|
|
// Miscellaneous stuff |
|
|
|
//----------------------------------------------------------------------------------- |
|
|
|
|