nlopess Sat Jul 31 06:02:17 2004 EDT
Modified files:
/phpdoc/en/appendices tokens.xml
Log:
document PHP 5 changes on comments
http://cvs.php.net/diff.php/phpdoc/en/appendices/tokens.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/appendices/tokens.xml
diff -u phpdoc/en/appendices/tokens.xml:1.12 phpdoc/en/appendices/tokens.xml:1.13
--- phpdoc/en/appendices/tokens.xml:1.12 Fri May 21 06:13:35 2004
+++ phpdoc/en/appendices/tokens.xml Sat Jul 31 06:02:17 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<appendix id="tokens">
<title>List of Parser Tokens</title>
@@ -93,7 +93,7 @@
</row>
<row>
<entry>T_COMMENT</entry>
- <entry>// or #</entry>
+ <entry>// or #, and /* */ on PHP 5</entry>
<entry><link linkend="language.basic-syntax.comments">comments</link></entry>
</row>
<row>
@@ -151,6 +151,11 @@
<entry><link linkend="language.types.float">floating point numbers</link></entry>
</row>
<row>
+ <entry>T_DOC_COMMENT</entry>
+ <entry>/** */</entry>
+ <entry><link linkend="language.basic-syntax.comments">PHPDoc style
comments</link></entry>
+ </row>
+ <row>
<entry>T_DO</entry>
<entry>do</entry>
<entry><link linkend="control-structures.do.while">do..while</link></entry>
@@ -385,7 +390,8 @@
<row>
<entry>T_ML_COMMENT</entry>
<entry>/* and */</entry>
- <entry><link linkend="language.basic-syntax.comments">comments</link></entry>
+ <entry><link linkend="language.basic-syntax.comments">comments</link>
+ (PHP 4 only)</entry>
</row>
<row>
<entry>T_MOD_EQUAL</entry>
