This is an automated email from the ASF dual-hosted git repository. tmysik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 0614aefff6cfe98341767affb32f3f2c128cfb49 Merge: a6ed963 2df1fe5 Author: Tomáš Myšík <[email protected]> AuthorDate: Sun Oct 28 16:05:18 2018 +0100 Merge pull request #989 from junichi11/netbeans-1563-heredoc-syntax-error [NETBEANS-1563] Error while parsing HEREDOC .../php/editor/lexer/PHP5ColoringLexer.java | 604 +++++++++++---------- .../modules/php/editor/parser/ASTPHP5Scanner.java | 248 +++++---- .../lexer/PHPLexerTest/lexer/netbeans1563_01.pass | 18 + .../lexer/PHPLexerTest/lexer/netbeans1563_02.pass | 16 + .../lexer/PHPLexerTest/lexer/netbeans1563_03.pass | 21 + .../lexer/PHPLexerTest/lexer/netbeans1563_04.pass | 23 + .../ASTPHP5ParserTest/parser/netbeans1563_01.pass | 45 ++ .../ASTPHP5ParserTest/parser/netbeans1563_02.pass | 45 ++ .../ASTPHP5ParserTest/parser/netbeans1563_03.pass | 73 +++ .../ASTPHP5ParserTest/parser/netbeans1563_04.pass | 73 +++ .../unit/data/testfiles/lexer/netbeans1563_01.php | 26 + .../unit/data/testfiles/lexer/netbeans1563_02.php | 23 + .../unit/data/testfiles/lexer/netbeans1563_03.php | 23 + .../unit/data/testfiles/lexer/netbeans1563_04.php | 26 + .../unit/data/testfiles/parser/netbeans1563_01.php | 26 + .../testfiles/parser/netbeans1563_01.php.errors | 1 + .../unit/data/testfiles/parser/netbeans1563_02.php | 23 + .../testfiles/parser/netbeans1563_02.php.errors | 1 + .../unit/data/testfiles/parser/netbeans1563_03.php | 23 + .../testfiles/parser/netbeans1563_03.php.errors | 1 + .../unit/data/testfiles/parser/netbeans1563_04.php | 26 + .../testfiles/parser/netbeans1563_04.php.errors | 0 .../modules/php/editor/lexer/PHPLexerTest.java | 17 + .../php/editor/parser/ASTPHP5ParserTest.java | 17 + .../php/editor/parser/PhpParserErrorTest.java | 17 + php/php.editor/tools/ASTPHP5Scanner.flex | 42 +- php/php.editor/tools/Php5ColoringScanner.flex | 40 +- 27 files changed, 1063 insertions(+), 435 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
