Document __DIR__ constant.

- Rename __MAGIC__ in tokens.xml from "constants" to "magic constants"


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@252734 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Edward Z. Yang 2008-02-12 04:39:11 +00:00
parent 43a6dca993
commit 5fd4ab47ee
3 changed files with 26 additions and 9 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.70 $ -->
<!-- $Revision: 1.71 $ -->
<appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>List of Reserved Words</title>
@ -273,7 +273,8 @@
<entry>
goto (PHP 6 only)
</entry>
<entry>
<entry>
<link linkend="language.constants.predefined">__DIR__</link> (as of PHP 5.3)
</entry>
<entry>
</entry>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.27 $ -->
<!-- $Revision: 1.28 $ -->
<appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook">
<title>List of Parser Tokens</title>
@ -100,7 +100,7 @@
<entry>T_CLASS_C</entry>
<entry>__CLASS__</entry>
<entry>
<link linkend="language.constants">constants</link>
<link linkend="language.constants.predefined">magic constants</link>
(available since PHP 4.3.0)
</entry>
</row>
@ -165,6 +165,12 @@
<entry>default</entry>
<entry><link linkend="control-structures.switch">switch</link></entry>
</row>
<row>
<entry>T_DIR</entry>
<entry>__DIR__</entry>
<entry><link linkend="language.constants.predefined">magic constants</link> (available
since PHP 5.3.0)</entry>
</row>
<row>
<entry>T_DIV_EQUAL</entry>
<entry>/=</entry>
@ -296,7 +302,7 @@
<row>
<entry>T_FILE</entry>
<entry>__FILE__</entry>
<entry><link linkend="language.constants">constants</link></entry>
<entry><link linkend="language.constants.predefined">magic constants</link></entry>
</row>
<row>
<entry>T_FINAL</entry>
@ -322,7 +328,7 @@
<entry>T_FUNC_C</entry>
<entry>__FUNCTION__</entry>
<entry>
<link linkend="language.constants">constants</link>
<link linkend="language.constants.predefined">magic constants</link>
(available since PHP 4.3.0)
</entry>
</row>
@ -424,7 +430,7 @@
<row>
<entry>T_LINE</entry>
<entry>__LINE__</entry>
<entry><link linkend="language.constants">constants</link></entry>
<entry><link linkend="language.constants.predefined">magic constants</link></entry>
</row>
<row>
<entry>T_LIST</entry>
@ -455,7 +461,7 @@
<entry>T_METHOD_C</entry>
<entry>__METHOD__</entry>
<entry>
<link linkend="language.constants">constants</link>
<link linkend="language.constants.predefined">magic constants</link>
(available since PHP 5.0.0)
</entry>
</row>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- $Revision: 1.49 $ -->
<!-- $Revision: 1.50 $ -->
<chapter xml:id="language.constants" xmlns="http://docbook.org/ns/docbook">
<title>Constants</title>
@ -201,6 +201,16 @@ echo Constant; // outputs "Constant" and issues a notice.
under some circumstances.
</entry>
</row>
<row>
<entry><constant>__DIR__</constant></entry>
<entry>
The directory of the file. If used inside an include,
the directory of the included file is returned. This is equivalent
to <literal>dirname(__FILE__)</literal>. This directory name
does not have a trailing slash unless it is the root directory.
(Added in PHP 5.3.0.)
</entry>
</row>
<row>
<entry><constant>__FUNCTION__</constant></entry>
<entry>