clean
Merge branch 'better_grammar2' of github.com:bobzhang/Fan into better_grammar2
make token a record structure