Antoine, I will upload a patch that relies on BufferedReader. As you mentioned, it will get rid of supporting the buffer and reduce a lot of code.
The only issue is that it helps me to know if the current buffer is at EOF (the documentation of peek does not mention  guaranteeing Eof if buffer returned is less than what we expect), because patterns at EOF are different, but I think I can work around that.