ANTLR grammar
upstream changes applied