parse range calls and extract expression; add tests