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 0614aef Merge pull request #989 from
junichi11/netbeans-1563-heredoc-syntax-error
add 84dd8ca [NETBEANS-1552] Syntax error for UVS
new 9ff3df1 Merge pull request #990 from
junichi11/netbeans-1552-syntax-error-uvs
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/php.editor/build.xml | 43 +
.../modules/php/editor/parser/ASTPHP5Parser.java | 1846 ++--
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../php/editor/parser/EncodedActionTable1.java | 7282 ++++++++--------
.../php/editor/parser/EncodedActionTable10.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable11.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable12.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable13.java | 8540 ++++++++++---------
.../php/editor/parser/EncodedActionTable14.java | 487 ++
.../php/editor/parser/EncodedActionTable2.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable3.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable4.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable5.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable6.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable7.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable8.java | 9000 ++++++++++----------
.../php/editor/parser/EncodedActionTable9.java | 9000 ++++++++++----------
.../parser/astnodes/DereferencableVariable.java | 3 +-
.../parser/uniformVariableSyntax_38.pass | 702 ++
.../testfiles/parser/uniformVariableSyntax_38.php} | 44 +-
.../parser/uniformVariableSyntax_38.php.errors} | 0
.../php/editor/parser/ASTPHP5ParserTest.java | 6 +
.../php/editor/parser/PhpParserErrorTest.java | 6 +
php/php.editor/tools/ASTPHP5Parser.cup | 16 +-
24 files changed, 59878 insertions(+), 58099 deletions(-)
create mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable14.java
create mode 100644
php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/uniformVariableSyntax_38.pass
copy
php/php.editor/{src/org/netbeans/modules/php/editor/parser/astnodes/DereferencableVariable.java
=> test/unit/data/testfiles/parser/uniformVariableSyntax_38.php} (54%)
copy
php/{php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl
=>
php.editor/test/unit/data/testfiles/parser/uniformVariableSyntax_38.php.errors}
(100%)
---------------------------------------------------------------------
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
