Revert changes in r1559401 for this file.
The first attempt at a fix introduced a different regression

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1559553 13f79535-47bb-0310-9956-ffa450edef68
Second attempt at fixing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56029
This fixes BZ56029 by storing any whitespace before a token with the
token and then including it when the expression is re-created.
It also fixes an issue with the function parsing that meant that ternary
expressions could be corrupted if two tokens were parsed before the mark
was reset.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1559555 13f79535-47bb-0310-9956-ffa450edef68