am 6929b5fa: am c71fdabd: Merge "First pass on reentrant C++-ish parser"

* commit '6929b5fab007281d3c35deec905feb8fdc506a31':
  First pass on reentrant C++-ish parser