refactor IntegerExp
Merge pull request #3495 from WalterBright/refactor-IntegerExp

refactor IntegerExp