cvs: phpdoc-ja /appendices tokens.xml /language variables.xml /language/oop5 overloading.xml

takagi Sun Nov 18 00:43:25 2007 UTC Modified files: /phpdoc-ja/language/oop5 overloading.xml /phpdoc-ja/language variables.xml /phpdoc-ja/appendices tokens.xml Log: sync with en. http://cvs.php.net/viewvc.cgi/phpdoc-ja/language/oop5/overloading.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc-ja/language/oop5/overloading.xml diff -u phpdoc-ja/language/oop5/overloading.xml:1.11 phpdoc-ja/language/oop5/overloading.xml:1.12 --- phpdoc-ja/language/oop5/overloading.xml:1.11 Sun Nov 11 10:47:36 2007 +++ phpdoc-ja/language/oop5/overloading.xml Sun Nov 18 00:43:25 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.11 $ --> -<!-- EN-Revision: 1.19 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.12 $ --> +<!-- EN-Revision: 1.20 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <sect1 xml:id="language.oop5.overloading" xmlns="http://docbook.org/ns/docbook"> @@ -155,7 +155,7 @@ object(Setter)#1 (2) { ["n"]=> int(1) - ["x:private"]=> + ["x":"Setter":private]=> array(2) { ["b"]=> int(2) http://cvs.php.net/viewvc.cgi/phpdoc-ja/language/variables.xml?r1=1.34&r2=1.35&diff_format=u Index: phpdoc-ja/language/variables.xml diff -u phpdoc-ja/language/variables.xml:1.34 phpdoc-ja/language/variables.xml:1.35 --- phpdoc-ja/language/variables.xml:1.34 Fri Nov 16 10:56:50 2007 +++ phpdoc-ja/language/variables.xml Sun Nov 18 00:43:25 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.34 $ --> -<!-- EN-Revision: 1.97 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.35 $ --> +<!-- EN-Revision: 1.98 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <chapter xml:id="language.variables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>変数</title> @@ -28,6 +28,12 @@ </simpara> </note> + <note> + <simpara> + <literal>$this</literal> は特別な変数であり、ここに代入することはできません。 + </simpara> + </note> + &tip.userlandnaming; <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/appendices/tokens.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc-ja/appendices/tokens.xml diff -u phpdoc-ja/appendices/tokens.xml:1.12 phpdoc-ja/appendices/tokens.xml:1.13 --- phpdoc-ja/appendices/tokens.xml:1.12 Fri Jun 22 14:31:32 2007 +++ phpdoc-ja/appendices/tokens.xml Sun Nov 18 00:43:25 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.12 $ --> -<!-- EN-Revision: 1.26 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.13 $ --> +<!-- EN-Revision: 1.27 Maintainer: hirokawa Status: ready --> <!-- CREDITS: takagi --> <appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook"> @@ -100,6 +100,14 @@ <entry><link linkend="language.oop">クラスとオブジェクト</link></entry> </row> <row> + <entry>T_CLASS_C</entry> + <entry>__CLASS__</entry> + <entry> + <link linkend="language.constants">定数</link> + (PHP 4.3.0 以降で使用可能) + </entry> + </row> + <row> <entry>T_CLONE</entry> <entry>clone</entry> <entry> @@ -311,6 +319,14 @@ <entry><link linkend="language.functions">関数</link></entry> </row> <row> + <entry>T_FUNC_C</entry> + <entry>__FUNCTION__</entry> + <entry> + <link linkend="language.constants">定数</link> + (PHP 4.3.0 以降で使用可能) + </entry> + </row> + <row> <entry>T_GLOBAL</entry> <entry>global</entry> <entry><link linkend="language.variables.scope">変数のスコープ</link></entry> @@ -455,6 +471,15 @@ </link></entry> </row> <row> + <entry>T_NS_C</entry> + <entry>__NAMESPACE__</entry> + <entry> + <link linkend="language.namespaces">名前空間</link>。 + <constant>T_NAMESPACE</constant> としても定義されています + (PHP 5.3.0 以降で使用可能) + </entry> + </row> + <row> <entry>T_NEW</entry> <entry>new</entry> <entry><link linkend="language.oop">クラスとオブジェクト</link></entry> @@ -631,7 +656,8 @@ <row> <entry>T_USE</entry> <entry>use</entry> - <entry>(未実装)</entry> + <entry><link linkend="language.namespaces">名前空間</link> + (PHP 5.3.0 以降で使用可能)</entry> </row> <row> <entry>T_VAR</entry> @@ -659,22 +685,6 @@ <entry>^=</entry> <entry><link linkend="language.operators.assignment">代入演算子</link></entry> </row> - <row> - <entry>T_FUNC_C</entry> - <entry>__FUNCTION__</entry> - <entry> - <link linkend="language.constants">定数</link> - (PHP 4.3.0 以降で使用可能) - </entry> - </row> - <row> - <entry>T_CLASS_C</entry> - <entry>__CLASS__</entry> - <entry> - <link linkend="language.constants">定数</link> - (PHP 4.3.0 以降で使用可能) - </entry> - </row> </tbody> </tgroup> </table>