cvs: phpdoc /ja/appendices migration.xml migration4.xml phpdevel.xml
| From: | Masaki Fujimoto | Date: | Mon, 10 Dec 2001 15:16:34 +0000 |
| Subject: | cvs: phpdoc /ja/appendices migration.xml migration4.xml phpdevel.xml | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969339602@lists.php.net to get a copy of this message | ||
fujimoto Mon Dec 10 10:16:34 2001 EDT
Modified files:
/phpdoc/ja/appendices migration.xml migration4.xml phpdevel.xml
Log:
fixed typo, enclosed programlisting with CDATA and added the role attribute.
Index: phpdoc/ja/appendices/migration.xml diff -u phpdoc/ja/appendices/migration.xml:1.6 phpdoc/ja/appendices/migration.xml:1.7 --- phpdoc/ja/appendices/migration.xml:1.6 Sun Dec 9 22:10:13 2001 +++ phpdoc/ja/appendices/migration.xml Mon Dec 10 10:16:32 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix id="migration"> <title>PHP/FI 2.0 ãã PHP 3.0 ã¸ã®ç§»è¡</title> @@ -248,7 +248,7 @@ </section> <section id="migration.truefalse"> - <title>颿°ã® &true;/false è¿ãå¤</title> + <title>颿°ã® &true;/&false; è¿ãå¤</title> <simpara> ã»ã¨ãã©ã®å é¨é¢æ°ãæ¸ãç´ãããã®ã«ä¼´ããPHP/FI 2.0 ã§ã¯æåæã« 0 ã失ææã« -1 ãè¿ãã¦ããã®ãããããã &true; 㨠&false; ãè¿ã @@ -269,7 +269,7 @@ if ($fp == -1); echo("$file ãèªã¿è¾¼ã¿å°ç¨ã¨ãã¦éããã¨ãåºæ¥ã¾ããã§ãã<br>\n"); endif; -]]| +]]> </programlisting> </example> <example> Index: phpdoc/ja/appendices/migration4.xml diff -u phpdoc/ja/appendices/migration4.xml:1.7 phpdoc/ja/appendices/migration4.xml:1.8 --- phpdoc/ja/appendices/migration4.xml:1.7 Sun Dec 9 21:42:38 2001 +++ phpdoc/ja/appendices/migration4.xml Mon Dec 10 10:16:33 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <appendix id="migration4"> <title>PHP 3.0ããPHP 4.0ã¸ã®ç§»è¡</title> @@ -49,7 +49,7 @@ å¿ è¦ãªãªã³ã¯æ¡å¼µ(--enable-versioning)ãæå®ãã¾ãããã以å¤ã®å ´åã é常ã®å½ä»¤ã使ç¨ããã¾ããä¾ãã°ã <informalexample> - <programlisting> + <programlisting role="configure"> <![CDATA[ $ ./configure \ --with-apxs=/apache/bin/apxs \ @@ -72,7 +72,7 @@ Apacheè¨å®ãã¡ã¤ã«ã®å ´åã夿´ç¹ã¯ããå¤ããªã£ã¦ãã¾ããPHPã¢ã¸ã¥ã¼ ã«ã«ããèªèãããMIMEåã夿´ã¨ãªãã¾ããã <informalexample> - <programlisting> + <programlisting role="apache"> <![CDATA[ application/x-httpd-php3 --> application/x-httpd-php application/x-httpd-php3-source --> application/x-httpd-php-source @@ -85,7 +85,7 @@ ã³ã«åºã¥ã)両æ¹ã®ãã¼ã¸ã§ã³ã§åä½ããè¨å®ãã¡ã¤ã«ã使ãããã¨ã å¯è½ã§ãã <informalexample> - <programlisting> + <programlisting role="apache"> <![CDATA[ AddType application/x-httpd-php3 .php3 AddType application/x-httpd-php3-source .php3s Index: phpdoc/ja/appendices/phpdevel.xml diff -u phpdoc/ja/appendices/phpdevel.xml:1.7 phpdoc/ja/appendices/phpdevel.xml:1.8 --- phpdoc/ja/appendices/phpdevel.xml:1.7 Wed Nov 14 17:55:18 2001 +++ phpdoc/ja/appendices/phpdevel.xml Mon Dec 10 10:16:33 2001 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- $Revision: 1.8 $ --> <appendix id="phpdevel"> <title>PHP ã®éçº</title> @@ -10,10 +11,12 @@ <title>颿°ãããã¿ã¤ã</title> <para> å ¨ã¦ã®é¢æ°ã¯æ¬¡ã®ãããªå½¢å¼ã§ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ void php3_foo(INTERNAL_FUNCTION_PARAMETERS) { } +]]> </programlisting> 颿°ã弿°ãåããªãå ´åã§ãããã®ãããªå½¢å¼ã§ã³ã¼ã«ããã¾ãã </para> @@ -30,11 +33,13 @@ <para> <example> <title>弿°ã®åå¾</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arg1, *arg2; if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) { WRONG_PARAM_COUNT; } +]]> </programlisting> </example> @@ -72,7 +77,8 @@ <para> <example> <title>å¯å¤å¼æ°</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arg1, *arg2, *arg3; int arg_count = ARG_COUNT(ht); @@ -80,6 +86,7 @@ getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) { WRONG_PARAM_COUNT; } +]]> </programlisting> </example> </para> @@ -140,12 +147,14 @@ ãã®å¼æ°ãå¼·å¶çã«ããåã§ä½¿ç¨ãããå ´åã æ¬¡ã®å¤æé¢æ°ã®ã©ããã使ç¨ãããã¨ãã§ãã¾ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ convert_to_long(arg1); convert_to_double(arg1); convert_to_string(arg1); convert_to_boolean_long(arg1); /* æååã "" ã¾ã㯠"0" ã®å ´å 0ããã®ä»ã®å ´å 1 ã«ãªãã¾ã */ convert_string_to_number(arg1); /* æååã«å¿ãã¦å¤ã LONG ã¾ã㯠DOUBLE ã«å¤æ´ãã¾ã */ +]]> </programlisting> </para> <simpara> @@ -258,16 +267,20 @@ <para> <example> <title>$foo ãã·ã³ãã«ãã¼ãã«ã«åå¨ãããã©ããã調ã¹ã</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... } else { doesn't exist } +]]> </programlisting> </example> <example> <title>ã·ã³ãã«ãã¼ãã«ã«ãã夿°ã®ãµã¤ãºã®èª¿ã¹æ¹</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue); check(pvalue.type); +]]> </programlisting> </example> PHP 3.0 ã«ãããé åã¯ãã·ã³ãã«ãã¼ãã«ã¨åããããã·ã¥ãã¼ãã« @@ -290,11 +303,13 @@ <para> <example> <title>æ°è¦ã®é åã®åæå</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval arr; if (array_init(&arr) == FAILURE) { failed... }; hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL); +]]> </programlisting> </example> ãã®ã³ã¼ãã¯ãã¢ã¯ãã£ãã·ã³ãã«ãã¼ãã«ã«ããã¦æ°è¦é åã宣è¨ãã¦ãã¾ãã @@ -306,7 +321,8 @@ <para> <example> <title>æ°è¦é åã«ã¨ã³ããªãå ãã</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval entry; entry.type = IS_LONG; @@ -322,6 +338,7 @@ * (php2 ã¨åæ§ã«åä½ãã¾ã) */ hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); +]]> </programlisting> </example> @@ -342,26 +359,32 @@ 颿°ããé åãè¿ãæ§æã¨ããå ´åã 以ä¸ã®ããã«ããã ãã§é åã®åæåãè¡ããã¨ãã§ãã¾ãã </simpara> - <programlisting> + <programlisting role="c"> +<![CDATA[ if (array_init(return_value) == FAILURE) { failed...; } +]]> </programlisting> <simpara> ç¶ãã¦ããã«ãã¼é¢æ°ãç¨ãã¦å¤ãä»å ãã¾ãã </simpara> - <programlisting> + <programlisting role="c"> +<![CDATA[ add_next_index_long(return_value,long_value); add_next_index_double(return_value,double_value); add_next_index_string(return_value,estrdup(string_value)); +]]> </programlisting> <para> ãã¡ãããä»å ãé åã®åæåç´å¾ã«è¡ãããªãå ´åã«ã¯ã é åãã¾ã確èªããå¿ è¦ããããã¨ã§ãããã - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arr; if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { can't find... } else { use arr->value.ht... } +]]> </programlisting> </para> <simpara> @@ -458,8 +481,10 @@ ããã¾ããããã¯ãåºæ¬çã«é常ã®ããã·ã¥ãã¼ãã«ã§ãã (ããªãã¡ã.value.ht ã«é常ã®ããã·ã¥é¢æ°ã使ç¨å¯è½ã§ã) å®éã®é¢æ°ã®ç»é²ã¯ã次ã®ããã«ãã¦å®è¡ã§ãã¾ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ add_method( return_value, function_name, function_ptr ); +]]> </programlisting> </para> </listitem> @@ -550,19 +575,22 @@ <para> <example> <title>æ°è¦ãªã½ã¼ã¹ã®è¿½å </title> - <programlisting> + <programlisting role="c"> +<![CDATA[ RESOURCE *resource; /* ...ãªã½ã¼ã¹ç¨ã®ã¡ã¢ãªã確ä¿ãããªã½ã¼ã¹ãç²å¾ãã¾ã... */ /* æ°è¦ã®ãªã½ã¼ã¹ããªã¹ãã«è¿½å ãã¾ã */ return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE); return_value->type = IS_LONG; +]]> </programlisting> </example> <example> <title>æ¢åã®ãªã½ã¼ã¹ã®ä½¿ç¨æ³</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *resource_id; RESOURCE *resource; int type; @@ -574,18 +602,21 @@ RETURN_FALSE; } /* ...ãªã½ã¼ã¹ã使ç¨ãã¾ã... */ +]]> </programlisting> </example> <example> <title>æ¢åã®ãªã½ã¼ã¹ã®åé¤</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *resource_id; RESOURCE *resource; int type; convert_to_long(resource_id); php3_list_delete(resource_id->value.lval); +]]> </programlisting> </example> ãªã½ã¼ã¹å㯠php3_list.h ã® enum list_entry_type ã«ã¦ç»é²ããå¿ è¦ã
Index: phpdoc/ja/appendices/migration.xml diff -u phpdoc/ja/appendices/migration.xml:1.6 phpdoc/ja/appendices/migration.xml:1.7 --- phpdoc/ja/appendices/migration.xml:1.6 Sun Dec 9 22:10:13 2001 +++ phpdoc/ja/appendices/migration.xml Mon Dec 10 10:16:32 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <appendix id="migration"> <title>PHP/FI 2.0 ãã PHP 3.0 ã¸ã®ç§»è¡</title> @@ -248,7 +248,7 @@ </section> <section id="migration.truefalse"> - <title>颿°ã® &true;/false è¿ãå¤</title> + <title>颿°ã® &true;/&false; è¿ãå¤</title> <simpara> ã»ã¨ãã©ã®å é¨é¢æ°ãæ¸ãç´ãããã®ã«ä¼´ããPHP/FI 2.0 ã§ã¯æåæã« 0 ã失ææã« -1 ãè¿ãã¦ããã®ãããããã &true; 㨠&false; ãè¿ã @@ -269,7 +269,7 @@ if ($fp == -1); echo("$file ãèªã¿è¾¼ã¿å°ç¨ã¨ãã¦éããã¨ãåºæ¥ã¾ããã§ãã<br>\n"); endif; -]]| +]]> </programlisting> </example> <example> Index: phpdoc/ja/appendices/migration4.xml diff -u phpdoc/ja/appendices/migration4.xml:1.7 phpdoc/ja/appendices/migration4.xml:1.8 --- phpdoc/ja/appendices/migration4.xml:1.7 Sun Dec 9 21:42:38 2001 +++ phpdoc/ja/appendices/migration4.xml Mon Dec 10 10:16:33 2001 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <appendix id="migration4"> <title>PHP 3.0ããPHP 4.0ã¸ã®ç§»è¡</title> @@ -49,7 +49,7 @@ å¿ è¦ãªãªã³ã¯æ¡å¼µ(--enable-versioning)ãæå®ãã¾ãããã以å¤ã®å ´åã é常ã®å½ä»¤ã使ç¨ããã¾ããä¾ãã°ã <informalexample> - <programlisting> + <programlisting role="configure"> <![CDATA[ $ ./configure \ --with-apxs=/apache/bin/apxs \ @@ -72,7 +72,7 @@ Apacheè¨å®ãã¡ã¤ã«ã®å ´åã夿´ç¹ã¯ããå¤ããªã£ã¦ãã¾ããPHPã¢ã¸ã¥ã¼ ã«ã«ããèªèãããMIMEåã夿´ã¨ãªãã¾ããã <informalexample> - <programlisting> + <programlisting role="apache"> <![CDATA[ application/x-httpd-php3 --> application/x-httpd-php application/x-httpd-php3-source --> application/x-httpd-php-source @@ -85,7 +85,7 @@ ã³ã«åºã¥ã)両æ¹ã®ãã¼ã¸ã§ã³ã§åä½ããè¨å®ãã¡ã¤ã«ã使ãããã¨ã å¯è½ã§ãã <informalexample> - <programlisting> + <programlisting role="apache"> <![CDATA[ AddType application/x-httpd-php3 .php3 AddType application/x-httpd-php3-source .php3s Index: phpdoc/ja/appendices/phpdevel.xml diff -u phpdoc/ja/appendices/phpdevel.xml:1.7 phpdoc/ja/appendices/phpdevel.xml:1.8 --- phpdoc/ja/appendices/phpdevel.xml:1.7 Wed Nov 14 17:55:18 2001 +++ phpdoc/ja/appendices/phpdevel.xml Mon Dec 10 10:16:33 2001 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- $Revision: 1.8 $ --> <appendix id="phpdevel"> <title>PHP ã®éçº</title> @@ -10,10 +11,12 @@ <title>颿°ãããã¿ã¤ã</title> <para> å ¨ã¦ã®é¢æ°ã¯æ¬¡ã®ãããªå½¢å¼ã§ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ void php3_foo(INTERNAL_FUNCTION_PARAMETERS) { } +]]> </programlisting> 颿°ã弿°ãåããªãå ´åã§ãããã®ãããªå½¢å¼ã§ã³ã¼ã«ããã¾ãã </para> @@ -30,11 +33,13 @@ <para> <example> <title>弿°ã®åå¾</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arg1, *arg2; if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) { WRONG_PARAM_COUNT; } +]]> </programlisting> </example> @@ -72,7 +77,8 @@ <para> <example> <title>å¯å¤å¼æ°</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arg1, *arg2, *arg3; int arg_count = ARG_COUNT(ht); @@ -80,6 +86,7 @@ getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) { WRONG_PARAM_COUNT; } +]]> </programlisting> </example> </para> @@ -140,12 +147,14 @@ ãã®å¼æ°ãå¼·å¶çã«ããåã§ä½¿ç¨ãããå ´åã æ¬¡ã®å¤æé¢æ°ã®ã©ããã使ç¨ãããã¨ãã§ãã¾ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ convert_to_long(arg1); convert_to_double(arg1); convert_to_string(arg1); convert_to_boolean_long(arg1); /* æååã "" ã¾ã㯠"0" ã®å ´å 0ããã®ä»ã®å ´å 1 ã«ãªãã¾ã */ convert_string_to_number(arg1); /* æååã«å¿ãã¦å¤ã LONG ã¾ã㯠DOUBLE ã«å¤æ´ãã¾ã */ +]]> </programlisting> </para> <simpara> @@ -258,16 +267,20 @@ <para> <example> <title>$foo ãã·ã³ãã«ãã¼ãã«ã«åå¨ãããã©ããã調ã¹ã</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... } else { doesn't exist } +]]> </programlisting> </example> <example> <title>ã·ã³ãã«ãã¼ãã«ã«ãã夿°ã®ãµã¤ãºã®èª¿ã¹æ¹</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue); check(pvalue.type); +]]> </programlisting> </example> PHP 3.0 ã«ãããé åã¯ãã·ã³ãã«ãã¼ãã«ã¨åããããã·ã¥ãã¼ãã« @@ -290,11 +303,13 @@ <para> <example> <title>æ°è¦ã®é åã®åæå</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval arr; if (array_init(&arr) == FAILURE) { failed... }; hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL); +]]> </programlisting> </example> ãã®ã³ã¼ãã¯ãã¢ã¯ãã£ãã·ã³ãã«ãã¼ãã«ã«ããã¦æ°è¦é åã宣è¨ãã¦ãã¾ãã @@ -306,7 +321,8 @@ <para> <example> <title>æ°è¦é åã«ã¨ã³ããªãå ãã</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval entry; entry.type = IS_LONG; @@ -322,6 +338,7 @@ * (php2 ã¨åæ§ã«åä½ãã¾ã) */ hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); +]]> </programlisting> </example> @@ -342,26 +359,32 @@ 颿°ããé åãè¿ãæ§æã¨ããå ´åã 以ä¸ã®ããã«ããã ãã§é åã®åæåãè¡ããã¨ãã§ãã¾ãã </simpara> - <programlisting> + <programlisting role="c"> +<![CDATA[ if (array_init(return_value) == FAILURE) { failed...; } +]]> </programlisting> <simpara> ç¶ãã¦ããã«ãã¼é¢æ°ãç¨ãã¦å¤ãä»å ãã¾ãã </simpara> - <programlisting> + <programlisting role="c"> +<![CDATA[ add_next_index_long(return_value,long_value); add_next_index_double(return_value,double_value); add_next_index_string(return_value,estrdup(string_value)); +]]> </programlisting> <para> ãã¡ãããä»å ãé åã®åæåç´å¾ã«è¡ãããªãå ´åã«ã¯ã é åãã¾ã確èªããå¿ è¦ããããã¨ã§ãããã - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *arr; if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { can't find... } else { use arr->value.ht... } +]]> </programlisting> </para> <simpara> @@ -458,8 +481,10 @@ ããã¾ããããã¯ãåºæ¬çã«é常ã®ããã·ã¥ãã¼ãã«ã§ãã (ããªãã¡ã.value.ht ã«é常ã®ããã·ã¥é¢æ°ã使ç¨å¯è½ã§ã) å®éã®é¢æ°ã®ç»é²ã¯ã次ã®ããã«ãã¦å®è¡ã§ãã¾ãã - <programlisting> + <programlisting role="c"> +<![CDATA[ add_method( return_value, function_name, function_ptr ); +]]> </programlisting> </para> </listitem> @@ -550,19 +575,22 @@ <para> <example> <title>æ°è¦ãªã½ã¼ã¹ã®è¿½å </title> - <programlisting> + <programlisting role="c"> +<![CDATA[ RESOURCE *resource; /* ...ãªã½ã¼ã¹ç¨ã®ã¡ã¢ãªã確ä¿ãããªã½ã¼ã¹ãç²å¾ãã¾ã... */ /* æ°è¦ã®ãªã½ã¼ã¹ããªã¹ãã«è¿½å ãã¾ã */ return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE); return_value->type = IS_LONG; +]]> </programlisting> </example> <example> <title>æ¢åã®ãªã½ã¼ã¹ã®ä½¿ç¨æ³</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *resource_id; RESOURCE *resource; int type; @@ -574,18 +602,21 @@ RETURN_FALSE; } /* ...ãªã½ã¼ã¹ã使ç¨ãã¾ã... */ +]]> </programlisting> </example> <example> <title>æ¢åã®ãªã½ã¼ã¹ã®åé¤</title> - <programlisting> + <programlisting role="c"> +<![CDATA[ pval *resource_id; RESOURCE *resource; int type; convert_to_long(resource_id); php3_list_delete(resource_id->value.lval); +]]> </programlisting> </example> ãªã½ã¼ã¹å㯠php3_list.h ã® enum list_entry_type ã«ã¦ç»é²ããå¿ è¦ã