updated cfg and new mynewgrammar.jj