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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/syntax.xml b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/syntax.xml
index 35c78f0..fc39beb 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/syntax.xml
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/syntax.xml
@@ -2855,77 +2855,53 @@
 <s f="Exception::getTraceAsString" u="string Exception::getTraceAsString()">Obtain the backtrace for the exception as a string (instead of an array)</s>
 <s f="Exception::__construct" u=" Exception::__construct(string message, int code)">Exception constructor</s>
 <s f="ErrorException::__construct" u=" ErrorException::__construct(string message, int code, int severity [, string filename [, int lineno]])">ErrorException constructor</s>
-<s f="__construct" u="([ mixed $args  [,  $...  ]] )">PHP 5 allows developers to declare constructor methods for classes. Classes which have a constructor method call this method on each newly-created object, so it is suitable for any initialization that the object may need before it is used.</s><s f="__destruct" u="( void  )">PHP 5 introduces a destructor concept similar to that of other object-oriented languages, such as C++. The destructor method will be called as soon as all references to a particular object are removed or when the object is explicitly destroyed or in any order in shutdown sequence.</s><s k="and" />
-<s k="or" />
-<s k="xor" />
-<s k="__FILE__" />
-<s k="exception" />
-<s k="__LINE__" />
+<s f="__construct" u="([ mixed $args  [,  $...  ]] )">PHP 5 allows developers to declare constructor methods for classes. Classes which have a constructor method call this method on each newly-created object, so it is suitable for any initialization that the object may need before it is used.</s><s f="__destruct" u="( void  )">PHP 5 introduces a destructor concept similar to that of other object-oriented languages, such as C++. The destructor method will be called as soon as all references to a particular object are removed or when the object is explicitly destroyed or in any order in shutdown sequence.</s><s k="abstract" />
+<s k="and" />
 <s k="array" />
 <s k="as" />
 <s k="break" />
 <s k="case" />
+<s k="catch" />
 <s k="class" />
+<s k="clone" />
 <s k="const" />
 <s k="continue" />
 <s k="declare" />
 <s k="default" />
-<s k="die" />
 <s k="do" />
-<s k="echo" />
 <s k="else" />
 <s k="elseif" />
-<s k="empty" />
 <s k="enddeclare" />
 <s k="endfor" />
 <s k="endforeach" />
 <s k="endif" />
 <s k="endswitch" />
 <s k="endwhile" />
-<s k="eval" />
-<s k="exit" />
 <s k="extends" />
+<s k="final" />
 <s k="for" />
 <s k="foreach" />
 <s k="function" />
 <s k="global" />
 <s k="if" />
-<s k="include" />
-<s k="include_once" />
-<s k="isset" />
-<s k="list" />
+<s k="implements" />
+<s k="interface" />
+<s k="instanceof" />
+<s k="namespace" />
 <s k="new" />
-<s k="print" />
-<s k="require" />
-<s k="require_once" />
-<s k="return" />
+<s k="or" />
+<s k="private" />
+<s k="protected" />
+<s k="public" />
 <s k="static" />
 <s k="switch" />
-<s k="unset" />
+<s k="this" />
+<s k="throw" />
+<s k="try" />
 <s k="use" />
 <s k="var" />
 <s k="while" />
-<s k="__FUNCTION__" />
-<s k="__CLASS__" />
-<s k="__METHOD__" />
-<s k="final" />
-<s k="php_user_filter" />
-<s k="interface" />
-<s k="implements" />
-<s k="instanceof" />
-<s k="public" />
-<s k="private" />
-<s k="protected" />
-<s k="abstract" />
-<s k="clone" />
-<s k="try" />
-<s k="catch" />
-<s k="throw" />
-<s k="this" />
-<s k="final" />
-<s k="__NAMESPACE__" />
-<s k="namespace" />
-<s k="__DIR__" />
+<s k="xor" />
 <s k="true" />
 <s k="false" />
 <s k="null" />
@@ -2957,6 +2933,7 @@
 <s c="BBCODE_ARG_DOUBLE_QUOTE" />
 <s c="BBCODE_ARG_SINGLE_QUOTE" />
 <s c="BBCODE_ARG_HTML_QUOTE" />
+<s c="BBCODE_ARG_QUOTE_ESCAPING" />
 <s c="BBCODE_AUTO_CORRECT" />
 <s c="BBCODE_CORRECT_REOPEN_TAGS" />
 <s c="BBCODE_DISABLE_TREE_BUILD" />
@@ -3102,6 +3079,17 @@
 <s c="PGSQL_STATUS_STRING" />
 <s c="PGSQL_CONV_IGNORE_DEFAULT" />
 <s c="PGSQL_CONV_FORCE_NULL" />
+<s c="SQLITE3_ASSOC" />
+<s c="SQLITE3_NUM" />
+<s c="SQLITE3_BOTH" />
+<s c="SQLITE3_INTEGER" />
+<s c="SQLITE3_FLOAT" />
+<s c="SQLITE3_TEXT" />
+<s c="SQLITE3_BLOB" />
+<s c="SQLITE3_NULL" />
+<s c="SQLITE3_OPEN_READONLY" />
+<s c="SQLITE3_OPEN_READWRITE" />
+<s c="SQLITE3_OPEN_CREATE" />
 <s c="XSLT_OPT_SILENT" />
 <s c="XSLT_SABOPT_PARSE_PUBLIC_ENTITIES" />
 <s c="XSLT_SABOPT_DISABLE_ADDING_META" />
@@ -3538,10 +3526,10 @@
 <s c="GD_MINOR_VERSION" />
 <s c="GD_RELEASE_VERSION" />
 <s c="GD_EXTRA_VERSION" />
+<s c="GD_BUNDLE" />
 <s c="IMG_GIF" />
 <s c="IMG_JPG" />
 <s c="IMG_JPEG" />
-<s c="IMAGE_JPG" />
 <s c="IMG_PNG" />
 <s c="IMG_WBMP" />
 <s c="IMG_XPM" />
@@ -3668,6 +3656,8 @@
 <s c="M_ERROR" />
 <s c="M_FAIL" />
 <s c="M_SUCCESS" />
+<s c="256">Phar::SHA512 ( integer )</s>
+<s c="PHP">Phar::PHPS ( integer )</s>
 <s c="MHASH_ADLER32" />
 <s c="MHASH_CRC32" />
 <s c="MHASH_CRC32B" />
@@ -3979,20 +3969,60 @@
 <s c="imagick::DISPOSE_NONE" />
 <s c="imagick::DISPOSE_BACKGROUND" />
 <s c="imagick::DISPOSE_PREVIOUS" />
-<s c="imagick::COMPOSITE_OVER" />
-<s c="imagick::COMPOSITE_IN" />
-<s c="imagick::COMPOSITE_OUT" />
-<s c="imagick::COMPOSITE_ATOP" />
-<s c="imagick::COMPOSITE_XOR" />
-<s c="imagick::COMPOSITE_PLUS" />
-<s c="imagick::COMPOSITE_MINUS" />
+<s c="imagick::COMPOSITE_DEFAULT" />
+<s c="imagick::COMPOSITE_UNDEFINED" />
+<s c="imagick::COMPOSITE_NO" />
 <s c="imagick::COMPOSITE_ADD" />
-<s c="imagick::COMPOSITE_SUBTRACT" />
-<s c="imagick::COMPOSITE_DIFFERENCE" />
+<s c="imagick::COMPOSITE_ATOP" />
+<s c="imagick::COMPOSITE_BLEND" />
 <s c="imagick::COMPOSITE_BUMPMAP" />
+<s c="imagick::COMPOSITE_CLEAR" />
+<s c="imagick::COMPOSITE_COLORBURN" />
+<s c="imagick::COMPOSITE_COLORDODGE" />
+<s c="imagick::COMPOSITE_COLORIZE" />
+<s c="imagick::COMPOSITE_COPYBLACK" />
+<s c="imagick::COMPOSITE_COPYBLUE" />
 <s c="imagick::COMPOSITE_COPY" />
+<s c="imagick::COMPOSITE_COPYCYAN" />
+<s c="imagick::COMPOSITE_COPYGREEN" />
+<s c="imagick::COMPOSITE_COPYMAGENTA" />
+<s c="imagick::COMPOSITE_COPYOPACITY" />
+<s c="imagick::COMPOSITE_COPYRED" />
+<s c="imagick::COMPOSITE_COPYYELLOW" />
+<s c="imagick::COMPOSITE_DARKEN" />
+<s c="imagick::COMPOSITE_DSTATOP" />
+<s c="imagick::COMPOSITE_DST" />
+<s c="imagick::COMPOSITE_DSTIN" />
+<s c="imagick::COMPOSITE_DSTOUT" />
+<s c="imagick::COMPOSITE_DSTOVER" />
+<s c="imagick::COMPOSITE_DIFFERENCE" />
 <s c="imagick::COMPOSITE_DISPLACE" />
-<s c="imagick::COMPOSITE_DEFAULT" />
+<s c="imagick::COMPOSITE_DISSOLVE" />
+<s c="imagick::COMPOSITE_EXCLUSION" />
+<s c="imagick::COMPOSITE_HARDLIGHT" />
+<s c="imagick::COMPOSITE_HUE" />
+<s c="imagick::COMPOSITE_IN" />
+<s c="imagick::COMPOSITE_LIGHTEN" />
+<s c="imagick::COMPOSITE_LUMINIZE" />
+<s c="imagick::COMPOSITE_MINUS" />
+<s c="imagick::COMPOSITE_MODULATE" />
+<s c="imagick::COMPOSITE_MULTIPLY" />
+<s c="imagick::COMPOSITE_OUT" />
+<s c="imagick::COMPOSITE_OVER" />
+<s c="imagick::COMPOSITE_OVERLAY" />
+<s c="imagick::COMPOSITE_PLUS" />
+<s c="imagick::COMPOSITE_REPLACE" />
+<s c="imagick::COMPOSITE_SATURATE" />
+<s c="imagick::COMPOSITE_SCREEN" />
+<s c="imagick::COMPOSITE_SOFTLIGHT" />
+<s c="imagick::COMPOSITE_SRCATOP" />
+<s c="imagick::COMPOSITE_SRC" />
+<s c="imagick::COMPOSITE_SRCIN" />
+<s c="imagick::COMPOSITE_SRCOUT" />
+<s c="imagick::COMPOSITE_SRCOVER" />
+<s c="imagick::COMPOSITE_SUBTRACT" />
+<s c="imagick::COMPOSITE_THRESHOLD" />
+<s c="imagick::COMPOSITE_XOR" />
 <s c="imagick::MONTAGEMODE_FRAME" />
 <s c="imagick::MONTAGEMODE_UNFRAME" />
 <s c="imagick::MONTAGEMODE_CONCATENATE" />
@@ -4564,24 +4594,24 @@
 <s c="SVN_PROP_REVISION_ORIG_DATE" />
 <s c="SVN_PROP_REVISION_AUTHOR" />
 <s c="SVN_PROP_REVISION_LOG" />
-<s c="svn_wc_status_none" />
-<s c="svn_wc_status_unversioned" />
-<s c="svn_wc_status_normal" />
-<s c="svn_wc_status_added" />
-<s c="svn_wc_status_missing" />
-<s c="svn_wc_status_deleted" />
-<s c="svn_wc_status_replaced" />
-<s c="svn_wc_status_modified" />
-<s c="svn_wc_status_merged" />
-<s c="svn_wc_status_conflicted" />
-<s c="svn_wc_status_ignored" />
-<s c="svn_wc_status_obstructed" />
-<s c="svn_wc_status_external" />
-<s c="svn_wc_status_incomplete" />
-<s c="svn_node_none" />
-<s c="svn_node_file" />
-<s c="svn_node_dir" />
-<s c="svn_node_unknown" />
+<s c="SVN_WC_STATUS_NONE" />
+<s c="SVN_WC_STATUS_UNVERSIONED" />
+<s c="SVN_WC_STATUS_NORMAL" />
+<s c="SVN_WC_STATUS_ADDED" />
+<s c="SVN_WC_STATUS_MISSING" />
+<s c="SVN_WC_STATUS_DELETED" />
+<s c="SVN_WC_STATUS_REPLACED" />
+<s c="SVN_WC_STATUS_MODIFIED" />
+<s c="SVN_WC_STATUS_MERGED" />
+<s c="SVN_WC_STATUS_CONFLICTED" />
+<s c="SVN_WC_STATUS_IGNORED" />
+<s c="SVN_WC_STATUS_OBSTRUCTED" />
+<s c="SVN_WC_STATUS_EXTERNAL" />
+<s c="SVN_WC_STATUS_INCOMPLETE" />
+<s c="SVN_NODE_NONE" />
+<s c="SVN_NODE_FILE" />
+<s c="SVN_NODE_DIR" />
+<s c="SVN_NODE_UNKNOWN" />
 <s c="HTTP_SUPPORT" />
 <s c="HTTP_SUPPORT_REQUESTS" />
 <s c="HTTP_SUPPORT_MAGICMIME" />
@@ -4726,6 +4756,7 @@
 <s c="FTP_FAILED" />
 <s c="FTP_FINISHED" />
 <s c="FTP_MOREDATA" />
+<s c="__default" />
 <s c="RUNKIT_IMPORT_FUNCTIONS" />
 <s c="RUNKIT_IMPORT_CLASS_METHODS" />
 <s c="RUNKIT_IMPORT_CLASS_CONSTS" />
@@ -6115,6 +6146,42 @@
 <s c="15">End Element</s>
 <s c="16">End Entity</s>
 <s c="17">XML Declaration node</s>
+<s c="SEARCHD_OK" />
+<s c="SEARCHD_ERROR" />
+<s c="SEARCHD_RETRY" />
+<s c="SEARCHD_WARNING" />
+<s c="SPH_MATCH_ALL" />
+<s c="SPH_MATCH_ANY" />
+<s c="SPH_MATCH_PHRASE" />
+<s c="SPH_MATCH_BOOLEAN" />
+<s c="SPH_MATCH_EXTENDED" />
+<s c="SPH_MATCH_FULLSCAN" />
+<s c="SPH_MATCH_EXTENDED2" />
+<s c="SPH_RANK_PROXIMITY_BM25" />
+<s c="SPH_RANK_BM25" />
+<s c="SPH_RANK_NONE" />
+<s c="SPH_RANK_WORDCOUNT" />
+<s c="SPH_SORT_RELEVANCE" />
+<s c="SPH_SORT_ATTR_DESC" />
+<s c="SPH_SORT_ATTR_ASC" />
+<s c="SPH_SORT_TIME_SEGMENTS" />
+<s c="SPH_SORT_EXTENDED" />
+<s c="SPH_SORT_EXPR" />
+<s c="SPH_FILTER_VALUES" />
+<s c="SPH_FILTER_RANGE" />
+<s c="SPH_FILTER_FLOATRANGE" />
+<s c="SPH_ATTR_INTEGER" />
+<s c="SPH_ATTR_TIMESTAMP" />
+<s c="SPH_ATTR_ORDINAL" />
+<s c="SPH_ATTR_BOOL" />
+<s c="SPH_ATTR_FLOAT" />
+<s c="SPH_ATTR_MULTI" />
+<s c="SPH_GROUPBY_DAY" />
+<s c="SPH_GROUPBY_WEEK" />
+<s c="SPH_GROUPBY_MONTH" />
+<s c="SPH_GROUPBY_YEAR" />
+<s c="SPH_GROUPBY_ATTR" />
+<s c="SPH_GROUPBY_ATTRPAIR" />
 <s c="U_INVALID_STOP" /> 
 <s c="U_INVALID_SKIP">1</s>
 <s c="U_INVALID_SUBSTITUTE">2</s>