finished adding tokens for most of c++