integrate Grammar-Kit/pull/31 from ligasgr
move getTokenType() up so white-spaces are skipped before rawTokenIndex() call