Deleted PHPFunctionNames use only phpsyntax.xml instead !

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPCodeScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
index 38486aa..1fd27c1 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
@@ -13,7 +13,6 @@ package net.sourceforge.phpeclipse.phpeditor.php;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 import net.sourceforge.phpdt.internal.ui.text.AbstractJavaScanner;
 import net.sourceforge.phpdt.ui.text.IColorManager;
@@ -275,13 +274,15 @@ public class PHPCodeScanner
     Token functionName= getToken(IPreferenceConstants.PHP_FUNCTIONNAME);
     Token type= getToken(IPreferenceConstants.PHP_TYPE);
     Token constant= getToken(IPreferenceConstants.PHP_CONSTANT);
-    PHPSyntaxRdr.readInSyntax();
-    Vector buffer = PHPSyntaxRdr.getsyntaxdata();
+    
+    ArrayList buffer = PHPSyntaxRdr.getSyntaxData();
   //  String strbuffer = null;  unused
     PHPElement elbuffer = null;
-    while ((buffer != null)
-      && (!buffer.isEmpty()
-        && ((elbuffer = (PHPElement) buffer.remove(0)) != null))) {
+    for (int i=0;i<buffer.size();i++) {
+//    while ((buffer != null)
+//      && (!buffer.isEmpty()
+//        && ((elbuffer = (PHPElement) buffer.remove(0)) != null))) {
+                       elbuffer = (PHPElement) buffer.get(i);
       if (elbuffer instanceof PHPKeyword)
         wordRule.addWord(((PHPKeyword) elbuffer).getName(), keyword);
       if (elbuffer instanceof PHPFunction)