added complex typedef
added bare numeric type to Token
added numeric flags to TOken