Add data structures for token parser