This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 37fddc4c685 Merge pull request #9113 from haidubogdan/t_php85
add efe097332a8 PHP editor: reenable ant targets to regenerate
lexers/scanner/parsed based on their inputs
new 54cff995995 Merge pull request #9264 from
matthiasblaesing/php.editor.simplify_grammar_generation
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:
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +
php/php.editor/build.xml | 147 ++++++++----
php/php.editor/external/binaries-list | 2 +
.../php.editor}/external/jflex-1.4.3-license.txt | 1 +
.../netbeans-php-parser-cutter-1.0-license.txt | 10 +-
.../editor/lexer/DocumentorColoringScanner.java | 144 ++++++-----
.../php/editor/lexer/PHP5ColoringLexer.java | 66 ++---
.../modules/php/editor/parser/ASTPHP5Parser.java | 4 +-
.../modules/php/editor/parser/ASTPHP5Scanner.java | 59 +++--
.../modules/php/editor/parser/ASTPHP5Symbols.java | 2 +-
.../php/editor/parser/EncodedActionTable1.java | 1 -
.../php/editor/parser/EncodedActionTable10.java | 1 -
.../php/editor/parser/EncodedActionTable11.java | 1 -
.../php/editor/parser/EncodedActionTable12.java | 1 -
.../php/editor/parser/EncodedActionTable13.java | 1 -
.../php/editor/parser/EncodedActionTable14.java | 1 -
.../php/editor/parser/EncodedActionTable15.java | 1 -
.../php/editor/parser/EncodedActionTable16.java | 1 -
.../php/editor/parser/EncodedActionTable17.java | 1 -
.../php/editor/parser/EncodedActionTable18.java | 1 -
.../php/editor/parser/EncodedActionTable19.java | 1 -
.../php/editor/parser/EncodedActionTable2.java | 1 -
.../php/editor/parser/EncodedActionTable20.java | 1 -
.../php/editor/parser/EncodedActionTable21.java | 1 -
.../php/editor/parser/EncodedActionTable22.java | 266 ---------------------
.../php/editor/parser/EncodedActionTable3.java | 1 -
.../php/editor/parser/EncodedActionTable4.java | 1 -
.../php/editor/parser/EncodedActionTable5.java | 1 -
.../php/editor/parser/EncodedActionTable6.java | 1 -
.../php/editor/parser/EncodedActionTable7.java | 1 -
.../php/editor/parser/EncodedActionTable8.java | 1 -
.../php/editor/parser/EncodedActionTable9.java | 1 -
32 files changed, 265 insertions(+), 460 deletions(-)
copy {webcommon/javascript2.jade =>
php/php.editor}/external/jflex-1.4.3-license.txt (99%)
copy
contrib/j2ee.weblogic9/external/j2ee.weblogic9-generated-schema-classes-license.txt
=> php/php.editor/external/netbeans-php-parser-cutter-1.0-license.txt (99%)
delete mode 100644
php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable22.java
---------------------------------------------------------------------
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
