Add token value info and format re2c