while and for added to parser