lot of fixes about offsets

[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 011f1f2..1b90e5c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
+++ b/net.sourceforge.phpeclipse/src/test/SimpleCharStream.java
@@ -17,6 +17,8 @@ public class SimpleCharStream
   //Added by Matthieu Casanova
   public static int position = 0;
 
+  public static int beginOffset, endOffset;
+
   static protected int bufline[];
   static protected int bufcolumn[];
 
@@ -134,6 +136,7 @@ public class SimpleCharStream
 
   static public char BeginToken() throws java.io.IOException
   {
+     beginOffset = endOffset;
      tokenBegin = -1;
      char c = readChar();
      tokenBegin = bufpos;
@@ -179,10 +182,12 @@ public class SimpleCharStream
 
      bufline[bufpos] = line;
      bufcolumn[bufpos] = column;
+
   }
 
   static public char readChar() throws java.io.IOException
   {
+    endOffset++;
      if (inBuf > 0)
      {
         --inBuf;
@@ -206,7 +211,7 @@ public class SimpleCharStream
   }
 
   /**
-   * @deprecated 
+   * @deprecated
    * @see #getEndColumn
    */
 
@@ -215,7 +220,7 @@ public class SimpleCharStream
   }
 
   /**
-   * @deprecated 
+   * @deprecated
    * @see #getEndLine
    */
 
@@ -240,7 +245,7 @@ public class SimpleCharStream
   }
 
   static public void backup(int amount) {
-
+    endOffset -= amount;
     inBuf += amount;
     if ((bufpos -= amount) < 0)
        bufpos += bufsize;
@@ -262,6 +267,9 @@ public class SimpleCharStream
     buffer = new char[buffersize];
     bufline = new int[buffersize];
     bufcolumn = new int[buffersize];
+    beginOffset = 1;
+    endOffset = 1;
+
   }
 
   public SimpleCharStream(java.io.Reader dstream, int startline,
@@ -293,6 +301,8 @@ public class SimpleCharStream
     tokenBegin = inBuf = maxNextCharInd = 0;
     bufpos = -1;
     position = 0;
+    beginOffset = 1;
+    endOffset = 1;
   }
 
   public void ReInit(java.io.Reader dstream, int startline,
@@ -367,6 +377,7 @@ public class SimpleCharStream
      buffer = null;
      bufline = null;
      bufcolumn = null;
+
   }
 
   /**
@@ -397,7 +408,7 @@ public class SimpleCharStream
         bufcolumn[j] = newCol + columnDiff;
         columnDiff = nextColDiff;
         i++;
-     } 
+     }
 
      if (i < len)
      {
@@ -406,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;
+           }
         }
      }