This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from a6ed963 [NETBEANS-1342] Hide the panel for iOS in the Mobile
Platforms Options (#953)
add 2df1fe5 [NETBEANS-1563] Error while parsing HEREDOC
new 0614aef Merge pull request #989 from
junichi11/netbeans-1563-heredoc-syntax-error
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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} | 0
.../unit/data/testfiles/parser/netbeans1563_02.php | 23 +
.../testfiles/parser/netbeans1563_02.php.errors} | 0
.../unit/data/testfiles/parser/netbeans1563_03.php | 23 +
.../testfiles/parser/netbeans1563_03.php.errors} | 0
.../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, 1060 insertions(+), 435 deletions(-)
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_02.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_03.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/netbeans1563_04.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_01.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_02.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_03.pass
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/netbeans1563_04.pass
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/netbeans1563_01.php
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/netbeans1563_02.php
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/netbeans1563_03.php
create mode 100644
php/php.editor/test/unit/data/testfiles/lexer/netbeans1563_04.php
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/netbeans1563_01.php
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=> php.editor/test/unit/data/testfiles/parser/netbeans1563_01.php.errors} (100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/netbeans1563_02.php
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=> php.editor/test/unit/data/testfiles/parser/netbeans1563_02.php.errors} (100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/netbeans1563_03.php
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=> php.editor/test/unit/data/testfiles/parser/netbeans1563_03.php.errors} (100%)
create mode 100644
php/php.editor/test/unit/data/testfiles/parser/netbeans1563_04.php
copy
webcommon/web.clientproject/test/qa-functional/data/simpleProject/public_html/refresh.js
=> php/php.editor/test/unit/data/testfiles/parser/netbeans1563_04.php.errors
(100%)
---------------------------------------------------------------------
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
