add lexer and changes to javaParser