[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/jython ReaderCharStream.java,1.2,1.3 FastCharStream.java,1.3,1.4

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23022/src/org/python/pydev/parser/jython

Modified Files:
	ReaderCharStream.java FastCharStream.java 
Log Message:


Index: ReaderCharStream.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ReaderCharStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReaderCharStream.java	27 Apr 2006 20:00:58 -0000	1.2
--- ReaderCharStream.java	28 Apr 2006 11:56:24 -0000	1.3
***************
*** 6,11 ****
  
  public final class ReaderCharStream implements CharStream {
- 	public static final boolean staticFlag = false;
- 
  	int bufsize;
  
--- 6,9 ----

Index: FastCharStream.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/FastCharStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FastCharStream.java	28 Apr 2006 02:01:54 -0000	1.3
--- FastCharStream.java	28 Apr 2006 11:56:24 -0000	1.4
***************
*** 29,32 ****
--- 29,34 ----
  	
  	private int tokenBegin;
+ 	
+ 	private static IOException ioException;
  
  	private final void UpdateLineColumn(char c) {
***************
*** 74,78 ****
  	}
  
! 	public char readChar() throws IOException {
  		try {
  		    bufpos++;
--- 76,80 ----
  	}
  
! 	public final char readChar() throws IOException {
  		try {
  		    bufpos++;
***************
*** 85,89 ****
  		} catch (ArrayIndexOutOfBoundsException e) {
  		    bufpos--;
! 			throw new IOException();
  		}
  	}
--- 87,94 ----
  		} catch (ArrayIndexOutOfBoundsException e) {
  		    bufpos--;
! 		    if (ioException == null){
! 		    	ioException = new IOException();
! 		    }
! 			throw ioException;
  		}
  	}
***************
*** 123,127 ****
  	}
  
! 	public void backup(int amount) {
  		bufpos -= amount;
  		if (bufpos < 0) {
--- 128,132 ----
  	}
  
! 	public final void backup(int amount) {
  		bufpos -= amount;
  		if (bufpos < 0) {
***************
*** 130,134 ****
  	}
  
! 	public char BeginToken() throws IOException {
  		char c = readChar();
  		tokenBegin = bufpos;
--- 135,139 ----
  	}
  
! 	public final char BeginToken() throws IOException {
  		char c = readChar();
  		tokenBegin = bufpos;
***************
*** 136,140 ****
  	}
  
! 	public String GetImage() {
  		String s = null;
  		if (bufpos >= tokenBegin) {
--- 141,145 ----
  	}
  
! 	public final String GetImage() {
  		String s = null;
  		if (bufpos >= tokenBegin) {
***************
*** 146,154 ****
  	}
  
! 	public char[] GetSuffix(int len) {
! 
! 		if ((bufpos + len) > buffer.length) {
! 			len = buffer.length - bufpos;
! 		}
  
  		char[] ret = new char[len];
--- 151,155 ----
  	}
  
! 	public final char[] GetSuffix(int len) {
  
  		char[] ret = new char[len];
***************
*** 171,176 ****
  	}
  
! 	public void Done() {
  		buffer = null;
  	}
  
--- 172,179 ----
  	}
  
! 	public final void Done() {
  		buffer = null;
+ 		bufline = null;
+ 		bufcolumn = null;
  	}