changes to use JFlex 1.5