D6-3: add support and test cases for different kinds of comments and empty statement