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 983e2eb861b0d952add8694782fe20f60964c2dd Merge: 17587af d3f9a4c Author: Tomáš Myšík <tomas.my...@gmail.com> AuthorDate: Thu Sep 20 10:06:44 2018 +0200 Merge pull request #889 from junichi11/php7.3-support-flexible-heredoc-nowdoc-syntaxes [NETBEANS-946] PHP 7.3 support (Flexible Heredoc and Nowdoc Syntaxes) .../php/editor/lexer/PHP5ColoringLexer.java | 2689 +++++++++---------- .../modules/php/editor/parser/ASTPHP5Scanner.java | 2740 ++++++++++---------- .../modules/php/editor/parser/astnodes/Quote.java | 9 +- .../editor/verification/PHP73UnhandledError.java | 51 + .../lexer/PHP53FeaturesTest/lexer/heredoc_001.pass | 50 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_002.pass | 50 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_003.pass | 54 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_004.pass | 58 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_005.pass | 72 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_006.pass | 92 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_007.pass | 88 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_009.pass | 49 - .../lexer/PHP53FeaturesTest/lexer/heredoc_010.pass | 74 - .../lexer/PHP53FeaturesTest/lexer/heredoc_011.pass | 39 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_012.pass | 21 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_013.pass | 21 +- .../lexer/PHP53FeaturesTest/lexer/heredoc_015.pass | 61 +- .../lexer/PHP53FeaturesTest/lexer/issue225549.pass | 9 +- .../lexer/PHP53FeaturesTest/lexer/nowdoc_008.pass | 42 +- .../lexer/PHP53FeaturesTest/lexer/nowdoc_009.pass | 35 - .../lexer/PHP53FeaturesTest/lexer/nowdoc_010.pass | 42 - .../lexer/PHP53FeaturesTest/lexer/nowdoc_012.pass | 35 +- .../lexer/PHP53FeaturesTest/lexer/nowdoc_013.pass | 69 +- .../lexer/PHP53FeaturesTest/lexer/nowdoc_014.pass | 69 +- .../lexer/PHP53FeaturesTest/lexer/nowdoc_015.pass | 243 +- .../lexer/php73/heredoc_indent_spaces_01.pass | 26 + .../lexer/php73/heredoc_indent_spaces_02.pass | 24 + .../lexer/php73/heredoc_indent_spaces_03.pass | 20 + .../lexer/php73/heredoc_indent_spaces_04.pass | 20 + .../lexer/php73/heredoc_indent_tabs_01.pass | 26 + .../lexer/php73/heredoc_indent_tabs_02.pass | 24 + .../lexer/php73/heredoc_indent_tabs_03.pass | 20 + .../lexer/php73/heredoc_mixed_01.pass | 93 + .../lexer/php73/heredoc_mixed_02.pass | 90 + .../lexer/php73/heredoc_mixed_03.pass | 39 + .../lexer/php73/heredoc_new_line_01.pass | 34 + .../lexer/php73/heredoc_new_line_02.pass | 23 + .../lexer/php73/heredoc_new_line_03.pass | 23 + .../lexer/php73/heredoc_new_line_04.pass | 25 + .../lexer/php73/nowdoc_indent_spaces_01.pass | 25 + .../lexer/php73/nowdoc_indent_spaces_02.pass | 24 + .../lexer/php73/nowdoc_indent_spaces_03.pass | 20 + .../lexer/php73/nowdoc_indent_spaces_04.pass | 20 + .../lexer/php73/nowdoc_indent_tabs_01.pass | 25 + .../lexer/php73/nowdoc_indent_tabs_02.pass | 24 + .../lexer/php73/nowdoc_indent_tabs_03.pass | 20 + .../lexer/php73/nowdoc_mixed_01.pass | 67 + .../lexer/php73/nowdoc_mixed_02.pass | 52 + .../lexer/php73/nowdoc_mixed_03.pass | 23 + .../lexer/php73/nowdoc_new_line_01.pass | 28 + .../lexer/php73/nowdoc_new_line_02.pass | 20 + .../lexer/php73/nowdoc_new_line_03.pass | 20 + .../lexer/php73/nowdoc_new_line_04.pass | 20 + .../editor/lexer/PHPLexerTest/lexer/heredoc00.pass | 85 +- .../lexer/PHPLexerTest/lexer/heredoc_02.pass | 11 +- .../lexer/PHPLexerTest/lexer/heredoc_03.pass | 17 +- .../lexer/PHPLexerTest/lexer/issue221484.pass | 9 +- .../lexer/PHPLexerTest/lexer/issue222092_01.pass | 9 +- .../lexer/PHPLexerTest/lexer/issue222092_02.pass | 9 +- .../{ => php73}/functionCallTrailingCommas_01.pass | 0 .../parser/php73/heredoc_indent_spaces_01.pass | 73 + .../parser/php73/heredoc_indent_spaces_02.pass | 69 + .../parser/php73/heredoc_indent_spaces_03.pass | 68 + .../parser/php73/heredoc_indent_spaces_04.pass | 68 + .../parser/php73/heredoc_indent_tabs_01.pass | 73 + .../parser/php73/heredoc_indent_tabs_02.pass | 69 + .../parser/php73/heredoc_indent_tabs_03.pass | 68 + .../parser/php73/heredoc_mixed_01.pass | 319 +++ .../parser/php73/heredoc_mixed_02.pass | 317 +++ .../parser/php73/heredoc_mixed_03.pass | 149 ++ .../parser/php73/heredoc_new_line_01.pass | 109 + .../parser/php73/heredoc_new_line_02.pass | 72 + .../parser/php73/heredoc_new_line_03.pass | 72 + .../parser/php73/heredoc_new_line_04.pass | 82 + .../{ => php73}/listReferenceAssignment_01.pass | 0 .../parser/php73/nowdoc_indent_spaces_01.pass | 69 + .../parser/php73/nowdoc_indent_spaces_02.pass | 66 + .../parser/php73/nowdoc_indent_spaces_03.pass | 65 + .../parser/php73/nowdoc_indent_spaces_04.pass | 65 + .../parser/php73/nowdoc_indent_tabs_01.pass | 69 + .../parser/php73/nowdoc_indent_tabs_02.pass | 66 + .../parser/php73/nowdoc_indent_tabs_03.pass | 65 + .../parser/php73/nowdoc_mixed_01.pass | 239 ++ .../parser/php73/nowdoc_mixed_02.pass | 151 ++ .../parser/php73/nowdoc_mixed_03.pass | 81 + .../parser/php73/nowdoc_new_line_01.pass | 101 + .../parser/php73/nowdoc_new_line_02.pass | 68 + .../parser/php73/nowdoc_new_line_03.pass | 68 + .../parser/php73/nowdoc_new_line_04.pass | 68 + .../testfiles/formatting/flexibleHeredoc_01.php | 49 + .../formatting/flexibleHeredoc_01.php.formatted | 50 + .../testfiles/formatting/flexibleNowdoc_01.php | 49 + .../formatting/flexibleNowdoc_01.php.formatted | 50 + .../lexer/php73/heredoc_indent_spaces_01.php | 26 + .../lexer/php73/heredoc_indent_spaces_02.php | 25 + .../lexer/php73/heredoc_indent_spaces_03.php | 22 + .../lexer/php73/heredoc_indent_spaces_04.php | 22 + .../lexer/php73/heredoc_indent_tabs_01.php | 26 + .../lexer/php73/heredoc_indent_tabs_02.php | 25 + .../lexer/php73/heredoc_indent_tabs_03.php | 22 + .../testfiles/lexer/php73/heredoc_mixed_01.php | 49 + .../testfiles/lexer/php73/heredoc_mixed_02.php | 42 + .../testfiles/lexer/php73/heredoc_mixed_03.php | 29 + .../testfiles/lexer/php73/heredoc_new_line_01.php | 31 + .../testfiles/lexer/php73/heredoc_new_line_02.php | 25 + .../testfiles/lexer/php73/heredoc_new_line_03.php | 25 + .../testfiles/lexer/php73/heredoc_new_line_04.php | 25 + .../lexer/php73/nowdoc_indent_spaces_01.php | 26 + .../lexer/php73/nowdoc_indent_spaces_02.php | 25 + .../lexer/php73/nowdoc_indent_spaces_03.php | 22 + .../lexer/php73/nowdoc_indent_spaces_04.php | 22 + .../lexer/php73/nowdoc_indent_tabs_01.php | 26 + .../lexer/php73/nowdoc_indent_tabs_02.php | 25 + .../lexer/php73/nowdoc_indent_tabs_03.php | 22 + .../data/testfiles/lexer/php73/nowdoc_mixed_01.php | 49 + .../data/testfiles/lexer/php73/nowdoc_mixed_02.php | 42 + .../data/testfiles/lexer/php73/nowdoc_mixed_03.php | 29 + .../testfiles/lexer/php73/nowdoc_new_line_01.php | 31 + .../testfiles/lexer/php73/nowdoc_new_line_02.php | 25 + .../testfiles/lexer/php73/nowdoc_new_line_03.php | 25 + .../testfiles/lexer/php73/nowdoc_new_line_04.php | 25 + .../unit/data/testfiles/parser/heredoc_009.php | 42 - .../unit/data/testfiles/parser/heredoc_010.php | 32 - .../test/unit/data/testfiles/parser/nowdoc_009.php | 40 - .../test/unit/data/testfiles/parser/nowdoc_010.php | 33 - .../{ => php73}/functionCallTrailingCommas_01.php | 0 .../functionCallTrailingCommas_01.php.errors | 0 .../{ => php73}/functionCallTrailingCommas_02.php | 0 .../functionCallTrailingCommas_02.php.errors | 0 .../{ => php73}/functionCallTrailingCommas_03.php | 0 .../functionCallTrailingCommas_03.php.errors | 0 .../{ => php73}/functionCallTrailingCommas_04.php | 0 .../functionCallTrailingCommas_04.php.errors | 0 .../parser/php73/heredoc_indent_spaces_01.php | 26 + .../heredoc_indent_spaces_01.php.errors} | 0 .../parser/php73/heredoc_indent_spaces_02.php | 25 + .../heredoc_indent_spaces_02.php.errors} | 0 .../parser/php73/heredoc_indent_spaces_03.php | 22 + .../heredoc_indent_spaces_03.php.errors} | 0 .../parser/php73/heredoc_indent_spaces_04.php | 22 + .../heredoc_indent_spaces_04.php.errors} | 0 .../parser/php73/heredoc_indent_tabs_01.php | 26 + .../heredoc_indent_tabs_01.php.errors} | 0 .../parser/php73/heredoc_indent_tabs_02.php | 25 + .../heredoc_indent_tabs_02.php.errors} | 0 .../parser/php73/heredoc_indent_tabs_03.php | 22 + .../heredoc_indent_tabs_03.php.errors} | 0 .../testfiles/parser/php73/heredoc_mixed_01.php | 49 + .../heredoc_mixed_01.php.errors} | 0 .../testfiles/parser/php73/heredoc_mixed_02.php | 42 + .../heredoc_mixed_02.php.errors} | 0 .../testfiles/parser/php73/heredoc_mixed_03.php | 29 + .../heredoc_mixed_03.php.errors} | 0 .../testfiles/parser/php73/heredoc_new_line_01.php | 31 + .../heredoc_new_line_01.php.errors} | 0 .../testfiles/parser/php73/heredoc_new_line_02.php | 25 + .../heredoc_new_line_02.php.errors} | 0 .../testfiles/parser/php73/heredoc_new_line_03.php | 25 + .../heredoc_new_line_03.php.errors} | 0 .../testfiles/parser/php73/heredoc_new_line_04.php | 25 + .../heredoc_new_line_04.php.errors} | 0 .../parser/php73/heredoc_new_line_error_01.php | 25 + .../php73/heredoc_new_line_error_01.php.errors | 16 + .../parser/php73/heredoc_new_line_error_02.php | 25 + .../php73/heredoc_new_line_error_02.php.errors | 16 + .../{ => php73}/listReferenceAssignment_01.php | 0 .../listReferenceAssignment_01.php.errors | 0 .../parser/php73/nowdoc_indent_spaces_01.php | 26 + .../nowdoc_indent_spaces_01.php.errors} | 0 .../parser/php73/nowdoc_indent_spaces_02.php | 25 + .../nowdoc_indent_spaces_02.php.errors} | 0 .../parser/php73/nowdoc_indent_spaces_03.php | 22 + .../nowdoc_indent_spaces_03.php.errors} | 0 .../parser/php73/nowdoc_indent_spaces_04.php | 22 + .../nowdoc_indent_spaces_04.php.errors} | 0 .../parser/php73/nowdoc_indent_tabs_01.php | 26 + .../nowdoc_indent_tabs_01.php.errors} | 0 .../parser/php73/nowdoc_indent_tabs_02.php | 25 + .../nowdoc_indent_tabs_02.php.errors} | 0 .../parser/php73/nowdoc_indent_tabs_03.php | 22 + .../nowdoc_indent_tabs_03.php.errors} | 0 .../testfiles/parser/php73/nowdoc_mixed_01.php | 49 + .../nowdoc_mixed_01.php.errors} | 0 .../testfiles/parser/php73/nowdoc_mixed_02.php | 42 + .../nowdoc_mixed_02.php.errors} | 0 .../testfiles/parser/php73/nowdoc_mixed_03.php | 29 + .../nowdoc_mixed_03.php.errors} | 0 .../testfiles/parser/php73/nowdoc_new_line_01.php | 31 + .../nowdoc_new_line_01.php.errors} | 0 .../testfiles/parser/php73/nowdoc_new_line_02.php | 25 + .../nowdoc_new_line_02.php.errors} | 0 .../testfiles/parser/php73/nowdoc_new_line_03.php | 25 + .../nowdoc_new_line_03.php.errors} | 0 .../testfiles/parser/php73/nowdoc_new_line_04.php | 25 + .../nowdoc_new_line_04.php.errors} | 0 .../parser/php73/nowdoc_new_line_error_01.php | 25 + .../php73/nowdoc_new_line_error_01.php.errors | 16 + .../parser/php73/nowdoc_new_line_error_02.php | 25 + .../php73/nowdoc_new_line_error_02.php.errors | 16 + .../php/editor/indent/PHPFormatterTest.java | 11 + .../php/editor/lexer/PHP53FeaturesTest.java | 20 +- .../php/editor/lexer/PHP73FeaturesTest.java | 149 ++ .../php/editor/parser/ASTPHP5ParserTest.java | 140 +- .../php/editor/parser/PhpParserErrorTest.java | 142 +- php/php.editor/tools/ASTPHP5Scanner.flex | 140 +- php/php.editor/tools/Php5ColoringScanner.flex | 152 +- 206 files changed, 9729 insertions(+), 3736 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists