Add token types and SAVETOKEN macro
Update test file
Revise makefile