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

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