Revert "updated grammar and codegenerator for functionCalls"

This reverts commit d8926232135780d69ebd62a977b416cc61cc764c.