improved PHP parser

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / JavaBreakIterator.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaBreakIterator.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaBreakIterator.java
index 14a9b0b..eb4067f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaBreakIterator.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaBreakIterator.java
@@ -13,6 +13,8 @@ package net.sourceforge.phpdt.internal.ui.text;
 import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
+
 import org.eclipse.jface.text.Assert;
 
 
@@ -84,7 +86,7 @@ public class JavaBreakIterator extends BreakIterator {
                private static final char EXIT= '\1';
                
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#init()
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#init()
                 */
                protected void init() {
                        super.init();
@@ -92,7 +94,7 @@ public class JavaBreakIterator extends BreakIterator {
                }
                
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#consume(char)
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#consume(char)
                 */
                protected boolean consume(char ch) {
                        if (!isValid(ch) || fState == EXIT)
@@ -118,10 +120,10 @@ public class JavaBreakIterator extends BreakIterator {
        
        static final class Identifier extends Run {
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
                 */
                protected boolean isValid(char ch) {
-                       return Character.isJavaIdentifierPart(ch);
+                       return Scanner.isPHPIdentifierPart(ch);
                }
        }
        
@@ -151,7 +153,7 @@ public class JavaBreakIterator extends BreakIterator {
                };
                
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#init()
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#init()
                 */
                protected void init() {
                        super.init();
@@ -159,7 +161,7 @@ public class JavaBreakIterator extends BreakIterator {
                }
                
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#consumes(char)
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#consumes(char)
                 */
                protected boolean consume(char ch) {
                        int kind= getKind(ch);
@@ -191,25 +193,25 @@ public class JavaBreakIterator extends BreakIterator {
                                return K_UPPER;
                        if (Character.isLowerCase(ch))
                                return K_LOWER;
-                       if (Character.isJavaIdentifierPart(ch)) // _, digits...
+                       if (Scanner.isPHPIdentifierPart(ch)) // _, digits...
                                return K_OTHER;
                        return K_INVALID;
                }
 
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
                 */
                protected boolean isValid(char ch) {
-                       return Character.isJavaIdentifierPart(ch);
+                       return Scanner.isPHPIdentifierPart(ch);
                }
        }
 
        static final class Other extends Run {
                /*
-                * @see org.eclipse.jdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
+                * @see net.sourceforge.phpdt.internal.ui.text.JavaBreakIterator.Run#isValid(char)
                 */
                protected boolean isValid(char ch) {
-                       return !Character.isWhitespace(ch) && !Character.isJavaIdentifierPart(ch);
+                       return !Character.isWhitespace(ch) && !Scanner.isPHPIdentifierPart(ch);
                }
        }