put CONDITIONAL back in parsingrules
Merge branch 'master' of github.com:puconghan/plt