Tokenizer merged with parser