Consequently, this PR intentionally breaks the build, which should now fail at the point where the parser is compiled.

#599 fixes the conflicts in the grammar. The combination of that PR and this one restores the build to a working state and adds a check to avoid conflicts in the future.

I think this is a great idea (and I would have been quite happy to have that when I made my parser patches).

I would suggest we adopt menhir's flag for this, which is --strict.

As the person who had introduced these reduce/reduce conflicts in the first place, I wholehearteadly agree.

@yallop Please change the name of the option to --strict; then this is OK

This PR was discussed last week at the developers meeting, and everyone agreed it's a good idea and the option's name should be --strict. @yallop can you make the change?

@damiendoligez: yes, I'll push the change shortly.

@mshinwell, @damiendoligez: 27346eb

Thanks, @gasche. I just realised that I didn't add a Changelog entry, which might be helpful since this is a change in the ocamlyacc interface. Would you like another PR to add the entry, or can you push small changes like that directly?

I pushed a Changes entry. Thanks!