cvs: pear /PHP_Parser/Parser/DocBlock Default.jay Default.php DefaultLexer.lex DefaultLexer.php /PHP_Parser/tests
PHP_Parser_DocBlock_Default_basic_test.php
| From: | Greg Beaver | Date: | Sat, 17 Apr 2004 17:50:18 +0000 |
| Subject: | cvs: pear /PHP_Parser/Parser/DocBlock Default.jay Default.php DefaultLexer.lex DefaultLexer.php /PHP_Parser/tests PHP_Parser_DocBlock_Default_basic_test.php |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-18351@lists.php.net to get a copy of this message | ||
cellog Sat Apr 17 13:50:18 2004 EDT
Modified files:
/pear/PHP_Parser/Parser/DocBlock Default.jay Default.php
DefaultLexer.lex DefaultLexer.php
/pear/PHP_Parser/tests PHP_Parser_DocBlock_Default_basic_test.php
Log:
allow multiple paragraphs in a simple list
- item 1 text
line 2, item 1
paragraph 2, item 1
- item 2
- item 3
http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/Default.jay?r1=1.12&r2=1.13&ty=u Index: pear/PHP_Parser/Parser/DocBlock/Default.jay diff -u pear/PHP_Parser/Parser/DocBlock/Default.jay:1.12 pear/PHP_Parser/Parser/DocBlock/Default.jay:1.13 --- pear/PHP_Parser/Parser/DocBlock/Default.jay:1.12 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/Default.jay Sat Apr 17 13:50:18 2004 @@ -17,7 +17,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Default.jay,v 1.12 2004/04/17 05:17:30 cellog Exp $ +// $Id: Default.jay,v 1.13 2004/04/17 17:50:18 cellog Exp $ // define('PHP_PARSER_DOCBLOCK_DEFAULT_ERROR_PARSE', 1); require_once 'PHP/Parser/MsgServer.php'; @@ -1237,6 +1237,10 @@ { $$ = array($1); } + | T_DOUBLE_NL + { + $$ = array("\n\n"); + } | T_ESCAPED_TAG { $$ = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $1)); @@ -1299,6 +1303,11 @@ $$ = $1; $$[] = $2; } + | simplelist_line T_DOUBLE_NL + { + $$ = $1; + $$[] = "\n\n"; + } ; simplelist_line_with_p: http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/Default.php?r1=1.10&r2=1.11&ty=u Index: pear/PHP_Parser/Parser/DocBlock/Default.php diff -u pear/PHP_Parser/Parser/DocBlock/Default.php:1.10 pear/PHP_Parser/Parser/DocBlock/Default.php:1.11 --- pear/PHP_Parser/Parser/DocBlock/Default.php:1.10 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/Default.php Sat Apr 17 13:50:18 2004 @@ -33,7 +33,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Default.php,v 1.10 2004/04/17 05:17:30 cellog Exp $ +// $Id: Default.php,v 1.11 2004/04/17 17:50:18 cellog Exp $ // define('PHP_PARSER_DOCBLOCK_DEFAULT_ERROR_PARSE', 1); require_once 'PHP/Parser/MsgServer.php'; @@ -1439,16 +1439,21 @@ function _113($yyTop) // line 1241 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { - $this->yyVal = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop])); + $this->yyVal = array("\n\n"); } function _114($yyTop) // line 1245 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { - $this->yyVal = array($this->yyVals[0+$yyTop]); + $this->yyVal = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop])); } function _115($yyTop) // line 1249 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { + $this->yyVal = array($this->yyVals[0+$yyTop]); + } + + function _116($yyTop) // line 1253 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + { if ($this->yyVals[0+$yyTop] == '{@}') { $this->yyVal = array('{@'); } elseif ($this->yyVals[0+$yyTop] == '{@*}') { @@ -1458,18 +1463,18 @@ } } - function _116($yyTop) // line 1259 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _117($yyTop) // line 1263 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _117($yyTop) // line 1263 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _118($yyTop) // line 1267 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _118($yyTop) // line 1268 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _119($yyTop) // line 1272 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; if (is_string($this->yyVal[$index])) { @@ -1479,13 +1484,13 @@ } } - function _119($yyTop) // line 1277 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _120($yyTop) // line 1281 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _120($yyTop) // line 1282 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _121($yyTop) // line 1286 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $t = array('{@'); @@ -1502,7 +1507,7 @@ } } - function _121($yyTop) // line 1298 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _122($yyTop) // line 1302 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; @@ -1510,15 +1515,21 @@ function _123($yyTop) // line 1307 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { + $this->yyVal = $this->yyVals[-1+$yyTop]; + $this->yyVal[] = "\n\n"; + } + + function _125($yyTop) // line 1316 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + { $this->yyVal = str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop]); } - function _124($yyTop) // line 1311 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _126($yyTop) // line 1320 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _125($yyTop) // line 1315 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _127($yyTop) // line 1324 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $this->yyVal = array('{@'); @@ -1529,23 +1540,23 @@ } } - function _126($yyTop) // line 1325 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _128($yyTop) // line 1334 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _127($yyTop) // line 1329 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _129($yyTop) // line 1338 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _128($yyTop) // line 1333 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _130($yyTop) // line 1342 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _129($yyTop) // line 1338 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _131($yyTop) // line 1347 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $index = count($this->yyVal) - 1; @@ -1556,13 +1567,13 @@ } } - function _130($yyTop) // line 1348 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _132($yyTop) // line 1357 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _131($yyTop) // line 1353 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _133($yyTop) // line 1362 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $t = array('{@'); @@ -1580,7 +1591,7 @@ } } - function _132($yyTop) // line 1370 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _134($yyTop) // line 1379 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $index = count($this->yyVal) - 1; @@ -1591,23 +1602,23 @@ } } - function _133($yyTop) // line 1380 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _135($yyTop) // line 1389 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _134($yyTop) // line 1388 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _136($yyTop) // line 1397 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->_parseInlineTag($this->yyVals[-2+$yyTop], $this->yyVals[-1+$yyTop]); } - function _135($yyTop) // line 1392 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _137($yyTop) // line 1401 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->_parseInlineTag($this->yyVals[-1+$yyTop], array()); } - function _136($yyTop) // line 1399 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _138($yyTop) // line 1408 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->_options['parseInternal']) { $this->yyVal = $this->yyVals[-1+$yyTop]; @@ -1616,7 +1627,7 @@ } } - function _137($yyTop) // line 1410 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _139($yyTop) // line 1419 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->_options['parseInternal']) { $this->yyVal = $this->yyVals[-1+$yyTop]; @@ -1624,13 +1635,13 @@ $this->yyVal = ''; } } - // line 1628 "-" + // line 1639 "-" - // line 1418 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + // line 1427 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" /**#@-*/ } - // line 1634 "-" + // line 1645 "-" $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyLhs'] = array( -1, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, @@ -1645,8 +1656,8 @@ 31, 33, 32, 32, 32, 32, 34, 34, 34, 34, 35, 35, 40, 40, 40, 38, 39, 36, 36, 37, 37, 41, 41, 41, 41, 41, 41, 41, 41, 41, - 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 10, 10, 14, 11, + 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 10, 10, 14, 11, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyLen'] = array( 2, 1, 2, 3, 2, 1, 1, 2, 2, 1, 2, @@ -1660,9 +1671,9 @@ 1, 2, 3, 3, 2, 2, 3, 2, 2, 3, 2, 2, 2, 3, 3, 4, 2, 3, 3, 4, 1, 2, 1, 1, 1, 2, 2, 1, 3, 1, - 3, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 4, 3, 3, 3, + 3, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 4, 3, 3, 3, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyDefRed'] = array( 0, 103, 104, 105, 0, 0, 0, 0, 0, 0, 0, @@ -1674,224 +1685,224 @@ 65, 66, 0, 0, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, 45, 41, 48, 0, 2, 0, 44, 42, 43, 49, 7, - 16, 0, 85, 86, 0, 112, 113, 115, 114, 116, - 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, - 0, 0, 30, 25, 31, 32, 26, 27, 28, 29, - 0, 88, 89, 0, 122, 123, 125, 126, 127, 124, - 0, 0, 0, 77, 80, 69, 0, 67, 73, 75, - 71, 136, 0, 135, 0, 0, 3, 0, 94, 0, - 87, 0, 117, 118, 120, 119, 121, 0, 78, 82, - 70, 68, 74, 76, 72, 137, 51, 0, 98, 0, - 90, 0, 128, 129, 131, 132, 133, 130, 83, 0, - 134, 106, 96, 0, 84, 107, 100, 0, + 16, 0, 85, 86, 0, 112, 114, 116, 113, 115, + 117, 0, 0, 0, 0, 81, 0, 0, 0, 0, + 0, 0, 0, 30, 25, 31, 32, 26, 27, 28, + 29, 0, 88, 89, 0, 124, 125, 127, 128, 129, + 126, 0, 0, 0, 77, 80, 69, 0, 67, 73, + 75, 71, 138, 0, 137, 0, 0, 3, 0, 94, + 0, 87, 0, 118, 119, 121, 123, 120, 122, 0, + 78, 82, 70, 68, 74, 76, 72, 139, 51, 0, + 98, 0, 90, 0, 130, 131, 133, 134, 135, 132, + 83, 0, 136, 106, 96, 0, 84, 107, 100, 0, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyDgoto'] = array( 20, 69, 22, 85, 23, 70, 24, 52, 53, 54, 25, 56, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 57, 58, 59, 60, 61, 62, 67, 104, 68, 105, - 35, 36, 63, 64, 37, 101, 131, 149, 169, 38, - 102, 132, + 57, 58, 59, 60, 61, 62, 67, 105, 68, 106, + 35, 36, 63, 64, 37, 102, 132, 150, 171, 38, + 103, 133, ); - $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yySindex'] = array( 221, - 0, 0, 0, 186, 559, -7, 597, 597, 597, 597, - 597, 0, 0, 0, 0, 0, 597, -21, -14, 0, - 183, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 153, 149, 669, 0, 0, 11, - 559, 559, 559, 559, 559, 0, 0, 0, 0, 21, - 0, 259, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 176, 204, 307, 597, 51, 0, 297, 52, - 71, -6, -3, 97, 210, 597, 187, 0, 0, 0, - 0, 0, 597, 0, 34, 0, 0, 0, 0, 0, - 0, 93, 0, 0, 251, 0, 0, 0, 0, 0, - 100, 697, 559, 94, 0, 331, 369, 407, 445, 483, - 33, 103, 0, 0, 0, 0, 0, 0, 0, 0, - 107, 0, 0, 278, 0, 0, 0, 0, 0, 0, - 122, 659, -9, 0, 0, 0, 597, 0, 0, 0, - 0, 0, 98, 0, 109, 98, 0, 169, 0, 93, - 0, 669, 0, 0, 0, 0, 0, 521, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 169, 0, 107, - 0, 307, 0, 0, 0, 0, 0, 0, 0, 297, - 0, 0, 0, 697, 0, 0, 0, 659, + $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yySindex'] = array( 224, + 0, 0, 0, 227, 562, 13, 600, 600, 600, 600, + 600, 0, 0, 0, 0, 0, 600, 33, 50, 0, + 186, 0, -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 106, 148, 310, 0, 0, 81, + 562, 562, 562, 562, 562, 0, 0, 0, 0, 86, + 0, 262, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 155, 206, 662, 600, 70, 0, 300, -1, + -12, 104, 39, 109, 132, 600, 22, 0, 0, 0, + 0, 0, 600, 0, 64, 0, 0, 0, 0, 0, + 0, 125, 0, 0, 173, 0, 0, 0, 0, 0, + 0, 107, 672, 562, 122, 0, 334, 372, 410, 448, + 486, 31, 134, 0, 0, 0, 0, 0, 0, 0, + 0, 140, 0, 0, 178, 0, 0, 0, 0, 0, + 0, 164, 700, -10, 0, 0, 0, 600, 0, 0, + 0, 0, 0, 159, 0, 153, 159, 0, 156, 0, + 125, 0, 310, 0, 0, 0, 0, 0, 0, 524, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, + 0, 140, 0, 662, 0, 0, 0, 0, 0, 0, + 0, 300, 0, 0, 0, 672, 0, 0, 0, 700, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyRindex'] = array( 0, - 0, 0, 0, 0, 0, 0, 58, 74, 85, 37, - 127, 0, 0, 0, 0, 0, 266, 154, 0, 0, - 162, 0, 166, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 56, 108, 61, + 117, 0, 0, 0, 0, 0, 213, 198, 0, 0, + 200, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -8, 0, 0, 611, 0, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 0, 20, 0, 192, 0, 0, 0, 0, 0, - 0, 241, 0, 0, 0, 0, 0, 0, 0, 0, - 298, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 263, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 354, 131, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 195, 0, 0, 4, 0, 0, 0, 279, + 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, 614, 0, + 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, + 0, 0, 20, 0, 215, 0, 0, 0, 0, 0, + 0, 244, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 254, 25, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 266, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 281, 168, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 221, 0, 0, 11, 0, 0, 0, + 282, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 350, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 632, - 0, 0, 0, 168, 0, 0, 0, 203, + 0, 353, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 635, 0, 0, 0, 185, 0, 0, 0, 205, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyGindex'] = array( 0, - 3, -15, 0, 175, 114, -16, 101, -23, -30, -5, - -17, -20, -19, -11, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 132, 123, - 182, 0, 171, 0, 10, 0, 0, 80, 63, 233, - 96, 78, + 3, -17, 0, 181, 99, -18, 82, -38, -31, -5, + -23, -20, -19, -11, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 166, 131, + 204, 0, 174, 0, 10, 0, 0, 100, 94, 249, + 118, 102, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyTable'] = array( 55, - 87, 88, 21, 8, 66, 84, 91, 90, 52, 89, - 76, 10, 179, 12, 65, 86, 100, 5, 52, 12, - 139, 118, 103, 50, 140, 77, 137, 12, 117, 137, - 5, 99, 137, 50, 120, 55, 55, 55, 55, 55, - 8, 129, 5, 52, 18, 52, 119, 12, 87, 88, - 65, 65, 65, 65, 65, 12, 12, 89, 50, 130, - 50, 65, 66, 86, 12, 108, 108, 166, 108, 147, - 18, 134, 12, 65, 136, 118, 118, 118, 118, 118, - 12, 157, 117, 117, 117, 117, 117, 137, 120, 120, - 120, 120, 120, 12, 91, 138, 156, 55, 12, 148, - 119, 119, 119, 119, 119, 103, 137, 152, 177, 12, - 167, 12, 65, 168, 159, 65, 65, 65, 65, 65, - 12, 71, 72, 73, 74, 141, 178, 118, 182, 172, - 75, 100, 137, 137, 117, 110, 110, 186, 110, 180, - 120, 106, 107, 108, 109, 110, 99, 181, 129, 1, - 2, 3, 119, 9, 94, 12, 4, 92, 93, 87, - 88, 1, 12, 157, 177, 6, 130, 65, 89, 1, - 2, 3, 109, 109, 86, 109, 4, 65, 156, 133, - 121, 122, 178, 1, 2, 3, 1, 2, 3, 143, - 4, 4, 78, 6, 11, 7, 146, 8, 135, 9, - 10, 11, 79, 158, 1, 2, 3, 111, 111, 123, - 111, 4, 13, 80, 81, 82, 17, 95, 83, 18, - 19, 1, 2, 3, 111, 144, 160, 145, 4, 183, - 5, 6, 187, 7, 124, 8, 39, 9, 10, 11, - 12, 93, 93, 93, 142, 137, 93, 184, 93, 188, - 13, 14, 15, 16, 17, 150, 151, 18, 19, 1, - 2, 3, 0, 97, 97, 97, 4, 0, 97, 40, - 97, 41, 0, 42, 0, 43, 44, 45, 112, 95, - 95, 95, 170, 171, 95, 0, 95, 0, 46, 113, - 114, 115, 50, 0, 116, 0, 19, 1, 2, 3, - 12, 12, 91, 91, 4, 0, 78, 6, 0, 7, - 125, 8, 0, 9, 10, 11, 79, 40, 0, 41, - 0, 42, 0, 43, 44, 45, 13, 80, 81, 82, - 17, 1, 2, 3, 19, 0, 46, 126, 4, 127, - 0, 40, 128, 41, 19, 42, 0, 43, 44, 45, - 99, 99, 99, 161, 0, 99, 0, 99, 92, 92, - 46, 113, 114, 115, 50, 0, 116, 0, 19, 1, - 2, 3, 0, 0, 0, 0, 4, 0, 0, 40, - 0, 41, 0, 42, 0, 43, 44, 45, 0, 0, - 0, 0, 0, 162, 0, 0, 0, 0, 46, 113, - 114, 115, 50, 0, 116, 0, 19, 1, 2, 3, - 0, 0, 0, 0, 4, 0, 0, 40, 0, 41, - 0, 42, 0, 43, 44, 45, 0, 0, 0, 0, - 0, 0, 0, 163, 0, 0, 46, 113, 114, 115, - 50, 0, 116, 0, 19, 1, 2, 3, 0, 0, - 0, 0, 4, 0, 0, 40, 0, 41, 0, 42, - 0, 43, 44, 45, 0, 0, 0, 0, 0, 0, - 0, 0, 164, 0, 46, 113, 114, 115, 50, 0, - 116, 0, 19, 1, 2, 3, 0, 0, 0, 0, - 4, 0, 0, 40, 0, 41, 0, 42, 0, 43, - 44, 45, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 165, 46, 113, 114, 115, 50, 0, 116, 0, - 19, 1, 2, 3, 0, 0, 0, 0, 4, 0, - 0, 40, 0, 41, 0, 42, 0, 43, 44, 45, - 0, 0, 185, 0, 0, 0, 0, 0, 0, 0, - 46, 113, 114, 115, 50, 0, 116, 0, 19, 1, - 2, 3, 0, 0, 0, 0, 4, 0, 0, 40, - 0, 41, 0, 42, 0, 43, 44, 45, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, - 48, 49, 50, 0, 51, 0, 19, 1, 2, 3, - 0, 0, 0, 0, 4, 0, 0, 6, 0, 7, - 13, 8, 0, 9, 10, 11, 12, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 14, 15, 16, - 17, 14, 13, 13, 19, 13, 0, 13, 13, 13, - 0, 0, 0, 0, 0, 13, 13, 13, 0, 0, - 0, 0, 0, 14, 14, 0, 14, 0, 14, 14, - 14, 0, 173, 0, 0, 0, 14, 14, 14, 40, - 0, 41, 96, 42, 0, 43, 44, 45, 0, 6, - 0, 7, 0, 8, 0, 9, 10, 11, 46, 174, - 0, 175, 0, 0, 176, 0, 19, 0, 13, 97, - 153, 98, 0, 0, 0, 0, 19, 6, 0, 7, - 0, 8, 0, 9, 10, 11, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 154, 0, 155, - 0, 0, 0, 0, 19, + 87, 88, 21, 84, 91, 90, 5, 52, 50, 89, + 8, 181, 139, 118, 65, 86, 101, 52, 50, 12, + 119, 137, 10, 138, 66, 138, 130, 12, 121, 108, + 108, 100, 108, 18, 138, 55, 55, 55, 55, 55, + 5, 12, 52, 50, 52, 50, 120, 8, 87, 88, + 65, 65, 65, 65, 65, 12, 12, 89, 12, 131, + 145, 65, 146, 86, 76, 168, 141, 148, 118, 118, + 118, 118, 118, 65, 138, 119, 119, 119, 119, 119, + 12, 66, 159, 121, 121, 121, 121, 121, 12, 77, + 135, 12, 104, 91, 179, 5, 12, 158, 55, 12, + 18, 120, 120, 120, 120, 120, 71, 72, 73, 74, + 92, 93, 12, 65, 153, 75, 65, 65, 65, 65, + 65, 118, 107, 108, 109, 110, 111, 180, 119, 184, + 140, 149, 101, 104, 12, 130, 121, 142, 188, 138, + 182, 169, 161, 12, 138, 12, 170, 100, 1, 2, + 3, 179, 12, 94, 120, 4, 1, 2, 3, 122, + 123, 87, 88, 4, 134, 159, 143, 138, 131, 65, + 89, 174, 110, 110, 144, 110, 86, 151, 152, 65, + 158, 147, 172, 173, 180, 160, 1, 2, 3, 109, + 109, 183, 109, 4, 138, 78, 6, 9, 7, 1, + 8, 6, 9, 10, 11, 79, 1, 2, 3, 111, + 111, 124, 111, 4, 4, 13, 80, 81, 82, 17, + 11, 83, 18, 19, 1, 2, 3, 1, 2, 3, + 112, 4, 136, 5, 6, 162, 7, 125, 8, 95, + 9, 10, 11, 12, 93, 93, 93, 12, 12, 93, + 185, 93, 39, 13, 14, 15, 16, 17, 91, 91, + 18, 19, 1, 2, 3, 189, 97, 97, 97, 4, + 186, 97, 40, 97, 41, 190, 42, 0, 43, 44, + 45, 113, 95, 95, 95, 92, 92, 95, 0, 95, + 0, 46, 114, 115, 116, 50, 0, 117, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 78, + 6, 0, 7, 96, 8, 0, 9, 10, 11, 79, + 6, 0, 7, 0, 8, 0, 9, 10, 11, 13, + 80, 81, 82, 17, 1, 2, 3, 19, 0, 13, + 97, 4, 98, 0, 40, 99, 41, 19, 42, 0, + 43, 44, 45, 99, 99, 99, 163, 0, 99, 0, + 99, 0, 0, 46, 114, 115, 116, 50, 0, 117, + 0, 19, 1, 2, 3, 0, 0, 0, 0, 4, + 0, 0, 40, 0, 41, 0, 42, 0, 43, 44, + 45, 0, 0, 0, 0, 0, 164, 0, 0, 0, + 0, 46, 114, 115, 116, 50, 0, 117, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 0, + 40, 0, 41, 0, 42, 0, 43, 44, 45, 0, + 0, 0, 0, 0, 0, 0, 165, 0, 0, 46, + 114, 115, 116, 50, 0, 117, 0, 19, 1, 2, + 3, 0, 0, 0, 0, 4, 0, 0, 40, 0, + 41, 0, 42, 0, 43, 44, 45, 0, 0, 0, + 0, 0, 0, 0, 0, 166, 0, 46, 114, 115, + 116, 50, 0, 117, 0, 19, 1, 2, 3, 0, + 0, 0, 0, 4, 0, 0, 40, 0, 41, 0, + 42, 0, 43, 44, 45, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 167, 46, 114, 115, 116, 50, + 0, 117, 0, 19, 1, 2, 3, 0, 0, 0, + 0, 4, 0, 0, 40, 0, 41, 0, 42, 0, + 43, 44, 45, 0, 0, 187, 0, 0, 0, 0, + 0, 0, 0, 46, 114, 115, 116, 50, 0, 117, + 0, 19, 1, 2, 3, 0, 0, 0, 0, 4, + 0, 0, 40, 0, 41, 0, 42, 0, 43, 44, + 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 47, 48, 49, 50, 0, 51, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 0, + 6, 0, 7, 13, 8, 0, 9, 10, 11, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, + 14, 15, 16, 17, 14, 13, 13, 19, 13, 0, + 13, 13, 13, 0, 0, 0, 0, 0, 13, 13, + 13, 0, 0, 0, 0, 0, 14, 14, 0, 14, + 0, 14, 14, 14, 0, 126, 0, 0, 0, 14, + 14, 14, 40, 0, 41, 154, 42, 0, 43, 44, + 45, 0, 6, 0, 7, 0, 8, 0, 9, 10, + 11, 46, 127, 0, 128, 0, 0, 129, 0, 19, + 0, 13, 155, 175, 156, 0, 0, 157, 0, 19, + 40, 0, 41, 0, 42, 0, 43, 44, 45, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, + 176, 0, 177, 0, 0, 178, 0, 19, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyCheck'] = array( 5, - 21, 21, 0, 0, 12, 21, 23, 23, 0, 21, - 32, 0, 22, 22, 5, 21, 37, 10, 10, 0, - 27, 52, 12, 0, 28, 40, 36, 36, 52, 36, - 10, 37, 36, 10, 52, 41, 42, 43, 44, 45, - 37, 65, 10, 35, 37, 37, 52, 36, 69, 69, - 41, 42, 43, 44, 45, 36, 37, 69, 35, 65, - 37, 52, 12, 69, 28, 5, 6, 35, 8, 85, - 37, 21, 36, 64, 23, 106, 107, 108, 109, 110, - 23, 102, 106, 107, 108, 109, 110, 36, 106, 107, - 108, 109, 110, 36, 111, 25, 102, 103, 25, 7, - 106, 107, 108, 109, 110, 12, 36, 8, 132, 36, - 8, 27, 103, 7, 21, 106, 107, 108, 109, 110, - 36, 8, 9, 10, 11, 29, 132, 158, 148, 8, - 17, 152, 36, 36, 158, 5, 6, 168, 8, 137, - 158, 41, 42, 43, 44, 45, 152, 39, 172, 1, - 2, 3, 158, 0, 6, 29, 8, 5, 6, 180, - 180, 0, 36, 184, 188, 0, 172, 158, 180, 1, - 2, 3, 5, 6, 180, 8, 8, 168, 184, 66, - 5, 6, 188, 1, 2, 3, 1, 2, 3, 76, - 8, 0, 10, 11, 0, 13, 83, 15, 67, 17, - 18, 19, 20, 103, 1, 2, 3, 5, 6, 6, - 8, 8, 30, 31, 32, 33, 34, 36, 36, 37, - 38, 1, 2, 3, 50, 39, 104, 41, 8, 150, - 10, 11, 170, 13, 64, 15, 4, 17, 18, 19, - 20, 1, 2, 3, 35, 36, 6, 152, 8, 172, - 30, 31, 32, 33, 34, 5, 6, 37, 38, 1, - 2, 3, -1, 1, 2, 3, 8, -1, 6, 11, - 8, 13, -1, 15, -1, 17, 18, 19, 20, 1, - 2, 3, 5, 6, 6, -1, 8, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - 35, 36, 5, 6, 8, -1, 10, 11, -1, 13, - 4, 15, -1, 17, 18, 19, 20, 11, -1, 13, - -1, 15, -1, 17, 18, 19, 30, 31, 32, 33, - 34, 1, 2, 3, 38, -1, 30, 31, 8, 33, - -1, 11, 36, 13, 38, 15, -1, 17, 18, 19, - 1, 2, 3, 23, -1, 6, -1, 8, 5, 6, - 30, 31, 32, 33, 34, -1, 36, -1, 38, 1, - 2, 3, -1, -1, -1, -1, 8, -1, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, -1, -1, - -1, -1, -1, 25, -1, -1, -1, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - -1, -1, -1, -1, 8, -1, -1, 11, -1, 13, - -1, 15, -1, 17, 18, 19, -1, -1, -1, -1, - -1, -1, -1, 27, -1, -1, 30, 31, 32, 33, - 34, -1, 36, -1, 38, 1, 2, 3, -1, -1, - -1, -1, 8, -1, -1, 11, -1, 13, -1, 15, - -1, 17, 18, 19, -1, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, 31, 32, 33, 34, -1, - 36, -1, 38, 1, 2, 3, -1, -1, -1, -1, - 8, -1, -1, 11, -1, 13, -1, 15, -1, 17, - 18, 19, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, - 38, 1, 2, 3, -1, -1, -1, -1, 8, -1, - -1, 11, -1, 13, -1, 15, -1, 17, 18, 19, - -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, - 30, 31, 32, 33, 34, -1, 36, -1, 38, 1, - 2, 3, -1, -1, -1, -1, 8, -1, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - -1, -1, -1, -1, 8, -1, -1, 11, -1, 13, - 0, 15, -1, 17, 18, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 30, 31, 32, 33, - 34, 0, 22, 23, 38, 25, -1, 27, 28, 29, - -1, -1, -1, -1, -1, 35, 36, 37, -1, -1, - -1, -1, -1, 22, 23, -1, 25, -1, 27, 28, - 29, -1, 4, -1, -1, -1, 35, 36, 37, 11, - -1, 13, 4, 15, -1, 17, 18, 19, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, 30, 31, - -1, 33, -1, -1, 36, -1, 38, -1, 30, 31, - 4, 33, -1, -1, -1, -1, 38, 11, -1, 13, - -1, 15, -1, 17, 18, 19, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 30, 31, -1, 33, - -1, -1, -1, -1, 38, + 21, 21, 0, 21, 23, 23, 10, 0, 0, 21, + 0, 22, 25, 52, 5, 21, 37, 10, 10, 0, + 52, 23, 0, 36, 12, 36, 65, 22, 52, 5, + 6, 37, 8, 37, 36, 41, 42, 43, 44, 45, + 10, 36, 35, 35, 37, 37, 52, 37, 69, 69, + 41, 42, 43, 44, 45, 36, 37, 69, 36, 65, + 39, 52, 41, 69, 32, 35, 28, 85, 107, 108, + 109, 110, 111, 64, 36, 107, 108, 109, 110, 111, + 25, 12, 103, 107, 108, 109, 110, 111, 28, 40, + 21, 36, 12, 112, 133, 10, 36, 103, 104, 23, + 37, 107, 108, 109, 110, 111, 8, 9, 10, 11, + 5, 6, 36, 104, 8, 17, 107, 108, 109, 110, + 111, 160, 41, 42, 43, 44, 45, 133, 160, 149, + 27, 7, 153, 12, 27, 174, 160, 29, 170, 36, + 138, 8, 21, 36, 36, 29, 7, 153, 1, 2, + 3, 190, 36, 6, 160, 8, 1, 2, 3, 5, + 6, 182, 182, 8, 66, 186, 35, 36, 174, 160, + 182, 8, 5, 6, 76, 8, 182, 5, 6, 170, + 186, 83, 5, 6, 190, 104, 1, 2, 3, 5, + 6, 39, 8, 8, 36, 10, 11, 0, 13, 0, + 15, 0, 17, 18, 19, 20, 1, 2, 3, 5, + 6, 6, 8, 8, 0, 30, 31, 32, 33, 34, + 0, 36, 37, 38, 1, 2, 3, 1, 2, 3, + 50, 8, 67, 10, 11, 105, 13, 64, 15, 36, + 17, 18, 19, 20, 1, 2, 3, 35, 36, 6, + 151, 8, 4, 30, 31, 32, 33, 34, 5, 6, + 37, 38, 1, 2, 3, 172, 1, 2, 3, 8, + 153, 6, 11, 8, 13, 174, 15, -1, 17, 18, + 19, 20, 1, 2, 3, 5, 6, 6, -1, 8, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, 10, + 11, -1, 13, 4, 15, -1, 17, 18, 19, 20, + 11, -1, 13, -1, 15, -1, 17, 18, 19, 30, + 31, 32, 33, 34, 1, 2, 3, 38, -1, 30, + 31, 8, 33, -1, 11, 36, 13, 38, 15, -1, + 17, 18, 19, 1, 2, 3, 23, -1, 6, -1, + 8, -1, -1, 30, 31, 32, 33, 34, -1, 36, + -1, 38, 1, 2, 3, -1, -1, -1, -1, 8, + -1, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, -1, -1, -1, -1, -1, 25, -1, -1, -1, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, -1, + 11, -1, 13, -1, 15, -1, 17, 18, 19, -1, + -1, -1, -1, -1, -1, -1, 27, -1, -1, 30, + 31, 32, 33, 34, -1, 36, -1, 38, 1, 2, + 3, -1, -1, -1, -1, 8, -1, -1, 11, -1, + 13, -1, 15, -1, 17, 18, 19, -1, -1, -1, + -1, -1, -1, -1, -1, 28, -1, 30, 31, 32, + 33, 34, -1, 36, -1, 38, 1, 2, 3, -1, + -1, -1, -1, 8, -1, -1, 11, -1, 13, -1, + 15, -1, 17, 18, 19, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, + -1, 36, -1, 38, 1, 2, 3, -1, -1, -1, + -1, 8, -1, -1, 11, -1, 13, -1, 15, -1, + 17, 18, 19, -1, -1, 22, -1, -1, -1, -1, + -1, -1, -1, 30, 31, 32, 33, 34, -1, 36, + -1, 38, 1, 2, 3, -1, -1, -1, -1, 8, + -1, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, -1, + 11, -1, 13, 0, 15, -1, 17, 18, 19, 20, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, + 31, 32, 33, 34, 0, 22, 23, 38, 25, -1, + 27, 28, 29, -1, -1, -1, -1, -1, 35, 36, + 37, -1, -1, -1, -1, -1, 22, 23, -1, 25, + -1, 27, 28, 29, -1, 4, -1, -1, -1, 35, + 36, 37, 11, -1, 13, 4, 15, -1, 17, 18, + 19, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, 30, 31, -1, 33, -1, -1, 36, -1, 38, + -1, 30, 31, 4, 33, -1, -1, 36, -1, 38, + 11, -1, 13, -1, 15, -1, 17, 18, 19, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, + 31, -1, 33, -1, -1, 36, -1, 38, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyFinal'] = 20; @@ -2009,6 +2020,7 @@ //t "simplelist_contents_with_p : simplelist_line_with_p ", //t "simplelist_contents_with_p : simplelist_contents_with_p T_WHITESPACE simplelist_line_with_p ", //t "simplelist_line : T_SIMPLELIST ", +//t "simplelist_line : T_DOUBLE_NL ", //t "simplelist_line : T_ESCAPED_TAG ", //t "simplelist_line : inlinetag ", //t "simplelist_line : T_INLINE_ESC ", @@ -2018,6 +2030,7 @@ //t "simplelist_line : simplelist_line inlinetag ", //t "simplelist_line : simplelist_line T_INLINE_ESC ", //t "simplelist_line : simplelist_line htmltag ", +//t "simplelist_line : simplelist_line T_DOUBLE_NL ", //t "simplelist_line_with_p : T_SIMPLELIST ", //t "simplelist_line_with_p : T_ESCAPED_TAG ", //t "simplelist_line_with_p : inlinetag ", http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex?r1=1.16&r2=1.17&ty=u Index: pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex diff -u pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.16 pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.17 --- pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.16 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex Sat Apr 17 13:50:18 2004 @@ -16,7 +16,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: DefaultLexer.lex,v 1.16 2004/04/17 05:17:30 cellog Exp $ +// $Id: DefaultLexer.lex,v 1.17 2004/04/17 17:50:18 cellog Exp $ // require_once 'PEAR/ErrorStack.php'; @@ -718,16 +718,26 @@ } <SIMPLELIST, INTERNALSIMPLELIST> [\n]+ { + $this->_atNewLine = true; if (strlen($this->yytext()) > 1) { - // A simple list may not contain double newlines - $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; - $this->yybegin($this->_listOriginal); - if ($this->debug) echo "end simple list (in \\n handler)\n"; - $this->_atNewLine = true; - return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + $save = $this->saveState(); + if ($this->debug) { + echo "**testing tokens multi-\\n**\n"; + } + $this->advance(); + $token = $this->token; + $this->restoreState($save); + if ($token == PHP_PARSER_DOCLEX_WHITESPACE || $token == PHP_PARSER_DOCLEX_SIMPLELIST_START) { + if ($this->debug) echo "double newline in simplelist [" . $this->yytext() . "]\n"; + return array(PHP_PARSER_DOCLEX_DOUBLENL, $this->yytext()); + } else { + // A simple list may not contain double newlines + $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; + $this->yybegin($this->_listOriginal); + if ($this->debug) echo "end simple list (in \\n handler)\n"; + return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + } } - $this->_atNewLine = true; - $old = $this->yy_lexical_state; $save = $this->saveState(); if ($this->debug) { echo "**testing tokens**\n"; http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php?r1=1.14&r2=1.15&ty=u Index: pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php diff -u pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.14 pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.15 --- pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.14 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php Sat Apr 17 13:50:18 2004 @@ -16,7 +16,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: DefaultLexer.php,v 1.14 2004/04/17 05:17:30 cellog Exp $ +// $Id: DefaultLexer.php,v 1.15 2004/04/17 17:50:18 cellog Exp $ // require_once 'PEAR/ErrorStack.php'; define('PHP_Parser_DocBlock_DefaultLexer_ERROR', 1); @@ -1507,16 +1507,26 @@ } case 19: { + $this->_atNewLine = true; if (strlen($this->yytext()) > 1) { - // A simple list may not contain double newlines - $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; - $this->yybegin($this->_listOriginal); - if ($this->debug) echo "end simple list (in \\n handler)\n"; - $this->_atNewLine = true; - return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + $save = $this->saveState(); + if ($this->debug) { + echo "**testing tokens multi-\\n**\n"; + } + $this->advance(); + $token = $this->token; + $this->restoreState($save); + if ($token == PHP_PARSER_DOCLEX_WHITESPACE || $token == PHP_PARSER_DOCLEX_SIMPLELIST_START) { + if ($this->debug) echo "double newline in simplelist [" . $this->yytext() . "]\n"; + return array(PHP_PARSER_DOCLEX_DOUBLENL, $this->yytext()); + } else { + // A simple list may not contain double newlines + $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; + $this->yybegin($this->_listOriginal); + if ($this->debug) echo "end simple list (in \\n handler)\n"; + return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + } } - $this->_atNewLine = true; - $old = $this->yy_lexical_state; $save = $this->saveState(); if ($this->debug) { echo "**testing tokens**\n"; http://cvs.php.net/diff.php/pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php?r1=1.6&r2=1.7&ty=u Index: pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php diff -u pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.6 pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.7 --- pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.6 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php Sat Apr 17 13:50:18 2004 @@ -3,7 +3,7 @@ /** * API Unit tests for PHP_Parser package. * - * @version $Id: PHP_Parser_DocBlock_Default_basic_test.php,v 1.6 2004/04/17 05:17:30 cellog Exp $ + * @version $Id: PHP_Parser_DocBlock_Default_basic_test.php,v 1.7 2004/04/17 17:50:18 cellog Exp $ * @author Laurent Laville <pear@laurent-laville.org> portions from HTML_CSS * @author Greg Beaver * @package PHP_Parser @@ -553,8 +553,6 @@ Does this work? - second item - third item'; - $this->parser->debug = true; - echo '<pre>'; $this->assertEquals(array( 'summary' => array(), 'documentation' => array( @@ -573,8 +571,41 @@ 'startline' => 1, 'endline' => 5, ), $this->parser->parse($this->getOptions($comment, true)), 'parse'); - echo '</pre>'; - $this->parser->debug = false; + $this->assertNoErrors('test_parse_simplelist', 'oops 1'); + } + function test_parse_simplelist_multiparagraph() + { + if (!$this->_methodExists('parse')) { + return; + } + $comment = ' - first item + + + Does this work? + - second item + - third item'; +// $this->parser->debug = true; +// echo '<pre>'; + $this->assertEquals(array( + 'summary' => array(), + 'documentation' => array( + array( + array('list' => + array( + array(' first item', "\n\n", " Does this work?"), + array(' second item'), + array(' third item'), + ), + 'type' => '-', + ), + ) + ), + 'tags' => array(), + 'startline' => 1, + 'endline' => 7, + ), $this->parser->parse($this->getOptions($comment, true)), 'parse'); +// echo '</pre>'; +// $this->parser->debug = false; $this->assertNoErrors('test_parse_simplelist', 'oops 1'); } }
http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/Default.jay?r1=1.12&r2=1.13&ty=u Index: pear/PHP_Parser/Parser/DocBlock/Default.jay diff -u pear/PHP_Parser/Parser/DocBlock/Default.jay:1.12 pear/PHP_Parser/Parser/DocBlock/Default.jay:1.13 --- pear/PHP_Parser/Parser/DocBlock/Default.jay:1.12 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/Default.jay Sat Apr 17 13:50:18 2004 @@ -17,7 +17,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Default.jay,v 1.12 2004/04/17 05:17:30 cellog Exp $ +// $Id: Default.jay,v 1.13 2004/04/17 17:50:18 cellog Exp $ // define('PHP_PARSER_DOCBLOCK_DEFAULT_ERROR_PARSE', 1); require_once 'PHP/Parser/MsgServer.php'; @@ -1237,6 +1237,10 @@ { $$ = array($1); } + | T_DOUBLE_NL + { + $$ = array("\n\n"); + } | T_ESCAPED_TAG { $$ = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $1)); @@ -1299,6 +1303,11 @@ $$ = $1; $$[] = $2; } + | simplelist_line T_DOUBLE_NL + { + $$ = $1; + $$[] = "\n\n"; + } ; simplelist_line_with_p: http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/Default.php?r1=1.10&r2=1.11&ty=u Index: pear/PHP_Parser/Parser/DocBlock/Default.php diff -u pear/PHP_Parser/Parser/DocBlock/Default.php:1.10 pear/PHP_Parser/Parser/DocBlock/Default.php:1.11 --- pear/PHP_Parser/Parser/DocBlock/Default.php:1.10 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/Default.php Sat Apr 17 13:50:18 2004 @@ -33,7 +33,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Default.php,v 1.10 2004/04/17 05:17:30 cellog Exp $ +// $Id: Default.php,v 1.11 2004/04/17 17:50:18 cellog Exp $ // define('PHP_PARSER_DOCBLOCK_DEFAULT_ERROR_PARSE', 1); require_once 'PHP/Parser/MsgServer.php'; @@ -1439,16 +1439,21 @@ function _113($yyTop) // line 1241 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { - $this->yyVal = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop])); + $this->yyVal = array("\n\n"); } function _114($yyTop) // line 1245 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { - $this->yyVal = array($this->yyVals[0+$yyTop]); + $this->yyVal = array(str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop])); } function _115($yyTop) // line 1249 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { + $this->yyVal = array($this->yyVals[0+$yyTop]); + } + + function _116($yyTop) // line 1253 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + { if ($this->yyVals[0+$yyTop] == '{@}') { $this->yyVal = array('{@'); } elseif ($this->yyVals[0+$yyTop] == '{@*}') { @@ -1458,18 +1463,18 @@ } } - function _116($yyTop) // line 1259 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _117($yyTop) // line 1263 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _117($yyTop) // line 1263 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _118($yyTop) // line 1267 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _118($yyTop) // line 1268 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _119($yyTop) // line 1272 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; if (is_string($this->yyVal[$index])) { @@ -1479,13 +1484,13 @@ } } - function _119($yyTop) // line 1277 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _120($yyTop) // line 1281 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _120($yyTop) // line 1282 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _121($yyTop) // line 1286 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $t = array('{@'); @@ -1502,7 +1507,7 @@ } } - function _121($yyTop) // line 1298 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _122($yyTop) // line 1302 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; @@ -1510,15 +1515,21 @@ function _123($yyTop) // line 1307 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { + $this->yyVal = $this->yyVals[-1+$yyTop]; + $this->yyVal[] = "\n\n"; + } + + function _125($yyTop) // line 1316 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + { $this->yyVal = str_replace(array('<<', '>>', '/'), array('<', '>', ''), $this->yyVals[0+$yyTop]); } - function _124($yyTop) // line 1311 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _126($yyTop) // line 1320 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _125($yyTop) // line 1315 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _127($yyTop) // line 1324 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $this->yyVal = array('{@'); @@ -1529,23 +1540,23 @@ } } - function _126($yyTop) // line 1325 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _128($yyTop) // line 1334 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _127($yyTop) // line 1329 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _129($yyTop) // line 1338 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = array($this->yyVals[0+$yyTop]); } - function _128($yyTop) // line 1333 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _130($yyTop) // line 1342 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _129($yyTop) // line 1338 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _131($yyTop) // line 1347 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $index = count($this->yyVal) - 1; @@ -1556,13 +1567,13 @@ } } - function _130($yyTop) // line 1348 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _132($yyTop) // line 1357 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _131($yyTop) // line 1353 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _133($yyTop) // line 1362 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->yyVals[0+$yyTop] == '{@}') { $t = array('{@'); @@ -1580,7 +1591,7 @@ } } - function _132($yyTop) // line 1370 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _134($yyTop) // line 1379 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $index = count($this->yyVal) - 1; @@ -1591,23 +1602,23 @@ } } - function _133($yyTop) // line 1380 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _135($yyTop) // line 1389 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->yyVals[-1+$yyTop]; $this->yyVal[] = $this->yyVals[0+$yyTop]; } - function _134($yyTop) // line 1388 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _136($yyTop) // line 1397 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->_parseInlineTag($this->yyVals[-2+$yyTop], $this->yyVals[-1+$yyTop]); } - function _135($yyTop) // line 1392 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _137($yyTop) // line 1401 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { $this->yyVal = $this->_parseInlineTag($this->yyVals[-1+$yyTop], array()); } - function _136($yyTop) // line 1399 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _138($yyTop) // line 1408 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->_options['parseInternal']) { $this->yyVal = $this->yyVals[-1+$yyTop]; @@ -1616,7 +1627,7 @@ } } - function _137($yyTop) // line 1410 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + function _139($yyTop) // line 1419 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" { if ($this->_options['parseInternal']) { $this->yyVal = $this->yyVals[-1+$yyTop]; @@ -1624,13 +1635,13 @@ $this->yyVal = ''; } } - // line 1628 "-" + // line 1639 "-" - // line 1418 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" + // line 1427 "C:/devel/PHP_Parser/Parser/DocBlock/Default.jay" /**#@-*/ } - // line 1634 "-" + // line 1645 "-" $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyLhs'] = array( -1, 0, 0, 0, 0, 0, 0, 0, 3, 2, 2, @@ -1645,8 +1656,8 @@ 31, 33, 32, 32, 32, 32, 34, 34, 34, 34, 35, 35, 40, 40, 40, 38, 39, 36, 36, 37, 37, 41, 41, 41, 41, 41, 41, 41, 41, 41, - 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 10, 10, 14, 11, + 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 10, 10, 14, 11, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyLen'] = array( 2, 1, 2, 3, 2, 1, 1, 2, 2, 1, 2, @@ -1660,9 +1671,9 @@ 1, 2, 3, 3, 2, 2, 3, 2, 2, 3, 2, 2, 2, 3, 3, 4, 2, 3, 3, 4, 1, 2, 1, 1, 1, 2, 2, 1, 3, 1, - 3, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 4, 3, 3, 3, + 3, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 4, 3, 3, 3, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyDefRed'] = array( 0, 103, 104, 105, 0, 0, 0, 0, 0, 0, 0, @@ -1674,224 +1685,224 @@ 65, 66, 0, 0, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, 45, 41, 48, 0, 2, 0, 44, 42, 43, 49, 7, - 16, 0, 85, 86, 0, 112, 113, 115, 114, 116, - 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, - 0, 0, 30, 25, 31, 32, 26, 27, 28, 29, - 0, 88, 89, 0, 122, 123, 125, 126, 127, 124, - 0, 0, 0, 77, 80, 69, 0, 67, 73, 75, - 71, 136, 0, 135, 0, 0, 3, 0, 94, 0, - 87, 0, 117, 118, 120, 119, 121, 0, 78, 82, - 70, 68, 74, 76, 72, 137, 51, 0, 98, 0, - 90, 0, 128, 129, 131, 132, 133, 130, 83, 0, - 134, 106, 96, 0, 84, 107, 100, 0, + 16, 0, 85, 86, 0, 112, 114, 116, 113, 115, + 117, 0, 0, 0, 0, 81, 0, 0, 0, 0, + 0, 0, 0, 30, 25, 31, 32, 26, 27, 28, + 29, 0, 88, 89, 0, 124, 125, 127, 128, 129, + 126, 0, 0, 0, 77, 80, 69, 0, 67, 73, + 75, 71, 138, 0, 137, 0, 0, 3, 0, 94, + 0, 87, 0, 118, 119, 121, 123, 120, 122, 0, + 78, 82, 70, 68, 74, 76, 72, 139, 51, 0, + 98, 0, 90, 0, 130, 131, 133, 134, 135, 132, + 83, 0, 136, 106, 96, 0, 84, 107, 100, 0, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyDgoto'] = array( 20, 69, 22, 85, 23, 70, 24, 52, 53, 54, 25, 56, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 57, 58, 59, 60, 61, 62, 67, 104, 68, 105, - 35, 36, 63, 64, 37, 101, 131, 149, 169, 38, - 102, 132, + 57, 58, 59, 60, 61, 62, 67, 105, 68, 106, + 35, 36, 63, 64, 37, 102, 132, 150, 171, 38, + 103, 133, ); - $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yySindex'] = array( 221, - 0, 0, 0, 186, 559, -7, 597, 597, 597, 597, - 597, 0, 0, 0, 0, 0, 597, -21, -14, 0, - 183, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 153, 149, 669, 0, 0, 11, - 559, 559, 559, 559, 559, 0, 0, 0, 0, 21, - 0, 259, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 176, 204, 307, 597, 51, 0, 297, 52, - 71, -6, -3, 97, 210, 597, 187, 0, 0, 0, - 0, 0, 597, 0, 34, 0, 0, 0, 0, 0, - 0, 93, 0, 0, 251, 0, 0, 0, 0, 0, - 100, 697, 559, 94, 0, 331, 369, 407, 445, 483, - 33, 103, 0, 0, 0, 0, 0, 0, 0, 0, - 107, 0, 0, 278, 0, 0, 0, 0, 0, 0, - 122, 659, -9, 0, 0, 0, 597, 0, 0, 0, - 0, 0, 98, 0, 109, 98, 0, 169, 0, 93, - 0, 669, 0, 0, 0, 0, 0, 521, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 169, 0, 107, - 0, 307, 0, 0, 0, 0, 0, 0, 0, 297, - 0, 0, 0, 697, 0, 0, 0, 659, + $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yySindex'] = array( 224, + 0, 0, 0, 227, 562, 13, 600, 600, 600, 600, + 600, 0, 0, 0, 0, 0, 600, 33, 50, 0, + 186, 0, -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 106, 148, 310, 0, 0, 81, + 562, 562, 562, 562, 562, 0, 0, 0, 0, 86, + 0, 262, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 155, 206, 662, 600, 70, 0, 300, -1, + -12, 104, 39, 109, 132, 600, 22, 0, 0, 0, + 0, 0, 600, 0, 64, 0, 0, 0, 0, 0, + 0, 125, 0, 0, 173, 0, 0, 0, 0, 0, + 0, 107, 672, 562, 122, 0, 334, 372, 410, 448, + 486, 31, 134, 0, 0, 0, 0, 0, 0, 0, + 0, 140, 0, 0, 178, 0, 0, 0, 0, 0, + 0, 164, 700, -10, 0, 0, 0, 600, 0, 0, + 0, 0, 0, 159, 0, 153, 159, 0, 156, 0, + 125, 0, 310, 0, 0, 0, 0, 0, 0, 524, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, + 0, 140, 0, 662, 0, 0, 0, 0, 0, 0, + 0, 300, 0, 0, 0, 672, 0, 0, 0, 700, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyRindex'] = array( 0, - 0, 0, 0, 0, 0, 0, 58, 74, 85, 37, - 127, 0, 0, 0, 0, 0, 266, 154, 0, 0, - 162, 0, 166, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 56, 108, 61, + 117, 0, 0, 0, 0, 0, 213, 198, 0, 0, + 200, 0, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -8, 0, 0, 611, 0, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 0, 20, 0, 192, 0, 0, 0, 0, 0, - 0, 241, 0, 0, 0, 0, 0, 0, 0, 0, - 298, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 263, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 354, 131, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 195, 0, 0, 4, 0, 0, 0, 279, + 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, 614, 0, + 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, + 0, 0, 20, 0, 215, 0, 0, 0, 0, 0, + 0, 244, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 254, 25, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, + 0, 266, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 281, 168, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 221, 0, 0, 11, 0, 0, 0, + 282, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 350, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 632, - 0, 0, 0, 168, 0, 0, 0, 203, + 0, 353, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 635, 0, 0, 0, 185, 0, 0, 0, 205, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyGindex'] = array( 0, - 3, -15, 0, 175, 114, -16, 101, -23, -30, -5, - -17, -20, -19, -11, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 132, 123, - 182, 0, 171, 0, 10, 0, 0, 80, 63, 233, - 96, 78, + 3, -17, 0, 181, 99, -18, 82, -38, -31, -5, + -23, -20, -19, -11, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 166, 131, + 204, 0, 174, 0, 10, 0, 0, 100, 94, 249, + 118, 102, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyTable'] = array( 55, - 87, 88, 21, 8, 66, 84, 91, 90, 52, 89, - 76, 10, 179, 12, 65, 86, 100, 5, 52, 12, - 139, 118, 103, 50, 140, 77, 137, 12, 117, 137, - 5, 99, 137, 50, 120, 55, 55, 55, 55, 55, - 8, 129, 5, 52, 18, 52, 119, 12, 87, 88, - 65, 65, 65, 65, 65, 12, 12, 89, 50, 130, - 50, 65, 66, 86, 12, 108, 108, 166, 108, 147, - 18, 134, 12, 65, 136, 118, 118, 118, 118, 118, - 12, 157, 117, 117, 117, 117, 117, 137, 120, 120, - 120, 120, 120, 12, 91, 138, 156, 55, 12, 148, - 119, 119, 119, 119, 119, 103, 137, 152, 177, 12, - 167, 12, 65, 168, 159, 65, 65, 65, 65, 65, - 12, 71, 72, 73, 74, 141, 178, 118, 182, 172, - 75, 100, 137, 137, 117, 110, 110, 186, 110, 180, - 120, 106, 107, 108, 109, 110, 99, 181, 129, 1, - 2, 3, 119, 9, 94, 12, 4, 92, 93, 87, - 88, 1, 12, 157, 177, 6, 130, 65, 89, 1, - 2, 3, 109, 109, 86, 109, 4, 65, 156, 133, - 121, 122, 178, 1, 2, 3, 1, 2, 3, 143, - 4, 4, 78, 6, 11, 7, 146, 8, 135, 9, - 10, 11, 79, 158, 1, 2, 3, 111, 111, 123, - 111, 4, 13, 80, 81, 82, 17, 95, 83, 18, - 19, 1, 2, 3, 111, 144, 160, 145, 4, 183, - 5, 6, 187, 7, 124, 8, 39, 9, 10, 11, - 12, 93, 93, 93, 142, 137, 93, 184, 93, 188, - 13, 14, 15, 16, 17, 150, 151, 18, 19, 1, - 2, 3, 0, 97, 97, 97, 4, 0, 97, 40, - 97, 41, 0, 42, 0, 43, 44, 45, 112, 95, - 95, 95, 170, 171, 95, 0, 95, 0, 46, 113, - 114, 115, 50, 0, 116, 0, 19, 1, 2, 3, - 12, 12, 91, 91, 4, 0, 78, 6, 0, 7, - 125, 8, 0, 9, 10, 11, 79, 40, 0, 41, - 0, 42, 0, 43, 44, 45, 13, 80, 81, 82, - 17, 1, 2, 3, 19, 0, 46, 126, 4, 127, - 0, 40, 128, 41, 19, 42, 0, 43, 44, 45, - 99, 99, 99, 161, 0, 99, 0, 99, 92, 92, - 46, 113, 114, 115, 50, 0, 116, 0, 19, 1, - 2, 3, 0, 0, 0, 0, 4, 0, 0, 40, - 0, 41, 0, 42, 0, 43, 44, 45, 0, 0, - 0, 0, 0, 162, 0, 0, 0, 0, 46, 113, - 114, 115, 50, 0, 116, 0, 19, 1, 2, 3, - 0, 0, 0, 0, 4, 0, 0, 40, 0, 41, - 0, 42, 0, 43, 44, 45, 0, 0, 0, 0, - 0, 0, 0, 163, 0, 0, 46, 113, 114, 115, - 50, 0, 116, 0, 19, 1, 2, 3, 0, 0, - 0, 0, 4, 0, 0, 40, 0, 41, 0, 42, - 0, 43, 44, 45, 0, 0, 0, 0, 0, 0, - 0, 0, 164, 0, 46, 113, 114, 115, 50, 0, - 116, 0, 19, 1, 2, 3, 0, 0, 0, 0, - 4, 0, 0, 40, 0, 41, 0, 42, 0, 43, - 44, 45, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 165, 46, 113, 114, 115, 50, 0, 116, 0, - 19, 1, 2, 3, 0, 0, 0, 0, 4, 0, - 0, 40, 0, 41, 0, 42, 0, 43, 44, 45, - 0, 0, 185, 0, 0, 0, 0, 0, 0, 0, - 46, 113, 114, 115, 50, 0, 116, 0, 19, 1, - 2, 3, 0, 0, 0, 0, 4, 0, 0, 40, - 0, 41, 0, 42, 0, 43, 44, 45, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 46, 47, - 48, 49, 50, 0, 51, 0, 19, 1, 2, 3, - 0, 0, 0, 0, 4, 0, 0, 6, 0, 7, - 13, 8, 0, 9, 10, 11, 12, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 14, 15, 16, - 17, 14, 13, 13, 19, 13, 0, 13, 13, 13, - 0, 0, 0, 0, 0, 13, 13, 13, 0, 0, - 0, 0, 0, 14, 14, 0, 14, 0, 14, 14, - 14, 0, 173, 0, 0, 0, 14, 14, 14, 40, - 0, 41, 96, 42, 0, 43, 44, 45, 0, 6, - 0, 7, 0, 8, 0, 9, 10, 11, 46, 174, - 0, 175, 0, 0, 176, 0, 19, 0, 13, 97, - 153, 98, 0, 0, 0, 0, 19, 6, 0, 7, - 0, 8, 0, 9, 10, 11, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 154, 0, 155, - 0, 0, 0, 0, 19, + 87, 88, 21, 84, 91, 90, 5, 52, 50, 89, + 8, 181, 139, 118, 65, 86, 101, 52, 50, 12, + 119, 137, 10, 138, 66, 138, 130, 12, 121, 108, + 108, 100, 108, 18, 138, 55, 55, 55, 55, 55, + 5, 12, 52, 50, 52, 50, 120, 8, 87, 88, + 65, 65, 65, 65, 65, 12, 12, 89, 12, 131, + 145, 65, 146, 86, 76, 168, 141, 148, 118, 118, + 118, 118, 118, 65, 138, 119, 119, 119, 119, 119, + 12, 66, 159, 121, 121, 121, 121, 121, 12, 77, + 135, 12, 104, 91, 179, 5, 12, 158, 55, 12, + 18, 120, 120, 120, 120, 120, 71, 72, 73, 74, + 92, 93, 12, 65, 153, 75, 65, 65, 65, 65, + 65, 118, 107, 108, 109, 110, 111, 180, 119, 184, + 140, 149, 101, 104, 12, 130, 121, 142, 188, 138, + 182, 169, 161, 12, 138, 12, 170, 100, 1, 2, + 3, 179, 12, 94, 120, 4, 1, 2, 3, 122, + 123, 87, 88, 4, 134, 159, 143, 138, 131, 65, + 89, 174, 110, 110, 144, 110, 86, 151, 152, 65, + 158, 147, 172, 173, 180, 160, 1, 2, 3, 109, + 109, 183, 109, 4, 138, 78, 6, 9, 7, 1, + 8, 6, 9, 10, 11, 79, 1, 2, 3, 111, + 111, 124, 111, 4, 4, 13, 80, 81, 82, 17, + 11, 83, 18, 19, 1, 2, 3, 1, 2, 3, + 112, 4, 136, 5, 6, 162, 7, 125, 8, 95, + 9, 10, 11, 12, 93, 93, 93, 12, 12, 93, + 185, 93, 39, 13, 14, 15, 16, 17, 91, 91, + 18, 19, 1, 2, 3, 189, 97, 97, 97, 4, + 186, 97, 40, 97, 41, 190, 42, 0, 43, 44, + 45, 113, 95, 95, 95, 92, 92, 95, 0, 95, + 0, 46, 114, 115, 116, 50, 0, 117, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 78, + 6, 0, 7, 96, 8, 0, 9, 10, 11, 79, + 6, 0, 7, 0, 8, 0, 9, 10, 11, 13, + 80, 81, 82, 17, 1, 2, 3, 19, 0, 13, + 97, 4, 98, 0, 40, 99, 41, 19, 42, 0, + 43, 44, 45, 99, 99, 99, 163, 0, 99, 0, + 99, 0, 0, 46, 114, 115, 116, 50, 0, 117, + 0, 19, 1, 2, 3, 0, 0, 0, 0, 4, + 0, 0, 40, 0, 41, 0, 42, 0, 43, 44, + 45, 0, 0, 0, 0, 0, 164, 0, 0, 0, + 0, 46, 114, 115, 116, 50, 0, 117, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 0, + 40, 0, 41, 0, 42, 0, 43, 44, 45, 0, + 0, 0, 0, 0, 0, 0, 165, 0, 0, 46, + 114, 115, 116, 50, 0, 117, 0, 19, 1, 2, + 3, 0, 0, 0, 0, 4, 0, 0, 40, 0, + 41, 0, 42, 0, 43, 44, 45, 0, 0, 0, + 0, 0, 0, 0, 0, 166, 0, 46, 114, 115, + 116, 50, 0, 117, 0, 19, 1, 2, 3, 0, + 0, 0, 0, 4, 0, 0, 40, 0, 41, 0, + 42, 0, 43, 44, 45, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 167, 46, 114, 115, 116, 50, + 0, 117, 0, 19, 1, 2, 3, 0, 0, 0, + 0, 4, 0, 0, 40, 0, 41, 0, 42, 0, + 43, 44, 45, 0, 0, 187, 0, 0, 0, 0, + 0, 0, 0, 46, 114, 115, 116, 50, 0, 117, + 0, 19, 1, 2, 3, 0, 0, 0, 0, 4, + 0, 0, 40, 0, 41, 0, 42, 0, 43, 44, + 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 47, 48, 49, 50, 0, 51, 0, 19, + 1, 2, 3, 0, 0, 0, 0, 4, 0, 0, + 6, 0, 7, 13, 8, 0, 9, 10, 11, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, + 14, 15, 16, 17, 14, 13, 13, 19, 13, 0, + 13, 13, 13, 0, 0, 0, 0, 0, 13, 13, + 13, 0, 0, 0, 0, 0, 14, 14, 0, 14, + 0, 14, 14, 14, 0, 126, 0, 0, 0, 14, + 14, 14, 40, 0, 41, 154, 42, 0, 43, 44, + 45, 0, 6, 0, 7, 0, 8, 0, 9, 10, + 11, 46, 127, 0, 128, 0, 0, 129, 0, 19, + 0, 13, 155, 175, 156, 0, 0, 157, 0, 19, + 40, 0, 41, 0, 42, 0, 43, 44, 45, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, + 176, 0, 177, 0, 0, 178, 0, 19, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyCheck'] = array( 5, - 21, 21, 0, 0, 12, 21, 23, 23, 0, 21, - 32, 0, 22, 22, 5, 21, 37, 10, 10, 0, - 27, 52, 12, 0, 28, 40, 36, 36, 52, 36, - 10, 37, 36, 10, 52, 41, 42, 43, 44, 45, - 37, 65, 10, 35, 37, 37, 52, 36, 69, 69, - 41, 42, 43, 44, 45, 36, 37, 69, 35, 65, - 37, 52, 12, 69, 28, 5, 6, 35, 8, 85, - 37, 21, 36, 64, 23, 106, 107, 108, 109, 110, - 23, 102, 106, 107, 108, 109, 110, 36, 106, 107, - 108, 109, 110, 36, 111, 25, 102, 103, 25, 7, - 106, 107, 108, 109, 110, 12, 36, 8, 132, 36, - 8, 27, 103, 7, 21, 106, 107, 108, 109, 110, - 36, 8, 9, 10, 11, 29, 132, 158, 148, 8, - 17, 152, 36, 36, 158, 5, 6, 168, 8, 137, - 158, 41, 42, 43, 44, 45, 152, 39, 172, 1, - 2, 3, 158, 0, 6, 29, 8, 5, 6, 180, - 180, 0, 36, 184, 188, 0, 172, 158, 180, 1, - 2, 3, 5, 6, 180, 8, 8, 168, 184, 66, - 5, 6, 188, 1, 2, 3, 1, 2, 3, 76, - 8, 0, 10, 11, 0, 13, 83, 15, 67, 17, - 18, 19, 20, 103, 1, 2, 3, 5, 6, 6, - 8, 8, 30, 31, 32, 33, 34, 36, 36, 37, - 38, 1, 2, 3, 50, 39, 104, 41, 8, 150, - 10, 11, 170, 13, 64, 15, 4, 17, 18, 19, - 20, 1, 2, 3, 35, 36, 6, 152, 8, 172, - 30, 31, 32, 33, 34, 5, 6, 37, 38, 1, - 2, 3, -1, 1, 2, 3, 8, -1, 6, 11, - 8, 13, -1, 15, -1, 17, 18, 19, 20, 1, - 2, 3, 5, 6, 6, -1, 8, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - 35, 36, 5, 6, 8, -1, 10, 11, -1, 13, - 4, 15, -1, 17, 18, 19, 20, 11, -1, 13, - -1, 15, -1, 17, 18, 19, 30, 31, 32, 33, - 34, 1, 2, 3, 38, -1, 30, 31, 8, 33, - -1, 11, 36, 13, 38, 15, -1, 17, 18, 19, - 1, 2, 3, 23, -1, 6, -1, 8, 5, 6, - 30, 31, 32, 33, 34, -1, 36, -1, 38, 1, - 2, 3, -1, -1, -1, -1, 8, -1, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, -1, -1, - -1, -1, -1, 25, -1, -1, -1, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - -1, -1, -1, -1, 8, -1, -1, 11, -1, 13, - -1, 15, -1, 17, 18, 19, -1, -1, -1, -1, - -1, -1, -1, 27, -1, -1, 30, 31, 32, 33, - 34, -1, 36, -1, 38, 1, 2, 3, -1, -1, - -1, -1, 8, -1, -1, 11, -1, 13, -1, 15, - -1, 17, 18, 19, -1, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, 31, 32, 33, 34, -1, - 36, -1, 38, 1, 2, 3, -1, -1, -1, -1, - 8, -1, -1, 11, -1, 13, -1, 15, -1, 17, - 18, 19, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, 33, 34, -1, 36, -1, - 38, 1, 2, 3, -1, -1, -1, -1, 8, -1, - -1, 11, -1, 13, -1, 15, -1, 17, 18, 19, - -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, - 30, 31, 32, 33, 34, -1, 36, -1, 38, 1, - 2, 3, -1, -1, -1, -1, 8, -1, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 30, 31, - 32, 33, 34, -1, 36, -1, 38, 1, 2, 3, - -1, -1, -1, -1, 8, -1, -1, 11, -1, 13, - 0, 15, -1, 17, 18, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 30, 31, 32, 33, - 34, 0, 22, 23, 38, 25, -1, 27, 28, 29, - -1, -1, -1, -1, -1, 35, 36, 37, -1, -1, - -1, -1, -1, 22, 23, -1, 25, -1, 27, 28, - 29, -1, 4, -1, -1, -1, 35, 36, 37, 11, - -1, 13, 4, 15, -1, 17, 18, 19, -1, 11, - -1, 13, -1, 15, -1, 17, 18, 19, 30, 31, - -1, 33, -1, -1, 36, -1, 38, -1, 30, 31, - 4, 33, -1, -1, -1, -1, 38, 11, -1, 13, - -1, 15, -1, 17, 18, 19, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 30, 31, -1, 33, - -1, -1, -1, -1, 38, + 21, 21, 0, 21, 23, 23, 10, 0, 0, 21, + 0, 22, 25, 52, 5, 21, 37, 10, 10, 0, + 52, 23, 0, 36, 12, 36, 65, 22, 52, 5, + 6, 37, 8, 37, 36, 41, 42, 43, 44, 45, + 10, 36, 35, 35, 37, 37, 52, 37, 69, 69, + 41, 42, 43, 44, 45, 36, 37, 69, 36, 65, + 39, 52, 41, 69, 32, 35, 28, 85, 107, 108, + 109, 110, 111, 64, 36, 107, 108, 109, 110, 111, + 25, 12, 103, 107, 108, 109, 110, 111, 28, 40, + 21, 36, 12, 112, 133, 10, 36, 103, 104, 23, + 37, 107, 108, 109, 110, 111, 8, 9, 10, 11, + 5, 6, 36, 104, 8, 17, 107, 108, 109, 110, + 111, 160, 41, 42, 43, 44, 45, 133, 160, 149, + 27, 7, 153, 12, 27, 174, 160, 29, 170, 36, + 138, 8, 21, 36, 36, 29, 7, 153, 1, 2, + 3, 190, 36, 6, 160, 8, 1, 2, 3, 5, + 6, 182, 182, 8, 66, 186, 35, 36, 174, 160, + 182, 8, 5, 6, 76, 8, 182, 5, 6, 170, + 186, 83, 5, 6, 190, 104, 1, 2, 3, 5, + 6, 39, 8, 8, 36, 10, 11, 0, 13, 0, + 15, 0, 17, 18, 19, 20, 1, 2, 3, 5, + 6, 6, 8, 8, 0, 30, 31, 32, 33, 34, + 0, 36, 37, 38, 1, 2, 3, 1, 2, 3, + 50, 8, 67, 10, 11, 105, 13, 64, 15, 36, + 17, 18, 19, 20, 1, 2, 3, 35, 36, 6, + 151, 8, 4, 30, 31, 32, 33, 34, 5, 6, + 37, 38, 1, 2, 3, 172, 1, 2, 3, 8, + 153, 6, 11, 8, 13, 174, 15, -1, 17, 18, + 19, 20, 1, 2, 3, 5, 6, 6, -1, 8, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, 10, + 11, -1, 13, 4, 15, -1, 17, 18, 19, 20, + 11, -1, 13, -1, 15, -1, 17, 18, 19, 30, + 31, 32, 33, 34, 1, 2, 3, 38, -1, 30, + 31, 8, 33, -1, 11, 36, 13, 38, 15, -1, + 17, 18, 19, 1, 2, 3, 23, -1, 6, -1, + 8, -1, -1, 30, 31, 32, 33, 34, -1, 36, + -1, 38, 1, 2, 3, -1, -1, -1, -1, 8, + -1, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, -1, -1, -1, -1, -1, 25, -1, -1, -1, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, -1, + 11, -1, 13, -1, 15, -1, 17, 18, 19, -1, + -1, -1, -1, -1, -1, -1, 27, -1, -1, 30, + 31, 32, 33, 34, -1, 36, -1, 38, 1, 2, + 3, -1, -1, -1, -1, 8, -1, -1, 11, -1, + 13, -1, 15, -1, 17, 18, 19, -1, -1, -1, + -1, -1, -1, -1, -1, 28, -1, 30, 31, 32, + 33, 34, -1, 36, -1, 38, 1, 2, 3, -1, + -1, -1, -1, 8, -1, -1, 11, -1, 13, -1, + 15, -1, 17, 18, 19, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 29, 30, 31, 32, 33, 34, + -1, 36, -1, 38, 1, 2, 3, -1, -1, -1, + -1, 8, -1, -1, 11, -1, 13, -1, 15, -1, + 17, 18, 19, -1, -1, 22, -1, -1, -1, -1, + -1, -1, -1, 30, 31, 32, 33, 34, -1, 36, + -1, 38, 1, 2, 3, -1, -1, -1, -1, 8, + -1, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 30, 31, 32, 33, 34, -1, 36, -1, 38, + 1, 2, 3, -1, -1, -1, -1, 8, -1, -1, + 11, -1, 13, 0, 15, -1, 17, 18, 19, 20, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, + 31, 32, 33, 34, 0, 22, 23, 38, 25, -1, + 27, 28, 29, -1, -1, -1, -1, -1, 35, 36, + 37, -1, -1, -1, -1, -1, 22, 23, -1, 25, + -1, 27, 28, 29, -1, 4, -1, -1, -1, 35, + 36, 37, 11, -1, 13, 4, 15, -1, 17, 18, + 19, -1, 11, -1, 13, -1, 15, -1, 17, 18, + 19, 30, 31, -1, 33, -1, -1, 36, -1, 38, + -1, 30, 31, 4, 33, -1, -1, 36, -1, 38, + 11, -1, 13, -1, 15, -1, 17, 18, 19, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 30, + 31, -1, 33, -1, -1, 36, -1, 38, ); $GLOBALS['_PHP_PARSER_DOCBLOCK_DEFAULT']['yyFinal'] = 20; @@ -2009,6 +2020,7 @@ //t "simplelist_contents_with_p : simplelist_line_with_p ", //t "simplelist_contents_with_p : simplelist_contents_with_p T_WHITESPACE simplelist_line_with_p ", //t "simplelist_line : T_SIMPLELIST ", +//t "simplelist_line : T_DOUBLE_NL ", //t "simplelist_line : T_ESCAPED_TAG ", //t "simplelist_line : inlinetag ", //t "simplelist_line : T_INLINE_ESC ", @@ -2018,6 +2030,7 @@ //t "simplelist_line : simplelist_line inlinetag ", //t "simplelist_line : simplelist_line T_INLINE_ESC ", //t "simplelist_line : simplelist_line htmltag ", +//t "simplelist_line : simplelist_line T_DOUBLE_NL ", //t "simplelist_line_with_p : T_SIMPLELIST ", //t "simplelist_line_with_p : T_ESCAPED_TAG ", //t "simplelist_line_with_p : inlinetag ", http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex?r1=1.16&r2=1.17&ty=u Index: pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex diff -u pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.16 pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.17 --- pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex:1.16 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/DefaultLexer.lex Sat Apr 17 13:50:18 2004 @@ -16,7 +16,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: DefaultLexer.lex,v 1.16 2004/04/17 05:17:30 cellog Exp $ +// $Id: DefaultLexer.lex,v 1.17 2004/04/17 17:50:18 cellog Exp $ // require_once 'PEAR/ErrorStack.php'; @@ -718,16 +718,26 @@ } <SIMPLELIST, INTERNALSIMPLELIST> [\n]+ { + $this->_atNewLine = true; if (strlen($this->yytext()) > 1) { - // A simple list may not contain double newlines - $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; - $this->yybegin($this->_listOriginal); - if ($this->debug) echo "end simple list (in \\n handler)\n"; - $this->_atNewLine = true; - return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + $save = $this->saveState(); + if ($this->debug) { + echo "**testing tokens multi-\\n**\n"; + } + $this->advance(); + $token = $this->token; + $this->restoreState($save); + if ($token == PHP_PARSER_DOCLEX_WHITESPACE || $token == PHP_PARSER_DOCLEX_SIMPLELIST_START) { + if ($this->debug) echo "double newline in simplelist [" . $this->yytext() . "]\n"; + return array(PHP_PARSER_DOCLEX_DOUBLENL, $this->yytext()); + } else { + // A simple list may not contain double newlines + $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; + $this->yybegin($this->_listOriginal); + if ($this->debug) echo "end simple list (in \\n handler)\n"; + return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + } } - $this->_atNewLine = true; - $old = $this->yy_lexical_state; $save = $this->saveState(); if ($this->debug) { echo "**testing tokens**\n"; http://cvs.php.net/diff.php/pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php?r1=1.14&r2=1.15&ty=u Index: pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php diff -u pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.14 pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.15 --- pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php:1.14 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/Parser/DocBlock/DefaultLexer.php Sat Apr 17 13:50:18 2004 @@ -16,7 +16,7 @@ // | Authors: Greg Beaver <cellog@php.net> | // +----------------------------------------------------------------------+ // -// $Id: DefaultLexer.php,v 1.14 2004/04/17 05:17:30 cellog Exp $ +// $Id: DefaultLexer.php,v 1.15 2004/04/17 17:50:18 cellog Exp $ // require_once 'PEAR/ErrorStack.php'; define('PHP_Parser_DocBlock_DefaultLexer_ERROR', 1); @@ -1507,16 +1507,26 @@ } case 19: { + $this->_atNewLine = true; if (strlen($this->yytext()) > 1) { - // A simple list may not contain double newlines - $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; - $this->yybegin($this->_listOriginal); - if ($this->debug) echo "end simple list (in \\n handler)\n"; - $this->_atNewLine = true; - return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + $save = $this->saveState(); + if ($this->debug) { + echo "**testing tokens multi-\\n**\n"; + } + $this->advance(); + $token = $this->token; + $this->restoreState($save); + if ($token == PHP_PARSER_DOCLEX_WHITESPACE || $token == PHP_PARSER_DOCLEX_SIMPLELIST_START) { + if ($this->debug) echo "double newline in simplelist [" . $this->yytext() . "]\n"; + return array(PHP_PARSER_DOCLEX_DOUBLENL, $this->yytext()); + } else { + // A simple list may not contain double newlines + $this->yy_buffer_end = $this->yy_buffer_index = $this->yy_buffer_start; + $this->yybegin($this->_listOriginal); + if ($this->debug) echo "end simple list (in \\n handler)\n"; + return array(PHP_PARSER_DOCLEX_SIMPLELIST_END, ''); + } } - $this->_atNewLine = true; - $old = $this->yy_lexical_state; $save = $this->saveState(); if ($this->debug) { echo "**testing tokens**\n"; http://cvs.php.net/diff.php/pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php?r1=1.6&r2=1.7&ty=u Index: pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php diff -u pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.6 pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.7 --- pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php:1.6 Sat Apr 17 01:17:30 2004 +++ pear/PHP_Parser/tests/PHP_Parser_DocBlock_Default_basic_test.php Sat Apr 17 13:50:18 2004 @@ -3,7 +3,7 @@ /** * API Unit tests for PHP_Parser package. * - * @version $Id: PHP_Parser_DocBlock_Default_basic_test.php,v 1.6 2004/04/17 05:17:30 cellog Exp $ + * @version $Id: PHP_Parser_DocBlock_Default_basic_test.php,v 1.7 2004/04/17 17:50:18 cellog Exp $ * @author Laurent Laville <pear@laurent-laville.org> portions from HTML_CSS * @author Greg Beaver * @package PHP_Parser @@ -553,8 +553,6 @@ Does this work? - second item - third item'; - $this->parser->debug = true; - echo '<pre>'; $this->assertEquals(array( 'summary' => array(), 'documentation' => array( @@ -573,8 +571,41 @@ 'startline' => 1, 'endline' => 5, ), $this->parser->parse($this->getOptions($comment, true)), 'parse'); - echo '</pre>'; - $this->parser->debug = false; + $this->assertNoErrors('test_parse_simplelist', 'oops 1'); + } + function test_parse_simplelist_multiparagraph() + { + if (!$this->_methodExists('parse')) { + return; + } + $comment = ' - first item + + + Does this work? + - second item + - third item'; +// $this->parser->debug = true; +// echo '<pre>'; + $this->assertEquals(array( + 'summary' => array(), + 'documentation' => array( + array( + array('list' => + array( + array(' first item', "\n\n", " Does this work?"), + array(' second item'), + array(' third item'), + ), + 'type' => '-', + ), + ) + ), + 'tags' => array(), + 'startline' => 1, + 'endline' => 7, + ), $this->parser->parse($this->getOptions($comment, true)), 'parse'); +// echo '</pre>'; +// $this->parser->debug = false; $this->assertNoErrors('test_parse_simplelist', 'oops 1'); } }