Update calc.y

Updates all the tokens also am going to update the data types on some of them next