moved comment handling from tokenizer to parser