upgrade to JavaCC 6.1.2