updates number macros to work for value conversion; tests integer lexing