cvs: phpdoc /en/appendices reserved.xml

From: Date: Wed, 20 Aug 2008 19:06:20 +0000
Subject: cvs: phpdoc /en/appendices reserved.xml
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-2065@lists.php.net to get a copy of this message
kalle Wed Aug 20 19:06:20 2008 UTC Modified files: /phpdoc/en/appendices reserved.xml Log: Fixes #45069 (multiple problems with reserved.php) Also restructures the table into one with reserved keywords, language constructs and compile time constants

http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/reserved.xml?r1=1.75&r2=1.76&diff_format=u Index: phpdoc/en/appendices/reserved.xml diff -u phpdoc/en/appendices/reserved.xml:1.75 phpdoc/en/appendices/reserved.xml:1.76 --- phpdoc/en/appendices/reserved.xml:1.75 Wed Aug 20 03:05:52 2008 +++ phpdoc/en/appendices/reserved.xml Wed Aug 20 19:06:20 2008 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.75 $ --> +<!-- $Revision: 1.76 $ --> <appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>List of Reserved Words</title> @@ -27,43 +27,40 @@ <tbody> <row> <entry> - <link linkend="language.operators.logical">and</link> + <link linkend="language.oop5.abstract">abstract</link> (as of PHP 5) </entry> <entry> - <link linkend="language.operators.logical">or</link> + <link linkend="language.operators.logical">and</link> </entry> <entry> - <link linkend="language.operators.logical">xor</link> + <function>array</function> </entry> <entry> - <link linkend="language.constants.predefined">__FILE__</link> + <link linkend="control-structures.foreach">as</link> </entry> <entry> - <link linkend="reserved.classes.php5">exception</link> (PHP 5) + <link linkend="control-structures.break">break</link> </entry> </row> <row> <entry> - <link linkend="language.constants.predefined">__LINE__</link> + <link linkend="control-structures.switch">case</link> </entry> <entry> - <function>array</function> + <link linkend="language.exceptions">catch</link> (as of PHP 5) </entry> <entry> - <link linkend="control-structures.foreach">as</link> + cfunction (PHP 4 only) </entry> <entry> - <link linkend="control-structures.break">break</link> + <link linkend="keyword.class">class</link> </entry> <entry> - <link linkend="control-structures.switch">case</link> + <link linkend="language.oop5.cloning">clone</link> (as of PHP 5) </entry> </row> <row> <entry> - <link linkend="keyword.class">class</link> - </entry> - <entry> <link linkend="language.oop5.constants">const</link> </entry> <entry> @@ -75,28 +72,17 @@ <entry> <link linkend="control-structures.switch">default</link> </entry> - </row> - <row> - <entry> - <function>die</function> - </entry> <entry> <link linkend="control-structures.do.while">do</link> </entry> - <entry> - <function>echo</function> - </entry> + </row> + <row> <entry> <link linkend="control-structures.else">else</link> </entry> <entry> <link linkend="control-structures.elseif">elseif</link> </entry> - </row> - <row> - <entry> - <function>empty</function> - </entry> <entry> <link linkend="control-structures.declare">enddeclare</link> </entry> @@ -106,11 +92,11 @@ <entry> <link linkend="control-structures.alternative-syntax">endforeach</link> </entry> + </row> + <row> <entry> <link linkend="control-structures.alternative-syntax">endif</link> </entry> - </row> - <row> <entry> <link linkend="control-structures.alternative-syntax">endswitch</link> </entry> @@ -118,13 +104,10 @@ <link linkend="control-structures.alternative-syntax">endwhile</link> </entry> <entry> - <function>eval</function> - </entry> - <entry> - <function>exit</function> + <link linkend="keyword.class">extends</link> </entry> <entry> - <link linkend="keyword.class">extends</link> + <link linkend="language.oop5.final">final</link> (as of PHP 5) </entry> </row> <row> @@ -141,49 +124,63 @@ <link linkend="language.variables.scope">global</link> </entry> <entry> - <link linkend="control-structures.if">if</link> + goto (as of PHP 5.3) </entry> </row> <row> <entry> - <function>include</function> + <link linkend="control-structures.if">if</link> </entry> <entry> - <function>include_once</function> + <link linkend="language.oop5.interfaces">implements</link> (as of PHP 5) </entry> <entry> - <function>isset</function> + <link linkend="language.oop5.interfaces">interface</link> (as of PHP 5) </entry> <entry> - <function>list</function> + <link linkend="language.operators.type">instanceof</link> (as of PHP 5) + </entry> + </row> + <row> + <entry> + <link linkend="language.namespaces">namespace</link> (as of PHP 5.3) </entry> <entry> <link linkend="keyword.class">new</link> </entry> + <entry> + old_function (PHP 4 only) + </entry> + <entry> + <link linkend="language.operators.logical">or</link> + </entry> + <entry> + <link linkend="language.oop5.visibility">private</link> (as of PHP 5) + </entry> </row> <row> <entry> - <function>print</function> + <link linkend="language.oop5.visibility">protected</link> (as of PHP 5) </entry> <entry> - <function>require</function> + <link linkend="language.oop5.visibility">public</link> (as of PHP 5) </entry> <entry> - <function>require_once</function> + <link linkend="language.variables.scope">static</link> </entry> <entry> - <function>return</function> + <link linkend="control-structures.switch">switch</link> </entry> <entry> - <link linkend="language.variables.scope">static</link> + <link linkend="keyword.class">this</link> (as of PHP 5) </entry> </row> <row> <entry> - <link linkend="control-structures.switch">switch</link> + <link linkend="language.exceptions">throw</link> (as of PHP 5) </entry> <entry> - <function>unset</function> + <link linkend="language.exceptions">try</link> (as of PHP 5) </entry> <entry> <link linkend="language.namespaces">use</link> @@ -197,83 +194,109 @@ </row> <row> <entry> - <link linkend="language.constants.predefined">__FUNCTION__</link> + <link linkend="language.operators.logical">xor</link> </entry> <entry> + </entry> + <entry> + </entry> + <entry> + </entry> + <entry> + </entry> + </row> + </tbody> + </tgroup> + </table> + <table> + <title>Compile-time constants</title> + <tgroup cols="5"> + <tbody> + <row> + <entry> <link linkend="language.constants.predefined">__CLASS__</link> </entry> + <entry> + <link linkend="language.constants.predefined">__DIR__</link> (as of PHP 5.3) + </entry> <entry> - <link linkend="language.constants.predefined">__METHOD__</link> + <link linkend="language.constants.predefined">__FILE__</link> </entry> <entry> - <link linkend="language.oop5.final">final</link> (as of PHP 5) + <link linkend="language.constants.predefined">__FUNCTION__</link> </entry> <entry> - <link linkend="reserved.classes.php5">php_user_filter</link> (as of PHP 5) + <link linkend="language.constants.predefined">__METHOD__</link> </entry> </row> <row> <entry> - <link linkend="language.oop5.interfaces">interface</link> (as of PHP 5) + <link linkend="language.namespaces">__NAMESPACE__</link> (as of PHP 5.3) </entry> <entry> - <link linkend="language.oop5.interfaces">implements</link> (as of PHP 5) </entry> <entry> - <link linkend="language.operators.type">instanceof</link> (as of PHP 5) </entry> <entry> - <link linkend="language.oop5.visibility">public</link> (as of PHP 5) </entry> <entry> - <link linkend="language.oop5.visibility">private</link> (as of PHP 5) </entry> </row> + </tbody> + </tgroup> + </table> + <table> + <title>Language constructs</title> + <tgroup cols="5"> + <tbody> <row> <entry> - <link linkend="language.oop5.visibility">protected</link> (as of PHP 5) + <function>die</function> </entry> <entry> - <link linkend="language.oop5.abstract">abstract</link> (as of PHP 5) + <function>echo</function> </entry> <entry> - <link linkend="language.oop5.cloning">clone</link> (as of PHP 5) + <function>empty</function> </entry> <entry> - <link linkend="language.exceptions">try</link> (as of PHP 5) + <function>exit</function> </entry> <entry> - <link linkend="language.exceptions">catch</link> (as of PHP 5) + <function>eval</function> </entry> </row> <row> <entry> - <link linkend="language.exceptions">throw</link> (as of PHP 5) + <link linkend="function.include">include</link> </entry> <entry> - cfunction (PHP 4 only) + <link linkend="function.include_once">include_once</link> </entry> <entry> - old_function (PHP 4 only) + <function>isset</function> </entry> <entry> - <link linkend="keyword.class">this</link> (as of PHP 5) + <function>list</function> </entry> - <entry> - <link linkend="language.constants.predefined">__DIR__</link> (as of PHP 5.3) + <entry> + <link linkend="function.require">require</link> </entry> </row> <row> <entry> - <link linkend="language.namespaces">__NAMESPACE__</link> (as of PHP 5.3) + <function>unset</function> </entry> <entry> - <link linkend="language.namespaces">namespace</link> (as of PHP 5.3) + <link linkend="function.require_once">require_once</link> </entry> <entry> - goto (as of PHP 5.3) + <link linkend="function.return">return</link> </entry> - <entry> + <entry> + <function>print</function> + </entry> + <entry> </entry> </row> </tbody>
« previous php.doc.cvs (#2065) next »