SONARPLUGINS-2391 Improve and fix grammar and implement function expression.
SONARPLUGINS-2391 Small clean up in grammar and add test.