Added case when and first version of antlr parser