seemly reached parity with ANTLR3 grammar. Has not been tested with Junit