typename collisions: if, comment

[milahu]

there is collision between the if block and the if keyword

if
  if
  x
  then
  x
  else
  x

rename the if block to ifthenelse?

more collisions

rename comment to commentblock for /* asdf */?

[cstrahan]

Hi @milahu -- is your issue still relevant with the grammar as it is now? (Sorry it's taken me so long to come around to this.)