move // processing

Move processing of // comments to the two token section.
handle comments at end of strings

there was no bug, test added