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 9ff3df1b97ef8fd6bb842fc6d98ff98c39a834d0
Merge: 0614aef 84dd8ca
Author: Tomáš Myšík <tomas.my...@gmail.com>
AuthorDate: Sun Oct 28 16:50:48 2018 +0100
Merge pull request #990 from junichi11/netbeans-1552-syntax-error-uvs
[NETBEANS-1552] Syntax error for UVS
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 | 1 +
.../php/editor/parser/ASTPHP5ParserTest.java | 6 +
.../php/editor/parser/PhpParserErrorTest.java | 6 +
php/php.editor/tools/ASTPHP5Parser.cup | 16 +-
24 files changed, 59879 insertions(+), 58099 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
