SOURCES (AC-branch): php.vim - updated to 0.9.7

adamg adamg at pld-linux.org
Fri May 30 00:21:23 CEST 2008


Author: adamg                        Date: Thu May 29 22:21:23 2008 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- updated to 0.9.7

---- Files affected:
SOURCES:
   php.vim (1.10 -> 1.10.2.1) 

---- Diffs:

================================================================
Index: SOURCES/php.vim
diff -u SOURCES/php.vim:1.10 SOURCES/php.vim:1.10.2.1
--- SOURCES/php.vim:1.10	Sat Mar 22 12:20:35 2008
+++ SOURCES/php.vim	Fri May 30 00:21:17 2008
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:     PHP 4/5
 " Maintainer:   Peter Hodge <toomuchphp-vim at yahoo.com>
-" Last Change:  October 27, 2006
+" Last Change:  May 7, 2008
 "
 " URL:      http://www.vim.org/scripts/script.php?script_id=1571
-" Version:  0.9.6
+" Version:  0.9.7
 "
 " ================================================================
 "
@@ -13,31 +13,36 @@
 "         :let php_folding = 0
 "         :let php_strict_blocks = 0
 "
+"       Also, there is a 'large file' mode which can disable certain options
+"       if a PHP file is too big (see php_large_file below).
+"
 " ================================================================
 "
-" Note: If you are using a colour terminal with dark background, you will
-"       probably find the 'elflord' colorscheme is well suited to PHP syntax
-"       because of the way it highlights the flow-control statements in your
-"       code.
+" Note: If you are using a colour terminal with a dark background, you will
+"       probably find the 'elflord' colorscheme will give you the most
+"       distinctive colors.
 "
 " ================================================================
 "
 " OPTIONS:
 "
-"    Note: Many of these default to 1 (On), so you would need to set
-"	       them to 0 to turn them off. E.g., in your .vimrc file:
-"            let php_special_variables = 0
-"            let php_special_functions = 0
-"            let php_alt_comparisons = 0
-"            etc.
-"          If the variables do not exist, the default value will be used.
-"
-"    Note: All options can be set globally or on a per-file basis by using
-"          global or buffer local variables.  For example, you could turn on SQL
-"          highlighting globally in your .vimrc:
-"            let g:php_sql_query = 1
-"          but then turn it off in only one buffer (one open file):
-"            let b:php_sql_query = 0
+"    Many of these default to 1 (On), so you would need to set
+"	 them to 0 to turn them off. E.g., in your .vimrc file:
+"      let php_special_vars = 0
+"      let php_special_functions = 0
+"      let php_alt_comparisons = 0
+"      etc.
+"    If the variables do not exist, the default value will be used.
+"
+"
+"    All options can be set globally or on a per-file basis by using
+"    global or buffer-local variables.  For example, you could turn on
+"    automatic folding for all PHP scripts in your .vimrc:
+"      let g:php_folding = 3
+"
+"    Then you could turn it off in only one file using this command:
+"
+"      :let b:php_folding = 0 | setfiletype php
 "
 "
 "   -- PHP FEATURES --
@@ -51,7 +56,7 @@
 "         let php_baselib = 1/0  [default 0]
 "             ... for highlighting baselib functions
 "
-"         let php_special_variables = 1/0  [default 1]
+"         let php_special_vars = 1/0  [default 1]
 "             ... to highlight superglobals like $_GET, $_SERVER, etc.
 "               * always on if using php_oldStyle
 "
@@ -68,10 +73,21 @@
 "                 This also applies to a function which returns by-reference,
 "                 as well as a function argument which is by-reference.
 "
+"         let php_smart_members = 1/0  [default 0]
+"             ... syntax works out whether -> indicates a property or method.
+"                 Otherwise method colours may be used on properties, for
+"                 example:
+"                   $object->__get[] = true;
+"                 '__get' would be highlighted as a special method, even
+"                 thought it is clearly a property in this context.
+"                 Note: turning this OFF can improve the highlighting speed on
+"                 object-oriented code
+"
 "         let php_alt_properties = 1/0  [default 0]
 "             ... use a different color for '->' based on whether it is used
 "                 for property access, method access, or dynamic access (using
 "                 '->{...}')
+"               * requires php_smart_members
 "
 "         let php_highlight_quotes = 1/0  [default 0]
 "             ... makes quote characters the same colour as the string
@@ -83,9 +99,12 @@
 "         let php_smart_semicolon = 1/0  [default 1]
 "             ... semicolon adopts the color of a 'return' or 'break' keyword
 "               * requires php_show_semicolon
+"                 Note: this also includes the ':' or ';' which follows a
+"                 'case' or 'default' inside a switch
 "
 "         let php_alt_blocks = 1/0  [default 1]
-"             ... colorize { and } around class/function/try/catch bodies.
+"             ... colorize { and } around class/function/try/catch bodies
+"                 according to the type of code block.
 "               * requires php_strict_blocks
 "
 "         let php_alt_arrays = 0/1/2  [default 1]
@@ -95,9 +114,21 @@
 "                 Commas are not highlighted by default because it's too much
 "                 color.
 "
-"         let php_show_preg = 1/0  [default 1]
+"         let php_alt_construct_parents = 0/1  [default 0]
+"             ... to colorize the ( and ) around an if, while, foreach, or switch
+"                 body.
+"               * requires ... what?
+"                 TODO: work out dependencies, code them correctly
+"
+"         let php_show_spl = 1/0  [default 1]
+"             .. to colorize methods which are defined by PHP default interfaces
+"                TODO: work out what these interfaces are part of: SPL or just
+"                PHP
+"
+"         let php_show_pcre = 1/0  [default 1]
+"                 (was: 'php_show_preg')
 "             ... to highlight regular expression patterns inside calls
-"                 to preg_match(), preg_replace, etc.
+"                 to preg_match(), preg_replace(), etc.
 "
 "
 "   -- FINDING ERRORS --
@@ -106,7 +137,7 @@
 "             ... for highlighting parent error ] or ) or }
 "               * requires php_strict_blocks
 "
-"         let php_parent_error_open =
+"         let php_parent_error_open = ?
 "             ... for skipping a php end tag, if there exists an
 "                 open ( or [ without a closing one
 "                 Note: this option is now enabled permanently (unless
@@ -118,6 +149,11 @@
 "                 an if/else/while/for/foreach/switch statement (the
 "                 logical constructs should have a body).
 "               * requires php_strict_blocks
+
+"         let php_show_semicolon_error = 1/0  [default 1]
+"             ... highlights certain cases when ';' is followed by an
+"                 operator such as '+'.
+"               * requires php_show_semicolon
 "
 "         let php_nested_functions = 0/1  [default 0]
 "             ... Whether or not to allow contiaining one function inside
@@ -126,22 +162,43 @@
 "                 editting a large class.
 "                 Note: this is the only option which might break valid PHP
 "                 code, although only if you define one function inside
-"                 another, which is useually discouraged.
-"               * irrelevent without php_strict_blocks
+"                 another, which is usually discouraged.
+"               * only relevant when using php_strict_blocks
 "
 "   -- OTHER OPTIONS --
 "
+"         let php_large_file = 0/?  [ default 3000 ]
+"             ... If a PHP script has more lines than this limit (e.g., more
+"                 than 3000 lines), some options are automatically turned off
+"                 to help it load faster.  These options are:
+"                   php_strict_blocks = 0
+"                   php_smart_members = 0
+"                   php_smart_semicolon = 0
+"                   php_show_pcre = 0
+"                   php_folding = 0
+"                 Note: If you set this option to '0', then this feature will
+"                 be disabled; thus you can use:
+"                   :let b:php_large_file = 0 | setfiletype php
+"                 to reload the current file with the disabled syntax options
+"                 re-activated.
+"
 "         let php_strict_blocks = 1/0  [default 1]
 "             ... to match together all {} () and [] blocks correctly. This is
-"                 required by some of the other options for find errors,
+"                 required by some of the other options for finding errors and
 "                 applying correct colors to { } blocks, etc.  However, it may
 "                 cause Vim to slow down on large files.
 "
 "         let php_asp_tags = 1/0  [default 0]
-"             ... for highlighting ASP-style short tags
+"             ... for highlighting ASP-style short tags: <% %>
 "
 "         let php_noShortTags = 1/0  [default 0]
 "             ... don't sync <? ?> as php
+"               * This has been deprecated in favour of php_short_tags (which
+"                 has the opposite meaning)
+"
+"         let php_short_tags = 1/0  [default 1]
+"             ... highlight <?...?> blocks as php. If this is OFF, you need to
+"                 use the longer <?php...?>
 "
 "         let php_oldStyle = 1
 "             ... for using old colorstyle
@@ -150,17 +207,20 @@
 "             ... 1: for folding classes and functions
 "                 2: for folding all { } regions
 "                 3: for folding only functions
+"                 TODO: documentation for php_folding_manual
 "
 "         let php_fold_arrays = 0/1  [default 0]
 "             ... To fold arrays as well.
+"               * requires php_folding, php_strict_blocks, php_alt_arrays
+"
+"         let php_fold_heredoc = 0/1  [default 0]
+"             ... Fold heredoc blocks ($string = <<<ENDOFSTRING)
 "               * requires php_folding
 "
 "         let php_sync_method = x
 "             ... x = -1 to sync by search (default)
 "                 x > 0  to sync at least x lines backwards
 "                 x = 0  to sync from start
-"                 TODO: investigate sync methods, try and find something which
-"                       is most effective for PHP
 "
 "
 " ================================================================
@@ -168,26 +228,21 @@
 " TODO LIST:
 "
 " PRIORITY:
+"   - document the phpControlParent feature, make sure it works fully, or not
+"     at all
 "   - what to do about 'iskeyword' containing '$'?
-"   - provide an option to turn off array index colors [0] etc
-"     (these array index colors may be deprecated/unnecessary if choosing
-"     colors automatically - they were added in because array indexes weren't
-"     visible inside a string).
-"   - Investigate possibilities for automatic syncing ... Vim regularly
-"     gets lost and a sync from start is required.  This is quite annoying.
 "   - test syntax against older Vims (6.4, 6.0, 5.7)
+"   - concat rid of lines beginning with '\'
 "   - allow turning off all semicolon errors
+"   - fix bug in highlighting of pattern: /[\\\]/ and /[\\]]/
+"   - fix bug in highlighting of pattern: "/\$/" should make the '$' match the
+"     end-of-pattern
+"   - case/default syntax items don't work inside a switch/endswitch
+"     although it's still OK using {...}
 "
 " PHP Syntax:
-"   - add @Spell and @NoSpell in appropriate places (spell-checking inside
-"     comments and strings probably needs to be optional).
-"   - option to disable nesting function declarations so that an unclosed
-"     function block can end at the next function declaration
-"     (This will be much faster when inserting an '{' near the start of a
-"     large class, as not so many { } blocks will need to be recalculated)
 "   - review support for PHP built-in superglobals:
 "     - ensure all PHP 5.2 superglobals are recognized
-"     - highlight known array keys for GLOBALS, _SERVER, _ENV, etc?
 "   - review support for PHP built-in constants, make sure I've got them all
 "   - make support for PHP built-in class methods optional.
 "   - review highlight links to ensure maximum readability on GUI
@@ -198,8 +253,19 @@
 "   - use 'nextgroup' to highlight errors when a ']' or ')' is followed by
 "     a constant/variable or function call.  This will also help find when
 "     a closing ')' is missing.
+"   - Review syncing searches, see if there is anything we can add to help the
+"     syncing process.
+"   - make ';' on the end of a while() NOT a problem unless it is followed by
+"     a '{'
 "
 " PCRE Syntax:
+"   - fix problem: in regex "/(...)\1/", '\1' does NOT refer to a backreference!
+"     this is caused by incorrect matching of escape sequences in
+"     double-quoted strings where the double-quote escape sequences should
+"     take precedence
+"   - fix problem: this line breaks folding
+"   		preg_match("#^require MODULES_PATH \. (['\"])main\.inc\.php\\1;$#m", '', $m))
+"
 "   - decide on terminology: 'PCRE' or 'PREG'
 "   - Review effects of paired delimiters when combined with other
 "     PCRE complex atoms using those symbols
@@ -209,8 +275,6 @@
 "
 " Future Plans:
 "   - option to choose PHP4 or PHP5 compatibility
-"   - some way to detect missing commas in various places
-"     (function calls, function proto types, class 'implements')
 "   - differentiate between an interface block and a class block
 "   - add ability to highlight user-defined functions and keywords
 "     using any of the following means:
@@ -223,10 +287,18 @@
 "   - allow easy embedding of the PHP syntax using 'contains=@phpClTop' or
 "     'syn region phpRegion ...'
 "   - automatically select best colors by examining the colorscheme
-"   - check to see if the baselib needs to be highlighted still
+"   - check to see if 'baselib' needs to be highlighted still
 "   - Add support 2nd parameter to preg_replace and highlight
 "     "\1" and other confusing sequences as errors ("\1" is "\x01")
-"   - use nextgroup= to match correct syntax usage
+"   - Add support for class constants (foo::bar)
+"
+" Difficult To Implement:
+"   - Highlight expressions without operators or commas, such as:
+"       echo $a $b;
+"     These expressions are *really* difficult to find efficiently.
+"   - Folding around 'case' blocks.
+"
+"
 "
 " ================================================================
 "
@@ -277,78 +349,101 @@
   endif
 endfunction
 
-" set up variables based on global or buffer variables which have been set
-  " Strict Blocks (s:strict_blocks) {{{1
-  let s:strict_blocks = s:ChooseValue('php_strict_blocks', 1)
+" set up variables based on global or buffer variables {{{1
+  " Is it a large file? (s:large_file) {{{2
+  let s:large_file_limit = s:ChooseValue('php_large_file', 3000)
+  let s:large_file = (s:large_file_limit == 0) ? 0 : (line('$') >= s:large_file_limit)
+
+  if s:large_file
+    echohl WarningMsg
+    echomsg printf('WARNING: Large PHP File (%d lines); some syntax options have been disabled.', line('$'))
+    echohl None
+  endif
 
-  " Fold Level (s:folding) {{{1
-  let s:folding = s:ChooseValue('php_folding', 0)
+  " Strict Blocks (s:strict_blocks) {{{2
+  let s:strict_blocks = s:large_file ? 0 : s:ChooseValue('php_strict_blocks', 1)
 
-  " Fold arrays (s:fold_arrays) {{{1
+  " Fold Level (s:folding) {{{2
+  let s:folding = s:large_file ? 0 : s:ChooseValue('php_folding', 0)
+
+  " Fold manually (s:fold_manual) {{{2
+  let s:fold_manual = s:large_file ? 0 : s:ChooseValue('php_fold_manual', s:folding ? 1 : 0)
+
+  " Fold arrays (s:fold_arrays) {{{2
   let s:fold_arrays = (s:folding && s:ChooseValue('php_fold_arrays', 0))
 
-  " Allow nested functions (s:nested_functions) {{{1
-  " TODO: document this feature
+  " Fold heredoc strings (s:fold_heredoc) {{{2
+  let s:fold_heredoc = (s:folding && s:ChooseValue('php_fold_heredoc', 0))
+
+  " Allow nested functions (s:nested_functions) {{{2
   let s:nested_functions = s:ChooseValue('php_nested_functions', 1)
 
-  " Allow ASP-style <% %> tags (s:asp_tags) {{{1
+  " Allow ASP-style <% %> tags (s:asp_tags) {{{2
   let s:asp_tags = s:ChooseValue('php_asp_tags', 0)
 
-  " Only allow long tags '<?php' (s:long_tags) {{{1
-  let s:long_tags = s:ChooseValue('php_noShortTags', 0)
+  " Only allow long tags '<?php' (s:long_tags) {{{2
+  let s:long_tags = !s:ChooseValue('php_short_tags', !s:ChooseValue('php_noShortTags', 0))
 
-  " SQL in strings (s:show_sql) {{{1
+  " SQL in strings (s:show_sql) {{{2
   let s:show_sql = s:ChooseValue('php_sql_query', 0)
 
-  " HTML in strings (s:show_html_in_strings) {{{1
+  " HTML in strings (s:show_html_in_strings) {{{2
   let s:show_html_in_strings = s:ChooseValue('php_htmlInStrings', 0)
 
-  " Highlight the PHP baselib (s:show_baselib) {{{1
+  " Highlight the PHP baselib (s:show_baselib) {{{2
   let s:show_baselib = s:ChooseValue('php_baselib', 0)
 
-  " Highlight superglobals (s:superglobals) {{{1
-  " TODO: this is supposed to be always on if using php_oldStyle
-  let s:superglobals = s:ChooseValue('php_special_variables', 1)
+  " Highlight superglobals (s:special_vars) {{{2
+  let s:special_vars = s:ChooseValue('php_special_vars', s:ChooseValue('php_special_variables', s:ChooseValue('php_oldStyle', 1)))
 
-  " Highlight special functions (s:special_functions) {{{1
+  " Highlight special functions (s:special_functions) {{{2
   let s:special_functions = s:ChooseValue('php_special_functions', 1)
 
-  " Highlight quotes around strings (s:show_quotes) {{{1
+  " Highlight quotes around strings (s:show_quotes) {{{2
   let s:show_quotes = s:ChooseValue('php_highlight_quotes', 0)
 
-  " Highlight PCRE patterns (s:show_pcre) {{{1
-  let s:show_pcre = s:ChooseValue('php_show_preg', 1)
+  " Highlight PCRE patterns (s:show_pcre) {{{2
+  let s:show_pcre = s:large_file ? 0 : s:ChooseValue('php_show_pcre', s:ChooseValue('php_show_preg', 1))
 
-  " Highlight ';' (s:show_semicolon) {{{1
+  " Highlight ';' (s:show_semicolon) {{{2
   let s:show_semicolon = s:ChooseValue('php_show_semicolon', 1)
 
-  " Highlight parent error ) ] or } (s:parent_error_close) {{{1
+  " Highlight ';' errors (s:show_semicolon_error) {{{2
+  let s:show_semicolon_error = (s:show_semicolon && s:ChooseValue('php_show_semicolon_error', 1))
+
+  " Highlight parent error ) ] or } (s:parent_error_close) {{{2
   let s:parent_error_close = (s:strict_blocks && s:ChooseValue('php_parent_error_close', 1))
 
-  " Highlight invalid ';' after if/while/foreach (s:no_empty_construct) {{{1
+  " Highlight invalid ';' after if/while/foreach (s:no_empty_construct) {{{2
   let s:no_empty_construct = (s:strict_blocks && s:ChooseValue('php_empty_construct_error', 1))
 
-  " Alt colors for {} around class/func/try/catch blocks (s:alt_blocks) {{{1
+  " Alt colors for {} around class/func/try/catch blocks (s:alt_blocks) {{{2
   let s:alt_blocks = (s:strict_blocks && s:ChooseValue('php_alt_blocks', 1))
 
-  " Alt color for by-reference operators (s:alt_refs) {{{1
+  " Alt color for by-reference operators (s:alt_refs) {{{2
   let s:alt_refs = s:ChooseValue('php_alt_assignByReference', 1)
 
-  "}}}1
-  " Alt color for array syntax (s:alt_arrays) {{{1
+  " Alt color for control structure parents (s:alt_control_parents) {{{2
+  let s:alt_control_parents = s:ChooseValue('php_alt_construct_parents', 0)
+
+  " Alt color for array syntax (s:alt_arrays) {{{2
   " * requires strict_blocks
   let s:alt_arrays = (s:strict_blocks ? s:ChooseValue('php_alt_arrays', 1) : 0)
 
-  " Alt color for comparisons (s:alt_comparisons) {{{1
-  " TODO: this is supposed to be always on if using php_oldStyle
-  let s:alt_comparisons = s:ChooseValue('php_alt_comparisons', 1)
-  " Alt colors for ';' after return/break (s:smart_semicolon) {{{1
-  let s:smart_semicolon = (s:show_semicolon && s:ChooseValue('php_smart_semicolon', 1))
+  " Alt color for comparisons (s:alt_comparisons) {{{2
+  let s:alt_comparisons = s:ChooseValue('php_alt_comparisons', s:ChooseValue('php_oldStyle', 1))
+
+  " Alt colors for ';' after return/break (s:smart_semicolon) {{{2
+  let s:smart_semicolon = s:large_file ? 0 : (s:show_semicolon && s:ChooseValue('php_smart_semicolon', 1))
 
-  " Alt colors for '->' (s:alt_properties) {{{1
-  let s:alt_properties = s:ChooseValue('php_alt_properties', 0)
+  " Alt colors for '->' (s:smart_members / s:alt_properties) {{{2
+  let s:smart_members = s:large_file ? 0 : s:ChooseValue('php_smart_members', 0)
+  let s:alt_properties = (s:smart_members && s:ChooseValue('php_alt_properties', 0))
 
-  "}}}1
+  " Syncing method (s:sync) {{{2
+  let s:sync = s:ChooseValue('php_sync_method', -1)
+
+" }}}1
 
 delfunction s:ChooseValue
 
@@ -366,11 +461,11 @@
 unlet b:current_syntax
 syn cluster sqlTop remove=sqlString,sqlComment
 if s:show_sql
-  syn cluster phpAddStrings contains=@sqlTop
+  syn cluster phpClShowInStrings contains=@sqlTop
 endif
 
 if s:show_html_in_strings
-  syn cluster phpAddStrings add=@htmlTop
+  syn cluster phpClShowInStrings add=@htmlTop
 endif
 
 " NOTE: syntax case should be 'ignore' for all items (in keeping
@@ -381,646 +476,1591 @@
 " syntax matches and regions may use '\C' to utilize case sensitivity
 syn case ignore
 
+" PHP syntax: clusters {{{1
 
+  " these represent a single value in PHP
+  syn cluster phpClValues add=@phpClConstants
 
-" Env Variables
-" TODO: check these against the latest PHP manual
-syn case match
-syn keyword	phpEnvVar	GATEWAY_INTERFACE SERVER_NAME SERVER_SOFTWARE SERVER_PROTOCOL REQUEST_METHOD QUERY_STRING DOCUMENT_ROOT HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ENCODING HTTP_ACCEPT_LANGUAGE HTTP_CONNECTION HTTP_HOST HTTP_REFERER HTTP_USER_AGENT REMOTE_ADDR REMOTE_PORT SCRIPT_FILENAME SERVER_ADMIN SERVER_PORT SERVER_SIGNATURE PATH_TRANSLATED SCRIPT_NAME REQUEST_URI	contained
-syn case ignore
+  syn cluster phpClValues add=phpIdentifier,phpIdentifierComplex,phpMethodsVar
 
-" Internal Variables
-" TODO: check these against the latest PHP manual
-syn case match
-syn keyword	phpIntVar	contained GLOBALS PHP_ERRMSG PHP_SELF HTTP_GET_VARS HTTP_POST_VARS HTTP_COOKIE_VARS HTTP_POST_FILES HTTP_ENV_VARS HTTP_SERVER_VARS HTTP_SESSION_VARS HTTP_RAW_POST_DATA HTTP_STATE_VARS _GET _POST _COOKIE _FILES _SERVER _ENV _SERVER _REQUEST _SESSION
-syn keyword	phpIntVar	contained argc argv
-syn case ignore
+  " TODO: add class constants (foo::BAR)
 
-" Constants
-" Peter Hodge, June 18, 2006
-" - this keyword list is way behind! Unfortunately, all I have
-"   access to at the moment is my home installation of 5.1.2, so I will add
-"   the ... er ... 626 ... constants harvested from get_defined_constants().
-" TODO: check these against the latest PHP manual
-syn case match
-syn keyword phpCoreConstant contained ASSERT_ACTIVE ASSERT_BAIL ASSERT_CALLBACK ASSERT_QUIET_EVAL ASSERT_WARNING
-syn keyword phpCoreConstant contained CAL_DOW_DAYNO CAL_DOW_LONG CAL_DOW_SHORT CAL_EASTER_ALWAYS_GREGORIAN CAL_EASTER_ALWAYS_JULIAN CAL_EASTER_DEFAULT CAL_EASTER_ROMAN CAL_FRENCH CAL_GREGORIAN CAL_JULIAN CAL_NUM_CALS CAL_JEWISH CAL_JEWISH_ADD_ALAFIM CAL_JEWISH_ADD_ALAFIM_GERESH CAL_JEWISH_ADD_GERESHAYIM CAL_MONTH_FRENCH CAL_MONTH_GREGORIAN_LONG CAL_MONTH_GREGORIAN_SHORT CAL_MONTH_JEWISH CAL_MONTH_JULIAN_LONG CAL_MONTH_JULIAN_SHORT
-syn keyword phpCoreConstant contained CASE_LOWER CASE_UPPER CHAR_MAX
-syn keyword phpCoreConstant contained CLSCTX_ALL CLSCTX_INPROC_HANDLER CLSCTX_INPROC_SERVER CLSCTX_LOCAL_SERVER CLSCTX_REMOTE_SERVER CLSCTX_SERVER
-syn keyword phpCoreConstant contained CONNECTION_ABORTED CONNECTION_NORMAL CONNECTION_TIMEOUT
-syn keyword phpCoreConstant contained COUNT_NORMAL COUNT_RECURSIVE
-syn keyword phpCoreConstant contained CP_ACP CP_MACCP CP_OEMCP CP_SYMBOL CP_THREAD_ACP CP_UTF7 CP_UTF8
-syn keyword phpCoreConstant contained CREDITS_ALL CREDITS_DOCS CREDITS_FULLPAGE CREDITS_GENERAL CREDITS_GROUP CREDITS_MODULES CREDITS_QA CREDITS_SAPI
-syn keyword phpCoreConstant contained CRYPT_BLOWFISH CRYPT_EXT_DES CRYPT_MD5 CRYPT_SALT_LENGTH CRYPT_STD_DES
-syn keyword phpCoreConstant contained DATE_ATOM DATE_COOKIE DATE_ISO8601 DATE_RFC1036 DATE_RFC1123 DATE_RFC2822 DATE_RFC822 DATE_RFC850 DATE_RSS DATE_W3C
-syn keyword phpCoreConstant contained DEFAULT_INCLUDE_PATH DIRECTORY_SEPARATOR
-syn keyword phpCoreConstant contained DISP_E_BADINDEX DISP_E_DIVBYZERO DISP_E_OVERFLOW
-syn keyword phpCoreConstant contained DOMSTRING_SIZE_ERR
-syn keyword phpCoreConstant contained DOM_HIERARCHY_REQUEST_ERR DOM_INDEX_SIZE_ERR DOM_INUSE_ATTRIBUTE_ERR DOM_INVALID_ACCESS_ERR DOM_INVALID_CHARACTER_ERR DOM_INVALID_MODIFICATION_ERR
-syn keyword phpCoreConstant contained DOM_INVALID_STATE_ERR DOM_NAMESPACE_ERR DOM_NOT_FOUND_ERR DOM_NOT_SUPPORTED_ERR DOM_NO_DATA_ALLOWED_ERR DOM_NO_MODIFICATION_ALLOWED_ERR DOM_PHP_ERR
-syn keyword phpCoreConstant contained DOM_SYNTAX_ERR DOM_VALIDATION_ERR DOM_WRONG_DOCUMENT_ERR
-syn keyword phpCoreConstant contained ENT_COMPAT ENT_NOQUOTES ENT_QUOTES
-syn keyword phpCoreConstant contained EXTR_IF_EXISTS EXTR_OVERWRITE EXTR_PREFIX_ALL EXTR_PREFIX_IF_EXISTS EXTR_PREFIX_INVALID EXTR_PREFIX_SAME EXTR_REFS EXTR_SKIP
-syn keyword phpCoreConstant contained E_ERROR E_WARNING E_PARSE E_NOTICE E_STRICT E_CORE_ERROR E_CORE_WARNING E_COMPILE_ERROR E_COMPILE_WARNING E_USER_ERROR E_USER_WARNING E_USER_NOTICE E_ALL
-syn keyword phpCoreConstant contained FILE_APPEND FILE_IGNORE_NEW_LINES FILE_NO_DEFAULT_CONTEXT FILE_SKIP_EMPTY_LINES FILE_USE_INCLUDE_PATH
-syn keyword phpCoreConstant contained FORCE_DEFLATE FORCE_GZIP
-syn keyword phpCoreConstant contained FTP_ASCII FTP_AUTORESUME FTP_AUTOSEEK FTP_BINARY FTP_FAILED FTP_FINISHED FTP_IMAGE FTP_MOREDATA FTP_TEXT FTP_TIMEOUT_SEC
-syn keyword phpCoreConstant contained GLOB_BRACE GLOB_ERR GLOB_MARK GLOB_NOCHECK GLOB_NOESCAPE GLOB_NOSORT GLOB_ONLYDIR
-syn keyword phpCoreConstant contained HTML_ENTITIES HTML_SPECIALCHARS
-syn keyword phpCoreConstant contained ICONV_IMPL ICONV_MIME_DECODE_CONTINUE_ON_ERROR ICONV_MIME_DECODE_STRICT ICONV_VERSION
-syn keyword phpCoreConstant contained IMAGETYPE_BMP IMAGETYPE_GIF IMAGETYPE_IFF IMAGETYPE_JB2 IMAGETYPE_JP2 IMAGETYPE_JPC IMAGETYPE_JPEG IMAGETYPE_JPEG2000
-syn keyword phpCoreConstant contained IMAGETYPE_JPX IMAGETYPE_PNG IMAGETYPE_PSD IMAGETYPE_SWC IMAGETYPE_SWF IMAGETYPE_TIFF_II IMAGETYPE_TIFF_MM IMAGETYPE_WBMP IMAGETYPE_XBM
-syn keyword phpCoreConstant contained INF
-syn keyword phpCoreConstant contained INFO_ALL INFO_CONFIGURATION INFO_CREDITS INFO_ENVIRONMENT INFO_GENERAL INFO_LICENSE INFO_MODULES INFO_VARIABLES
-syn keyword phpCoreConstant contained INI_ALL INI_PERDIR INI_SYSTEM INI_USER
-syn keyword phpCoreConstant contained LC_ALL LC_COLLATE LC_CTYPE LC_MONETARY LC_NUMERIC LC_TIME
-syn keyword phpCoreConstant contained LIBXML_COMPACT LIBXML_DOTTED_VERSION LIBXML_DTDATTR LIBXML_DTDLOAD LIBXML_DTDVALID LIBXML_ERR_ERROR LIBXML_ERR_FATAL LIBXML_ERR_NONE
-syn keyword phpCoreConstant contained LIBXML_ERR_WARNING LIBXML_NOBLANKS LIBXML_NOCDATA LIBXML_NOEMPTYTAG LIBXML_NOENT LIBXML_NOERROR LIBXML_NONET LIBXML_NOWARNING
-syn keyword phpCoreConstant contained LIBXML_NOXMLDECL LIBXML_NSCLEAN LIBXML_VERSION LIBXML_XINCLUDE
-syn keyword phpCoreConstant contained LOCK_EX LOCK_NB LOCK_SH LOCK_UN
-syn keyword phpCoreConstant contained LOG_ALERT LOG_AUTH LOG_AUTHPRIV LOG_CONS LOG_CRIT LOG_CRON LOG_DAEMON LOG_DEBUG
-syn keyword phpCoreConstant contained LOG_EMERG LOG_ERR LOG_INFO LOG_KERN LOG_LPR LOG_MAIL LOG_NDELAY LOG_NEWS
-syn keyword phpCoreConstant contained LOG_NOTICE LOG_NOWAIT LOG_ODELAY LOG_PERROR LOG_PID LOG_SYSLOG LOG_USER LOG_UUCP LOG_WARNING
-syn keyword phpCoreConstant contained MK_E_UNAVAILABLE
-syn keyword phpCoreConstant contained MYSQL_ASSOC MYSQL_BOTH MYSQL_CLIENT_COMPRESS MYSQL_CLIENT_IGNORE_SPACE MYSQL_CLIENT_INTERACTIVE MYSQL_CLIENT_SSL MYSQL_NUM
-syn keyword phpCoreConstant contained M_1_PI M_2_PI M_2_SQRTPI M_E M_LN10 M_LN2 M_LOG10E M_LOG2E M_PI M_PI_2 M_PI_4 M_SQRT1_2 M_SQRT2
-syn keyword phpCoreConstant contained NAN
-syn keyword phpCoreConstant contained NORM_IGNORECASE NORM_IGNOREKANATYPE NORM_IGNORENONSPACE NORM_IGNORESYMBOLS NORM_IGNOREWIDTH
-syn keyword phpCoreConstant contained ODBC_BINMODE_CONVERT ODBC_BINMODE_PASSTHRU ODBC_BINMODE_RETURN ODBC_TYPE
-syn keyword phpCoreConstant contained PATHINFO_BASENAME PATHINFO_DIRNAME PATHINFO_EXTENSION
-syn keyword phpCoreConstant contained PATH_SEPARATOR
-syn keyword phpCoreConstant contained PEAR_INSTALL_DIR PEAR_EXTENSION_DIR
-syn keyword phpCoreConstant contained PHP_PREFIX PHP_BINDIR PHP_CONFIG_FILE_PATH PHP_CONFIG_FILE_SCAN_DIR PHP_DATADIR PHP_EXTENSION_DIR PHP_LIBDIR PHP_LOCALSTATEDIR PHP_SYSCONFDIR PHP_SHLIB_SUFFIX
-syn keyword phpCoreConstant contained PHP_OUTPUT_HANDLER_CONT PHP_OUTPUT_HANDLER_END PHP_OUTPUT_HANDLER_START
-syn keyword phpCoreConstant contained PHP_URL_FRAGMENT PHP_URL_HOST PHP_URL_PASS PHP_URL_PATH PHP_URL_PORT PHP_URL_QUERY PHP_URL_SCHEME PHP_URL_USER
-syn keyword phpCoreConstant contained PHP_VERSION PHP_OS PHP_SAPI PHP_EOL PHP_INT_MAX PHP_INT_SIZE
-syn keyword phpCoreConstant contained PREG_GREP_INVERT PREG_OFFSET_CAPTURE PREG_PATTERN_ORDER PREG_SET_ORDER PREG_SPLIT_DELIM_CAPTURE PREG_SPLIT_NO_EMPTY PREG_SPLIT_OFFSET_CAPTURE
-syn keyword phpCoreConstant contained PSFS_ERR_FATAL PSFS_FEED_ME PSFS_FLAG_FLUSH_CLOSE PSFS_FLAG_FLUSH_INC PSFS_FLAG_NORMAL PSFS_PASS_ON
-syn keyword phpCoreConstant contained SEEK_CUR SEEK_END SEEK_SET
-syn keyword phpCoreConstant contained SORT_ASC SORT_DESC SORT_LOCALE_STRING SORT_NUMERIC SORT_REGULAR SORT_STRING
-syn keyword phpCoreConstant contained SQL_BIGINT SQL_BINARY SQL_BIT SQL_CHAR SQL_CONCURRENCY SQL_CONCUR_LOCK SQL_CONCUR_READ_ONLY SQL_CONCUR_ROWVER SQL_CONCUR_VALUES
-syn keyword phpCoreConstant contained SQL_CURSOR_DYNAMIC SQL_CURSOR_FORWARD_ONLY SQL_CURSOR_KEYSET_DRIVEN SQL_CURSOR_STATIC SQL_CURSOR_TYPE SQL_CUR_USE_DRIVER SQL_CUR_USE_IF_NEEDED SQL_CUR_USE_ODBC
-syn keyword phpCoreConstant contained SQL_DATE SQL_DECIMAL SQL_DOUBLE SQL_FETCH_FIRST SQL_FETCH_NEXT SQL_FLOAT SQL_INTEGER SQL_KEYSET_SIZE
-syn keyword phpCoreConstant contained SQL_LONGVARBINARY SQL_LONGVARCHAR SQL_NUMERIC SQL_ODBC_CURSORS SQL_REAL SQL_SMALLINT SQL_TIME SQL_TIMESTAMP SQL_TINYINT SQL_VARBINARY SQL_VARCHAR
-syn keyword phpCoreConstant contained STDERR STDIN STDOUT
-syn keyword phpCoreConstant contained STREAM_CLIENT_ASYNC_CONNECT STREAM_CLIENT_CONNECT STREAM_CLIENT_PERSISTENT
-syn keyword phpCoreConstant contained STREAM_CRYPTO_METHOD_SSLv23_CLIENT STREAM_CRYPTO_METHOD_SSLv23_SERVER STREAM_CRYPTO_METHOD_SSLv2_CLIENT STREAM_CRYPTO_METHOD_SSLv2_SERVER STREAM_CRYPTO_METHOD_SSLv3_CLIENT STREAM_CRYPTO_METHOD_SSLv3_SERVER STREAM_CRYPTO_METHOD_TLS_CLIENT STREAM_CRYPTO_METHOD_TLS_SERVER
-syn keyword phpCoreConstant contained STREAM_ENFORCE_SAFE_MODE STREAM_FILTER_ALL STREAM_FILTER_READ STREAM_FILTER_WRITE STREAM_IGNORE_URL
-syn keyword phpCoreConstant contained STREAM_IPPROTO_ICMP STREAM_IPPROTO_IP STREAM_IPPROTO_RAW STREAM_IPPROTO_TCP STREAM_IPPROTO_UDP STREAM_MKDIR_RECURSIVE STREAM_MUST_SEEK
-syn keyword phpCoreConstant contained STREAM_NOTIFY_AUTH_REQUIRED STREAM_NOTIFY_AUTH_RESULT STREAM_NOTIFY_COMPLETED STREAM_NOTIFY_CONNECT STREAM_NOTIFY_FAILURE STREAM_NOTIFY_FILE_SIZE_IS STREAM_NOTIFY_MIME_TYPE_IS
-syn keyword phpCoreConstant contained STREAM_NOTIFY_PROGRESS STREAM_NOTIFY_REDIRECTED STREAM_NOTIFY_RESOLVE STREAM_NOTIFY_SEVERITY_ERR STREAM_NOTIFY_SEVERITY_INFO STREAM_NOTIFY_SEVERITY_WARN
-syn keyword phpCoreConstant contained STREAM_OOB STREAM_PEEK STREAM_PF_INET STREAM_PF_INET6 STREAM_PF_UNIX STREAM_REPORT_ERRORS STREAM_SERVER_BIND STREAM_SERVER_LISTEN
-syn keyword phpCoreConstant contained STREAM_SOCK_DGRAM STREAM_SOCK_RAW STREAM_SOCK_RDM STREAM_SOCK_SEQPACKET STREAM_SOCK_STREAM STREAM_URL_STAT_LINK STREAM_URL_STAT_QUIET STREAM_USE_PATH
-syn keyword phpCoreConstant contained STR_PAD_BOTH STR_PAD_LEFT STR_PAD_RIGHT
-syn keyword phpCoreConstant contained SUNFUNCS_RET_DOUBLE SUNFUNCS_RET_STRING SUNFUNCS_RET_TIMESTAMP
-syn keyword phpCoreConstant contained T_ABSTRACT T_AND_EQUAL T_ARRAY T_ARRAY_CAST T_AS T_BAD_CHARACTER T_BOOLEAN_AND T_BOOLEAN_OR T_BOOL_CAST T_BREAK T_CASE T_CATCH
-syn keyword phpCoreConstant contained T_CHARACTER T_CLASS T_CLASS_C T_CLONE T_CLOSE_TAG T_COMMENT T_CONCAT_EQUAL T_CONST T_CONSTANT_ENCAPSED_STRING T_CONTINUE
-syn keyword phpCoreConstant contained T_CURLY_OPEN T_DEC T_DECLARE T_DEFAULT T_DIV_EQUAL T_DNUMBER T_DO T_DOC_COMMENT T_DOLLAR_OPEN_CURLY_BRACES T_DOUBLE_ARROW
-syn keyword phpCoreConstant contained T_DOUBLE_CAST T_DOUBLE_COLON T_ECHO T_ELSE T_ELSEIF T_EMPTY T_ENCAPSED_AND_WHITESPACE T_ENDDECLARE T_ENDFOR T_ENDFOREACH
-syn keyword phpCoreConstant contained T_ENDIF T_ENDSWITCH T_ENDWHILE T_END_HEREDOC T_EVAL T_EXIT T_EXTENDS T_FILE T_FINAL T_FOR T_FOREACH T_FUNCTION T_FUNC_C
-syn keyword phpCoreConstant contained T_GLOBAL T_HALT_COMPILER T_IF T_IMPLEMENTS T_INC T_INCLUDE T_INCLUDE_ONCE T_INLINE_HTML T_INSTANCEOF T_INTERFACE T_INT_CAST
-syn keyword phpCoreConstant contained T_ISSET T_IS_EQUAL T_IS_GREATER_OR_EQUAL T_IS_IDENTICAL T_IS_NOT_EQUAL T_IS_NOT_IDENTICAL T_IS_SMALLER_OR_EQUAL T_LINE T_LIST
-syn keyword phpCoreConstant contained T_LNUMBER T_LOGICAL_AND T_LOGICAL_OR T_LOGICAL_XOR T_METHOD_C T_MINUS_EQUAL T_MOD_EQUAL T_MUL_EQUAL T_NEW T_NUM_STRING T_OBJECT_CAST
-syn keyword phpCoreConstant contained T_OBJECT_OPERATOR T_OPEN_TAG T_OPEN_TAG_WITH_ECHO T_OR_EQUAL T_PAAMAYIM_NEKUDOTAYIM T_PLUS_EQUAL T_PRINT T_PRIVATE T_PROTECTED T_PUBLIC
-syn keyword phpCoreConstant contained T_REQUIRE T_REQUIRE_ONCE T_RETURN T_SL T_SL_EQUAL T_SR T_SR_EQUAL T_START_HEREDOC T_STATIC T_STRING T_STRING_CAST T_STRING_VARNAME
-syn keyword phpCoreConstant contained T_SWITCH T_THROW T_TRY T_UNSET T_UNSET_CAST T_USE T_VAR T_VARIABLE T_WHILE T_WHITESPACE T_XOR_EQUAL
-syn keyword phpCoreConstant contained UPLOAD_ERR_CANT_WRITE UPLOAD_ERR_FORM_SIZE UPLOAD_ERR_INI_SIZE UPLOAD_ERR_NO_FILE UPLOAD_ERR_NO_TMP_DIR UPLOAD_ERR_OK UPLOAD_ERR_PARTIAL
-syn keyword phpCoreConstant contained VARCMP_EQ VARCMP_GT VARCMP_LT VARCMP_NULL
-syn keyword phpCoreConstant contained VT_ARRAY VT_BOOL VT_BSTR VT_BYREF VT_CY VT_DATE VT_DECIMAL VT_DISPATCH VT_EMPTY VT_ERROR VT_I1 VT_I2 VT_I4 VT_INT VT_NULL VT_R4 VT_R8 VT_UI1 VT_UI2 VT_UI4 VT_UINT VT_UNKNOWN VT_VARIANT
-syn keyword phpCoreConstant contained XML_ATTRIBUTE_CDATA XML_ATTRIBUTE_DECL_NODE XML_ATTRIBUTE_ENTITY XML_ATTRIBUTE_ENUMERATION XML_ATTRIBUTE_ID XML_ATTRIBUTE_IDREF
-syn keyword phpCoreConstant contained XML_ATTRIBUTE_IDREFS XML_ATTRIBUTE_NMTOKEN XML_ATTRIBUTE_NMTOKENS XML_ATTRIBUTE_NODE XML_ATTRIBUTE_NOTATION XML_CDATA_SECTION_NODE
-syn keyword phpCoreConstant contained XML_COMMENT_NODE XML_DOCUMENT_FRAG_NODE XML_DOCUMENT_NODE XML_DOCUMENT_TYPE_NODE XML_DTD_NODE XML_ELEMENT_DECL_NODE XML_ELEMENT_NODE
-syn keyword phpCoreConstant contained XML_ENTITY_DECL_NODE XML_ENTITY_NODE XML_ENTITY_REF_NODE XML_ERROR_ASYNC_ENTITY XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF XML_ERROR_BAD_CHAR_REF
-syn keyword phpCoreConstant contained XML_ERROR_BINARY_ENTITY_REF XML_ERROR_DUPLICATE_ATTRIBUTE XML_ERROR_EXTERNAL_ENTITY_HANDLING XML_ERROR_INCORRECT_ENCODING XML_ERROR_INVALID_TOKEN
-syn keyword phpCoreConstant contained XML_ERROR_JUNK_AFTER_DOC_ELEMENT XML_ERROR_MISPLACED_XML_PI XML_ERROR_NONE XML_ERROR_NO_ELEMENTS XML_ERROR_NO_MEMORY XML_ERROR_PARAM_ENTITY_REF
-syn keyword phpCoreConstant contained XML_ERROR_PARTIAL_CHAR XML_ERROR_RECURSIVE_ENTITY_REF XML_ERROR_SYNTAX XML_ERROR_TAG_MISMATCH XML_ERROR_UNCLOSED_CDATA_SECTION
-syn keyword phpCoreConstant contained XML_ERROR_UNCLOSED_TOKEN XML_ERROR_UNDEFINED_ENTITY XML_ERROR_UNKNOWN_ENCODING XML_HTML_DOCUMENT_NODE XML_LOCAL_NAMESPACE
-syn keyword phpCoreConstant contained XML_NAMESPACE_DECL_NODE XML_NOTATION_NODE XML_OPTION_CASE_FOLDING XML_OPTION_SKIP_TAGSTART XML_OPTION_SKIP_WHITE XML_OPTION_TARGET_ENCODING
-syn keyword phpCoreConstant contained XML_PI_NODE XML_SAX_IMPL XML_TEXT_NODE
-syn keyword phpCoreConstant contained ZEND_THREAD_SAFE
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php.vim?r1=1.10&r2=1.10.2.1&f=u



More information about the pld-cvs-commit mailing list