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

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