major work on javacc grammar