Use abstraction of PHPOutlinePage

[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / SimpleCharStream.java

diff --git a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
index 4a1c194..011f1f2 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
+++ b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
@@ -13,6 +13,10 @@ public class SimpleCharStream
   static int available;
   static int tokenBegin;
   static public int bufpos = -1;
+
+  //Added by Matthieu Casanova
+  public static int position = 0;
+
   static protected int bufline[];
   static protected int bufcolumn[];
 
@@ -23,6 +27,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 +91,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 +117,10 @@ public class SimpleCharStream
            inputStream.close();
            throw new java.io.IOException();
         }
-        else
+        else {
            maxNextCharInd += i;
+        }
+        currentBuffer.append(buffer);
         return;
      }
      catch(java.io.IOException e) {
@@ -178,14 +187,17 @@ public class SimpleCharStream
      {
         --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];
 
@@ -242,6 +254,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;
 
@@ -265,6 +278,7 @@ public class SimpleCharStream
   int startcolumn, int buffersize)
   {
     inputStream = dstream;
+    currentBuffer = new StringBuffer();
     line = startline;
     column = startcolumn - 1;
 
@@ -278,6 +292,7 @@ public class SimpleCharStream
     prevCharIsLF = prevCharIsCR = false;
     tokenBegin = inBuf = maxNextCharInd = 0;
     bufpos = -1;
+    position = 0;
   }
 
   public void ReInit(java.io.Reader dstream, int startline,
@@ -402,4 +417,8 @@ public class SimpleCharStream
      column = bufcolumn[j];
   }
 
+  //hack
+  public static int getPosition() {
+    return position + bufpos;
+  }
 }