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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPKeywords.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPKeywords.java
index f4f7ddd..8e86fb0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPKeywords.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPKeywords.java
@@ -11,8 +11,6 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
-
-
 /**
  * PHP keyWords and Token definitions
  */
@@ -50,16 +48,15 @@ public class PHPKeywords {
       "foreach",
       "endforeach",
       "extends",
-      "empty",
-      "array",
-   //   "isset",
-      "echo",
-      "var",
-      "as",
-      "print",
-      "unset",
-      "exit",
-      "die" };
+    //  "empty",
+    //  "array",
+    //   "isset",
+    "echo", "var", "as", "print", 
+    "unset", "exit", "die", "and", "or", "xor",
+    "list" };
+
+  public final static String[] PHP_TYPES =
+    { "string", "unset", "array", "object", "bool", "boolean", "real", "double", "float", "int", "integer", };
 
   public final static int TT_KEYWORD = 1000;
   public final static int TT_if = 1001;
@@ -68,33 +65,32 @@ public class PHPKeywords {
   public final static int TT_endif = 1004;
   public final static int TT_for = 1005;
   public final static int TT_endfor = 1006;
-  public final static int TT_while = 100;
-  public final static int TT_endwhile = 1007;
-  public final static int TT_switch = 1008;
-  public final static int TT_case = 1009;
-  public final static int TT_endswitch = 1010;
-  public final static int TT_break = 1011;
-  public final static int TT_continue = 1012;
-  public final static int TT_return = 1013;
-  public final static int TT_define = 1014;
-  public final static int TT_include = 1015;
-  public final static int TT_include_once = 1016;
-  public final static int TT_require = 1017;
-  public final static int TT_require_once = 1018;
-  public final static int TT_function = 1019;
-  public final static int TT_class = 1020;
-  public final static int TT_new = 1021;
-  public final static int TT_do = 1022;
-  public final static int TT_old_function = 1023;
-  public final static int TT_default = 1024;
-  public final static int TT_global = 1025;
-  public final static int TT_static = 1026;
-  public final static int TT_foreach = 1027;
-  public final static int TT_endforeach = 1028;
-  public final static int TT_extends = 1029;
-  public final static int TT_empty = 1030;
-  public final static int TT_array = 1031;
- // public final static int TT_isset = 1032;
+  public final static int TT_while = 1007;
+  public final static int TT_endwhile = 1008;
+  public final static int TT_switch = 1009;
+  public final static int TT_case = 10010;
+  public final static int TT_endswitch = 1011;
+  public final static int TT_break = 1012;
+  public final static int TT_continue = 1013;
+  public final static int TT_return = 1014;
+  public final static int TT_define = 1015;
+  public final static int TT_include = 1016;
+  public final static int TT_include_once = 1017;
+  public final static int TT_require = 1018;
+  public final static int TT_require_once = 1019;
+  public final static int TT_function = 1020;
+  public final static int TT_class = 1021;
+  public final static int TT_new = 1022;
+  public final static int TT_do = 1023;
+  public final static int TT_old_function = 1024;
+  public final static int TT_default = 1025;
+  public final static int TT_global = 1026;
+  public final static int TT_static = 1027;
+  public final static int TT_foreach = 1028;
+  public final static int TT_endforeach = 1029;
+  public final static int TT_extends = 1030;
+ // public final static int TT_empty = 1031;
+ // public final static int TT_array = 1032;
   public final static int TT_echo = 1033;
   public final static int TT_var = 1034;
   public final static int TT_as = 1035;
@@ -102,47 +98,46 @@ public class PHPKeywords {
   public final static int TT_unset = 1037;
   public final static int TT_exit = 1038;
   public final static int TT_die = 1039;
-  
+  public final static int TT_and = 1040;
+  public final static int TT_or = 1041;
+  public final static int TT_xor = 1042;
+  public final static int TT_list = 1043;
+
   public final static int[] PHP_KEYWORD_TOKEN =
     {
-    TT_if,
-    TT_elseif,
-    TT_else,
-    TT_endif,
-    TT_for,
-    TT_endfor,
-    TT_while,
-    TT_endwhile,
-    TT_switch,
-    TT_case,
-    TT_endswitch,
-    TT_break,
-    TT_continue,
-    TT_return,
-    TT_define,
-    TT_include,
-    TT_include_once,
-    TT_require,
-    TT_require_once,
-    TT_function,
-    TT_class,
-    TT_new,
-    TT_do,
-    TT_old_function,
-    TT_default,
-    TT_global,
-    TT_static,
-    TT_foreach,
-    TT_endforeach,
-    TT_extends,
-    TT_empty,
-    TT_array,
- //   TT_isset,
-    TT_echo,
-    TT_var,
-    TT_as,
-    TT_print,
-    TT_unset,
-    TT_exit,
-    TT_die };
+      TT_if,
+      TT_elseif,
+      TT_else,
+      TT_endif,
+      TT_for,
+      TT_endfor,
+      TT_while,
+      TT_endwhile,
+      TT_switch,
+      TT_case,
+      TT_endswitch,
+      TT_break,
+      TT_continue,
+      TT_return,
+      TT_define,
+      TT_include,
+      TT_include_once,
+      TT_require,
+      TT_require_once,
+      TT_function,
+      TT_class,
+      TT_new,
+      TT_do,
+      TT_old_function,
+      TT_default,
+      TT_global,
+      TT_static,
+      TT_foreach,
+      TT_endforeach,
+      TT_extends,
+     // TT_empty,
+    //  TT_array,
+    //   TT_isset,
+    TT_echo, TT_var, TT_as, TT_print, TT_unset, TT_exit, 
+    TT_die, TT_and, TT_or, TT_xor, TT_list };
 }