X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
index 4a1c194..e6aa7e0 100644
--- a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
+++ b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
@@ -13,6 +13,12 @@ public class SimpleCharStream
   static int available;
   static int tokenBegin;
   static public int bufpos = -1;
+
+  //Added by Matthieu Casanova
+  public static int position = 0;
+
+  public static int beginOffset, endOffset;
+
   static protected int bufline[];
   static protected int bufcolumn[];
 
@@ -23,6 +29,7 @@ public class SimpleCharStream
   static protected boolean prevCharIsLF = false;
 
   static protected java.io.Reader inputStream;
+  static protected StringBuffer currentBuffer = new StringBuffer();
 
   static protected char[] buffer;
   static protected int maxNextCharInd = 0;
@@ -86,12 +93,14 @@ public class SimpleCharStream
         {
            if (tokenBegin > 2048)
            {
+              position += bufpos;
               bufpos = maxNextCharInd = 0;
               available = tokenBegin;
            }
-           else if (tokenBegin < 0)
+           else if (tokenBegin < 0) {
+              position += bufpos;
               bufpos = maxNextCharInd = 0;
-           else
+           } else
               ExpandBuff(false);
         }
         else if (available > tokenBegin)
@@ -110,8 +119,10 @@ public class SimpleCharStream
            inputStream.close();
            throw new java.io.IOException();
         }
-        else
+        else {
            maxNextCharInd += i;
+        }
+        currentBuffer.append(buffer);
         return;
      }
      catch(java.io.IOException e) {
@@ -125,6 +136,7 @@ public class SimpleCharStream
 
   static public char BeginToken() throws java.io.IOException
   {
+     beginOffset = endOffset;
      tokenBegin = -1;
      char c = readChar();
      tokenBegin = bufpos;
@@ -170,22 +182,27 @@ public class SimpleCharStream
 
      bufline[bufpos] = line;
      bufcolumn[bufpos] = column;
+
   }
 
   static public char readChar() throws java.io.IOException
   {
+    endOffset++;
      if (inBuf > 0)
      {
         --inBuf;
 
-        if (++bufpos == bufsize)
+        if (++bufpos == bufsize) {
+           position += bufpos;
            bufpos = 0;
+        }
 
         return buffer[bufpos];
      }
 
-     if (++bufpos >= maxNextCharInd)
-        FillBuff();
+     if (++bufpos >= maxNextCharInd) {
+       FillBuff();
+     }
 
      char c = buffer[bufpos];
 
@@ -194,7 +211,7 @@ public class SimpleCharStream
   }
 
   /**
-   * @deprecated 
+   * @deprecated
    * @see #getEndColumn
    */
 
@@ -203,7 +220,7 @@ public class SimpleCharStream
   }
 
   /**
-   * @deprecated 
+   * @deprecated
    * @see #getEndLine
    */
 
@@ -228,7 +245,7 @@ public class SimpleCharStream
   }
 
   static public void backup(int amount) {
-
+    endOffset -= amount;
     inBuf += amount;
     if ((bufpos -= amount) < 0)
        bufpos += bufsize;
@@ -242,6 +259,7 @@ public class SimpleCharStream
        "       either use ReInit() or set the JavaCC option STATIC to false\n" +
        "       during the generation of this class.");
     inputStream = dstream;
+    currentBuffer = new StringBuffer();
     line = startline;
     column = startcolumn - 1;
 
@@ -249,6 +267,9 @@ public class SimpleCharStream
     buffer = new char[buffersize];
     bufline = new int[buffersize];
     bufcolumn = new int[buffersize];
+    beginOffset = 0;
+    endOffset = 0;
+
   }
 
   public SimpleCharStream(java.io.Reader dstream, int startline,
@@ -265,6 +286,7 @@ public class SimpleCharStream
   int startcolumn, int buffersize)
   {
     inputStream = dstream;
+    currentBuffer = new StringBuffer();
     line = startline;
     column = startcolumn - 1;
 
@@ -278,6 +300,9 @@ public class SimpleCharStream
     prevCharIsLF = prevCharIsCR = false;
     tokenBegin = inBuf = maxNextCharInd = 0;
     bufpos = -1;
+    position = 0;
+    beginOffset = 0;
+    endOffset = 0;
   }
 
   public void ReInit(java.io.Reader dstream, int startline,
@@ -352,6 +377,7 @@ public class SimpleCharStream
      buffer = null;
      bufline = null;
      bufcolumn = null;
+
   }
 
   /**
@@ -382,7 +408,7 @@ public class SimpleCharStream
         bufcolumn[j] = newCol + columnDiff;
         columnDiff = nextColDiff;
         i++;
-     } 
+     }
 
      if (i < len)
      {
@@ -391,10 +417,11 @@ public class SimpleCharStream
 
         while (i++ < len)
         {
-           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+           if (bufline[j = start % bufsize] != bufline[++start % bufsize]) {
               bufline[j] = newLine++;
-           else
+           } else {
               bufline[j] = newLine;
+           }
         }
      }
 
@@ -402,4 +429,11 @@ public class SimpleCharStream
      column = bufcolumn[j];
   }
 
+  /**
+   * @deprecated
+   * @return
+   */
+  public static int getPosition() {
+    return position + bufpos;
+  }
 }