Updated commun.h and xml.y