DRILL-529: 'atom' rule in Antlr grammar uses wrong token for calculating...

... ExpressionPosition