Improve some numeric syntax lexing

Improve some numeric syntax lexing