cvs: phpdoc-zh /reference/array/functions array-fill.xml array-flip.xml array-intersect.xml array-map.xml array-merge.xml array-pop.xml array-push.xml
array-shift.xml array-splice.xml array-unique.xml array-values.xml array.xml each.xml extract.xml range.xml sort.xml usort.xml
| From: | Dallas Thunder | Date: | Mon, 24 Feb 2003 07:43:11 +0000 |
| Subject: | cvs: phpdoc-zh /reference/array/functions array-fill.xml array-flip.xml array-intersect.xml array-map.xml array-merge.xml array-pop.xml array-push.xml array-shift.xml array-splice.xml array-unique.xml array-values.xml array.xml each.xml extract.xml range.xml sort.xml usort.xml |
||
| Groups: | php.doc.zh | ||
| Request: | Send a blank email to doc-zh+get-1111@lists.php.net to get a copy of this message | ||
dallas Mon Feb 24 02:43:11 2003 EDT
Modified files:
/phpdoc-zh/reference/array/functions array-fill.xml array-flip.xml
array-intersect.xml
array-map.xml array-merge.xml
array-pop.xml array-push.xml
array-shift.xml
array-splice.xml
array-unique.xml
array-values.xml array.xml
each.xml extract.xml range.xml
sort.xml usort.xml
Log:
updated.
Index: phpdoc-zh/reference/array/functions/array-fill.xml diff -u phpdoc-zh/reference/array/functions/array-fill.xml:1.2 phpdoc-zh/reference/array/functions/array-fill.xml:1.3 --- phpdoc-zh/reference/array/functions/array-fill.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-fill.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-fill"> <refnamediv> <refname>array_fill</refname> @@ -25,11 +25,14 @@ <title><function>array_fill</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $a = array_fill(5, 6, 'banana'); +print_r($a); +?> ]]> </programlisting> <para> - Óà <function>print_r</function> ²é¿´ $a ÏÔʾÈçÏ£º + <varname>$a</varname> ÏÖÔÚÊÇ£º <screen> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-flip.xml diff -u phpdoc-zh/reference/array/functions/array-flip.xml:1.3 phpdoc-zh/reference/array/functions/array-flip.xml:1.4 --- phpdoc-zh/reference/array/functions/array-flip.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-flip.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-flip"> <refnamediv> <refname>array_flip</refname> @@ -44,13 +44,15 @@ <title><function>array_flip</function> Àý×Ó£º³åÍ»</title> <programlisting role="php"> <![CDATA[ +<?php $trans = array ("a" => 1, "b" => 1, "c" => 2); $trans = array_flip ($trans); print_r($trans); +?> ]]> </programlisting> <para> - ÏÖÔÚ $trans ±ä³ÉÁË£º + ÏÖÔÚ <varname>$trans</varname> ±ä³ÉÁË£º <screen> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-intersect.xml diff -u phpdoc-zh/reference/array/functions/array-intersect.xml:1.3 phpdoc-zh/reference/array/functions/array-intersect.xml:1.4 --- phpdoc-zh/reference/array/functions/array-intersect.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-intersect.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-intersect"> <refnamediv> <refname>array_intersect</refname> @@ -24,9 +24,11 @@ <title><function>array_intersect</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?PHP $array1 = array ("a" => "green", "red", "blue"); $array2 = array ("b" => "green", "yellow", "red"); $result = array_intersect ($array1, $array2); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-map.xml diff -u phpdoc-zh/reference/array/functions/array-map.xml:1.3 phpdoc-zh/reference/array/functions/array-map.xml:1.4 --- phpdoc-zh/reference/array/functions/array-map.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-map.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.array-map"> <refnamediv> <refname>array_map</refname> @@ -11,17 +11,17 @@ </refnamediv> <refsect1> <title>˵Ã÷</title> - <methodsynopsis> - <type>array</type><methodname>array_map</methodname> - <methodparam><type>callback</type><parameter>function</parameter></methodparam> - <methodparam><type>array</type><parameter>arr1</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>arr2...</parameter></methodparam> - </methodsynopsis> + <methodsynopsis> + <type>array</type><methodname>array_map</methodname> + <methodparam><type>mixed</type><parameter>callback</parameter></methodparam> + <methodparam><type>array</type><parameter>arr1</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam> + </methodsynopsis> <para> <function>array_map</function> ·µ»ØÒ»¸öÊý×飬¸ÃÊý×é°üº¬ÁË - <parameter>arr1</parameter> ÖеÄËùÓе¥Ôª¾¹ý callback - <parameter>function</parameter> ×÷ÓùýÖ®ºóµÄµ¥Ôª¡£callback - <parameter>function</parameter> ½ÓÊܵIJÎÊýÊýĿӦ¸ÃºÍ´«µÝ¸ø + <parameter>arr1</parameter> ÖеÄËùÓе¥Ôª¾¹ý + <parameter>callback</parameter> ×÷ÓùýÖ®ºóµÄµ¥Ôª¡£<parameter>callback</parameter> + ½ÓÊܵIJÎÊýÊýĿӦ¸ÃºÍ´«µÝ¸ø <function>array_map</function> º¯ÊýµÄÊý×éÊýĿһÖ¡£ </para> <para> Index: phpdoc-zh/reference/array/functions/array-merge.xml diff -u phpdoc-zh/reference/array/functions/array-merge.xml:1.2 phpdoc-zh/reference/array/functions/array-merge.xml:1.3 --- phpdoc-zh/reference/array/functions/array-merge.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-merge.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> <refentry id="function.array-merge"> <refnamediv> <refname>array_merge</refname> @@ -29,10 +29,11 @@ $array1 = array ("color" => "red", 2, 4); $array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid", 4); $result = array_merge ($array1, $array2); +print_r($result); ]]> </programlisting> <para> - <literal>$result</literal> ³ÉΪ£º + <varname>$result</varname> ³ÉΪ£º <screen role="php"> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-pop.xml diff -u phpdoc-zh/reference/array/functions/array-pop.xml:1.2 phpdoc-zh/reference/array/functions/array-pop.xml:1.3 --- phpdoc-zh/reference/array/functions/array-pop.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-pop.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-pop"> <refnamediv> <refname>array_pop</refname> @@ -19,13 +19,17 @@ <parameter>array</parameter> µÄ³¤¶È¼õÒ»¡£Èç¹û <parameter>array</parameter> Ϊ¿Õ£¨»òÕß²»ÊÇÊý×飩½«·µ»Ø &null;¡£ </para> + &array.resetspointer; <para> <example> <title><function>array_pop</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $stack = array ("orange", "banana", "apple", "raspberry"); $fruit = array_pop ($stack); +print_r($stack); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-push.xml diff -u phpdoc-zh/reference/array/functions/array-push.xml:1.2 phpdoc-zh/reference/array/functions/array-push.xml:1.3 --- phpdoc-zh/reference/array/functions/array-push.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-push.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-push"> <refnamediv> <refname>array_push</refname> @@ -39,6 +39,7 @@ <![CDATA[ $stack = array ("orange", "banana"); array_push ($stack, "apple", "raspberry"); +print_r($stack); ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-shift.xml diff -u phpdoc-zh/reference/array/functions/array-shift.xml:1.2 phpdoc-zh/reference/array/functions/array-shift.xml:1.3 --- phpdoc-zh/reference/array/functions/array-shift.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-shift.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> <refentry id="function.array-shift"> <refnamediv> <refname>array_shift</refname> @@ -21,13 +21,17 @@ <parameter>array</parameter> µÄ³¤¶È¼õÒ»²¢½«ËùÓÐÆäËüµ¥ÔªÏòÇ°ÒÆ¶¯Ò»Î»¡£ËùÓеÄÊý×Ö¼üÃû½«¸ÄΪ´ÓÁ㿪ʼ¼ÆÊý£¬ÎÄ×Ö¼üÃû½«²»±ä¡£Èç¹û <parameter>array</parameter> Ϊ¿Õ£¨»òÕß²»ÊÇÊý×飩£¬Ôò·µ»Ø &null;¡£ </para> + &array.resetspointer; <para> <example> <title><function>array_shift</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $stack = array ("orange", "banana", "apple", "raspberry"); $fruit = array_shift ($stack); +print_r($stack); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-splice.xml diff -u phpdoc-zh/reference/array/functions/array-splice.xml:1.3 phpdoc-zh/reference/array/functions/array-splice.xml:1.4 --- phpdoc-zh/reference/array/functions/array-splice.xml:1.3 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-splice.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-splice"> <refnamediv> <refname>array_splice</refname> @@ -50,15 +50,53 @@ </para> <para> ÒÔϵıí´ïʽ¾ßÓÐͬÑùЧ¹û£º - <programlisting role="php"> -<![CDATA[ -array_push ($input, $x, $y) array_splice ($input, count ($input), 0, array ($x, $y)) -array_pop ($input) array_splice ($input, -1) -array_shift ($input) array_splice ($input, 0, 1) -array_unshift ($input, $x, $y) array_splice ($input, 0, 0, array ($x, $y)) -$input[$x] = $y array_splice ($input, $x, 1, $y) -]]> - </programlisting> + <table> + <title><function>array_splice</function> µÈ¼Û±í´ïʽ</title> + <tgroup cols="2"> + <tbody> + <row> + <entry> + array_push($input, $x, $y) + </entry> + <entry> + array_splice($input, count($input), 0, array($x, $y)) + </entry> + </row> + <row> + <entry> + array_pop($input) + </entry> + <entry> + array_splice($input, -1) + </entry> + </row> + <row> + <entry> + array_shift($input) + </entry> + <entry> + array_splice($input, -1) + </entry> + </row> + <row> + <entry> + array_unshift($input, $x, $y) + </entry> + <entry> + array_splice($input, 0, 0, array($x, $y)) + </entry> + </row> + <row> + <entry> + $a[$x] = $y + </entry> + <entry> + array_splice($input, $x, 1, $y) + </entry> + </row> + </tbody> + </tgroup> + </table> </para> <para> ·µ»ØÒ»¸ö°üº¬±»ÒƳýµ¥ÔªµÄÊý×é¡£ Index: phpdoc-zh/reference/array/functions/array-unique.xml diff -u phpdoc-zh/reference/array/functions/array-unique.xml:1.2 phpdoc-zh/reference/array/functions/array-unique.xml:1.3 --- phpdoc-zh/reference/array/functions/array-unique.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-unique.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.10 Maintainer: dallas Status: ready --> <refentry id="function.array-unique"> <refnamediv> <refname>array_unique</refname> @@ -26,26 +26,21 @@ <simpara> µ±ÇÒ½öµ± <literal>(string) $elem1 === (string) $elem2</literal> ʱÁ½¸öµ¥Ôª±»ÈÏΪÏàͬ¡£¾ÍÊÇ˵£¬µ±×Ö·û´®µÄ±í´ïÒ»Ñùʱ¡£ - <!-- TODO: example of it... --> </simpara> <simpara> µÚÒ»¸öµ¥Ôª½«±»±£Áô¡£ </simpara> </note> - <warning> - <simpara> - ±¾º¯ÊýÔÚ PHP 4.0.4 ÖÐÊÇ»µµÄ£¡ - <!-- TODO: when exactly was this broken?... --> - </simpara> - </warning> <para> <example> <title><function>array_unique</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $input = array ("a" => "green", "red", "b" => "green", "blue", "red"); $result = array_unique ($input); print_r($result); +?> ]]> </programlisting> <para> @@ -54,9 +49,9 @@ <![CDATA[ Array ( - [b] => green + [a] => green + [0] => red [1] => blue - [2] => red ) ]]> </screen> @@ -68,20 +63,20 @@ <title><function>array_unique</function> ºÍÀàÐÍ</title> <programlisting role="php"> <![CDATA[ +<?php $input = array (4,"4","3",4,3,"3"); $result = array_unique ($input); var_dump($result); +?> ]]> </programlisting> <para> - ÒÔÉϳÌÐòÊä³ö½á¹ûΪ£¨PHP 4.0.6£©£º + ±¾½Å±¾½«Êä³ö£º <screen role="php"> <![CDATA[ array(2) { - [0]=> - int(4) - [2]=> - string(1) "3" + [0] => int(4) + [2] => string(1) "3" } ]]> </screen> Index: phpdoc-zh/reference/array/functions/array-values.xml diff -u phpdoc-zh/reference/array/functions/array-values.xml:1.2 phpdoc-zh/reference/array/functions/array-values.xml:1.3 --- phpdoc-zh/reference/array/functions/array-values.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-values.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-values"> <refnamediv> <refname>array_values</refname> @@ -15,7 +15,7 @@ </methodsynopsis> <para> <function>array_values</function> ·µ»Ø - <parameter>input</parameter> Êý×éÖÐËùÓеÄÖµ¡£ + <parameter>input</parameter> Êý×éÖÐËùÓеÄÖµ²¢¸øÆä½¨Á¢Êý×ÖË÷Òý¡£ </para> <para> <example> Index: phpdoc-zh/reference/array/functions/array.xml diff -u phpdoc-zh/reference/array/functions/array.xml:1.3 phpdoc-zh/reference/array/functions/array.xml:1.4 --- phpdoc-zh/reference/array/functions/array.xml:1.3 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array"> <refnamediv> <refname>array</refname> @@ -91,9 +91,9 @@ <![CDATA[ Array ( - [1] => 'January' - [2] => 'February' - [3] => 'March' + [1] => January + [2] => February + [3] => March ) ]]> </screen> Index: phpdoc-zh/reference/array/functions/each.xml diff -u phpdoc-zh/reference/array/functions/each.xml:1.4 phpdoc-zh/reference/array/functions/each.xml:1.5 --- phpdoc-zh/reference/array/functions/each.xml:1.4 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/each.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.each"> <refnamediv> <refname>each</refname> @@ -32,31 +32,43 @@ <![CDATA[ $foo = array ("bob", "fred", "jussi", "jouni", "egon", "marliese"); $bar = each ($foo); +print_r($bar); ]]> </programlisting> <para> <varname>$bar</varname> ÏÖÔÚ°üº¬ÓÐÈçϵļü£¯Öµ¶Ô£º - <itemizedlist spacing="compact"> - <listitem><simpara>0 => 0</simpara></listitem> - <listitem><simpara>1 => 'bob'</simpara></listitem> - <listitem><simpara>key => 0</simpara></listitem> - <listitem><simpara>value => 'bob'</simpara></listitem> - </itemizedlist> + <screen> +<![CDATA[ +Array +{ + [1] => bob + [value] => bob + [0] => 0 + [key] => 0 +} +]]> + </screen> <programlisting role="php"> <![CDATA[ $foo = array ("Robert" => "Bob", "Seppo" => "Sepi"); $bar = each ($foo); +print_r($bar); ]]> </programlisting> </para> <para> <varname>$bar</varname> ÏÖÔÚ°üº¬ÓÐÈçϵļü£¯Öµ¶Ô£º - <itemizedlist spacing="compact"> - <listitem><simpara>0 => 'Robert'</simpara></listitem> - <listitem><simpara>1 => 'Bob'</simpara></listitem> - <listitem><simpara>key => 'Robert'</simpara></listitem> - <listitem><simpara>value => 'Bob'</simpara></listitem> - </itemizedlist> + <screen> +<![CDATA[ +Array +{ + [1] => Bob + [value] => Bob + [0] => Robert + [key] => Robert +} +]]> + </screen> </para> </example> </para> Index: phpdoc-zh/reference/array/functions/extract.xml diff -u phpdoc-zh/reference/array/functions/extract.xml:1.2 phpdoc-zh/reference/array/functions/extract.xml:1.3 --- phpdoc-zh/reference/array/functions/extract.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/extract.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.extract"> <refnamediv> <refname>extract</refname> @@ -29,7 +29,12 @@ </note> <note> <para> - EXTR_IF_EXISTS ºÍ EXTR_PREFIX_IF_EXISTS Êǰ汾 4.2.0 ÖÐÒý½øµÄ¡£ + <constant>EXTR_IF_EXISTS</constant> ºÍ <constant>EXTR_PREFIX_IF_EXISTS</constant> Êǰ汾 4.2.0 ÖÐÒý½øµÄ¡£ + </para> + </note> + <note> + <para> + <constant>EXTR_REFS</constant> Êǰ汾 4.3.0 ÖÐÒý½øµÄ¡£ </para> </note> <para> @@ -37,7 +42,7 @@ <parameter>extract_type</parameter> ²ÎÊý¾ö¶¨¡£¿ÉÒÔÊÇÒÔÏÂÖµÖ®Ò»£º <variablelist> <varlistentry> - <term>EXTR_OVERWRITE</term> + <term><constant>EXTR_OVERWRITE</constant></term> <listitem> <simpara> Èç¹ûÓгåÍ»£¬¸²¸ÇÒÑÓеıäÁ¿¡£ @@ -45,7 +50,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_SKIP</term> + <term><constant>EXTR_SKIP</constant></term> <listitem> <simpara> Èç¹ûÓгåÍ»£¬²»¸²¸ÇÒÑÓеıäÁ¿¡£ @@ -53,14 +58,14 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_SAME</term> + <term><constant>EXTR_PREFIX_SAME</constant></term> <listitem> <simpara>Èç¹ûÓгåÍ»£¬ÔÚ±äÁ¿Ãûǰ¼ÓÉÏǰ׺ <parameter>prefix</parameter>¡£ </simpara> </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_ALL</term> + <term><constant>EXTR_PREFIX_ALL</constant></term> <listitem> <simpara> ¸øËùÓбäÁ¿Ãû¼ÓÉÏǰ׺ @@ -69,7 +74,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_INVALID</term> + <term><constant>EXTR_PREFIX_INVALID</constant></term> <listitem> <simpara> ½öÔÚ·Ç·¨£¯Êý×ֵıäÁ¿Ãûǰ¼ÓÉÏǰ׺ @@ -78,7 +83,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_IF_EXISTS</term> + <term><constant>EXTR_IF_EXISTS</constant></term> <listitem> <simpara> ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬¸²¸ÇËüÃǵÄÖµ¡£ÆäËüµÄ¶¼²»´¦Àí¡£¿ÉÒÔÓÃÔÚÒѾ¶¨ÒåÁËÒ»×éºÏ·¨µÄ±äÁ¿£¬È»ºóÒª´ÓÒ»¸öÊý×éÀýÈç @@ -87,29 +92,42 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_IF_EXISTS</term> + <term><constant>EXTR_PREFIX_IF_EXISTS</constant></term> + <listitem> + <simpara> + ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬½¨Á¢¸½¼ÓÁËǰ׺µÄ±äÁ¿Ãû£¬ÆäËüµÄ¶¼²»´¦Àí¡£±¾±ê¼ÇÊÇ + PHP 4.2.0 мӵġ£ + </simpara> + </listitem> + </varlistentry> + <varlistentry> + <term><constant>EXTR_REFS</constant></term> <listitem> <simpara> - ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬½¨Á¢¸½¼ÓÁËǰ׺µÄ±äÁ¿Ãû£¬ÆäËüµÄ¶¼²»´¦Àí¡£±¾±ê¼ÇÊÇ PHP 4.2.0 мӵġ£ + ½«±äÁ¿×÷ΪÒýÓÃÌáÈ¡¡£ÕâÓÐÁ¦µØ±íÃ÷Á˵¼ÈëµÄ±äÁ¿ÈÔÈ»ÒýÓÃÁË + <parameter>var_array</parameter> ²ÎÊýµÄÖµ¡£¿ÉÒÔµ¥¶ÀʹÓÃÕâ¸ö±êÖ¾»òÕßÔÚ + <parameter>extract_type</parameter> ÖÐÓà OR ÓëÆäËüÈκαêÖ¾½áºÏʹÓᣱ¾±ê¼ÇÊÇ + PHP 4.3.0 мӵġ£ </simpara> </listitem> </varlistentry> </variablelist> </para> <para> - Èç¹ûûÓÐÖ¸¶¨ <parameter>extract_type</parameter>£¬Ôò±»¼Ù¶¨Îª EXTR_OVERWRITE¡£ + Èç¹ûûÓÐÖ¸¶¨ <parameter>extract_type</parameter>£¬Ôò±»¼Ù¶¨Îª <constant>EXTR_OVERWRITE</constant>¡£ </para> <para> ×¢Òâ <parameter>prefix</parameter> ½öÔÚ <parameter>extract_type</parameter> µÄÖµÊÇ - EXTR_PREFIX_SAME£¬EXTR_PREFIX_ALL£¬EXTR_PREFIX_INVALID »ò EXTR_PREFIX_IF_EXISTS + <constant>EXTR_PREFIX_SAME</constant>£¬<constant>EXTR_PREFIX_ALL</constant>£¬<constant>EXTR_PREFIX_INVALID</constant> + »ò <constant>EXTR_PREFIX_IF_EXISTS</constant> ʱÐèÒª¡£Èç¹û¸½¼ÓÁËǰ׺ºóµÄ½á¹û²»ÊǺϷ¨µÄ±äÁ¿Ãû£¬½«²»»áµ¼Èëµ½·ûºÅ±íÖС£ </para> <para> <function>extract</function> ·µ»Ø³É¹¦µ¼Èëµ½·ûºÅ±íÖеıäÁ¿ÊýÄ¿¡£ </para> <para> - Ò»ÖÖ¿ÉÄܵÄÓ÷¨Êǽ« <function>wddx_deserialize</function> + <function>extract</function> µÄÒ»ÖÖ¿ÉÄÜÓ÷¨Êǽ« <function>wddx_deserialize</function> ·µ»ØµÄ½áºÏÊý×éÖеÄÄÚÈݵ¼Èëµ½·ûºÅ±í±äÁ¿ÖÐÈ¥¡£ </para> <para> @@ -144,16 +162,16 @@ </para> <para> <varname>$size</varname> ûÓб»¸²¸Ç£¬ÒòΪָ¶¨ÁË - EXTR_PREFIX_SAME£¬ÕâʹµÃ <varname>$wddx_size</varname> - ±»½¨Á¢¡£Èç¹ûÖ¸¶¨ÁË EXTR_SKIP£¬Ôò $wddx_size - Ò²²»»á±»½¨Á¢¡£EXTR_OVERWRITE ½«Ê¹ <varname>$size</varname> - µÄֵΪ¡°medium¡±£¬EXTR_PREFIX_ALL ½«½¨Á¢Ð±äÁ¿ + <constant>EXTR_PREFIX_SAME</constant>£¬ÕâʹµÃ <varname>$wddx_size</varname> + ±»½¨Á¢¡£Èç¹ûÖ¸¶¨ÁË <constant>EXTR_SKIP</constant>£¬Ôò $wddx_size + Ò²²»»á±»½¨Á¢¡£<constant>EXTR_OVERWRITE</constant> ½«Ê¹ <varname>$size</varname> + µÄֵΪ¡°medium¡±£¬<constant>EXTR_PREFIX_ALL</constant> ½«½¨Á¢Ð±äÁ¿ <varname>$wddx_color</varname>£¬<varname>$wddx_size</varname> ºÍ <varname>$wddx_shape</varname>¡£ </para> <para> ±ØÐëʹÓýáºÏÊý×飬Êý×ÖË÷ÒýµÄÊý×齫²»»á²úÉú½á¹û£¬³ý·ÇÓÃÁË - EXTR_PREFIX_ALL »òÕß EXTR_PREFIX_INVALID¡£ + <constant>EXTR_PREFIX_ALL</constant> »òÕß <constant>EXTR_PREFIX_INVALID</constant>¡£ </para> <para> ²Î¼û <function>compact</function>¡£ Index: phpdoc-zh/reference/array/functions/range.xml diff -u phpdoc-zh/reference/array/functions/range.xml:1.4 phpdoc-zh/reference/array/functions/range.xml:1.5 --- phpdoc-zh/reference/array/functions/range.xml:1.4 Fri Jan 24 07:59:37 2003 +++ phpdoc-zh/reference/array/functions/range.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.4 $ --> -<!-- $Author: derick $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- $Author: dallas $ --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.range"> <refnamediv> <refname>range</refname> @@ -13,8 +13,8 @@ <title>˵Ã÷</title> <methodsynopsis> <type>array</type><methodname>range</methodname> - <methodparam><type>mixed</type><parameter>low</parameter></methodparam> - <methodparam><type>mixed</type><parameter>high</parameter></methodparam> + <methodparam><type>int</type><parameter>low</parameter></methodparam> + <methodparam><type>int</type><parameter>high</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>step</parameter></methodparam> </methodsynopsis> <para> Index: phpdoc-zh/reference/array/functions/sort.xml diff -u phpdoc-zh/reference/array/functions/sort.xml:1.2 phpdoc-zh/reference/array/functions/sort.xml:1.3 --- phpdoc-zh/reference/array/functions/sort.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/sort.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.sort"> <refnamediv> <refname>sort</refname> @@ -68,16 +68,16 @@ </listitem> </itemizedlist> </para> - <para> - ²Î¼û - <function>arsort</function>£¬<function>asort</function>£¬<function>ksort</function>£¬<function>natsort</function>£¬<function>natcasesort</function>£¬<function>rsort</function>£¬<function>usort</function>£¬<function>array_multisort</function> - ºÍ <function>uksort</function>¡£ - </para> <note> <para> µÚ¶þ¸ö²ÎÊýÊÇ PHP 4 мӵġ£ </para> </note> + <para> + ²Î¼û + <function>arsort</function>£¬<function>asort</function>£¬<function>ksort</function>£¬<function>natsort</function>£¬<function>natcasesort</function>£¬<function>rsort</function>£¬<function>usort</function>£¬<function>array_multisort</function> + ºÍ <function>uksort</function>¡£ + </para> </refsect1> </refentry> Index: phpdoc-zh/reference/array/functions/usort.xml diff -u phpdoc-zh/reference/array/functions/usort.xml:1.3 phpdoc-zh/reference/array/functions/usort.xml:1.4 --- phpdoc-zh/reference/array/functions/usort.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/usort.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.usort"> <refnamediv> <refname>usort</refname> @@ -151,9 +151,11 @@ </para> <para> <screen> +<![CDATA[ b c d +]]> </screen> </para> <para>
Index: phpdoc-zh/reference/array/functions/array-fill.xml diff -u phpdoc-zh/reference/array/functions/array-fill.xml:1.2 phpdoc-zh/reference/array/functions/array-fill.xml:1.3 --- phpdoc-zh/reference/array/functions/array-fill.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-fill.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-fill"> <refnamediv> <refname>array_fill</refname> @@ -25,11 +25,14 @@ <title><function>array_fill</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $a = array_fill(5, 6, 'banana'); +print_r($a); +?> ]]> </programlisting> <para> - Óà <function>print_r</function> ²é¿´ $a ÏÔʾÈçÏ£º + <varname>$a</varname> ÏÖÔÚÊÇ£º <screen> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-flip.xml diff -u phpdoc-zh/reference/array/functions/array-flip.xml:1.3 phpdoc-zh/reference/array/functions/array-flip.xml:1.4 --- phpdoc-zh/reference/array/functions/array-flip.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-flip.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-flip"> <refnamediv> <refname>array_flip</refname> @@ -44,13 +44,15 @@ <title><function>array_flip</function> Àý×Ó£º³åÍ»</title> <programlisting role="php"> <![CDATA[ +<?php $trans = array ("a" => 1, "b" => 1, "c" => 2); $trans = array_flip ($trans); print_r($trans); +?> ]]> </programlisting> <para> - ÏÖÔÚ $trans ±ä³ÉÁË£º + ÏÖÔÚ <varname>$trans</varname> ±ä³ÉÁË£º <screen> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-intersect.xml diff -u phpdoc-zh/reference/array/functions/array-intersect.xml:1.3 phpdoc-zh/reference/array/functions/array-intersect.xml:1.4 --- phpdoc-zh/reference/array/functions/array-intersect.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-intersect.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-intersect"> <refnamediv> <refname>array_intersect</refname> @@ -24,9 +24,11 @@ <title><function>array_intersect</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?PHP $array1 = array ("a" => "green", "red", "blue"); $array2 = array ("b" => "green", "yellow", "red"); $result = array_intersect ($array1, $array2); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-map.xml diff -u phpdoc-zh/reference/array/functions/array-map.xml:1.3 phpdoc-zh/reference/array/functions/array-map.xml:1.4 --- phpdoc-zh/reference/array/functions/array-map.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/array-map.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.array-map"> <refnamediv> <refname>array_map</refname> @@ -11,17 +11,17 @@ </refnamediv> <refsect1> <title>˵Ã÷</title> - <methodsynopsis> - <type>array</type><methodname>array_map</methodname> - <methodparam><type>callback</type><parameter>function</parameter></methodparam> - <methodparam><type>array</type><parameter>arr1</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>arr2...</parameter></methodparam> - </methodsynopsis> + <methodsynopsis> + <type>array</type><methodname>array_map</methodname> + <methodparam><type>mixed</type><parameter>callback</parameter></methodparam> + <methodparam><type>array</type><parameter>arr1</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam> + </methodsynopsis> <para> <function>array_map</function> ·µ»ØÒ»¸öÊý×飬¸ÃÊý×é°üº¬ÁË - <parameter>arr1</parameter> ÖеÄËùÓе¥Ôª¾¹ý callback - <parameter>function</parameter> ×÷ÓùýÖ®ºóµÄµ¥Ôª¡£callback - <parameter>function</parameter> ½ÓÊܵIJÎÊýÊýĿӦ¸ÃºÍ´«µÝ¸ø + <parameter>arr1</parameter> ÖеÄËùÓе¥Ôª¾¹ý + <parameter>callback</parameter> ×÷ÓùýÖ®ºóµÄµ¥Ôª¡£<parameter>callback</parameter> + ½ÓÊܵIJÎÊýÊýĿӦ¸ÃºÍ´«µÝ¸ø <function>array_map</function> º¯ÊýµÄÊý×éÊýĿһÖ¡£ </para> <para> Index: phpdoc-zh/reference/array/functions/array-merge.xml diff -u phpdoc-zh/reference/array/functions/array-merge.xml:1.2 phpdoc-zh/reference/array/functions/array-merge.xml:1.3 --- phpdoc-zh/reference/array/functions/array-merge.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-merge.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> <refentry id="function.array-merge"> <refnamediv> <refname>array_merge</refname> @@ -29,10 +29,11 @@ $array1 = array ("color" => "red", 2, 4); $array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid", 4); $result = array_merge ($array1, $array2); +print_r($result); ]]> </programlisting> <para> - <literal>$result</literal> ³ÉΪ£º + <varname>$result</varname> ³ÉΪ£º <screen role="php"> <![CDATA[ Array Index: phpdoc-zh/reference/array/functions/array-pop.xml diff -u phpdoc-zh/reference/array/functions/array-pop.xml:1.2 phpdoc-zh/reference/array/functions/array-pop.xml:1.3 --- phpdoc-zh/reference/array/functions/array-pop.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-pop.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-pop"> <refnamediv> <refname>array_pop</refname> @@ -19,13 +19,17 @@ <parameter>array</parameter> µÄ³¤¶È¼õÒ»¡£Èç¹û <parameter>array</parameter> Ϊ¿Õ£¨»òÕß²»ÊÇÊý×飩½«·µ»Ø &null;¡£ </para> + &array.resetspointer; <para> <example> <title><function>array_pop</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $stack = array ("orange", "banana", "apple", "raspberry"); $fruit = array_pop ($stack); +print_r($stack); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-push.xml diff -u phpdoc-zh/reference/array/functions/array-push.xml:1.2 phpdoc-zh/reference/array/functions/array-push.xml:1.3 --- phpdoc-zh/reference/array/functions/array-push.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-push.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-push"> <refnamediv> <refname>array_push</refname> @@ -39,6 +39,7 @@ <![CDATA[ $stack = array ("orange", "banana"); array_push ($stack, "apple", "raspberry"); +print_r($stack); ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-shift.xml diff -u phpdoc-zh/reference/array/functions/array-shift.xml:1.2 phpdoc-zh/reference/array/functions/array-shift.xml:1.3 --- phpdoc-zh/reference/array/functions/array-shift.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-shift.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> <refentry id="function.array-shift"> <refnamediv> <refname>array_shift</refname> @@ -21,13 +21,17 @@ <parameter>array</parameter> µÄ³¤¶È¼õÒ»²¢½«ËùÓÐÆäËüµ¥ÔªÏòÇ°ÒÆ¶¯Ò»Î»¡£ËùÓеÄÊý×Ö¼üÃû½«¸ÄΪ´ÓÁ㿪ʼ¼ÆÊý£¬ÎÄ×Ö¼üÃû½«²»±ä¡£Èç¹û <parameter>array</parameter> Ϊ¿Õ£¨»òÕß²»ÊÇÊý×飩£¬Ôò·µ»Ø &null;¡£ </para> + &array.resetspointer; <para> <example> <title><function>array_shift</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $stack = array ("orange", "banana", "apple", "raspberry"); $fruit = array_shift ($stack); +print_r($stack); +?> ]]> </programlisting> <para> Index: phpdoc-zh/reference/array/functions/array-splice.xml diff -u phpdoc-zh/reference/array/functions/array-splice.xml:1.3 phpdoc-zh/reference/array/functions/array-splice.xml:1.4 --- phpdoc-zh/reference/array/functions/array-splice.xml:1.3 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-splice.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array-splice"> <refnamediv> <refname>array_splice</refname> @@ -50,15 +50,53 @@ </para> <para> ÒÔϵıí´ïʽ¾ßÓÐͬÑùЧ¹û£º - <programlisting role="php"> -<![CDATA[ -array_push ($input, $x, $y) array_splice ($input, count ($input), 0, array ($x, $y)) -array_pop ($input) array_splice ($input, -1) -array_shift ($input) array_splice ($input, 0, 1) -array_unshift ($input, $x, $y) array_splice ($input, 0, 0, array ($x, $y)) -$input[$x] = $y array_splice ($input, $x, 1, $y) -]]> - </programlisting> + <table> + <title><function>array_splice</function> µÈ¼Û±í´ïʽ</title> + <tgroup cols="2"> + <tbody> + <row> + <entry> + array_push($input, $x, $y) + </entry> + <entry> + array_splice($input, count($input), 0, array($x, $y)) + </entry> + </row> + <row> + <entry> + array_pop($input) + </entry> + <entry> + array_splice($input, -1) + </entry> + </row> + <row> + <entry> + array_shift($input) + </entry> + <entry> + array_splice($input, -1) + </entry> + </row> + <row> + <entry> + array_unshift($input, $x, $y) + </entry> + <entry> + array_splice($input, 0, 0, array($x, $y)) + </entry> + </row> + <row> + <entry> + $a[$x] = $y + </entry> + <entry> + array_splice($input, $x, 1, $y) + </entry> + </row> + </tbody> + </tgroup> + </table> </para> <para> ·µ»ØÒ»¸ö°üº¬±»ÒƳýµ¥ÔªµÄÊý×é¡£ Index: phpdoc-zh/reference/array/functions/array-unique.xml diff -u phpdoc-zh/reference/array/functions/array-unique.xml:1.2 phpdoc-zh/reference/array/functions/array-unique.xml:1.3 --- phpdoc-zh/reference/array/functions/array-unique.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-unique.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.10 Maintainer: dallas Status: ready --> <refentry id="function.array-unique"> <refnamediv> <refname>array_unique</refname> @@ -26,26 +26,21 @@ <simpara> µ±ÇÒ½öµ± <literal>(string) $elem1 === (string) $elem2</literal> ʱÁ½¸öµ¥Ôª±»ÈÏΪÏàͬ¡£¾ÍÊÇ˵£¬µ±×Ö·û´®µÄ±í´ïÒ»Ñùʱ¡£ - <!-- TODO: example of it... --> </simpara> <simpara> µÚÒ»¸öµ¥Ôª½«±»±£Áô¡£ </simpara> </note> - <warning> - <simpara> - ±¾º¯ÊýÔÚ PHP 4.0.4 ÖÐÊÇ»µµÄ£¡ - <!-- TODO: when exactly was this broken?... --> - </simpara> - </warning> <para> <example> <title><function>array_unique</function> Àý×Ó</title> <programlisting role="php"> <![CDATA[ +<?php $input = array ("a" => "green", "red", "b" => "green", "blue", "red"); $result = array_unique ($input); print_r($result); +?> ]]> </programlisting> <para> @@ -54,9 +49,9 @@ <![CDATA[ Array ( - [b] => green + [a] => green + [0] => red [1] => blue - [2] => red ) ]]> </screen> @@ -68,20 +63,20 @@ <title><function>array_unique</function> ºÍÀàÐÍ</title> <programlisting role="php"> <![CDATA[ +<?php $input = array (4,"4","3",4,3,"3"); $result = array_unique ($input); var_dump($result); +?> ]]> </programlisting> <para> - ÒÔÉϳÌÐòÊä³ö½á¹ûΪ£¨PHP 4.0.6£©£º + ±¾½Å±¾½«Êä³ö£º <screen role="php"> <![CDATA[ array(2) { - [0]=> - int(4) - [2]=> - string(1) "3" + [0] => int(4) + [2] => string(1) "3" } ]]> </screen> Index: phpdoc-zh/reference/array/functions/array-values.xml diff -u phpdoc-zh/reference/array/functions/array-values.xml:1.2 phpdoc-zh/reference/array/functions/array-values.xml:1.3 --- phpdoc-zh/reference/array/functions/array-values.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array-values.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.array-values"> <refnamediv> <refname>array_values</refname> @@ -15,7 +15,7 @@ </methodsynopsis> <para> <function>array_values</function> ·µ»Ø - <parameter>input</parameter> Êý×éÖÐËùÓеÄÖµ¡£ + <parameter>input</parameter> Êý×éÖÐËùÓеÄÖµ²¢¸øÆä½¨Á¢Êý×ÖË÷Òý¡£ </para> <para> <example> Index: phpdoc-zh/reference/array/functions/array.xml diff -u phpdoc-zh/reference/array/functions/array.xml:1.3 phpdoc-zh/reference/array/functions/array.xml:1.4 --- phpdoc-zh/reference/array/functions/array.xml:1.3 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/array.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> <refentry id="function.array"> <refnamediv> <refname>array</refname> @@ -91,9 +91,9 @@ <![CDATA[ Array ( - [1] => 'January' - [2] => 'February' - [3] => 'March' + [1] => January + [2] => February + [3] => March ) ]]> </screen> Index: phpdoc-zh/reference/array/functions/each.xml diff -u phpdoc-zh/reference/array/functions/each.xml:1.4 phpdoc-zh/reference/array/functions/each.xml:1.5 --- phpdoc-zh/reference/array/functions/each.xml:1.4 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/each.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.each"> <refnamediv> <refname>each</refname> @@ -32,31 +32,43 @@ <![CDATA[ $foo = array ("bob", "fred", "jussi", "jouni", "egon", "marliese"); $bar = each ($foo); +print_r($bar); ]]> </programlisting> <para> <varname>$bar</varname> ÏÖÔÚ°üº¬ÓÐÈçϵļü£¯Öµ¶Ô£º - <itemizedlist spacing="compact"> - <listitem><simpara>0 => 0</simpara></listitem> - <listitem><simpara>1 => 'bob'</simpara></listitem> - <listitem><simpara>key => 0</simpara></listitem> - <listitem><simpara>value => 'bob'</simpara></listitem> - </itemizedlist> + <screen> +<![CDATA[ +Array +{ + [1] => bob + [value] => bob + [0] => 0 + [key] => 0 +} +]]> + </screen> <programlisting role="php"> <![CDATA[ $foo = array ("Robert" => "Bob", "Seppo" => "Sepi"); $bar = each ($foo); +print_r($bar); ]]> </programlisting> </para> <para> <varname>$bar</varname> ÏÖÔÚ°üº¬ÓÐÈçϵļü£¯Öµ¶Ô£º - <itemizedlist spacing="compact"> - <listitem><simpara>0 => 'Robert'</simpara></listitem> - <listitem><simpara>1 => 'Bob'</simpara></listitem> - <listitem><simpara>key => 'Robert'</simpara></listitem> - <listitem><simpara>value => 'Bob'</simpara></listitem> - </itemizedlist> + <screen> +<![CDATA[ +Array +{ + [1] => Bob + [value] => Bob + [0] => Robert + [key] => Robert +} +]]> + </screen> </para> </example> </para> Index: phpdoc-zh/reference/array/functions/extract.xml diff -u phpdoc-zh/reference/array/functions/extract.xml:1.2 phpdoc-zh/reference/array/functions/extract.xml:1.3 --- phpdoc-zh/reference/array/functions/extract.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/extract.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.extract"> <refnamediv> <refname>extract</refname> @@ -29,7 +29,12 @@ </note> <note> <para> - EXTR_IF_EXISTS ºÍ EXTR_PREFIX_IF_EXISTS Êǰ汾 4.2.0 ÖÐÒý½øµÄ¡£ + <constant>EXTR_IF_EXISTS</constant> ºÍ <constant>EXTR_PREFIX_IF_EXISTS</constant> Êǰ汾 4.2.0 ÖÐÒý½øµÄ¡£ + </para> + </note> + <note> + <para> + <constant>EXTR_REFS</constant> Êǰ汾 4.3.0 ÖÐÒý½øµÄ¡£ </para> </note> <para> @@ -37,7 +42,7 @@ <parameter>extract_type</parameter> ²ÎÊý¾ö¶¨¡£¿ÉÒÔÊÇÒÔÏÂÖµÖ®Ò»£º <variablelist> <varlistentry> - <term>EXTR_OVERWRITE</term> + <term><constant>EXTR_OVERWRITE</constant></term> <listitem> <simpara> Èç¹ûÓгåÍ»£¬¸²¸ÇÒÑÓеıäÁ¿¡£ @@ -45,7 +50,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_SKIP</term> + <term><constant>EXTR_SKIP</constant></term> <listitem> <simpara> Èç¹ûÓгåÍ»£¬²»¸²¸ÇÒÑÓеıäÁ¿¡£ @@ -53,14 +58,14 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_SAME</term> + <term><constant>EXTR_PREFIX_SAME</constant></term> <listitem> <simpara>Èç¹ûÓгåÍ»£¬ÔÚ±äÁ¿Ãûǰ¼ÓÉÏǰ׺ <parameter>prefix</parameter>¡£ </simpara> </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_ALL</term> + <term><constant>EXTR_PREFIX_ALL</constant></term> <listitem> <simpara> ¸øËùÓбäÁ¿Ãû¼ÓÉÏǰ׺ @@ -69,7 +74,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_INVALID</term> + <term><constant>EXTR_PREFIX_INVALID</constant></term> <listitem> <simpara> ½öÔÚ·Ç·¨£¯Êý×ֵıäÁ¿Ãûǰ¼ÓÉÏǰ׺ @@ -78,7 +83,7 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_IF_EXISTS</term> + <term><constant>EXTR_IF_EXISTS</constant></term> <listitem> <simpara> ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬¸²¸ÇËüÃǵÄÖµ¡£ÆäËüµÄ¶¼²»´¦Àí¡£¿ÉÒÔÓÃÔÚÒѾ¶¨ÒåÁËÒ»×éºÏ·¨µÄ±äÁ¿£¬È»ºóÒª´ÓÒ»¸öÊý×éÀýÈç @@ -87,29 +92,42 @@ </listitem> </varlistentry> <varlistentry> - <term>EXTR_PREFIX_IF_EXISTS</term> + <term><constant>EXTR_PREFIX_IF_EXISTS</constant></term> + <listitem> + <simpara> + ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬½¨Á¢¸½¼ÓÁËǰ׺µÄ±äÁ¿Ãû£¬ÆäËüµÄ¶¼²»´¦Àí¡£±¾±ê¼ÇÊÇ + PHP 4.2.0 мӵġ£ + </simpara> + </listitem> + </varlistentry> + <varlistentry> + <term><constant>EXTR_REFS</constant></term> <listitem> <simpara> - ½öÔÚµ±Ç°·ûºÅ±íÖÐÒÑÓÐͬÃû±äÁ¿Ê±£¬½¨Á¢¸½¼ÓÁËǰ׺µÄ±äÁ¿Ãû£¬ÆäËüµÄ¶¼²»´¦Àí¡£±¾±ê¼ÇÊÇ PHP 4.2.0 мӵġ£ + ½«±äÁ¿×÷ΪÒýÓÃÌáÈ¡¡£ÕâÓÐÁ¦µØ±íÃ÷Á˵¼ÈëµÄ±äÁ¿ÈÔÈ»ÒýÓÃÁË + <parameter>var_array</parameter> ²ÎÊýµÄÖµ¡£¿ÉÒÔµ¥¶ÀʹÓÃÕâ¸ö±êÖ¾»òÕßÔÚ + <parameter>extract_type</parameter> ÖÐÓà OR ÓëÆäËüÈκαêÖ¾½áºÏʹÓᣱ¾±ê¼ÇÊÇ + PHP 4.3.0 мӵġ£ </simpara> </listitem> </varlistentry> </variablelist> </para> <para> - Èç¹ûûÓÐÖ¸¶¨ <parameter>extract_type</parameter>£¬Ôò±»¼Ù¶¨Îª EXTR_OVERWRITE¡£ + Èç¹ûûÓÐÖ¸¶¨ <parameter>extract_type</parameter>£¬Ôò±»¼Ù¶¨Îª <constant>EXTR_OVERWRITE</constant>¡£ </para> <para> ×¢Òâ <parameter>prefix</parameter> ½öÔÚ <parameter>extract_type</parameter> µÄÖµÊÇ - EXTR_PREFIX_SAME£¬EXTR_PREFIX_ALL£¬EXTR_PREFIX_INVALID »ò EXTR_PREFIX_IF_EXISTS + <constant>EXTR_PREFIX_SAME</constant>£¬<constant>EXTR_PREFIX_ALL</constant>£¬<constant>EXTR_PREFIX_INVALID</constant> + »ò <constant>EXTR_PREFIX_IF_EXISTS</constant> ʱÐèÒª¡£Èç¹û¸½¼ÓÁËǰ׺ºóµÄ½á¹û²»ÊǺϷ¨µÄ±äÁ¿Ãû£¬½«²»»áµ¼Èëµ½·ûºÅ±íÖС£ </para> <para> <function>extract</function> ·µ»Ø³É¹¦µ¼Èëµ½·ûºÅ±íÖеıäÁ¿ÊýÄ¿¡£ </para> <para> - Ò»ÖÖ¿ÉÄܵÄÓ÷¨Êǽ« <function>wddx_deserialize</function> + <function>extract</function> µÄÒ»ÖÖ¿ÉÄÜÓ÷¨Êǽ« <function>wddx_deserialize</function> ·µ»ØµÄ½áºÏÊý×éÖеÄÄÚÈݵ¼Èëµ½·ûºÅ±í±äÁ¿ÖÐÈ¥¡£ </para> <para> @@ -144,16 +162,16 @@ </para> <para> <varname>$size</varname> ûÓб»¸²¸Ç£¬ÒòΪָ¶¨ÁË - EXTR_PREFIX_SAME£¬ÕâʹµÃ <varname>$wddx_size</varname> - ±»½¨Á¢¡£Èç¹ûÖ¸¶¨ÁË EXTR_SKIP£¬Ôò $wddx_size - Ò²²»»á±»½¨Á¢¡£EXTR_OVERWRITE ½«Ê¹ <varname>$size</varname> - µÄֵΪ¡°medium¡±£¬EXTR_PREFIX_ALL ½«½¨Á¢Ð±äÁ¿ + <constant>EXTR_PREFIX_SAME</constant>£¬ÕâʹµÃ <varname>$wddx_size</varname> + ±»½¨Á¢¡£Èç¹ûÖ¸¶¨ÁË <constant>EXTR_SKIP</constant>£¬Ôò $wddx_size + Ò²²»»á±»½¨Á¢¡£<constant>EXTR_OVERWRITE</constant> ½«Ê¹ <varname>$size</varname> + µÄֵΪ¡°medium¡±£¬<constant>EXTR_PREFIX_ALL</constant> ½«½¨Á¢Ð±äÁ¿ <varname>$wddx_color</varname>£¬<varname>$wddx_size</varname> ºÍ <varname>$wddx_shape</varname>¡£ </para> <para> ±ØÐëʹÓýáºÏÊý×飬Êý×ÖË÷ÒýµÄÊý×齫²»»á²úÉú½á¹û£¬³ý·ÇÓÃÁË - EXTR_PREFIX_ALL »òÕß EXTR_PREFIX_INVALID¡£ + <constant>EXTR_PREFIX_ALL</constant> »òÕß <constant>EXTR_PREFIX_INVALID</constant>¡£ </para> <para> ²Î¼û <function>compact</function>¡£ Index: phpdoc-zh/reference/array/functions/range.xml diff -u phpdoc-zh/reference/array/functions/range.xml:1.4 phpdoc-zh/reference/array/functions/range.xml:1.5 --- phpdoc-zh/reference/array/functions/range.xml:1.4 Fri Jan 24 07:59:37 2003 +++ phpdoc-zh/reference/array/functions/range.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.4 $ --> -<!-- $Author: derick $ --> -<!-- EN-Revision: 1.6 Maintainer: dallas Status: ready --> +<!-- $Revision: 1.5 $ --> +<!-- $Author: dallas $ --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.range"> <refnamediv> <refname>range</refname> @@ -13,8 +13,8 @@ <title>˵Ã÷</title> <methodsynopsis> <type>array</type><methodname>range</methodname> - <methodparam><type>mixed</type><parameter>low</parameter></methodparam> - <methodparam><type>mixed</type><parameter>high</parameter></methodparam> + <methodparam><type>int</type><parameter>low</parameter></methodparam> + <methodparam><type>int</type><parameter>high</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>step</parameter></methodparam> </methodsynopsis> <para> Index: phpdoc-zh/reference/array/functions/sort.xml diff -u phpdoc-zh/reference/array/functions/sort.xml:1.2 phpdoc-zh/reference/array/functions/sort.xml:1.3 --- phpdoc-zh/reference/array/functions/sort.xml:1.2 Sun Sep 29 23:05:57 2002 +++ phpdoc-zh/reference/array/functions/sort.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.4 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.5 Maintainer: dallas Status: ready --> <refentry id="function.sort"> <refnamediv> <refname>sort</refname> @@ -68,16 +68,16 @@ </listitem> </itemizedlist> </para> - <para> - ²Î¼û - <function>arsort</function>£¬<function>asort</function>£¬<function>ksort</function>£¬<function>natsort</function>£¬<function>natcasesort</function>£¬<function>rsort</function>£¬<function>usort</function>£¬<function>array_multisort</function> - ºÍ <function>uksort</function>¡£ - </para> <note> <para> µÚ¶þ¸ö²ÎÊýÊÇ PHP 4 мӵġ£ </para> </note> + <para> + ²Î¼û + <function>arsort</function>£¬<function>asort</function>£¬<function>ksort</function>£¬<function>natsort</function>£¬<function>natcasesort</function>£¬<function>rsort</function>£¬<function>usort</function>£¬<function>array_multisort</function> + ºÍ <function>uksort</function>¡£ + </para> </refsect1> </refentry> Index: phpdoc-zh/reference/array/functions/usort.xml diff -u phpdoc-zh/reference/array/functions/usort.xml:1.3 phpdoc-zh/reference/array/functions/usort.xml:1.4 --- phpdoc-zh/reference/array/functions/usort.xml:1.3 Sun Jan 12 07:02:03 2003 +++ phpdoc-zh/reference/array/functions/usort.xml Mon Feb 24 02:43:11 2003 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="gb2312"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- $Author: dallas $ --> -<!-- EN-Revision: 1.7 Maintainer: dallas Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready --> <refentry id="function.usort"> <refnamediv> <refname>usort</refname> @@ -151,9 +151,11 @@ </para> <para> <screen> +<![CDATA[ b c d +]]> </screen> </para> <para>