I just noticed that on HEAD, happy reports for Parser.y.pp:
$ happy -agc --strict compiler/stage1/build/Parser.y
unused rules: 2
shift/reduce conflicts: 49
reduce/reduce conflicts: 1
But the code claims:
12 October 2012
Conflicts: 43 shift/reduce
1 reduce/reduce
So somewhere recently we have picked up 6 additional shift/reduce conflicts.
Twan