added token macro processing for input