add DoWhileStatement and WhileStatement support