Fixed and improved javacc source for preprocessor