X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharInput.java;h=6dd9d7b0a2a2d23b8b9956ecdb83900ae386b65e;hb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;hp=795341800e312f42529b065bf255651dcb0acb8f;hpb=e12a3098c6ed3cbfa6493870af3688f833c4f8ac;p=sbp.git

diff --git a/src/edu/berkeley/sbp/chr/CharInput.java b/src/edu/berkeley/sbp/chr/CharInput.java
index 7953418..6dd9d7b 100644
--- a/src/edu/berkeley/sbp/chr/CharInput.java
+++ b/src/edu/berkeley/sbp/chr/CharInput.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.chr;
 import java.io.*;
 import java.util.*;
@@ -13,18 +15,21 @@ public class CharInput extends Cartesian.Input<Character> {
     
     public CharInput(String s)                { this(new StringReader(s)); }
     public CharInput(Reader r)                { this(r, null); }
-    public CharInput(Reader r,      String s) { this.r = r; }
+    public CharInput(Reader r,      String s) { this.r = new BufferedReader(r); }
     public CharInput(InputStream i)           { this(i, null); }
     public CharInput(InputStream i, String s) { this(new InputStreamReader(i), s); }
     
     boolean cr = false;
+    private int count = 0;
     public boolean   isCR() { return cr; }
-    public Character next() throws IOException {
+    public Character _next() throws IOException {
         cr = false;
         int i = r.read();
-        if (i==-1) return null;
+        if (i==-1) { System.err.print("\r...done       \r"); return null; }
         char c = (char)i;
         cr = c=='\n';
+        if ((count++) % 100 == 0)
+	  System.err.print("  " + count + "\r");
         return c;
     }
 }