Added matching for character constants