Update for new datashape grammar

This is a minimal change to the parser to handle common cases, a future additional change will be needed to fully convert the grammar.