overhaul descriptor string parsing

The logic for parsing descriptor strings seem excessively convoluted - the parser should be simplified and tests should be added to make sure that the parser impl adheres to the descriptor language specification.