added uptyped functions to parser and scanner