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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpsyntax.xml b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpsyntax.xml
index 998d77f..8336273 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpsyntax.xml
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/phpsyntax.xml
@@ -371,6 +371,7 @@ If the open fails, the function returns FALSE, otherwise it returns a pointer to
         <phpsyntax function="deg2rad"></phpsyntax>
         <phpsyntax function="delete_iovec"></phpsyntax>
         <phpsyntax function="dgettext"></phpsyntax>
+        <phpsyntax function="die"></phpsyntax>
         <phpsyntax function="dir" usage="class dir(string directory)">
 Directory class with properties, handle and class and methods read, rewind and close.
         </phpsyntax>
@@ -447,7 +448,7 @@ This function is identical to ereg_replace() except that this ignores case disti
         <phpsyntax function="exp"></phpsyntax>
         <phpsyntax function="explode" usage="array explode ( string separator, string string [, int limit])">Returns an array of strings, each of which is a substring of string formed by splitting it on boundaries formed by the string separator.
 If limit is set, the returned array will contain a maximum of limit elements with the last element containing the rest of string.
-If separator is an empty string (""), explode() will return FALSE. If separator contains a value that is not contained in string, 
+If separator is an empty string (&quot;&quot;), explode() will return FALSE. If separator contains a value that is not contained in string, 
 then explode() will return an array containing string. 
 Note: The limit parameter was added in PHP 4.0.1 
         </phpsyntax>
@@ -538,6 +539,9 @@ This function will not work on remote files; the file to be examined must be acc
 The results of this function are cached. See clearstatcache() for more details. 
 Using Windows shares: On windows, use //computername/share/filename or \\\\computername\share\filename to check files on network shares. 
         </phpsyntax>
+        <phpsyntax function="file_get_contents" usage="string file_get_contents ( string filename [, bool use_include_path [, resource context]])">Identical to file(), except that file_get_contents() returns the file in a string. On failure, file_get_contents() will return FALSE. 
+file_get_contents() is the preferred way to read the contents of a file into a string. It will use memory mapping techniques if supported by your OS to enhance performance.
+        </phpsyntax>
         <phpsyntax function="fileatime"></phpsyntax>
         <phpsyntax function="filectime"></phpsyntax>
         <phpsyntax function="filegroup"></phpsyntax>
@@ -1117,6 +1121,7 @@ if ENT_NOQUOTES is set neither single nor double quotes are translated.
         <phpsyntax function="ircg_set_current"></phpsyntax>
         <phpsyntax function="ircg_topic"></phpsyntax>
         <phpsyntax function="ircg_whois"></phpsyntax>
+        <phpsyntax function="is_a" usage="bool is_a ( object object, string class_name)">This function returns TRUE if the object is of this class or has this class as one of its parents, FALSE otherwise.</phpsyntax>
         <phpsyntax function="is_array"></phpsyntax>
         <phpsyntax function="is_bool"></phpsyntax>
         <phpsyntax function="is_dir"></phpsyntax>
@@ -1565,7 +1570,7 @@ zerofill - 1 if the column is zero-filled
         <phpsyntax function="mysql_list_dbs" usage="resource mysql_list_dbs ( [resource link_identifier])">List databases available on a MySQL server</phpsyntax>
         <phpsyntax function="mysql_list_fields" usage="resource mysql_list_fields ( string database_name, string table_name [, resource link_identifier])">List MySQL result fields</phpsyntax>
         <phpsyntax function="mysql_list_processes" usage="resource mysql_list_processes ( [resource link_identifier])">List MySQL processes</phpsyntax>
-        <phpsyntax function="mysql_list_tables" usage="resource mysql_list_tables ( string database [, resource link_identifier])"List tables in a MySQL database</phpsyntax>
+        <phpsyntax function="mysql_list_tables" usage="resource mysql_list_tables ( string database [, resource link_identifier])">List tables in a MySQL database</phpsyntax>
         <phpsyntax function="mysql_num_fields" usage="int mysql_num_fields ( resource result)">Get number of fields in result</phpsyntax>
         <phpsyntax function="mysql_num_rows" usage="int mysql_num_rows ( resource result)">Get number of rows in result</phpsyntax>
         <phpsyntax function="mysql_pconnect" usage="resource mysql_pconnect ( [string server [, string username [, string password [, int client_flags]]]])">Open a persistent connection to a MySQL server </phpsyntax>
@@ -2015,7 +2020,7 @@ Note: This information is also available in the predefined constant PHP_VERSION.
         <phpsyntax function="preg_replace_callback"></phpsyntax>
         <phpsyntax function="preg_split"></phpsyntax>
         <phpsyntax function="prev" usage="mixed prev ( array array)">Rewind the internal array pointer</phpsyntax>
-        <phpsyntax function="print" usage="">
+        <phpsyntax function="print">
 Output a string.
 Outputs arg. Returns TRUE on success or FALSE on failure. 
 print() is not actually a real function (it is a language construct) so you are not required to use parentheses with it. 
@@ -2181,7 +2186,7 @@ This does not indicate whether the user accepted the cookie.
 
 All the arguments except the name argument are optional. 
 If only the name argument is present, the cookie by that name will be deleted from the remote client. 
-You may also replace an argument with an empty string ("") in order to skip that argument. 
+You may also replace an argument with an empty string (&quot;&quot;) in order to skip that argument. 
 Because the expire and secure arguments are integers, they cannot be skipped with an empty string, use a zero (0) instead. 
         </phpsyntax>
         <phpsyntax function="setdepth"></phpsyntax>
@@ -2283,9 +2288,9 @@ will return the original version.
 </phpsyntax>
         <phpsyntax function="str_shuffle" usage="string str_shuffle ( string str)">Randomly shuffles a string</phpsyntax> 
         <phpsyntax function="str_word_count" usage="mixed str_word_count ( string string [, int format])">Return information about words used in a string </phpsyntax>
-        <phpsyntax function="strcasecmp" usage"int strcasecmp ( string str1, string str2)">Binary safe case-insensitive string comparison </phpsyntax>
+        <phpsyntax function="strcasecmp" usage="int strcasecmp ( string str1, string str2)">Binary safe case-insensitive string comparison </phpsyntax>
         <phpsyntax function="strchr" usage="string strchr ( string haystack, string needle)">Find the first occurrence of a character.This function is an alias for strstr(), and is identical in every way.</phpsyntax>
-        <phpsyntax function="strcmp" usage"int strcmp ( string str1, string str2)">Binary safe string comparison.
+        <phpsyntax function="strcmp" usage="int strcmp ( string str1, string str2)">Binary safe string comparison.
 Returns &lt; 0 if str1 is less than str2; &gt; 0 if str1 is greater than str2, and 0 if they are equal. 
 Note that this comparison is case sensitive. 
         </phpsyntax>
@@ -2623,7 +2628,7 @@ Note that this comparison is case sensitive.
         <phpsyntax keyword="break" tokenval="1012"></phpsyntax>
         <phpsyntax keyword="continue" tokenval="1013"></phpsyntax>
         <phpsyntax keyword="return" tokenval="1014"></phpsyntax>
-        <phpsyntax keyword="define" tokenval="1015"></phpsyntax>
+       
         <phpsyntax keyword="include" tokenval="1016"></phpsyntax>
         <phpsyntax keyword="include_once" tokenval="1017"></phpsyntax>
         <phpsyntax keyword="require" tokenval="1018"></phpsyntax>
@@ -2647,7 +2652,7 @@ Note that this comparison is case sensitive.
         <phpsyntax keyword="print" tokenval="1036"></phpsyntax> 
         <phpsyntax keyword="unset" tokenval="1037"></phpsyntax>
         <phpsyntax keyword="exit" tokenval="1038"></phpsyntax>
-        <phpsyntax keyword="die" tokenval="1039"></phpsyntax>
+
         <phpsyntax keyword="and" tokenval="1040"></phpsyntax>
         <phpsyntax keyword="or" tokenval="1041"></phpsyntax>
         <phpsyntax keyword="xor" tokenval="1042"></phpsyntax>
@@ -2655,6 +2660,27 @@ Note that this comparison is case sensitive.
         <phpsyntax keyword="null" tokenval="1044"></phpsyntax>
         <phpsyntax keyword="false" tokenval="1045"></phpsyntax>
         <phpsyntax keyword="true" tokenval="1046"></phpsyntax>
+        
+        <phpsyntax keyword="abstract" tokenval="1050"></phpsyntax>
+	    <phpsyntax keyword="catch" tokenval="1051"></phpsyntax>
+	    <phpsyntax keyword="finally" tokenval="1052"></phpsyntax>
+	    <phpsyntax keyword="try" tokenval="1053"></phpsyntax>
+	    <phpsyntax keyword="private" tokenval="1054"></phpsyntax>
+	    <phpsyntax keyword="protected" tokenval="1055"></phpsyntax>
+	<phpsyntax keyword="public" tokenval="1056"></phpsyntax>
+	<phpsyntax keyword="interface" tokenval="1057"></phpsyntax>
+	<phpsyntax keyword="implements" tokenval="1058"></phpsyntax>
+	<phpsyntax keyword="instanceof" tokenval="1059"></phpsyntax>
+	<phpsyntax keyword="super" tokenval="1060"></phpsyntax>
+	<phpsyntax keyword="throw" tokenval="1061"></phpsyntax>
+
+	<phpsyntax keyword="const" tokenval="1063"></phpsyntax>
+	<phpsyntax keyword="declare" tokenval="1064"></phpsyntax>
+	<phpsyntax keyword="enddeclare" tokenval="1065"></phpsyntax>
+	<phpsyntax keyword="eval" tokenval="1065"></phpsyntax>
+	<phpsyntax keyword="use" tokenval="1066"></phpsyntax>
+	<phpsyntax keyword="isset" tokenval="1066"></phpsyntax>
+	<phpsyntax keyword="final" tokenval="1067"></phpsyntax>
 =========================================================        
 *Below this are the various PHP-specific variable types *
 =========================================================