Fix grammar to inherit c++ grammar