Rewrote parser as a state machine, missing token info
Add token info in parser.
Better token info, state-machine-based has feature-parity with old parser
Debug--