cvs: phpdoc-zh /appendices comparisons.xml
| From: | Gang Chen | Date: | Sun, 21 Dec 2008 14:13:51 +0000 |
| Subject: | cvs: phpdoc-zh /appendices comparisons.xml | ||
| Groups: | php.doc.zh | ||
| Request: | Send a blank email to doc-zh+get-3132@lists.php.net to get a copy of this message | ||
eniac2008 Sun Dec 21 14:13:51 2008 UTC
Modified files:
/phpdoc-zh/appendices comparisons.xml
Log:
Sync with EN-Revision 1.14
http://cvs.php.net/viewvc.cgi/phpdoc-zh/appendices/comparisons.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-zh/appendices/comparisons.xml diff -u phpdoc-zh/appendices/comparisons.xml:1.5 phpdoc-zh/appendices/comparisons.xml:1.6 --- phpdoc-zh/appendices/comparisons.xml:1.5 Sun Jun 24 16:16:57 2007 +++ phpdoc-zh/appendices/comparisons.xml Sun Dec 21 14:13:51 2008 @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.5 $ --> -<!-- $Author: bjori $ --> -<!-- EN-Revision: 1.9 Maintainer: class007 Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- $Author: eniac2008 $ --> +<!-- EN-Revision: 1.14 Maintainer: Altair Status: ready --> +<!-- CREDITS: class007 --> <appendix xml:id="types.comparisons" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>PHP ÀàÐͱȽϱí</title> <para> @@ -29,9 +30,9 @@ <function>isset</function> º¯ÊýÀ´³õʼ»¯±äÁ¿¡£ </para> </note> - <para> + <para> <table> - <title>Óà PHP º¯Êý¶Ô <varname>$x</varname> µÄ±È½Ï</title> + <title>ʹÓà PHP º¯Êý¶Ô±äÁ¿ <varname>$x</varname> ½øÐбȽÏ</title> <tgroup cols="6"> <thead> <row> @@ -53,7 +54,7 @@ <entry>&false;</entry> </row> <row> - <entry><literal>$x = </literal>&null;</entry> + <entry><literal>$x = null;</literal></entry> <entry><type>NULL</type></entry> <entry>&true;</entry> <entry>&true;</entry> @@ -69,7 +70,7 @@ <entry>&false;</entry> </row> <row> - <entry><varname>$x</varname> ÉÐ䶨Òå</entry> + <entry><varname>$x</varname> is undefined</entry> <entry><type>NULL</type></entry> <entry>&true;</entry> <entry>&true;</entry> @@ -186,8 +187,8 @@ </para> <para> - <table> - <title>Óà <literal>==</literal> ½øÐÐËÉÉ¢±È½Ï</title> + <table xml:id="types.comparisions-loose"> + <title>ËÉÉ¢±È½Ï <literal>==</literal></title> <tgroup cols="12"> <thead> <row> @@ -203,6 +204,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -219,6 +221,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -233,6 +236,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -247,6 +251,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -261,6 +266,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -275,6 +281,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -289,6 +296,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -303,6 +311,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -317,9 +326,10 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> - <entry><literal>NULL</literal></entry> + <entry>&null;</entry> <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> @@ -331,6 +341,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -345,6 +356,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -359,6 +371,22 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> @@ -366,8 +394,8 @@ </para> <para> - <table> - <title>Óà <literal>===</literal> ½øÐÐÑϸñ±È½Ï</title> + <table xml:id="type.comparisons-strict"> + <title>Ñϸñ±È½Ï <literal>===</literal></title> <tgroup cols="12"> <thead> <row> @@ -383,6 +411,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -399,6 +428,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -413,6 +443,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -427,6 +458,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -441,6 +473,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -455,6 +488,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -469,6 +503,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -483,6 +518,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -497,6 +533,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&null;</entry> @@ -511,6 +548,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -525,6 +563,7 @@ <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -539,17 +578,27 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> </table> </para> - <note> - <title>PHP 3.0 ×¢ÒâÊÂÏî</title> - <para> - ÔÚ PHP 3 ÖУ¬×Ö·û´® <literal>"0"</literal> ±»ÈÏΪÊǷǿյģ¬Õâ¸öÇé¿öÔÚ PHP 4 Öз¢ÉúÁ˸ı䣬Ëü½«±»ÈÏΪÊÇ¿ÕÖµ¡£ - </para> - </note> </appendix> <!-- Keep this comment at the end of the file
http://cvs.php.net/viewvc.cgi/phpdoc-zh/appendices/comparisons.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-zh/appendices/comparisons.xml diff -u phpdoc-zh/appendices/comparisons.xml:1.5 phpdoc-zh/appendices/comparisons.xml:1.6 --- phpdoc-zh/appendices/comparisons.xml:1.5 Sun Jun 24 16:16:57 2007 +++ phpdoc-zh/appendices/comparisons.xml Sun Dec 21 14:13:51 2008 @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.5 $ --> -<!-- $Author: bjori $ --> -<!-- EN-Revision: 1.9 Maintainer: class007 Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- $Author: eniac2008 $ --> +<!-- EN-Revision: 1.14 Maintainer: Altair Status: ready --> +<!-- CREDITS: class007 --> <appendix xml:id="types.comparisons" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>PHP ÀàÐͱȽϱí</title> <para> @@ -29,9 +30,9 @@ <function>isset</function> º¯ÊýÀ´³õʼ»¯±äÁ¿¡£ </para> </note> - <para> + <para> <table> - <title>Óà PHP º¯Êý¶Ô <varname>$x</varname> µÄ±È½Ï</title> + <title>ʹÓà PHP º¯Êý¶Ô±äÁ¿ <varname>$x</varname> ½øÐбȽÏ</title> <tgroup cols="6"> <thead> <row> @@ -53,7 +54,7 @@ <entry>&false;</entry> </row> <row> - <entry><literal>$x = </literal>&null;</entry> + <entry><literal>$x = null;</literal></entry> <entry><type>NULL</type></entry> <entry>&true;</entry> <entry>&true;</entry> @@ -69,7 +70,7 @@ <entry>&false;</entry> </row> <row> - <entry><varname>$x</varname> ÉÐ䶨Òå</entry> + <entry><varname>$x</varname> is undefined</entry> <entry><type>NULL</type></entry> <entry>&true;</entry> <entry>&true;</entry> @@ -186,8 +187,8 @@ </para> <para> - <table> - <title>Óà <literal>==</literal> ½øÐÐËÉÉ¢±È½Ï</title> + <table xml:id="types.comparisions-loose"> + <title>ËÉÉ¢±È½Ï <literal>==</literal></title> <tgroup cols="12"> <thead> <row> @@ -203,6 +204,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -219,6 +221,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -233,6 +236,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -247,6 +251,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -261,6 +266,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -275,6 +281,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -289,6 +296,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -303,6 +311,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -317,9 +326,10 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> - <entry><literal>NULL</literal></entry> + <entry>&null;</entry> <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> @@ -331,6 +341,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&true;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -345,6 +356,7 @@ <entry>&true;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -359,6 +371,22 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> @@ -366,8 +394,8 @@ </para> <para> - <table> - <title>Óà <literal>===</literal> ½øÐÐÑϸñ±È½Ï</title> + <table xml:id="type.comparisons-strict"> + <title>Ñϸñ±È½Ï <literal>===</literal></title> <tgroup cols="12"> <thead> <row> @@ -383,6 +411,7 @@ <entry>&null;</entry> <entry><literal>array()</literal></entry> <entry><literal>"php"</literal></entry> + <entry><literal>""</literal></entry> </row> </thead> <tbody> @@ -399,6 +428,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&false;</entry> @@ -413,6 +443,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>1</literal></entry> @@ -427,6 +458,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>0</literal></entry> @@ -441,6 +473,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>-1</literal></entry> @@ -455,6 +488,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"1"</literal></entry> @@ -469,6 +503,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"0"</literal></entry> @@ -483,6 +518,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"-1"</literal></entry> @@ -497,6 +533,7 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry>&null;</entry> @@ -511,6 +548,7 @@ <entry>&true;</entry> <entry>&false;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>array()</literal></entry> @@ -525,6 +563,7 @@ <entry>&false;</entry> <entry>&true;</entry> <entry>&false;</entry> + <entry>&false;</entry> </row> <row> <entry><literal>"php"</literal></entry> @@ -539,17 +578,27 @@ <entry>&false;</entry> <entry>&false;</entry> <entry>&true;</entry> + <entry>&false;</entry> + </row> + <row> + <entry><literal>""</literal></entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&false;</entry> + <entry>&true;</entry> </row> </tbody> </tgroup> </table> </para> - <note> - <title>PHP 3.0 ×¢ÒâÊÂÏî</title> - <para> - ÔÚ PHP 3 ÖУ¬×Ö·û´® <literal>"0"</literal> ±»ÈÏΪÊǷǿյģ¬Õâ¸öÇé¿öÔÚ PHP 4 Öз¢ÉúÁ˸ı䣬Ëü½«±»ÈÏΪÊÇ¿ÕÖµ¡£ - </para> - </note> </appendix> <!-- Keep this comment at the end of the file