updated grammar and codegenerator for functionCalls
merge