added parser, fixed tokenizer to parse integers and floats as separate tokens