Improved tokenizer code layout.  Added unit test for CalcParser.