added string capture mode to LNPReader

Author: richhickey

src/jvm/clojure/lang/LineNumberingPushbackReader.java

@@ -27,46 +27,65 @@ public class LineNumberingPushbackReader extends PushbackReader{
 
 private boolean _atLineStart = true;
 private boolean _prev;
-private int _columnNumber = 1;
+private int _columnNumber = 1;
+private StringBuilder sb = null;
 
 public LineNumberingPushbackReader(Reader r){
 	super(new LineNumberReader(r));
 }
 
-public LineNumberingPushbackReader(Reader r, int size){
-	super(new LineNumberReader(r, size));
-}
-
+public LineNumberingPushbackReader(Reader r, int size){
+	super(new LineNumberReader(r, size));
+}
+
 public int getLineNumber(){
 	return ((LineNumberReader) in).getLineNumber() + 1;
 }
-
-public void setLineNumber(int line) { ((LineNumberReader) in).setLineNumber(line - 1); }
-
-public int getColumnNumber(){
-	return _columnNumber;
-}
-
+
+public void setLineNumber(int line) { ((LineNumberReader) in).setLineNumber(line - 1); }
+
+public void captureString(){
+    this.sb = new StringBuilder();
+}
+
+public String getString(){
+    if(sb != null)
+        {
+        String ret = sb.toString();
+        sb = null;
+        return ret;
+        }
+    return null;
+}
+
+public int getColumnNumber(){
+	return _columnNumber;
+}
+
 public int read() throws IOException{
     int c = super.read();
     _prev = _atLineStart;
-    if((c == newline) || (c == -1))
-        {
-        _atLineStart = true;
-        _columnNumber = 1;
-        }
-    else
-        {
-        _atLineStart = false;
-        _columnNumber++;
-        }
+    if((c == newline) || (c == -1))
+        {
+        _atLineStart = true;
+        _columnNumber = 1;
+        }
+    else
+        {
+        _atLineStart = false;
+        _columnNumber++;
+        }
+    if(sb != null)
+        sb.append((char)c);
     return c;
 }
 
 public void unread(int c) throws IOException{
     super.unread(c);
     _atLineStart = _prev;
-    _columnNumber--;
+    _columnNumber--;
+    if(sb != null)
+        sb.deleteCharAt(sb.length()-1);
 }
 
 public String readLine() throws IOException{
@@ -85,7 +104,7 @@ public String readLine() throws IOException{
         line = (rest == null) ? first : first + rest;
         _prev = false;
         _atLineStart = true;
-        _columnNumber = 1;
+        _columnNumber = 1;
         break;
     }
     return line;