From 07c74b23c6b8389b748faf58821272e68fecee29 Mon Sep 17 00:00:00 2001 From: crawshaw Date: Thu, 6 Jan 2005 15:58:43 +0000 Subject: [PATCH] update LineReader to use Baskets darcs-hash:20050106155843-2eb37-163887bcb4cfc98bfa0cf98cc5b14d8d5d7530d8.gz --- src/org/ibex/util/LineReader.java | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/org/ibex/util/LineReader.java b/src/org/ibex/util/LineReader.java index ac784b8..75c18f0 100644 --- a/src/org/ibex/util/LineReader.java +++ b/src/org/ibex/util/LineReader.java @@ -3,15 +3,20 @@ // You may not use this file except in compliance with the License. package org.ibex.util; -import java.io.*; +import java.io.Reader; +import java.io.IOException; + +/** @author adam@ibex.org */ public class LineReader { private int MAXBUF = 1024 * 16; - char[] buf = new char[MAXBUF]; - int buflen = 0; - Reader r; - Vec pushback = new Vec(); + + private final Basket.Stack pushback = new Basket.Array(); + + private char[] buf = new char[MAXBUF]; + private int buflen = 0; + private Reader r; public LineReader(Reader r) { this.r = r; } @@ -30,12 +35,12 @@ public class LineReader { return ret; } } - if (buflen == MAXBUF) { - char[] buf2 = new char[MAXBUF*2]; - System.arraycopy(buf, 0, buf2, 0, buflen); - buf = buf2; - MAXBUF *= 2; - } + if (buflen == MAXBUF) { + char[] buf2 = new char[MAXBUF*2]; + System.arraycopy(buf, 0, buf2, 0, buflen); + buf = buf2; + MAXBUF *= 2; + } int numread = r.read(buf, buflen, MAXBUF - buflen); if (numread == -1) { if (buflen == 0) return null; -- 1.7.10.4