Refactor BufferedMCLReader It used to inherit from BufferedReader but there is no reason for that. Also, it used to have a method readLine() which - returned the line read - stored the linetype In the new setup we have a method advance() which reads a line and stores both it and its type. This makes the code more regular and makes it possible to peek ahead without consuming.

--- a/src/main/java/org/monetdb/mcl/io/BufferedMCLWriter.java
+++ b/src/main/java/org/monetdb/mcl/io/BufferedMCLWriter.java
@@ -98,6 +98,6 @@ public final class BufferedMCLWriter ext
 
 		// reset reader state, last line isn't valid any more now
 		if (reader != null)
-			reader.setLineType(null);
+			reader.resetLineType();
 	}
 }