[206] several parser improvements

Revision: 206
Author: rong.chen

Log Message: