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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
index a4581f8..62687dd 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
@@ -8,7 +8,7 @@
  Contributors:
  Igor Malinin - initial contribution
 
- $Id: PHPPartitionScanner.java,v 1.29 2005-05-15 23:24:41 axelcl Exp $
+ $Id: PHPPartitionScanner.java,v 1.30 2005-09-30 18:10:36 axelcl Exp $
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
@@ -26,8 +26,8 @@ import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
 
 /**
- * 
- * 
+ *
+ *
  * @author Igor Malinin
  */
 public class PHPPartitionScanner implements IPartitionTokenScanner {
@@ -40,7 +40,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
 
   private IDocument document;
 
-  private int begin;
+//  private int begin;
 
   private int end;
 
@@ -50,7 +50,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
 
   private int position;
 
-  private int state;
+//  private int state;
 
   private Map tokens = new HashMap();
 
@@ -69,13 +69,13 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
 
     switch (read()) {
     case ICharacterScanner.EOF:
-      state = STATE_DEFAULT;
+//      state = STATE_DEFAULT;
       return getToken(null);
 
     case '<':
       switch (read()) {
       case ICharacterScanner.EOF:
-        state = STATE_DEFAULT;
+//        state = STATE_DEFAULT;
         return getToken(null);
 
       case '?': // <?
@@ -95,13 +95,13 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
     loop: while (true) {
       switch (read()) {
       case ICharacterScanner.EOF:
-        state = STATE_DEFAULT;
+//        state = STATE_DEFAULT;
         return getToken(null);
 
       case '<':
         switch (read()) {
         case ICharacterScanner.EOF:
-          state = STATE_DEFAULT;
+//          state = STATE_DEFAULT;
           return getToken(null);
 
         case '?':
@@ -117,7 +117,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
 
         unread();
 
-        state = STATE_DEFAULT;
+//        state = STATE_DEFAULT;
         return getToken(null);
       }
     }
@@ -128,19 +128,19 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
     while (true) {
       switch (ch) {
       case ICharacterScanner.EOF:
-        state = STATE_DEFAULT;
+//        state = STATE_DEFAULT;
         return getToken(token);
       case '"': // double quoted string
         // read until end of double quoted string
         if (!readUntilEscapedDQ()) {
-          state = STATE_DEFAULT;
+//          state = STATE_DEFAULT;
           return getToken(token);
         }
         break;
       case '\'': // single quoted string
         // read until end of single quoted string
         if (!readUntilEscapedSQ()) {
-          state = STATE_DEFAULT;
+//          state = STATE_DEFAULT;
           return getToken(token);
         }
         break;
@@ -152,14 +152,14 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
         case '/':
           // read until end of line
           if (!readSingleLine()) {
-            state = STATE_DEFAULT;
+//            state = STATE_DEFAULT;
             return getToken(token);
           }
           break;
         case '*':
           // read until end of comment
           if (!readMultiLineComment()) {
-            state = STATE_DEFAULT;
+//            state = STATE_DEFAULT;
             return getToken(token);
           }
           break;
@@ -170,7 +170,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
       case '#': // line comment
         // read until end of line
         if (!readSingleLine()) {
-          state = STATE_DEFAULT;
+//          state = STATE_DEFAULT;
           return getToken(token);
         }
         break;
@@ -179,7 +179,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
         switch (ch) {
         case ICharacterScanner.EOF:
         case '>':
-          state = STATE_DEFAULT;
+//          state = STATE_DEFAULT;
           return getToken(token);
 
         case '?':
@@ -207,7 +207,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
 //        e.printStackTrace();
 //      }
 //    }
-    
+
     if (type == null) {
       return Token.UNDEFINED;
     }
@@ -257,16 +257,16 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
     }
     return false;
   }
-  
+
   private boolean readUntilEscapedSQ() {
     // search last single quoted character
-    try {  
+    try {
       char ch;
       while (true) {
         if (position >= end) {
           return false;
         }
-        ch = document.getChar(position++); 
+        ch = document.getChar(position++);
         if (ch == '\\') {
           if (position >= end) {
             return false;
@@ -288,7 +288,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
         if (position >= end) {
           return false;
         }
-      } while (document.getChar(position++) != '\n'); 
+      } while (document.getChar(position++) != '\n');
       return true;
     } catch (BadLocationException e) {
       --position;
@@ -346,7 +346,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
    */
   public void setRange(IDocument document, int offset, int length) {
     this.document = document;
-    this.begin = offset;
+//    this.begin = offset;
     this.end = offset + length;
 
     this.offset = offset;
@@ -358,7 +358,7 @@ public class PHPPartitionScanner implements IPartitionTokenScanner {
    * @see org.eclipse.jface.text.rules.IPartitionTokenScanner
    */
   public void setPartialRange(IDocument document, int offset, int length, String contentType, int partitionOffset) {
-    state = STATE_DEFAULT;
+//    state = STATE_DEFAULT;
     if (partitionOffset > -1) {
       int delta = offset - partitionOffset;
       if (delta > 0) {