That two-pass lexer sounds like a good idea. I actually want to keep the happy parser if possible, can you elaborate on adding extra error handling cases for production rules? Do you mean I have to add a line for comments on possible places where they can occur?

Thanks