added position information to tokens and flattening of parse tree (need to implement shunting yard to re-establish precedence and associativity)