Update calc.y

there are 15 shift reduce conflicts, I am working them out now but this is compileable