Complement and validate bitset bug fix

see antlr/antlr4 https://github.com/antlr/antlr4/pull/778