refactor/reformat char and string literal parsing