match dash as token separator as well