fixed parser to use expressions for range generation