refractored TokenReader
Merge branch 'master' of https://github.com/OliverSch/compiler